[plans] Update older plans with build dependencies, etc.

This is a mixed bag commit, but freshens our software world Plan set.

Signed-off-by: Fletcher Nichol <[email protected]>

Pull request: #466
Approved by: adamhjk

plans/erlang/plan.sh

@@ -7,22 +7,39 @@ pkg_maintainer="The Habitat Maintainers <[email protected]>"
 pkg_source=http://www.erlang.org/download/otp_src_${pkg_version}.tar.gz
 pkg_filename=otp_src_${pkg_version}.tar.gz
 pkg_shasum=82d76ebfeeda5db64ea5b0f1a04aa0e9ac63380b278722e0e6052249bd3fe39a
-pkg_deps=(core/glibc core/zlib)
-pkg_lib_dirs=(lib)
+pkg_deps=(core/glibc core/zlib core/ncurses)
+pkg_build_deps=(core/coreutils core/gcc core/make core/perl)
+pkg_bin_dirs=(bin)
 pkg_include_dirs=(include)
+pkg_lib_dirs=(lib)
+
+do_prepare() {
+  # The `/bin/pwd` path is hardcoded, so we'll add a symlink if needed.
+  if [[ ! -r /bin/pwd ]]; then
+    ln -sv $(pkg_path_for coreutils)/bin/pwd /bin/pwd
+    _clean_pwd=true
+  fi
+}
 
 do_build() {
-    ./configure --prefix=${pkg_prefix} \
-                --enable-threads \
-                --enable-smp-support \
-                --enable-kernel-poll \
-                --enable-threads \
-                --enable-smp-support \
-                --enable-kernel-poll \
-                --enable-dynamic-ssl-lib \
-                --enable-shared-zlib \
-                --enable-hipe \
-                --without-javac \
-                --disable-debug
-    make
+  ./configure --prefix=${pkg_prefix} \
+              --enable-threads \
+              --enable-smp-support \
+              --enable-kernel-poll \
+              --enable-threads \
+              --enable-smp-support \
+              --enable-kernel-poll \
+              --enable-dynamic-ssl-lib \
+              --enable-shared-zlib \
+              --enable-hipe \
+              --without-javac \
+              --disable-debug
+  make
+}
+
+do_end() {
+  # Clean up the `pwd` link, if we set it up.
+  if [[ -n "$_clean_pwd" ]]; then
+    rm -fv /bin/pwd
+  fi
 }

plans/libaio/plan.sh

@@ -4,10 +4,11 @@ pkg_version=0.3.109
 pkg_license=('LGPL')
 pkg_maintainer="The Habitat Maintainers <[email protected]>"
 pkg_source=http://ftp.de.debian.org/debian/pool/main/liba/${pkg_name}/${pkg_name}_${pkg_version}.orig.tar.gz
+pkg_shasum=bf4a457253cbaab215aea75cb6e18dc8d95bbd507e9920661ff9bdd288c8778d
 pkg_filename=${pkg_name}-${pkg_version}.tar.gz
-pkg_lib_dirs=(lib)
+pkg_build_deps=(core/coreutils core/gcc core/make)
 pkg_include_dirs=(include)
-pkg_shasum=bf4a457253cbaab215aea75cb6e18dc8d95bbd507e9920661ff9bdd288c8778d
+pkg_lib_dirs=(lib)
 
 do_build() {
   make

plans/linux-pam/plan.sh

@@ -1,13 +1,14 @@
-pkg_origin=core
 pkg_name=linux-pam
+pkg_origin=core
 pkg_version=1.2.1
 pkg_license=('MIT', 'GPL')
 pkg_maintainer="The Habitat Maintainers <[email protected]>"
 pkg_source=http://www.linux-pam.org/library/Linux-PAM-1.2.1.tar.gz
 pkg_filename=${pkg_name}-${pkg_version}.tar.gz
 pkg_dirname=Linux-PAM-${pkg_version}
-pkg_lib_dirs=(lib)
-pkg_include_dirs=(include)
-pkg_bin_dirs=(sbin)
 pkg_shasum=8e3f07fdbad5b1c030498fd6298e115e6f740d39d930390fc6937d14fa5c1b4a
 pkg_deps=(core/glibc)
+pkg_build_deps=(core/coreutils core/gcc core/make)
+pkg_bin_dirs=(sbin)
+pkg_include_dirs=(include)
+pkg_lib_dirs=(lib)

plans/man-pages/plan.sh

@@ -5,6 +5,7 @@ pkg_maintainer="The Habitat Maintainers <[email protected]>"
 pkg_license=('gplv2')
 pkg_source=http://ftp.kernel.org/pub/linux/docs/$pkg_name/${pkg_name}-${pkg_version}.tar.xz
 pkg_shasum=48aacb75d522dd31978682c4fd8bc68e43c9a409bc4c7a126810e7610dff0dd3
+pkg_build_deps=(core/coreutils core/make)
 
 do_build() {
   return 0

plans/nodejs-tutorial-app/plan.sh

@@ -19,8 +19,8 @@ do_install() {
   # Copy our source files from HAB_CACHE_SRC_PATH to the nodejs-tutorial-app
   # package.  This is so that when Habitat calls "npm start" at start-up, we
   # have the source files included in the package.
-  cp package.json ${pkg_path}
-  cp server.js ${pkg_path}
+  cp package.json $pkg_prefix/
+  cp server.js $pkg_prefix/
 
   # Copy over the nconf module to the package that we installed in do_build().
   mkdir -p ${pkg_prefix}/node_modules/