# These packages are only for stage3
fpkg -m gnu ${WHICH}
-fpkg -s "utils/pciutils" ${PCIUTILS} ${KERNEL_URL}
+fpkg -s "software/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 -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 -e "tar.gz" ${SUDO} "http://www.sudo.ws/sudo/dist"
fpkg -m sf -e "tar.bz2" ${STRACE}
fpkg -m sf ${PCRE}
fpkg -m gnu ${WGET}
-fpkg ${TCPWRAPPERS} "ftp://ftp.porcupine.org/pub/security"
-fpkg ${PORTMAP} "http://neil.brown.name/portmap"
+fpkg -e "tar.gz" ${TCPWRAPPERS} "ftp://ftp.porcupine.org/pub/security"
+fpkg -e "tar.gz" ${PORTMAP} "http://neil.brown.name/portmap"
fpkg -s "linux/utils/nfs" ${NFS_UTILS} ${KERNEL_URL}
fpkg -e "tar.gz" ${XINETD} "http://www.xinetd.org"
fpkg -m sf ${DDCLIENT}
"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 -e "tar.gz" ${RSYNC} "http://samba.org/ftp/rsync/src"
fpkg -m hv ${GETDATE}
fpkg -e "tar.gz" ${MYSQL} \
"http://anduin.linuxfromscratch.org/sources/BLFS/svn/m"
-fpkg -f "zip$(get_pkg_ver ${ZIP} | sed 's!\.!!g')" -s "infozip" ${ZIP} \
- ${SOURCEFORGE_URL}
-fpkg -f "unzip$(get_pkg_ver ${UNZIP} | sed 's!\.!!g')" -s "infozip" ${UNZIP} \
- ${SOURCEFORGE_URL}
-fpkg -f "unrarsrc-$(get_pkg_ver ${UNRAR})" ${UNRAR} "http://www.rarlab.com/rar"
+fpkg -f "zip$(get_pkg_ver ${ZIP} | sed 's!\.!!g')" -s "infozip" \
+ -e "tar.gz" ${ZIP} ${SOURCEFORGE_URL}
+fpkg -f "unzip$(get_pkg_ver ${UNZIP} | sed 's!\.!!g')" -s "infozip" \
+ -e "tar.gz" ${UNZIP} ${SOURCEFORGE_URL}
+fpkg -f "unrarsrc-$(get_pkg_ver ${UNRAR})" -e "tar.gz" ${UNRAR} \
+ "http://www.rarlab.com/rar"
fpkg -m gnu ${CPIO}
fpkg -m gnu ${PARTED}
fpkg -m gnu ${BC}
fpkg -m sf ${FUSE}
fpkg ${DOSFSTOOLS} "http://www.daniel-baumann.ch/software/dosfstools"
-fpkg -s "pub/software/scm/git" ${GIT} ${KERNEL_URL}
+fpkg -s "software/scm/git" ${GIT} ${KERNEL_URL}
fpkg -s "software/scm/git" ${GIT_MANPAGES} ${KERNEL_URL}
# Perl modules
fpkg -f "jpegsrc.v$(get_pkg_ver ${LIBJPEG})" -e "tar.gz" ${LIBJPEG} \
"http://www.ijg.org/files"
fpkg -f "openjpeg_v$(get_pkg_ver ${LIBOPENJPEG} | sed 's!\.!_!g')" \
- ${LIBOPENJPEG} "http://www.openjpeg.org"
+ -e "tar.gz" ${LIBOPENJPEG} "http://www.openjpeg.org"
fpkg -m sf ${LIBPNG}
fpkg -m gnome ${LIBART}
fpkg -m sf ${LIBEXIF}
fpkg -e "tar.gz" ${FRIBIDI} "http://fribidi.org/download"
-fpkg -m fd -s "icon-theme" ${HICOLOR_ICON_THEME}
-fpkg ${TIFF} "http://download.osgeo.org/libtiff"
+fpkg -m fd -o "icon-theme" ${HICOLOR_ICON_THEME}
+fpkg -e "tar.gz" ${TIFF} "http://download.osgeo.org/libtiff"
fpkg -m sf ${GIFLIB}
fpkg -m sf ${LCMS}