fix package names and package flavour dependencies

ipkg does not allow package names with uppercase, so revert
some of phil changes.
dependency handling of package flavours were broken, because
of a chicken and egg problem. implement a new variable (PKGFS_XXX)
containing flavour dependent package dependencies.

20 files changed, 57 insertions, 47 deletions

diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index e6da5984a..35e57f24f 100644
--- a/package/DirectFB/Makefile
+++ b/package/DirectFB/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:=		http://directfb.org/downloads/Core/DirectFB-1.4/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,DIRECTFB,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--with-inputdrivers=linuxinput,keyboard,ps2mouse \
 			--with-gfxdrivers=none \
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 00920a740..2a4496913 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -12,7 +12,6 @@ PKG_SECTION:=		utils
 PKG_DEPENDS:=		alsa-lib libpthread
 PKG_BUILDDEP+=		alsa-lib
 ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)
-PKG_DEPENDS+=		libncurses
 PKG_BUILDDEP+=		libncurses
 endif
 PKG_URL:=		http://www.alsa-project.org
@@ -20,6 +19,7 @@ PKG_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \
 			ftp://ftp.alsa-project.org/pub/utils/
 
 PKG_FLAVOURS:=		WITH_ALSAMIXER
+PKGFS_WITH_ALSAMIXER:=	libncurses
 PKGFD_WITH_ALSAMIXER:=	include alsamixer ncurses applet
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index a6b3ef4a6..b56898d2a 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -174,7 +174,7 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 		rm -f gtalk.conf ; \
 		rm -f skinny.conf ; \
 		rm -f dundi.conf ; \
