-# 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_cust ${GCONF} cis-gconf
-ipkg_gnome ${GNOME_MIME_DATA}
-####ipkg_cust ${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_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}
-ipkg_gnome ${GNOME_MENUS}
-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_ac ${VTE} "--libexecdir=/usr/sbin --disable-gtk-doc"
-ipkg_gnome ${GNOME_TERMINAL}
-ipkg_gnome ${LIBGTOP}
-ipkg_gnome ${LIBGNOMEKBD}
-ipkg_gnome ${LIBGAIL_GNOME}
-ipkg_cust ${GNOME_APPLETS} cis-gnome-applets
-ipkg_gnome ${EEL}
-ipkg_gnome ${NAUTILUS}
-ipkg_gnome ${YELP}
-ipkg_cust ${METACITY} cis-metacity
-
-ipkg_gnome ${GNOME_CONTROL_CENTER}
-ipkg_gnome ${GNOME_SESSION}
-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 ${GTKHTML}
-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_cust ${SYSTEM_TOOLS_BACKENDS} cis-gnome-nobuild
-ipkg_cust ${GNOME_AUDIO} cis-gnome-audio
-
-# Gnome 2 additional packages - Utilities
-ipkg_gnome ${GEDIT} "--disable-spell"
-ipkg_gnome ${EOG}
-ipkg_gnome ${EVINCE}
-ipkg_gnome ${FILE_ROLLER}
-ipkg_gnome ${GCONF_EDITOR}
-ipkg_gnome ${GNOME_UTILS}
-ipkg_gnome ${GNOME_SYSTEM_MONITOR}
-ipkg_gnome ${NAUTILUS_CD_BURNER}
-ipkg_gnome ${GNOME_MEDIA}
-ipkg_gnome ${GNOME_NETSTATUS}
-ipkg_cust ${GCALCTOOL} cis-gnome-nobuild
-ipkg_gnome ${GUCHARMAP}
-ipkg_gnome ${ZENITY}
-ipkg_gnome ${GNOME_KEYRING_MANAGER}
-
-# Needs hal, which needs D-BUS...
-ipkg_gnome ${GNOME_VOLUME_MANAGER}
-
-ipkg_cust ${LIBMUSICBRAINZ} cis-libmusicbrainz
-ipkg_gnome ${GNOME_SOUND_JUICER}
-ipkg_cust ${ISO_CODES} cis-iso-codes
-ipkg_gnome ${GNOME_TOTEM}
-ipkg_cust ${GDM} cis-gdm
-ipkg_ac ${LIBNOTIFY}
-ipkg_cust ${GNOME_MOUNT} cis-gnome-nobuild
-
-ipkg_ac ${RHYTHMBOX} "--disable-python"
-
-ipkg_ac ${LIBGSF}
-ipkg_ac_nb ${GOFFICE}
-ipkg_cust ${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}
-ipkg_ac ${PIDGIN}
+# Scripts directory
+export SCRDIR=$(pwd)
+
+export XORG_PREFIX=/usr
+export XORG_CONFIG="\
+ --mandir=${XORG_PREFIX}/share/man \
+ --localstatedir=/var"
+
+LFS_PKG_DIR_ORIG=${LFS_PKG_DIR}
+
+# Arg #1: module name and version
+# Arg #2: subdirectory
+# Arg #3: optional configure arguments
+ipkg_xorg()
+{
+ local MODULE=${1}
+ local SUBDIR=${2}
+ shift 2
+ local CONFIGURE_OPTS=${*}
+
+ LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${SUBDIR}
+ ipkg_ac ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS}
+ LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}
+}
+
+# Install all submodules in a module
+#
+# Arg #1: module name and version
+# Arg #2: optional configure arguments
+install_xorg_modules()
+{
+ local MODULE=${1}
+ shift
+ local CONFIGURE_OPTS=${*}
+
+ local MODULE_NAME=$(get_pkg_name ${MODULE})
+
+ local MY_XORG_CONFIG
+
+ for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE_NAME}/${MODULE}.wget); do
+ SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')"
+
+ # Special configure options for specific packages
+ case ${SUBMOD} in
+ libXfont-[0-9]* )
+ MY_XORG_CONFIG="--disable-devel-docs"
+ ;;
+ libX11-[0-9]* )
+ MY_XORG_CONFIG="--without-xcb"
+ ;;
+ libXt-[0-9]* )
+ MY_XORG_CONFIG="--with-appdefaultdir=/etc/X11/app-defaults"
+ ;;
+ xinit-[0-9]* )
+ MY_XORG_CONFIG="--with-xinitdir=/etc/X11/app-defautls"
+ ;;
+ esac
+
+ ipkg_xorg ${SUBMOD} ${MODULE_NAME} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
+ done
+}
+
+install_xorg_modules ${XORG_PROTO}
+install_xorg_modules ${XORG_UTIL}
+ipkg_xorg ${LIBXAU} "lib"
+ipkg_xorg ${LIBXDMCP} "lib"
+install_xorg_modules ${XORG_LIB}
+ipkg_cust ${LESSTIF} cis-lesstif \
+ --sysconfdir=/etc/X11 \
+ --disable-debug \
+ --disable-build-tests \
+ --enable-production \
+ --with-xdnd \
+ --x-includes=$XORG_PREFIX/include \
+ --x-libraries=$XORG_PREFIX/lib
+ipkg_xorg ${XBITMAPS} "data"
+ipkg_ac ${LIBPTHREAD_STUBS}
+ipkg_ac ${LIBDRM} --enable-udev
+ipkg_cust ${MESALIB} cis-mesalib --enable-motif
+install_xorg_modules ${XORG_APP}
+ipkg_xorg ${XCURSOR_THEMES} "data"
+install_xorg_modules ${XORG_FONT}
+rscr once "Configuring fonts" configure-fonts
+ipkg_ac ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
+ipkg_xorg ${LUIT} "app"
+ipkg_ac ${PIXMAN}
+ipkg_ac ${LIBFFI}
+ipkg_cust ${DBUS} cis-dbus
+ipkg_cust ${GLIB} cis-glib --with-pcre=system
+ipkg_ac ${GOBJECT_INSTROSPECTION}
+ipkg_ac ${DBUS_GLIB} \
+ --disable-tests \
+ --disable-dependency-tracking \
+ --libexecdir=/usr/lib/dbus-1.0/dbus-1
+ipkg_ac ${EGGDBUS}
+ipkg_cust ${POLKIT} cis-polkit
+ipkg_ac_nb ${CONSOLEKIT} \
+ --libexecdir=/usr/lib/ConsoleKit \
+ --localstatedir=/var \
+ --enable-pam-module
+ipkg_cust ${POLICYKIT} cis-policykit
+ipkg_cust ${HAL} cis-hal
+ipkg_ac ${HAL_INFO}
+
+ipkg_xorg ${XORG_SERVER} "xserver" "\
+ --with-module-dir=${XORG_PREFIX}/lib/X11/modules \
+ --with-xkb-output=/var/lib/xkb \
+ --enable-install-setuid \
+ --disable-config-hal"
+
+# newport, vmware, and xgixp drivers cause Xorg -configure to hang
+# To fix this problem, comment out these drivers in both driver-7.5-2.md5 and driver-7.5-2.wget.
+install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=${XORG_PREFIX}/lib/X11/modules
+
+ipkg_xorg ${XDM} "app"
+
+rscr once "Configuring X.org" configure-xorg
+
+ipkg_cust ${XTERM} cis-xterm ${XORG_CONFIG}
+
+ipkg_cust ${T1LIB} cis-t1lib
+
+ipkg_cust ${TK} cis-tk
+
+# Re-installing python now that tk is present???
+ipkg_ac ${PYTHON} "--enable-shared"
+
+ipkg_cust ${WINDOWMAKER} cis-windowmaker
+ipkg_ac ${WINDOWMAKER_EXTRA}
+
+#source /etc/profile
+
+#rscr mult "Performing post-install" cis-post-install