Add option to append version number in fpkg()

[hvlinux.git] / stage3 / packages-update

diff --git a/stage3/packages-update b/stage3/packages-update
index 74168ad..0059278 100755 (executable)
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -8,7 +8,6 @@ update_packages_init ${*}
 lpkg 2 ${SHADOW}
 
 # These packages are only for stage3
-
 fpkg -m gnu ${WHICH}
 fpkg -e "tar.gz" ${BASHCOMPLETION} "http://www.caliban.org/files/bash"
 fpkg -s "software/utils/pciutils" ${PCIUTILS} ${KERNEL_URL}
@@ -46,15 +45,14 @@ fpkg -m sf ${DDCLIENT}
 fpkg -e "tar.gz" ${LIBPCAP} ${TCPDUMP_URL}
 fpkg -e "tar.gz" ${TCPDUMP} ${TCPDUMP_URL}
 fpkg ${NMAP} "http://download.insecure.org/nmap/dist"
-fpkg -e "tar.gz" -s "$(get_pkg_ver ${BIND})" ${BIND} \
-    "ftp://ftp.isc.org/isc/bind9"
+fpkg -e "tar.gz" -v 0 ${BIND} "ftp://ftp.isc.org/isc/bind9"
 fpkg ${IPTABLES} "http://www.netfilter.org/projects/iptables/files"
 fpkg ${CURL} "http://curl.haxx.se/download"
 fpkg -e "tar.gz" ${RSYNC} "http://samba.org/ftp/rsync/src"
 fpkg -m hv ${GETDATE}
 
 fpkg -e "tar.gz" ${LIBARCHIVE} "http://github.com/downloads/libarchive/libarchive"
-fpkg -e "tar.gz" ${CMAKE} "http://www.cmake.org/files/v$(get_pkg_ver2 ${CMAKE})"
+fpkg -e "tar.gz" -s "v" -v 2 ${CMAKE} "http://www.cmake.org/files"
 
 fpkg -e "tar.gz" ${MYSQL} \
     "http://anduin.linuxfromscratch.org/sources/BLFS/svn/m"
@@ -135,7 +133,7 @@ fpkg -m gnu ${GUILE2}
 fpkg -s "libgpg-error" ${LIBGPG_ERROR} ${GNUPG_URL}
 fpkg -s "libgcrypt"    ${LIBGCRYPT}    ${GNUPG_URL}
 fpkg -e "tar.gz" ${NETTLE} "http://www.lysator.liu.se/~nisse/archive"
-fpkg -e "tar.xz" -s "gnutls/v$(get_pkg_ver2 ${GNUTLS})" ${GNUTLS} ${GNUPG_URL}
+fpkg -e "tar.xz" -s "gnutls/v" -v 2 ${GNUTLS} ${GNUPG_URL}
 
 fpkg -e "tar.gz" ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail"
 fpkg -e "tgz" ${OPENLDAP} \
@@ -158,8 +156,7 @@ fpkg -e "tar.gz" ${YASM} "http://www.tortall.net/projects/yasm/releases"
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     if [ "x${SOUND_CARD}" = "xyes" ]; then
 
-        fpkg ${NASM} "http://www.nasm.us/pub/nasm/releasebuilds/$(get_pkg_ver \
-          ${NASM})"
+        fpkg -v 0 ${NASM} "http://www.nasm.us/pub/nasm/releasebuilds"
         fpkg ${ALSA_LIB}   "ftp://ftp.alsa-project.org/pub/lib"
         fpkg ${ALSA_UTILS} "ftp://ftp.alsa-project.org/pub/utils"