X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fpackages-update;h=4701dbd419a8045cc1fa50520b0c711cf2bd509c;hb=33e9c16fc4ef64f8da85cb25e8c2deea6fa33061;hp=179b95c7b7f926c59d0a3cda29ec429dcf900ccc;hpb=f3c8db3027d5dc530e1f30c88e0235975211582e;p=hvlinux.git

diff --git a/stage3/packages-update b/stage3/packages-update
index 179b95c..4701dbd 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -10,7 +10,7 @@ update_packages_init ${*}
 
 # 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}
@@ -29,13 +29,13 @@ 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 -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}
@@ -46,15 +46,16 @@ 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 -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}
@@ -62,7 +63,7 @@ fpkg -m gnu ${ED}
 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
@@ -93,13 +94,13 @@ fpkg ${XMLTO} "https://fedorahosted.org/releases/x/m/xmlto"
 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}
 
@@ -108,4 +109,67 @@ fpkg -m sf ${LIBMNG}
 fpkg -m sf ${FREETYPE}
 fpkg -e "tar.gz" ${FONTCONFIG} "http://fontconfig.org/release"
 
+# Using HV-repackaged version, because Ckermit decompresses all of its files in
+# the current directory.
+fpkg -m hv ${CKERMIT}
+
+fpkg -m gnu ${LIBTASN1}
+fpkg -m gnu ${GUILE}
+fpkg -s "libgpg-error" ${LIBGPG_ERROR} ${GNUPG_URL}
+fpkg -s "libgcrypt"    ${LIBGCRYPT}    ${GNUPG_URL}
+fpkg -s "gnutls"       ${GNUTLS}       ${GNUPG_URL}
+
+fpkg -e "tar.gz" ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail"
+fpkg -e "tgz" ${OPENLDAP} \
+    "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release"
+fpkg -m hv ${KERBEROS5}
+
+if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+    fpkg -e "tar.gz" -f "sendmail.$(get_pkg_ver ${SENDMAIL})" ${SENDMAIL} \
+        "ftp://ftp.sendmail.org/pub/sendmail"
+else
+    fpkg -m hv ${SSMTP}
+fi
+
+fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt"
+fpkg -m sf ${MUTT}
+
+# Audio
+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 ${ALSA_LIB}   "ftp://ftp.alsa-project.org/pub/lib"
+        fpkg ${ALSA_UTILS} "ftp://ftp.alsa-project.org/pub/utils"
+
+        fpkg -e "tar.gz" ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
+
+        fpkg -e "tar.gz" ${LIBOGG} "http://downloads.xiph.org/releases/ogg"
+        fpkg ${LIBVORBIS} "http://downloads.xiph.org/releases/vorbis"
+        fpkg -m sf ${FLAC}
+        fpkg -m sf ${LAME}
+        fpkg -m hv ${LIBA52}
+        fpkg -m hv ${LIBID3TAG}
+        fpkg -e "tar.gz" ${LIBMAD} "ftp://ftp.mars.org/pub/mpeg"
+
+        fpkg -m sf ${LIBFAAC}
+        fpkg ${LIBFAAD2} "http://downloads.sourceforge.net/faac"
+        fpkg ${LIBTHEORA} "http://downloads.xiph.org/releases/theora"
+        fpkg ${XVIDCORE} "http://downloads.xvid.org/downloads"
+
+        fpkg -e "tar.gz" ${AUDIOFILE} "http://www.68k.org/~michael/audiofile"
+        fpkg -e "tar.gz" -f "pa_stable_v19_20071207" ${PORTAUDIO} \
+          "http://www.portaudio.com/archives"
+        fpkg -e "tar.gz" ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile/files"
+
+        fpkg -e "tar.gz" ${SPEEX} "http://downloads.xiph.org/releases/speex"
+        fpkg -e "tar.gz" ${JACK} "http://jackaudio.org/downloads"
+        fpkg ${ALSA_PLUGINS} "ftp://ftp.alsa-project.org/pub/plugins"
+        fpkg -e "tar.gz" ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis"
+
+        fpkg ${MOC} "ftp://ftp.daper.net/pub/soft/moc/stable"
+    fi
+fi
+
 exit $?