add a lot of new devel subpackages and fix native builds of packages

mk/build.mk

@@ -119,7 +119,7 @@ world:
 	${BASH} ${TOPDIR}/scripts/update-sys
 	${BASH} ${TOPDIR}/scripts/update-pkg
 ifeq ($(ADK_NATIVE),y)
-	$(MAKE) -f mk/build.mk tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
+	$(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
 else
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
 	$(MAKE) -f mk/build.mk toolchain/install tools/install package/compile

mk/perl.mk

@@ -1,2 +1,2 @@
-PERL_VERSION=5.12.2
+PERL_VERSION=5.12.3
 PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION)/$(CPU_ARCH)-linux

package/apr-util/Makefile

@@ -19,13 +19,13 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,APR_UTIL,apr-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--without-berkeley-db \
-			--with-apr=${STAGING_TARGET_DIR}/usr \
+			--with-apr=${STAGING_DIR}/usr \
 			--with-expat=${STAGING_TARGET_DIR}/usr
-XAKE_FLAGS+=		apr_builddir=${STAGING_TARGET_DIR}/usr/share/build-1 \
-			apr_builders=${STAGING_TARGET_DIR}/usr/share/build-1
+XAKE_FLAGS+=		apr_builddir=${STAGING_DIR}/usr/share/build-1 \
+			apr_builders=${STAGING_DIR}/usr/share/build-1
 
 apr-util-install:
 	${INSTALL_DIR} ${IDIR_APR_UTIL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libaprutil-1.so* ${IDIR_APR_UTIL}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libaprutil-1.so* ${IDIR_APR_UTIL}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/apr/Makefile

@@ -13,12 +13,17 @@ PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://apr.apache.org/
 PKG_SITES:=		http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
 
+PKG_SUBPKGS:=		APR APR_DEV
+PKGSC_APR_DEV:=		devel
+PKGSD_APR_DEV:=		apr headers
+
 PKG_FLAVOURS_APR:=	WITH_IPV6
 PKGFD_WITH_IPV6:=	enable IPv6 support
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,APR,apr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,APR_DEV,apr-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_APR_DEV},${PKGSC_APR_DEV}))
 
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
@@ -31,21 +36,25 @@ CONFIGURE_ENV+=		apr_cv_tcp_nodelay_with_cork=no
 CONFIGURE_ARGS+=	--with-devrandom=/dev/urandom \
 			--enable-threads
 
-ifneq (${ADK_PACKAGE_LIBPCAP_WITH_IPV6},)
+ifneq (${ADK_PACKAGE_APR_WITH_IPV6},)
 CONFIGURE_ARGS+=	--enable-ipv6
 else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
 
-post-install:
+apr-install:
 	${INSTALL_DIR} ${IDIR_APR}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libapr-1.so* ${IDIR_APR}/usr/lib/
-	${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/build-1
-	${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_TARGET_DIR}/usr/share/build-1/
+	${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1
+	${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1/
 	# we need to patch paths to get apr-util compiling
-	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \
+	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \
 		${WRKINST}/usr/bin/apr-1-config
-	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \
+	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," \
 		${WRKINST}/usr/bin/apr-1-config
 
+apr-dev-install:
+	${INSTALL_DIR} ${IDIR_APR_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_APR_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/atk/Makefile

@@ -13,7 +13,9 @@ PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		${MASTER_SITE_GNOME:=/atk/1.33/}
 
-PKG_SUBPKGS:=		LIBATK
+PKG_SUBPKGS:=		LIBATK LIBATK_DEV
+PKGSC_LIBATK_DEV:=	devel
+PKGSD_LIBATK_DEV:=	libatk headers
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
@@ -22,9 +24,16 @@ endif
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBATK,libatk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBATK_DEV,libatk-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBATK_DEV},${PKGSC_LIBATK_DEV},${PKG_OPTS}))
 
 libatk-install:
 	${INSTALL_DIR} ${IDIR_LIBATK}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libatk-*.so* ${IDIR_LIBATK}/usr/lib
 
+libatk-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBATK_DEV}/usr/lib/pkgconfig
+	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_LIBATK_DEV}/usr/lib/pkgconfig
+	${INSTALL_DIR} ${IDIR_LIBATK_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBATK_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/autoconf/Makefile

@@ -17,7 +17,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AUTOCONF,autoconf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-XAKE_FLAGS+=		PERL="/usr/bin/perl"
+XAKE_FLAGS+=		PERL="/usr/bin/perl" \
+			M4="/usr/bin/m4"
 
 autoconf-install:
 	${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/bin

package/automake/Makefile

@@ -25,8 +25,11 @@ automake-install:
 	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/automake ${IDIR_AUTOMAKE}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/aclocal ${IDIR_AUTOMAKE}/usr/bin
-	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER}/
+	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/aclocal-${PKG_EXTRAVER}
+	${CP} ${WRKINST}/usr/share/aclocal-${PKG_EXTRAVER} \
+		${IDIR_AUTOMAKE}/usr/share/aclocal-${PKG_EXTRAVER}
+	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER}
 	${CP} ${WRKINST}/usr/share/automake-${PKG_EXTRAVER}/Automake \
