-# Begin
-
-# Gnome 2 core packages
-fpkg_gnome ${ORBIT2}
-fpkg_gnome ${LIBBONOBO}
-fpkg_gnome ${GCONF}
-fpkg_gnome ${GNOME_MIME_DATA}
-fpkg_gnome ${GNOME_VFS}
-fpkg_gnome ${GNOME_VFS_MONIKERS}
-fpkg_gnome ${LIBGNOME}
-fpkg_gnome ${LIBGNOMECANVAS}
-fpkg_gnome ${LIBBONOBOUI}
-fpkg_gnome ${GNOME_ICON_THEME}
-fpkg_gnu ${LIBTASN1}
-fpkg_gnome ${GNOME_KEYRING}
-fpkg_gnome ${LIBGNOMEUI}
-fpkg_gnome ${GNOME_THEMES}
-fpkg_gnome ${SCROLLKEEPER}
-fpkg_gnome ${GNOME_DOC_UTILS}
-fpkg_gnome ${GNOME_DESKTOP}
-fpkg_gnome ${GNOME_BACKGROUNDS}
-fpkg_gnome ${GNOME_MENUS}
-fpkg_gnome ${GNOME_PANEL}
-fpkg_gnome ${GNOME_SESSION}
-fpkg_gnome ${VTE}
-fpkg_gnome ${GNOME_TERMINAL}
-fpkg_gnome ${LIBGTOP}
-fpkg_gnome ${LIBGNOMEKBD}
-fpkg_gnome ${LIBGAIL_GNOME}
-fpkg_gnome ${GNOME_APPLETS}
-fpkg_gnome ${EEL}
-fpkg_gnome ${NAUTILUS}
-fpkg_gnome ${YELP}
-fpkg_gnome ${METACITY}
-fpkg_gnome ${GNOME_CONTROL_CENTER}
-fpkg_gnome ${GNOME_USER_DOCS}
-
-# Gnome 2 additional packages - Libraries
-fpkg_gnome ${LIBGNOMECUPS}
-fpkg_gnome ${LIBGNOMEPRINT}
-fpkg_gnome ${LIBGNOMEPRINTUI}
-fpkg_gnome ${GTKHTML}
-fpkg_gnome ${EVOLUTION_DATA_SERVER}
-fpkg_gnome ${GTKSOURCEVIEW}
-fpkg_gnome ${SYSTEM_TOOLS_BACKENDS}
-fpkg_gnome ${GNOME_AUDIO}
-
-# Gnome 2 additional packages - Utilities
-fpkg_gnome ${GEDIT}
-fpkg_gnome ${EOG}
-fpkg_gnome ${EVINCE}
-fpkg_gnome ${FILE_ROLLER}
-fpkg_gnome ${GCONF_EDITOR}
-fpkg_gnome ${GNOME_UTILS}
-fpkg_gnome ${GNOME_SYSTEM_MONITOR}
-fpkg_gnome ${NAUTILUS_CD_BURNER}
-fpkg_gnome ${GSTREAMER}
-fpkg_gnome ${GST_PLUGINS_BASE}
-fpkg ${GST_PLUGINS_GOOD} "http://gstreamer.freedesktop.org/src/gst-plugins-good"
-fpkg ${GST_PLUGINS_BAD} "http://gstreamer.freedesktop.org/src/gst-plugins-bad"
-fpkg ${GST_PLUGINS_UGLY} "http://gstreamer.freedesktop.org/src/gst-plugins-ugly"
-fpkg ${GST_FFMPEG} "http://gstreamer.freedesktop.org/src/gst-ffmpeg"
-fpkg_gnome ${GNOME_MEDIA}
-fpkg_gnome ${GNOME_NETSTATUS}
-fpkg_gnome ${GCALCTOOL}
-fpkg_gnome ${GUCHARMAP}
-fpkg_gnome ${ZENITY}
-
-fpkg_gnome ${GNOME_KEYRING_MANAGER}
-fpkg_gnome ${GNOME_VOLUME_MANAGER}
-fpkg ${LIBMUSICBRAINZ} "http://ftp.musicbrainz.org/pub/musicbrainz"
-fpkg_gnome ${GNOME_SOUND_JUICER}
-fpkg ${ISO_CODES} "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes"
-
-fpkg_gnome ${GNOME_TOTEM}
-fpkg_gnome ${GDM}
-fpkg ${LIBNOTIFY} "http://www.galago-project.org/files/releases/source/libnotify"
-fpkg ${GNOME_MOUNT} "http://people.freedesktop.org/~david/dist"
-
-fpkg_gnome ${RHYTHMBOX}
-
-fpkg_gnome ${LIBGSF}
-fpkg_gnome ${GOFFICE}
-fpkg_gnome ${GNUMERIC}
-fpkg_sf ${WV}
-fpkg ${ABIWORD} "http://www.abisource.com/downloads/abiword/$(get_pkg_ver ${ABIWORD})/source"
-
-fpkg_gnome ${EVOLUTION_EXCHANGE}
-fpkg_gnome ${EVOLUTION}
-
-fpkg ${LIBGPG_ERROR} "http://ftp.gnupg.org/gcrypt/libgpg-error"
-fpkg ${LIBGCRYPT} "http://ftp.gnupg.org/gcrypt/libgcrypt"
-fpkg ${GNUTLS} "http://ftp.gnupg.org/gcrypt/gnutls"
-fpkg_sf ${PIDGIN}
-
-# Return last error
+if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
+ export TEST_INTEGRITY=1
+fi
+
+lpkg 3 ${PYTHON}
+
+XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}"
+
+for module in ${XORG_MODULES_LIST}; do
+ MOD_NAME=$(get_pkg_name ${module})
+ DEST_DIR=${LFS_PKG_DIR}/${MOD_NAME}
+
+ fpkg -d ${DEST_DIR} -e wget ${module} ${BLFS_XORG_URL}
+ fpkg -d ${DEST_DIR} -e md5 ${module} ${BLFS_XORG_URL}
+
+ if [ "${MOD_NAME}" = "driver" ]; then
+ # Remove unwanted drivers
+ for ext in wget md5; do
+ for excldrv in vmware newport xgixp geode; do
+ sed -i -e "/.*xf86-video-${excldrv}.*/d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+ done
+ done
+ fi
+ if [ "${MOD_NAME}" = "app" ]; then
+ # Remove unneeded apps
+ for ext in wget md5; do
+ sed -i -e '/.*twm-.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+ sed -i -e '/.*xclock-.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+ done
+ fi
+
+ SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.wget | sed 's!\.tar\.bz2$!!')"
+
+ for submod in ${SUBMODS}; do
+ fpkg_xorg ${submod} ${MOD_NAME}
+ done
+
+ pushd ${DEST_DIR} >> ${LFS_LOG_FILE}
+ md5sum -c ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 >> ${LFS_LOG_FILE}
+ if [ $? -ne 0 ]; then
+ echo " md5sum error for ${module}"
+ fi
+ popd >> ${LFS_LOG_FILE}
+done
+
+fpkg_xorg ${LIBXAU} lib
+fpkg_xorg ${LIBXDMCP} lib
+fpkg_sf ${LESSTIF}
+fpkg_xorg ${XBITMAPS} data
+fpkg ${LIBPTHREAD_STUBS} "http://xcb.freedesktop.org/dist"
+fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm"
+fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} ftp://ftp.freedesktop.org/pub/mesa
+fpkg_xorg ${XCURSOR_THEMES} data
+fpkg ${XKEYBOARD_CONFIG} "http://xlibs.freedesktop.org/xkbdesc"
+fpkg_xorg ${LUIT} app
+fpkg ${PIXMAN} "http://cairographics.org/releases"
+fpkg ${LIBFFI} "ftp://sourceware.org/pub/libffi"
+fpkg ${DBUS} "http://dbus.freedesktop.org/releases/dbus"
+fpkg_gnome ${GLIB}
+fpkg_gnome ${GOBJECT_INSTROSPECTION}
+fpkg ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib"
+fpkg ${EGGDBUS} "http://hal.freedesktop.org/releases"
+fpkg ${POLKIT} "http://hal.freedesktop.org/releases"
+fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"
+fpkg ${POLICYKIT} "http://hal.freedesktop.org/releases"
+fpkg ${HAL} "http://hal.freedesktop.org/releases"
+fpkg ${HAL_INFO} "http://hal.freedesktop.org/releases"
+
+fpkg_xorg ${XORG_SERVER} xserver
+fpkg_xorg ${XDM} app
+
+fpkg -e tgz ${XTERM} "ftp://invisible-island.net/xterm"
+
+fpkg ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"
+
+fpkg_sf ${TK} tcl
+
+fpkg_gnu ${EMACS}
+fpkg ${WINDOWMAKER} "http://windowmaker.info/pub/source/release"
+fpkg ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release"
+