-fpkg_gnu ${WHICH}
-fpkg ${PCIUTILS} ftp://ftp.kernel.org/pub/software/utils/pciutils
-fpkg_sf ${LIBUSB}
-fpkg_sf ${LIBUSB_COMPAT} libusb
-fpkg ${USBUTILS} ${SOURCEFORGE_URL}/project/linux-usb/usbutils
-fpkg ${REISERFSPROGS} http://www.kernel.org/pub/linux/utils/fs/reiserfs
-fpkg ${POPT} http://rpm5.org/files/popt
-fpkg ${PAM} http://www.kernel.org/pub/linux/libs/pam/library
-fpkg -e "tar.gz" -f "${FCRON}.src" ${FCRON} http://fcron.free.fr/archives
-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 ${LYNX} http://lynx.isc.org/current
-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} tcl
-fpkg ${SQLITE} http://www.sqlite.org
-fpkg ${SUBVERSION} http://subversion.tigris.org/downloads
-fpkg ${SUDO} http://www.sudo.ws/sudo/dist
-fpkg_sf ${STRACE}
-fpkg_sf ${PCRE}
-
-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 ${XINETD} "http://www.xinetd.org"
-fpkg_sf ${DDCLIENT}
-fpkg ${LIBPCAP} "http://www.tcpdump.org/release"
-fpkg ${TCPDUMP} "http://www.tcpdump.org/release"
-fpkg ${NMAP} "http://download.insecure.org/nmap/dist"
-fpkg -e "tar.gz" -s "$(get_pkg_ver ${BIND})" ${BIND} "http://gd.tuwien.ac.at/infosys/servers/isc/bind9"
-fpkg ${IPTABLES} "http://www.netfilter.org/projects/iptables/files"
-fpkg ${CURL} "http://curl.haxx.se/download"
-fpkg ${RSYNC} "http://samba.org/ftp/rsync/src"
-fpkg_hv ${GETDATE}
+fpkg -m gnu ${WHICH}
+fpkg -s "utils/pciutils" ${PCIUTILS} ${KERNEL_URL}
+fpkg -m sf -e "tar.bz2" ${LIBUSB}
+fpkg -m sf -e "tar.bz2" -s "libusb" ${LIBUSB_COMPAT}
+fpkg -m sf -s "linux-usb/usbutils" ${USBUTILS}
+fpkg -s "linux/utils/fs/reiserfs" ${REISERFSPROGS} ${KERNEL_URL}
+fpkg -e "tar.gz" ${POPT} "http://rpm5.org/files/popt"
+fpkg -s "linux/libs/pam/library" ${PAM} ${KERNEL_URL}
+fpkg -e "tar.gz" -f "${FCRON}.src" ${FCRON} "http://fcron.free.fr/archives"
+fpkg -e "tar.gz" ${OPENSSL} "ftp://ftp.openssl.org/source"
+fpkg ${OPENSSL_ROOT_CERTS} "http://anduin.linuxfromscratch.org/files/BLFS"
+fpkg -e "tar.gz" ${OPENSSH} "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable"
+fpkg ${LYNX} "http://lynx.isc.org/current"
+fpkg -m sf ${EXPAT}
+fpkg -m apa ${APR}
+fpkg -m apa -s apr ${APR_UTIL}
+fpkg -e "tar.gz" ${NEON} "http://www.webdav.org/neon"
+fpkg -m sf -s "tcl" ${TCL}
+fpkg -e "tar.gz" ${SQLITE} "http://www.sqlite.org"
+fpkg ${SUBVERSION} "http://subversion.tigris.org/downloads"
+fpkg ${SUDO} "http://www.sudo.ws/sudo/dist"
+fpkg -m sf -e "tar.bz2" ${STRACE}
+fpkg -m sf ${PCRE}