-		echo -e '/^astdatadir =/s/var/usr/\nwq\n' | ed asterisk.conf ; \
+		$(SED) '#^astdatadir = /var/#/usr/#' asterisk.conf ; \
 	)
 	${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/
 	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' \
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 618346234..f9c3dbf82 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -9,8 +9,9 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		f8bcd62093f178bed81e46cc54e73f42
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11
-PKG_DEPENDS:=		libfltk libXi libiconv libpng zlib libjpeg
-PKG_BUILDDEP+=		fltk libiconv jpeg libpng zlib
+PKG_DEPENDS:=		libfltk libxi libiconv libpng zlib libjpeg
+PKG_DEPENDS+=		libstdcxx
+PKG_BUILDDEP+=		fltk libXi libiconv jpeg libpng zlib
 PKG_URL:=		http://www.dillo.org/
 PKG_SITES:=		http://www.dillo.org/download/
 
diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile
index f22a409ab..7014a7e01 100644
--- a/package/fetchmail/Makefile
+++ b/package/fetchmail/Makefile
@@ -10,7 +10,6 @@ PKG_MD5SUM:=		72c20ad2b9629f1a109668b05a84d823
 PKG_DESCR:=		fetch mail from a POP or IMAP server
 PKG_SECTION:=		text
 ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
-PKG_DEPENDS:=		libopenssl
 PKG_BUILDDEP+=		openssl
 endif
 PKG_URL:=		http://fetchmail.berlios.de/
@@ -20,6 +19,7 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 PKG_FLAVOURS:=		SSL
 PKGFD_SSL:=		enable SSL support
+PKGFS_SSL:=		libopenssl
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile
index 89c3df5ed..f583e1edd 100644
--- a/package/fluxbox/Makefile
+++ b/package/fluxbox/Makefile
@@ -12,7 +12,6 @@ PKG_SECTION:=		x11
 PKG_DEPENDS:=		libstdcxx
 PKG_BUILDDEP:=		libXpm
 ifeq (${ADK_PACKAGE_FLUXBOX_WITH_IMLIB2},y)
-PKG_DEPENDS+=		imlib2
 PKG_BUILDDEP+=		imlib2
 endif
 PKG_URL:=		http://www.fluxbox.org
@@ -20,6 +19,7 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 
 PKG_FLAVOURS:=		WITH_IMLIB2
 PKGFD_WITH_IMLIB2:=	enable imlib2 support
+PKGFS_WITH_IMLIB2:=	imlib2
 
 include $(TOPDIR)/mk/package.mk
 
@@ -28,8 +28,7 @@ $(eval $(call PKG_template,FLUXBOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${P
 ifeq (${ADK_PACKAGE_FLUXBOX_WITH_IMLIB2},y)
 CONFIGURE_ARGS+=	--enable-imlib2
 else
-#CONFIGURE_ARGS+=	--disable-imlib2
-CONFIGURE_ARGS+=	--enable-imlib2
+CONFIGURE_ARGS+=	--disable-imlib2
 endif
 
 post-install:
diff --git a/package/imlib2/Makefile b/package/imlib2/Makefile
index bc7f6ea14..0bf66f4a0 100644
--- a/package/imlib2/Makefile
+++ b/package/imlib2/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		20d59c7cda06742015baade6f5975415
 PKG_DESCR:=		Version 2 of an advanced replacement library for libraries like libXpm
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libfreetype
-PKG_BUILDDEP:=		libfreetype
+PKG_BUILDDEP:=		freetype
 PKG_URL:=		http://www.enlightenment.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index 820bb94d7..d67820445 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -12,7 +12,6 @@ PKG_SECTION:=		text
 PKG_DEPENDS:=		glib libncurses
 PKG_BUILDDEP+=		glib ncurses
 ifeq (${ADK_PACKAGE_IRSSI_SSL},y)
-PKG_DEPENDS+=		libopenssl
 PKG_BUILDDEP+=		openssl
 endif
 PKG_URL:=		http://www.irssi.org
@@ -22,6 +21,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 PKG_FLAVOURS:=		SSL
 PKGFD_SSL:=		SSL/TLS support
+PKGFS_SSL:=		libopenssl
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/libXScrnSaver/Makefile b/package/libXScrnSaver/Makefile
index 06ef24ebd..d87b396ff 100644
--- a/package/libXScrnSaver/Makefile
+++ b/package/libXScrnSaver/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXSCRNSAVER,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXSCRNSAVER,libxscrnsaver,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--enable-malloc0returnsnull
 
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index 8bf3fbb35..ae62712ce 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXAW,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--disable-docs
 
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index e3c97b139..42222d9d3 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXI,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 05de53da2..645e6868c 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -2,7 +2,15 @@
 # material, please see the LICENCE file in the top-level directory.
 
 include ${TOPDIR}/rules.mk
+ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 include ${TOPDIR}/toolchain/glibc/Makefile.inc
+else
+ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
+include ${TOPDIR}/toolchain/eglibc/Makefile.inc
+else
+include ${TOPDIR}/toolchain/uClibc/Makefile.inc
+endif
+endif
 
 PKG_NAME:=		libstdcxx
 PKG_DESCR:=		C++ support library
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index a9f375ce8..c173c6b56 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -12,51 +12,39 @@ PKG_SECTION:=		net
 PKG_DEPENDS:=		glib libstdcxx
 PKG_BUILDDEP+=		glib
 ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),)
-PKG_DEPENDS+=		alsa-lib
 PKG_BUILDDEP+=		alsa-lib
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_AO),)
-PKG_DEPENDS+=		libao
 PKG_BUILDDEP+=		libao
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),)
-PKG_DEPENDS+=		libid3tag libmad
 PKG_BUILDDEP+=		libid3tag libmad
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_MP4),)
-PKG_DEPENDS+=		libfaad2
 PKG_BUILDDEP+=		faad2
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_OGG),)
-PKG_DEPENDS+=		libvorbis libogg
 PKG_BUILDDEP+=		libvorbis libogg
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_TREMOR),)
-PKG_DEPENDS+=		libvorbisidec
 PKG_BUILDDEP+=		libvorbisidec
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_FLAC),)
-PKG_DEPENDS+=		libflac
 PKG_BUILDDEP+=		flac
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),)
-PKG_DEPENDS+=		libaudiofile
 PKG_BUILDDEP+=		libaudiofile
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),)
-PKG_DEPENDS+=		libshout liblame libvorbis
 PKG_BUILDDEP+=		lame libvorbis libshout
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),)
-PKG_DEPENDS+=		libcurl
 PKG_BUILDDEP+=		curl
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_MMS),)
-PKG_DEPENDS+=		libmms
 PKG_BUILDDEP+=		libmms
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),)
-PKG_DEPENDS+=		ffmpeg
 PKG_BUILDDEP+=		ffmpeg
 endif
 PKG_URL:=		http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki
@@ -66,17 +54,29 @@ PKG_FLAVOURS:=		WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR \
 			WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG \
 			WITH_SHOUT WITH_CURL
 PKGFD_WITH_ALSA:=	enable ALSA output
+PKGFS_WITH_ALSA:=	alsa-lib
 PKGFD_WITH_AO:=		enable Libao/ESD output
+PKGFS_WITH_AO:=		libao
 PKGFD_WITH_MP3:=	enable MP3 support
+PKGFS_WITH_MP3:=	libid3tag libmad
 PKGFD_WITH_MP4:=	enable MP4 support
+PKGFS_WITH_MP4:=	libfaad2
 PKGFD_WITH_OGG:=	enable OGG support
+PKGFS_WITH_OGG:=	libvorbis libogg
 PKGFD_WITH_TREMOR:=	enable fixpoint Vorbis/OGG support
+PKGFS_WITH_TREMOR:=	libvorbisidec
 PKGFD_WITH_FLAC:=	enable FLAC support
+PKGFD_WITH_FLAC:=	libflac
 PKGFD_WITH_WAV:=	enable WAVE support