-		${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER}/
+		${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER}
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/cairo/Makefile

@@ -14,19 +14,30 @@ PKG_BUILDDEP:=		libpng pixman freetype fontconfig libX11
 PKG_URL:=		http://cairographics.org/
 PKG_SITES:=		http://cairographics.org/releases/
 
+PKG_SUBPKGS:=		CAIRO CAIRO_DEV
+PKGSC_CAIRO_DEV:=	devel
+PKGSD_CAIRO_DEV:=	cairo headers
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CAIRO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-xlib=yes
 
-post-install:
+cairo-install:
 	${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcairo.so* ${IDIR_CAIRO}/usr/lib
 
+cairo-dev-install:
+	${INSTALL_DIR} ${IDIR_CAIRO_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_CAIRO_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_CAIRO_DEV}/usr/lib/pkgconfig
+	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_CAIRO_DEV}/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/dbus-glib/Makefile

@@ -14,16 +14,29 @@ PKG_BUILDDEP:=		dbus glib
 PKG_URL:=		http://www.freedesktop.org/wiki/Software/DBusBindings
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus-glib/
 
+PKG_SUBPKGS:=		DBUS_GLIB DBUS_GLIB_DEV
+PKGSC_DBUS_GLIB_DEV:=	devel
+PKGSD_DBUS_GLIB_DEV:=	dbus-glib headers
+
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,DBUS_GLIB,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DBUS_GLIB_DEV,dbus-glib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_GLIB_DEV},${PKGSC_DBUS_GLIB_DEV}))
 
 CONFIGURE_ARGS+=	--disable-checks
 CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
 
-post-install:
+dbus-glib-install:
 	$(INSTALL_DIR) $(IDIR_DBUS_GLIB)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libdbus-glib-1.so* \
 		$(IDIR_DBUS_GLIB)/usr/lib
 
