X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fstage4-install;h=6dbd59bf3d8278d971ae0c6119c5216e4da6f377;hb=f63a78e04ec65397472cda88061558f4e3a30fb2;hp=445c19c99b3567beb55d701decfbee5c63be84ea;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage4/stage4-install b/stage4/stage4-install
index 445c19c..6dbd59b 100755
--- a/stage4/stage4-install
+++ b/stage4/stage4-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export LFS_PKG_DIR="$(dirname $(dirname $(pwd)))/packages/stage4"
+export LFS_PKG_DIR="$(dirname $(pwd))/packages/stage4"
 export LFS_LOG_DIR=/var/log/hvlinux-install/stage4
 export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
 export LFS_TMP=/tmp
@@ -19,24 +19,25 @@ fi
 init_log_file
 
 # GNOME-2.X configuration
-
 action_checkbox "Configuring ${GNOME2_VER}" ./cis-gnome-config
 action_checkbox "Reloading /etc/profile" source /etc/profile
 
 # Gnome 2 core packages
 ipkg_gnome ${ORBIT2}
 ipkg_gnome ${LIBBONOBO}
-ipkg_gnome ${GCONF}
-ipkg       ${GNOME_MIME_DATA} cis-gnome-mime-data
-ipkg_gnome ${GNOME_VFS}
+ipkg       ${GCONF} cis-gconf
+ipkg_gnome ${GNOME_MIME_DATA}
+####ipkg       ${GNOME_VFS} cis-gnome-nb
+####ipkg_gnome ${GNOME_VFS_MONIKERS}
 ipkg_gnome ${LIBGNOME}
 ipkg_gnome ${LIBGNOMECANVAS}
 ipkg_gnome ${LIBBONOBOUI}
 ipkg_ac    ${GNOME_ICON_THEME}
+ipkg_ac    ${LIBTASN1}
 ipkg_gnome ${GNOME_KEYRING}
 ipkg_gnome ${LIBGNOMEUI}
 ipkg_ac    ${GNOME_THEMES}
-ipkg       ${SCROLLKEEPER} cis-scrollkeeper
+ipkg_ac_nb ${SCROLLKEEPER} "--localstatedir=/var --disable-static --with-omfdirs=/usr/share/omf:/opt/${GNOME2_VER}/share/omf"
 ipkg_gnome ${GNOME_DOC_UTILS}
 ipkg_gnome ${GNOME_DESKTOP}
 ipkg_gnome ${GNOME_BACKGROUNDS}
@@ -45,13 +46,14 @@ ipkg_gnome ${GNOME_PANEL}
 ipkg_ac    ${GSTREAMER}
 ipkg_ac    ${GST_PLUGINS_BASE}
 ipkg_ac    ${GST_PLUGINS_GOOD}
+ipkg_ac    ${GST_PLUGINS_BAD}
 ipkg_ac    ${GST_PLUGINS_UGLY}
 ipkg_ac    ${GST_FFMPEG}
-ipkg       ${VTE} cis-vte
+ipkg_ac    ${VTE} "--libexecdir=/usr/sbin --disable-gtk-doc"
 ipkg_gnome ${GNOME_TERMINAL}
 ipkg_gnome ${LIBGTOP}
 ipkg_gnome ${LIBGNOMEKBD}
-ipkg       ${GAIL} cis-gail
+ipkg_gnome ${LIBGAIL_GNOME}
 ipkg       ${GNOME_APPLETS} cis-gnome-applets
 ipkg_gnome ${EEL}
 ipkg_gnome ${NAUTILUS}
@@ -64,20 +66,19 @@ ipkg_gnome ${GNOME_USER_DOCS}
 action_checkbox "Updating the MIME-type application database" update-desktop-database
 
 # Gnome 2 additional packages - Libraries
-ipkg_gnome ${LIBGNOMECUPS}
-ipkg_gnome ${LIBGNOMEPRINT}
-ipkg_gnome ${LIBGNOMEPRINTUI}
+####ipkg_gnome ${LIBGNOMECUPS}
+####ipkg_gnome ${LIBGNOMEPRINT}
+####ipkg_gnome ${LIBGNOMEPRINTUI}
 ipkg_gnome ${GTKHTML}
-ipkg       ${EVOLUTION_DATA_SERVER} cis-evolution-data-server
+ipkg_gnome ${EVOLUTION_DATA_SERVER} "--with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr --with-openldap=yes --with-krb5=/usr"
 ipkg_gnome ${GTKSOURCEVIEW}
 ipkg       ${SYSTEM_TOOLS_BACKENDS} cis-gnome-nobuild
 ipkg       ${GNOME_AUDIO} cis-gnome-audio
 
 # Gnome 2 additional packages - Utilities
-ipkg       ${GEDIT} cis-gedit
+ipkg_gnome ${GEDIT} "--disable-spell"
 ipkg_gnome ${EOG}
 ipkg_gnome ${EVINCE}
-ipkg_gnome ${GGV} # Gnome Ghostview
 ipkg_gnome ${FILE_ROLLER}
 ipkg_gnome ${GCONF_EDITOR}
 ipkg_gnome ${GNOME_UTILS}
@@ -95,22 +96,22 @@ ipkg_gnome ${GNOME_VOLUME_MANAGER}
 
 ipkg       ${LIBMUSICBRAINZ} cis-libmusicbrainz
 ipkg_gnome ${GNOME_SOUND_JUICER}
-ipkg_ac    ${ISO_CODES}
+ipkg       ${ISO_CODES} cis-iso-codes
 ipkg_gnome ${GNOME_TOTEM}
 ipkg       ${GDM} cis-gdm
 ipkg_ac    ${LIBNOTIFY}
 ipkg       ${GNOME_MOUNT} cis-gnome-nobuild
 
-ipkg_ac    ${LIBGSF}
-ipkg       ${PCRE} cis-pcre
-ipkg       ${GOFFICE} cis-ac-nobuild # Depends on libgsf and pcre
-ipkg       ${GNUMERIC} cis-gnumeric # Depends on GOffice
-
-ipkg_ac    ${WV} # Needed by Abiword
-ipkg_ac    ${ABIWORD} "--disable-spellcheck"
-ipkg       ${EVOLUTION}          cis-evolution
-ipkg       ${EVOLUTION_EXCHANGE} cis-evolution-exchange
+ipkg_ac    ${RHYTHMBOX} "--disable-python"
 
+ipkg_ac    ${LIBGSF}
+ipkg_ac    ${PCRE} "--docdir=/usr/share/doc/pcre --enable-utf8"
+ipkg_ac_nb ${GOFFICE}
+ipkg       ${GNUMERIC} cis-gnumeric
+ipkg_ac    ${WV}
+ipkg_ac    ${ABIWORD}  "--disable-spellcheck"
+ipkg_gnome ${EVOLUTION} "--with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr --with-openldap=yes --with-krb5=/usr"
+ipkg_gnome ${EVOLUTION_EXCHANGE}
 ipkg_ac    ${LIBGPG_ERROR}
 ipkg_ac    ${LIBGCRYPT}
 ipkg_ac    ${GNUTLS}