+PKGFS_WITH_WAV:=	libaudiofile
 PKGFD_WITH_MMS:=	enable MMS support
+PKGFS_WITH_MMS:=	libmms
 PKGFD_WITH_FFMPEG:=	enable FFMPEG support
+PKGFS_WITH_FFMPEG:=	ffmpeg
 PKGFD_WITH_SHOUT:=	enable Shoutcast output support
+PKGFS_WITH_SHOUT:=	libshout liblame libvorbis
 PKGFD_WITH_CURL:=	enable CURL support
+PKGFS_WITH_CURL:=	libcurl
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 762994139..d05da35f5 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -14,14 +14,14 @@ PKG_DEPENDS+=		libogg libpng libpthread libvorbis
 PKG_DEPENDS+=		libx11 libxau libxdmcp libxext libxv zlib 
 PKG_BUILDDEP+=		alsa-lib libmad libvorbis faad2 ncurses zlib
 PKG_BUILDDEP+=		libX11 libXv libpng libXext
-ifeq (${ADK_PACKAGE_MPD_WITH_DIRECTFB},y)
-PKG_DEPENDS+=		DirectFB
+ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
 PKG_BUILDDEP+=		DirectFB
 endif
 PKG_URL:=		http://www.mplayerhq.hu
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_FLAVOURS:=		WITH_DIRECTFB
+PKGFS_WITH_DIRECTFB:=	directfb
 PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
 
 PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu shuttle lemote
@@ -42,7 +42,7 @@ endif
 # applications build fine against DirectFB. There is also a
 # related patch to allow configure to find out the DirectFB
 # version number.
-ifeq (${ADK_PACKAGE_MPD_WITH_DIRECTFB},y)
+ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
 TCFLAGS+=		-I${STAGING_DIR}/usr/include/directfb
 endif
 
@@ -67,10 +67,10 @@ CONFIGURE_CPU_OPTS:=	\
 endif
 
 ifeq ($(ADK_DEBUG),y)
-CONFIGURE_DEBUG=	--enable-debug
+CONFIGURE_DEBUG=	--enable-debug --enable-crash-debug
 endif
 
-ifeq (${ADK_PACKAGE_MPD_WITH_DIRECTFB},y)
+ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
 CONFIGURE_DIRECTFB=--enable-directfb
 else
 CONFIGURE_DIRECTFB=--disable-directfb
@@ -126,7 +126,7 @@ pre-configure:
 		--disable-xinerama \
 		--disable-vidix \
 		--disable-gl \
-		--extra-cflags="${EXTRA_CFLAGS}" \
+		--extra-cflags="${TCFLAGS} ${EXTRA_CFLAGS}" \
 		${CONFIGURE_CPU_OPTS} \
 		${CONFIGURE_DEBUG} \
 		${CONFIGURE_DIRECTFB} \
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 78017c615..97781670c 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -9,20 +9,13 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		c3ccd16c147befd49fe4541a506dd177
 PKG_DESCR:= 		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net
-PKG_DEPENDS:=		kmod-nfsd
-
+PKG_DEPENDS:=		kmod-nfsd portmap
 ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
-PKG_DEPENDS+=		libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue
 PKG_BUILDDEP+=		libnfsidmap krb5 libevent libgssglue librpcsecgss
 endif
-
 ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y)
-PKG_DEPENDS+=		libtirpc rpcbind
 PKG_BUILDDEP+=		libtirpc rpcbind
-else
-PKG_DEPENDS:=		portmap
 endif
-
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
@@ -30,7 +23,9 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 PKG_FLAVOURS:=		WITH_KERBEROS WITH_TIRPC
 PKGFD_WITH_KERBEROS:=	enable Kerberos support (MIT)
+PKGFS_WITH_KERBEROS:=	libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue
 PKGFD_WITH_TIRPC:=	enable Transport Independent RPC
+PKGFS_WITH_TIRPC:=	libtirpc rpcbind
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/nut/Makefile b/package/nut/Makefile
index e06a5784f..aae2f2b49 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -10,15 +10,12 @@ PKG_MD5SUM:=		609ebaf2123fc7171d25a6c742dd7d66
 PKG_DESCR:=		Network UPS Tools
 PKG_SECTION:=		sys
 ifneq (${ADK_PACKAGE_NUT_SSL},)
-PKG_DEPENDS+=		libopenssl
 PKG_BUILDDEP+=		openssl
 endif
 ifneq (${ADK_PACKAGE_NUT_USB},)
-PKG_DEPENDS+=		libusb
 PKG_BUILDDEP+=		libusb
 endif
 ifneq (${ADK_PACKAGE_NUT_SNMP},)
-PKG_DEPENDS+=		libnetsnmp
 PKG_BUILDDEP+=		net-snmp
 endif
 PKG_URL:=		http://www.networkupstools.org