+dbus-glib-dev-install:
+	$(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* \
+		$(IDIR_DBUS_GLIB_DEV)/usr/include
+	$(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig
+	${CP} $(WRKINST)/usr/lib/pkgconfig/*.pc \
+		$(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/dbus/Makefile

@@ -14,13 +14,18 @@ PKG_BUILDDEP:=		expat
 PKG_URL:=		http://dbus.freedesktop.org/
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
 
+PKG_SUBPKGS:=		DBUS DBUS_DEV
+PKGSC_DBUS_DEV:=	devel
+PKGSD_DBUS_DEV:=	DBUS headers
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-tests \
 			--disable-abstract-sockets \
@@ -34,16 +39,26 @@ CONFIGURE_ARGS+=	--disable-tests \
 CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
 
 pre-install:
-	${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus
+	${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus
 	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
-		$(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus/
+		$(STAGING_DIR)/usr/include/dbus-1.0/dbus
 
-post-install:
+dbus-install:
 	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \
 		${IDIR_DBUS}/usr/bin
-	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/
-	${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/
+	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc
+	${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib
+	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin
+
+dbus-dev-install:
+	${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_DBUS_DEV}/usr/include
+	${INSTALL_DIR} $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus
+	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
+		$(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus
+	${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/lib/pkgconfig
+	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_DBUS_DEV}/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/dsniff/patches/patch-confdefs_h

@@ -1,7 +1,7 @@
 $Id$
 --- dsniff-2.4.orig/confdefs.h	1970-01-01 00:00:00.000000000 +0100
-+++ dsniff-2.4/confdefs.h	2007-01-23 00:20:53.000000000 +0100
-@@ -0,0 +1,24 @@
++++ dsniff-2.4/confdefs.h	2011-03-11 21:17:49.000000000 +0100
+@@ -0,0 +1,22 @@
 +
 +#define X_DISPLAY_MISSING 1
 +#define STDC_HEADERS 1
@@ -19,10 +19,8 @@ $Id$
 +#define HAVE_SOCKET 1
 +#define HAVE_STRDUP 1
 +#define HAVE_STRSTR 1
-+#define HAVE_LIBNSL 1
++#define HAVE_LIBRESOLV 1
 +#define HAVE_DIRNAME 1
-+#define HAVE_STRLCPY 1
-+#define HAVE_STRLCAT 1
 +#define HAVE_STRSEP 1
 +#define HAVE_WARNX 1
 +#define HAVE_ETHER_NTOA 1

package/dsniff/patches/patch-configure

@@ -1,6 +1,6 @@
 $Id$
 --- dsniff-2.4.orig/configure	2001-03-19 07:52:37.000000000 +0100
-+++ dsniff-2.4/configure	2007-01-23 00:24:04.000000000 +0100
++++ dsniff-2.4/configure	2011-03-11 21:41:08.000000000 +0100
 @@ -16,6 +16,8 @@ ac_help="$ac_help
  ac_help="$ac_help
    --with-db=DIR           use Berkeley DB (with --enable-compat185) in DIR"
@@ -10,9 +10,18 @@ $Id$
    --with-libpcap=DIR      use libpcap in DIR"
  ac_help="$ac_help
    --with-libnet=DIR       use libnet in DIR"
-@@ -3031,7 +3033,7 @@ if test "${with_libpcap+set}" = set; the
- 	PCAPINC="-I$withval -I$withval/bpf"
- 	PCAPLIB="-L$withval -lpcap"
+@@ -3025,13 +3027,13 @@ if test "${with_libpcap+set}" = set; the
+      ;;
+   *)
+      echo "$ac_t""$withval" 1>&6
+-     if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
++     if test -f $withval/include/pcap.h -a -f $withval/lib/libpcap.so; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+-	PCAPINC="-I$withval -I$withval/bpf"
+-	PCAPLIB="-L$withval -lpcap"
++	PCAPINC="-I$withval/include -I$withval/include/bpf"
++	PCAPLIB="-L$withval/lib -lpcap"
       elif test -f $withval/include/pcap.h -a \
 -	       -f $withval/include/net/bpf.h -a \
 +	       -f $withval/include/pcap-bpf.h -a \
@@ -102,3 +111,27 @@ $Id$
       fi
       ;;
    esac 
+@@ -3183,19 +3218,19 @@ if test "${with_openssl+set}" = set; the
+      ;;
+   *)
+      echo "$ac_t""$withval" 1>&6
+-     if test -f $withval/include/openssl/ssl.h -a -f $withval/libssl.a; then
++     if test -f $withval/include/openssl/ssl.h -a -f $withval/lib/libssl.so; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	SSLINC="-I$withval/include"
+-	SSLLIB="-L$withval -lssl -lcrypto"
++	SSLLIB="-L$withval/lib -lssl -lcrypto"
+      elif test -f $withval/include/openssl/ssl.h -a \
+-	       -f $withval/lib/libssl.a; then
++	       -f $withval/lib/libssl.so; then
+ 	owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	SSLINC="-I$withval/include"
+ 	SSLLIB="-L$withval/lib -lssl -lcrypto"
+      else
+-        { echo "configure: error: ssl.h or libssl.a not found in $withval" 1>&2; exit 1; }
++        { echo "configure: error: ssl.h or libssl.so not found in $withval" 1>&2; exit 1; }
+      fi
+      WEBMITM="webmitm"
+      ;;

package/gettext/Makefile

@@ -64,6 +64,8 @@ libintl-dev-install:
 
 gettext-install:
 	${INSTALL_DIR} ${IDIR_GETTEXT}/usr/bin
+	$(INSTALL_BIN) $(WRKBUILD)/gettext-tools/src/.libs/xgettext \
+		$(IDIR_GETTEXT)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/gettext-runtime/src/.libs/gettext \
 		$(IDIR_GETTEXT)/usr/bin
 
@@ -78,5 +80,7 @@ msgfmt-install:
 		${IDIR_MSGFMT}/usr/lib
 	$(INSTALL_BIN) $(WRKBUILD)/gettext-tools/src/.libs/msgfmt \
 		$(IDIR_MSGFMT)/usr/bin
+	$(INSTALL_BIN) $(WRKBUILD)/gettext-tools/src/.libs/msgmerge \
+		$(IDIR_MSGFMT)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/gtk+/Makefile

@@ -17,7 +17,9 @@ PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/gtk+/$(PKG_EXTRAVER)/
 PKG_NEED_CXX:=		1
 
-PKG_SUBPKGS:=		LIBGTK
+PKG_SUBPKGS:=		LIBGTK LIBGTK_DEV
+PKGSC_LIBGTK_DEV:=	devel
+PKGSD_LIBGTK_DEV:=	GTK+ headers
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
@@ -26,6 +28,7 @@ endif
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGTK,libgtk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBGTK_DEV,libgtk-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGTK_DEV},${PKGSC_LIBGTK_DEV},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-gtk-doc-html \
 			--disable-modules \
@@ -38,10 +41,19 @@ CONFIGURE_ARGS+=	--disable-gtk-doc-html \
 CONFIGURE_ENV+=		gio_can_sniff=no \
 			ac_cv_path_GTK_UPDATE_ICON_CACHE=""
 
-post-install:
+libgtk-install:
 	${INSTALL_DIR} ${IDIR_LIBGTK}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgdk-x11*so* ${IDIR_LIBGTK}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgtk-x11*so* ${IDIR_LIBGTK}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgailutil*so* ${IDIR_LIBGTK}/usr/lib
 
+libgtk-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBGTK_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/lib/gtk-2.0/include
+	${CP} ${WRKINST}/usr/lib/gtk-2.0/include/* \
+		${IDIR_LIBGTK_DEV}/usr/lib/gtk-2.0/include
+	${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/lib/pkgconfig
+	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_LIBGTK_DEV}/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXdmcp/Makefile

@@ -34,5 +34,8 @@ libxdmcp-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBXDMCP_DEV}/usr/include/X11
 	${CP} ${WRKINST}/usr/include/X11/* \
 		${IDIR_LIBXDMCP_DEV}/usr/include/X11
-	
+	${INSTALL_DIR} ${IDIR_LIBXDMCP_DEV}/usr/lib/pkgconfig
+	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_LIBXDMCP_DEV}/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libffi/Makefile

@@ -12,12 +12,21 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://sourceware.org/libffi/
 PKG_SITES:=		ftp://sourceware.org/pub/libffi/
 
+PKG_SUBPKGS:=		LIBFFI LIBFFI_DEV
+PKGSC_LIBFFI_DEV:=	devel
+PKGSD_LIBFFI_DEV:=	libffi headers
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBFFI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFFI_DEV,libffi-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBFFI_DEV},${PKGSC_LIBFFI_DEV}))
 
-post-install:
+libffi-install:
 	${INSTALL_DIR} ${IDIR_LIBFFI}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libffi.so* ${IDIR_LIBFFI}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libffi.so* ${IDIR_LIBFFI}/usr/lib
+
+libffi-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBFFI_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBFFI_DEV}/usr/include
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libgcrypt/Makefile

@@ -32,8 +32,11 @@ libgcrypt-install:
 		${IDIR_LIBGCRYPT}/usr/lib
 
 libgcrypt-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBGCRYPT_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/* \
-		${IDIR_LIBGCRYPT}/usr/include
+		${IDIR_LIBGCRYPT_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBGCRYPT_DEV}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/libgcrypt-config \
+		${IDIR_LIBGCRYPT_DEV}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libnet/Makefile

@@ -15,8 +15,15 @@ PKG_URL:=		http://sourceforge.net/projects/libnet-dev/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libnet-dev/}
 PKG_NEED_CXX:=		1
 
+PKG_SUBPKGS:=		LIBNET LIBNET_DEV
+PKGSC_LIBNET_DEV:=	devel
+PKGSD_LIBNET_DEV:=	libnet headers
+
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNET_DEV,libnet-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNET_DEV},${PKGSC_LIBNET_DEV}))
+
 ENDIAN:=lil
 ifeq (${CPU_ARCH},mips)
 ENDIAN:=big
@@ -28,13 +35,18 @@ ifeq (${CPU_ARCH},ppc)
 ENDIAN:=big
 endif
 
-$(eval $(call PKG_template,LIBNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
 CONFIGURE_ENV+=		ac_cv_libnet_endianess=${ENDIAN} \
 			ac_cv_lbl_unaligned_fail=no
 
-post-install:
+libnet-install:
 	${INSTALL_DIR} ${IDIR_LIBNET}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libnet.so* ${IDIR_LIBNET}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libnet.so* ${IDIR_LIBNET}/usr/lib
+
+libnet-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBNET_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBNET_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBNET_DEV}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/libnet-config \
+		${IDIR_LIBNET_DEV}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libnetfilter_log/Makefile

@@ -16,13 +16,26 @@ PKG_SITES:=		http://www.netfilter.org/projects/libnetfilter_log/files/
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+PKG_SUBPKGS:=		LIBNETFILTER_LOG LIBNETFILTER_LOG_DEV
+PKGSC_LIBNETFILTER_LOG_DEV:=	devel
+PKGSD_LIBNETFILTER_LOG_DEV:=	libnetfilter-log headers
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBNETFILTER_LOG,libnetfilter-log,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNETFILTER_LOG_DEV,libnetfilter-log-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNETFILTER_LOG_DEV},${PKGSC_LIBNETFILTER_LOG_DEV}))
 
-post-install:
+libnetfilter-log-install:
 	$(INSTALL_DIR) $(IDIR_LIBNETFILTER_LOG)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libnetfilter_log*so* \
-		$(IDIR_LIBNETFILTER_LOG)/usr/lib/
+		$(IDIR_LIBNETFILTER_LOG)/usr/lib
+
+libnetfilter-log-dev-install:
+	$(INSTALL_DIR) $(IDIR_LIBNETFILTER_LOG_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* \
+		$(IDIR_LIBNETFILTER_LOG_DEV)/usr/include
+	$(INSTALL_DIR) $(IDIR_LIBNETFILTER_LOG_DEV)/usr/lib/pkgconfig
+	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
+		$(IDIR_LIBNETFILTER_LOG_DEV)/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libnids/Makefile

@@ -14,15 +14,25 @@ PKG_BUILDDEP:=		libnet libpcap glib
 PKG_URL:=		http://libnids.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libnids/}
 
+PKG_SUBPKGS:=		LIBNIDS LIBNIDS_DEV
+PKGSC_LIBNIDS_DEV:=	devel
+PKGSD_LIBNIDS_DEV:=	libnids headers
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBNIDS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNIDS_DEV,libnids-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNIDS_DEV},${PKGSC_LIBNIDS_DEV}))
 
+CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--with-libpcap=${STAGING_TARGET_DIR}/usr
 XAKE_FLAGS+=		install_prefix="${WRKINST}"
 
-post-install:
+libnids-install:
 	${INSTALL_DIR} ${IDIR_LIBNIDS}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libnids.so* ${IDIR_LIBNIDS}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libnids.so* ${IDIR_LIBNIDS}/usr/lib
+
+libnids-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBNIDS_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBNIDS_DEV}/usr/include
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libpng/Makefile

@@ -24,16 +24,19 @@ endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBPNG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS}))
 
-post-install:
+libpng-install:
 	${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libpng{,12}.so* ${IDIR_LIBPNG}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libpng{,12}.so* ${IDIR_LIBPNG}/usr/lib
 
 libpng-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/include/libpng12
 	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBPNG_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/libpng12/*.h ${IDIR_LIBPNG_DEV}/usr/include/libpng12
+	${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig
+	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libusb-compat/Makefile

@@ -35,5 +35,8 @@ libusb-compat-install:
 libusb-compat-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBUSB_COMPAT_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT_DEV}/usr/lib/pkgconfig
+	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_LIBUSB_COMPAT_DEV}/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/lynx/Makefile

@@ -39,7 +39,7 @@ CONFIGURE_ENV+=		ac_cv_path_TELNET=telnet \
 			ac_cv_path_UUDECODE=uudecode \
 			ac_cv_path_ZCAT=zcat \
 			ac_cv_path_ZIP=zip \
-			ac_cv_path_NCURSES_CONFIG=${STAGING_TARGET_DIR}/scripts/ncurses5-config
+			ac_cv_path_NCURSES_CONFIG=${STAGING_TARGET_DIR}/usr/bin/ncurses5-config
 
 CONFIGURE_ARGS+=	\
 			--disable-warnings \

package/mysql/Makefile

@@ -94,5 +94,8 @@ libmysqlclient-install:
 libmysqlclient-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBMYSQLCLIENT_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBMYSQLCLIENT_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBMYSQLCLIENT_DEV}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/mysql_config \
+		${IDIR_LIBMYSQLCLIENT_DEV}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/ncurses/Makefile

@@ -88,5 +88,8 @@ endif
 libncurses-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBNCURSES_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/ncurses5-config \
+		${IDIR_LIBNCURSES_DEV}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/neon/patches/patch-neon-config_in

@@ -0,0 +1,11 @@
+--- neon-0.29.5.orig/neon-config.in	2008-02-06 12:12:09.000000000 +0100
++++ neon-0.29.5/neon-config.in	2011-03-08 18:52:01.000000000 +0100
+@@ -78,7 +78,7 @@ while test $# -gt 0; do
+         if test "$prefix" != "/usr"; then
+            LIBS="-L${libdir} ${LIBS}"
+         fi
+-	echo @user_LDFLAGS@ ${LIBS}
++	echo ${LIBS}
+ 	;;
+ 
+     --la-file)

package/nspr/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nspr
-PKG_VERSION:=		4.8.6
+PKG_VERSION:=		4.8.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		592c275728c29d193fdba8009165990b
+PKG_MD5SUM:=		97e30989a56ab813453b71261849c200
 PKG_DESCR:=		Netscape Portable Runtime library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.mozilla.org/projects/nspr/
@@ -14,11 +14,16 @@ PKG_SITES:=		ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKG_VERSION}
 
 PKG_ARCH_DEPENDS:=	!cris
 
+PKG_SUBPKGS:=		NSPR NSPR_DEV
+PKGSC_NSPR_DEV:=	devel
+PKGSD_NSPR_DEV:=	nspr headers
+
 WRKSRC=			${WRKDIST}/mozilla/nsprpub
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NSPR,nspr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NSPR_DEV,nspr-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_NSPR_DEV},${PKGSC_NSPR_DEV}))
 
 CONFIGURE_ENV+=		OS_TARGET="Linux" HOST_CC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}"
 
@@ -26,8 +31,12 @@ ifeq (${ADK_LINUX_64},y)
 CONFIGURE_ARGS+=	--enable-64bit
 endif
 
-post-install:
+nspr-install:
 	$(INSTALL_DIR) $(IDIR_NSPR)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/*.so* $(IDIR_NSPR)/usr/lib
 
+nspr-dev-install:
+	$(INSTALL_DIR) $(IDIR_NSPR_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* $(IDIR_NSPR_DEV)/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/nss/Makefile

@@ -4,14 +4,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nss
-PKG_VERSION:=		3.12.8
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		40bf1bb0c7567827d3768d1fc6081100
+PKG_VERSION:=		3.12.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		bd32f183ca28440c1744650be31a9ccc
 PKG_DESCR:=		Network Security Services (NSS) library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		nspr zlib
 PKG_URL:=		http://www.mozilla.org/projects/security/pki/nss/
-PKG_SITES:=		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_8_RTM/src/
+PKG_SITES:=		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_9_RTM/src/
 PKG_NOPARALLEL:=	1
 
 PKG_HOST_DEPENDS:=	!cygwin
@@ -33,7 +33,7 @@ endif
 MAKE_FLAGS+=		NATIVE_CC="${CC_FOR_BUILD}" NATIVE_FLAGS="${CFLAGS_FOR_BUILD}"
 TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/nspr
 TARGET_CFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/nspr
-TARGET_LDFLAGS+=	-ldl
+TARGET_LDFLAGS+=	-ldl -pthread
 
 XAKE_FLAGS+=		SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist
 XAKE_FLAGS+=		ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"

package/openldap/Makefile

@@ -46,8 +46,6 @@ PKG_CONFIGURE_OPTIONS+= --enable-slapd \
 			--enable-syslog \
 			--enable-local \
 			--disable-syncprov \
-			--disable-slurpd \
-			--without-gssapi \
 			--without-fetch \
 			--with-cyrus-sasl \
 			--with-threads \

package/pango/Makefile

@@ -13,15 +13,20 @@ PKG_URL:=		http://www.pango.org/
 PKG_SITES:=		${MASTER_SITE_GNOME:=pango/1.28/}
 PKG_NEED_CXX:=		1
 
+PKG_SUBPKGS:=		PANGO PANGO_DEV
+PKGSC_PANGO_DEV:=	devel
+PKGSD_PANGO_DEV:=	pango headers
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,PANGO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,PANGO_DEV,pango-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PANGO_DEV},${PKGSC_PANGO_DEV},${PKG_OPTS}))
 
-post-install:
+pango-install:
 	$(INSTALL_DIR) $(IDIR_PANGO)/etc/pango
 	$(INSTALL_DIR) $(IDIR_PANGO)/usr/lib $(IDIR_PANGO)/usr/lib/pango/1.6.0/modules
 	$(INSTALL_DATA) ./files/pango.modules $(IDIR_PANGO)/etc/pango
@@ -29,4 +34,12 @@ post-install:
 	$(CP) $(WRKINST)/usr/lib/pango/1.6.0/modules/*.so \
 		$(IDIR_PANGO)/usr/lib/pango/1.6.0/modules
 
+pango-dev-install:
+	$(INSTALL_DIR) $(IDIR_PANGO_DEV)/usr/include
+	${CP} $(WRKINST)/usr/include/* \
+		$(IDIR_PANGO_DEV)/usr/include
+	$(INSTALL_DIR) $(IDIR_PANGO_DEV)/usr/lib/pkgconfig
+	${CP} $(WRKINST)/usr/lib/pkgconfig/*.pc \
+		$(IDIR_PANGO_DEV)/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/postgresql/Makefile

@@ -13,11 +13,12 @@ PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.postgresql.org/
 PKG_SITES:=		ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/
 
-PKG_SUBPKGS:=		LIBPQ
+PKG_SUBPKGS:=		LIBPQ LIBPQ_DEV
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBPQ_DEV,libpq-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
@@ -53,8 +54,15 @@ do-build:
 		DESTDIR="${WRKINST}" \
 		all install
 
-do-install:
+libpq-install:
 	${INSTALL_DIR} ${IDIR_LIBPQ}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libpq.so* ${IDIR_LIBPQ}/usr/lib
 
+libpq-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBPQ_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPQ_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBPQ_DEV}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/pg_config \
+		${IDIR_LIBPQ_DEV}/usr/bin
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/sdl/Makefile

@@ -15,7 +15,7 @@ PKG_URL:=		http://www.libsdl.org/
 PKG_SITES:=		http://www.libsdl.org/release/
 
 PKG_FLAVOURS_LIBSDL:=	WITH_TSLIB
-PKGFD_WITH_TSLIB:=	SDL with touchscreen support
+PKGFD_WITH_TSLIB:=	enable touchscreen support
 PKGFS_WITH_TSLIB:=	tslib
 PKGFB_WITH_TSLIB:=	tslib
 

package/sqlite/Makefile

@@ -33,9 +33,6 @@ CONFIGURE_ENV+=		config_BUILD_CC="${CC_FOR_BUILD}" \
 
 MAKE_FLAGS+=		LIBPTHREAD=-lm
 TARGET_CPPFLAGS+=	-DSQLITE_SECURE_DELETE=1
-CONFIGURE_ARGS+=	--disable-tcl \
-			--without-tcl \
-			--disable-amalgamation
 
 libsqlite-install:
 	${INSTALL_DIR} ${IDIR_LIBSQLITE}/usr/lib

toolchain/kernel-headers/Makefile

@@ -8,19 +8,19 @@ include ${TOPDIR}/mk/buildhlp.mk
 
 $(WRKBUILD)/.headers:
 	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
-		INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \
+		INSTALL_HDR_PATH=$(STAGING_DIR)/usr \
 		headers_install
 	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(LINUX_HEADER_DIR) \
 		headers_install
 	# cryptodev.h from ocf-linux-20080917
-	mkdir -p ${STAGING_TARGET_DIR}/usr/include/crypto
-	cp files/cryptodev.h ${STAGING_TARGET_DIR}/usr/include/crypto/
+	mkdir -p ${STAGING_DIR}/usr/include/crypto
+	cp files/cryptodev.h ${STAGING_DIR}/usr/include/crypto
 ifeq ($(ARCH),cris)
 ifeq ($(CPU_ARCH),crisv32)
-	cd $(STAGING_TARGET_DIR)/usr/include && ln -sf arch-v32/arch arch
+	cd $(STAGING_DIR)/usr/include && ln -sf arch-v32/arch arch
 else
-	cd $(STAGING_TARGET_DIR)/usr/include && ln -sf arch-v10/arch arch
+	cd $(STAGING_DIR)/usr/include && ln -sf arch-v10/arch arch
 endif
 endif
 	touch $@