X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fhv-install-1;h=a23118e11aad2614d664e10320093f33471d6cd3;hb=131d3a522878352b702de2f1ce9a5d7462f16e04;hp=2af024cf27bacf439448279afe4cf8bb783ffe07;hpb=3af763835d03474f8dd6fb7c352c8933502662e7;p=hvlinux.git

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 2af024c..a23118e 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -9,13 +9,14 @@ init_log_file
 ipkg ${WHICH}
 ipkg -m acnb ${REISERFSPROGS}
 ipkg -m acnb ${POPT}
+CFLAGS="${CFLAGS} -fPIC" ipkg -m acnb ${LIBTIRPC}
 ipkg ${PAM}
 ipkg -m noac ${OPENSSL}
 ipkg ${WGET} "--with-ssl=openssl"
 ipkg -m noac ${PCIUTILS}
 ipkg -m acnb ${LIBUSB}
 ipkg ${LIBUSB_COMPAT}
-ipkg -s usbutils ${USBUTILS}
+ipkg ${USBUTILS} "--disable-zlib --datadir=/usr/share/misc"
 ipkg -j ${FCRON}
 ipkg ${OPENSSH}
 ipkg -s lynx ${LYNX}
@@ -27,7 +28,11 @@ ipkg -s tcl ${TCL}
 CFLAGS="${CFLAGS} -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY=1" \
     ipkg ${SQLITE} "--enable-threadsafe --enable-readline --enable-dynamic-extensions"
 ipkg -j ${SUBVERSION} "--without-berkeley-db"
-ipkg ${SUDO}
+ipkg ${SUDO} "--libexecdir=/usr/lib/sudo \
+    --with-all-insults \
+    --with-env-editor \
+    --without-pam \
+    --without-sendmail"
 ipkg ${STRACE}
 ipkg ${PCRE} "--docdir=/usr/share/doc/pcre \
     --enable-utf8 \
@@ -37,12 +42,11 @@ ipkg ${PCRE} "--docdir=/usr/share/doc/pcre \
 
 # Networking
 ipkg -m noac -s tcp_wrappers ${TCPWRAPPERS}
-ipkg -m noac ${PORTMAP}
-ipkg -m acnb ${NFS_UTILS} "\
+ipkg -m acnb ${RPCBIND} "--bindir=/sbin"
+LIBS="-lpthread" ipkg -m acnb ${NFS_UTILS} "\
     --disable-nfsv4 \
     --disable-nfsv41 \
     --sbindir=/sbin \
-    --disable-tirpc \
     --disable-gss"
 ipkg ${XINETD}
 if [ "x${USE_DYNAMIC_DNS}" = "xyes" ]; then
@@ -68,7 +72,13 @@ fi
 ipkg -m noac ${ZIP}
 ipkg -m noac ${UNZIP}
 ipkg -m noac ${UNRAR}
-ipkg ${CPIO}
+ipkg ${CPIO} "\
+    --bindir=/bin \
+    --libexecdir=/tmp \
+    --enable-mt \
+    --with-rmt=/usr/sbin/rmt"
+
+ipkg ${SCREEN}
 
 ipkg ${PARTED} "--disable-device-mapper"
 ipkg ${BC} "--with-readline"
@@ -86,16 +96,15 @@ ipkg -m noac ${ACK}
 ipkg -m noac ${COLORDIFF}
 
 ipkg ${INTLTOOL}
-ipkg ${PYTHON} "--enable-shared"
 
-ipkg -m acnb ${GIT}
+ipkg -m acnb ${GIT} "--libexecdir=/usr/lib --with-gitconfig=/etc/gitconfig"
 
 # DocBook
 ipkg -m acnb ${SGML_COMMON}
 ipkg -m noac -s sgml-dtd3 ${SGML_DTD3}
 ipkg -m noac -s sgml-dtd4 ${SGML_DTD4}
 ipkg ${OPENSP}
-ipkg -m acnb ${OPENJADE}
+ipkg -m acnb ${OPENJADE} "--enable-splibdir=/usr/lib"
 ipkg -m noac ${DOCBOOK_DSSSL}
 ipkg -m noac ${SGML_SPM}
 ipkg ${DOCBOOK_UTILS}
@@ -110,6 +119,7 @@ ipkg ${XMLTO}
 ipkg ${LIBPNG}
 ipkg ${TIFF}
 ipkg -m acnb ${LCMS}
+ipkg ${LCMS2}
 ipkg ${LIBJPEG} "--enable-static --enable-shared"
 ipkg -m acnb ${LIBOPENJPEG}
 ipkg ${LIBART}
@@ -126,7 +136,6 @@ ipkg -m noac ${CKERMIT}
 
 ipkg ${LIBTASN1}
 ipkg ${LIBUNISTRING}
-ipkg ${LIBFFI}
 ipkg ${BDWGC}
 ipkg ${GUILE} \
     --enable-posix \
@@ -135,7 +144,7 @@ ipkg ${GUILE} \
     --enable-regex
 ipkg ${LIBGPG_ERROR}
 ipkg ${LIBGCRYPT}
-ipkg ${NETTLE}
+ipkg ${NETTLE} "--libdir=/usr/lib"
 ipkg -m acnb ${GNUTLS}
 
 # Mail
@@ -147,11 +156,11 @@ ipkg -s "krb5" ${KERBEROS5}
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m noac ${SENDMAIL}
 else
-    ipkg -m acnb ${SSMTP} "--enable-ssl"
+    ipkg ${MSMTP}
 fi
 
 ipkg ${GNUPG} "--libexecdir=/usr/lib"
-ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl"
+ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl --enable-hcache"
 
 # Audio
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then