@@ -26,8 +23,11 @@ PKG_SITES:=		http://www.networkupstools.org/source/2.4/
 
 PKG_FLAVOURS:=		SSL SNMP USB
 PKGFD_SSL:=		enable SSL support
+PKGFS_SSL:=		libopenssl
 PKGFD_SNMP:=		enable SNMP support
+PKGFS_SNMP:=		libnetsnmp
 PKGFD_USB:=		enable USB support
+PKGFS_USB:=		libusb
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/pkgmaker b/package/pkgmaker
index 677a44d08..cd40ccb94 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -66,6 +66,7 @@ for dn in */Makefile; do
 	    ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \
 	    PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} CFLINE_\${x}) \
 	    \$(foreach x,\${PKG_FLAVOURS},PKGFD_\${x}) \
+	    \$(foreach x,\${PKG_FLAVOURS},PKGFS_\${x}) \
 	    \$(foreach x,\${PKG_CHOICES},PKGCD_\${x}) \
 	    \$(foreach x,\${PKG_CHOICES},PKGCS_\${x}) \
 	    PKG_HOST_DEPENDS PKG_TARGET_DEPENDS")
@@ -280,11 +281,16 @@ EOF
 	# Handle flavours (per directory)
 	for pfcu in $PKG_FLAVOURS; do		# pfcu: pkg flavour conf opt.
 		eval pfd=\$PKGFD_$pfcu		# pfd: pkg flavour description
+		eval pfs=\$PKGFS_$pfcu		# pfs: pkg flavour dependencies
 		print
 		print config ADK_PACKAGE_${dnu}_$pfcu
 		print "\tbool \"${pfd:-$PKG_NAME -> flavour $pfcu}\""
 		print \\tdefault n
 		print \\tdepends on ADK_COMPILE_$dnu
+		for pfso in $pfs; do
+			typeset -u pfso=${pfso#!}
+			print \\tselect ADK_PACKAGE_${pfso}
+		done
 		print \\thelp
 		print "\t  flavour ADK_PACKAGE_${dnu}_$pfcu for $PKG_NAME"
 	done >&4
diff --git a/package/qingy/Makefile b/package/qingy/Makefile
index e78b94d1a..9e91ad4d5 100644
--- a/package/qingy/Makefile
+++ b/package/qingy/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		34f40172a71e9a6c2c77ddce11d2a63a
 PKG_DESCR:=		a DirectFB getty replacement
 PKG_SECTION:=		x11
-PKG_DEPENDS:=		DirectFB libXScrnSaver
+PKG_DEPENDS:=		directfb libxscrnsaver
 PKG_BUILDDEP+=		DirectFB libXScrnSaver
 PKG_URL:=		http://qingy.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=qingy/}
@@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,QINGY,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--disable-screen-savers \
+			--disable-optimizations \
 			--disable-pam \
 			--disable-crypto
 
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 554f84ba3..12ee831e1 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		ba0360b4ec1f6e541b264e45906bf5f2
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11
 PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile \
-			libfontenc xkeyboard-config xkbcomp libxau libXaw \
+			libfontenc xkeyboard-config xkbcomp libxau libxaw \
 			libxmu libxpm libxrender libxt libxxf86dga libxext \
 			libxdmcp libxv libsm libice libx11
 PKG_BUILDDEP+=		libX11 randrproto renderproto fixesproto damageproto \
@@ -19,7 +19,6 @@ PKG_BUILDDEP+=		libX11 randrproto renderproto fixesproto damageproto \
 			libpciaccess openssl xf86dgaproto
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
 PKG_BUILDDEP+=		xf86driproto glproto dri2proto MesaLib
-PKG_DEPENDS+=		mesalib
 endif
 PKG_URL:=		http://www.x.org
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/xserver/
@@ -29,6 +28,7 @@ PKG_TARGET_DEPENDS:=	!foxboard
 CFLINE_XORG_SERVER:=	depends on ADK_TARGET_WITH_VGA
 
 PKG_FLAVOURS:=		WITH_DRI
+PKGFS_WITH_DRI:=	mesalib
 PKGFD_WITH_DRI:=	enable DRI/DRI2 support
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xterm/Makefile b/package/xterm/Makefile
index 720516586..1e75a7345 100644
--- a/package/xterm/Makefile
+++ b/package/xterm/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		22037e1b794d749072310cb142800f05
 PKG_DESCR:=		Terminal Emulator for X Windows
 PKG_SECTION:=		x11
-PKG_DEPENDS:=		xorg-server libXaw
+PKG_DEPENDS:=		xorg-server libxaw
 PKG_URL:=		http://invisible-island.net/xterm/xterm.html
 PKG_SITES:=		ftp://invisible-island.net/xterm/