-# Additional packages (not in original LFS, only for hvlinux).
-fpkg_gnu ${EMACS}
-fpkg_gnu ${WHICH}
-fpkg ${REISERFSPROGS} http://www.kernel.org/pub/linux/utils/fs/reiserfs
-fpkg ${PCIUTILS} ftp://ftp.kernel.org/pub/software/utils/pciutils
-fpkg ${NET_TOOLS} http://www.tazenda.demon.co.uk/phil/net-tools
-fpkg ${DHCP} ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history
-fpkg ${POPT} http://rpm5.org/files/popt
-fpkg ${PAM} http://www.kernel.org/pub/linux/libs/pam/library
-fpkg ${OPENSSL} ftp://ftp.openssl.org/source
-fpkg ${OPENSSL_ROOT_CERTS} http://anduin.linuxfromscratch.org/files/BLFS
-fpkg ${OPENSSH} ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
-fpkg_sf ${EXPAT}
-fpkg ${APR} http://apache.sunsite.ualberta.ca/apr
-fpkg ${APR_UTIL} http://apache.sunsite.ualberta.ca/apr
-fpkg ${NEON} http://www.webdav.org/neon
-fpkg_sf ${TCL}
-fpkg ${SQLITE} http://www.sqlite.org
-fpkg ${SUBVERSION} http://subversion.tigris.org/downloads
-fpkg ${SUDO} http://www.sudo.ws/sudo/dist
-fpkg_gnu ${WGET}
-fpkg ${TCPWRAPPERS} ftp://ftp.porcupine.org/pub/security
-fpkg ${PORTMAP} http://neil.brown.name/portmap
-fpkg ${NFS_UTILS} ftp://ftp.kernel.org/pub/linux/utils/nfs
+fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi"
+fpkg ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})"
+fpkg -m gnome ${GLIB}
+fpkg -m fd ${PKG_CONFIG}
+fpkg ${IANA} "http://www.sethwklein.net"
+fpkg -e "tar.gz" ${PROCPS} "http://procps.sourceforge.net"
+fpkg -m gnu ${READLINE}
+fpkg -m gnu ${LIBTOOL}
+fpkg -m gnu ${GDBM}
+fpkg -m gnu ${INETUTILS}
+fpkg -m gnu ${AUTOCONF}
+fpkg -m gnu ${AUTOMAKE}
+fpkg -m gnu ${GROFF}
+fpkg -s "linux/utils/net/iproute2" ${IPROUTE2} ${KERNEL_URL}
+
+if [ -n "${WIFI_SUPPORT}" ]; then
+ fpkg -e "tar.gz" ${WIRELESS_TOOLS} \
+ "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux"
+ fpkg -e "tar.gz" ${WPA_SUPPLICANT} "http://hostap.epitest.fi/releases"
+
+ if [ -n "${B43_LPPHY}" ]; then
+ fpkg ${B43_FWCUTTER} "http://bues.ch/b43/fwcutter"
+ fpkg ${FIRMWARE_B43_LPPHY} "http://www.lwfinger.com/b43-firmware"
+ fi
+fi
+
+fpkg -e "tar.gz" ${KBD} "http://ftp.altlinux.org/pub/people/legion/kbd"
+fpkg -e "tar.gz" ${LESS} "http://www.greenwoodsoftware.com/less"
+fpkg -e "tar.gz" -s "libpipeline" ${LIBPIPELINE} \
+ "http://download.savannah.gnu.org/releases"
+fpkg -e "tar.gz" ${MAN_DB} "http://download.savannah.gnu.org/releases/man-db"
+fpkg -m sf ${PSMISC}
+fpkg -m hv ${SHADOW}
+fpkg -e "tar.gz" ${SYSKLOGD} \
+ "http://www.infodrom.org/projects/sysklogd/download"
+fpkg -m gnu ${GRUB}
+fpkg -e "tar.gz" ${DHCP} "ftp://ftp.isc.org/isc/dhcp/$(get_pkg_ver ${DHCP})"
+
+fpkg -e "tar.gz" ${ACPID} "http://www.tedfelix.com/linux"
+fpkg -m hv ${HV_UTILITIES}
+fpkg -m sf ${GPTFDISK}