automatically create development subpackages, without user interaction, depend on gcc for the target, simplifies a lot of library packages

BUGS

@@ -1,3 +1,6 @@
+- qemu-sparc with glibc/eglibc does not compile
+- qemu-ppc64 does not boot
+- cris foxboard-lx is broken, binutils failure
 - openssh on amd64 does not work, ssh-keygen endless loop
 - uclibc on lemote mips64 target does not work (only uclibc-trunk with patches)
 - qemu-mips64* targets does not boot, kernel problem?

Makefile

@@ -74,6 +74,10 @@ dev-help:
 	@echo ''
 	@echo 'Adding a new package:'
 	@echo 'make PKG=foo VER=1.0 newpackage'
+	@echo 'Adding a new simple library package:'
+	@echo 'make PKG=foo VER=1.0 TYPE=lib newpackage'
+	@echo 'Adding a new simple program package:'
+	@echo 'make PKG=foo VER=1.0 TYPE=prog newpackage'
 
 clean: .prereq_done
 	-@rm -f nohup.out

TODO

@@ -1 +1,9 @@
-nothing right now.
+- port full blown perl
+- implement host build infrastructure, fixes update-patches for the package
+  needed for ncurses, file, mesalib, openldap, python2, ..
+- gcc fixed-includes disabling
+http://www.linuxfromscratch.org/lfs/view/7.1/chapter05/gcc-pass2.html
+- port w3m
+- port libcec for xbmc
+- check xbmc samba/nfs support
+- add support for librtmp in xbmc

mk/build.mk

@@ -244,7 +244,7 @@ kernelconfig:
 # create a new package from package/.template
 newpackage:
 	@echo "Creating new package $(PKG)"
-	$(CP) $(TOPDIR)/package/.template $(TOPDIR)/package/$(PKG)
+	$(CP) $(TOPDIR)/package/.template$(TYPE) $(TOPDIR)/package/$(PKG)
 	pkg=$$(echo $(PKG)|tr '[:lower:]-' '[:upper:]_'); \
 		$(SED) "s#@UPKG@#$$pkg#" $(TOPDIR)/package/$(PKG)/Makefile
 	$(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile

mk/package.mk

@@ -98,11 +98,12 @@ build-all-pkgs: ${_IPKGS_COOKIE}
 # 4.) dependencies to other packages, $(PKG_DEPENDS)
 # 5.) description for the package, $(PKG_DESCR)
 # 6.) section of the package, $(PKG_SECTION)  
-# 7.) special package options
+# 7.) special package options $(PKG_OPTS)
 #     noscripts -> do not install scripts to $(STAGING_TARGET_DIR)/target/scripts
 #		  (needed for example for autoconf/automake)
 #     noremove -> do not remove files from $(STAGING_TARGET_DIR)/target while
 #                 cleaning (needed for toolchain packages like glibc/eglibc)
+#     dev -> create a development subpackage with headers and pkg-config files
 # should be package format independent and modular in the future
 define PKG_template
 ALL_PKGOPTS+=	$(1)
@@ -111,7 +112,9 @@ PKGDEPS_$(1)=	$(4)
 PKGDESC_$(1)=	$(5)
 PKGSECT_$(1)=	$(6)
 IPKG_$(1)=	$(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
+IPKG_$(1)_DEV=	$(PACKAGE_DIR)/$(2)-dev_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
 IDIR_$(1)=	$(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
+IDIR_$(1)_DEV=	$(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dev
 ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)
 ALL_IPKGS+=	$$(IPKG_$(1))
 ALL_IDIRS+=	$${IDIR_$(1)}
@@ -128,6 +131,7 @@ IDEPEND_$(1):=	$$(strip $(4))
 
 _ALL_CONTROLS+=	$$(IDIR_$(1))/CONTROL/control
 ICONTROL_$(1)?=	$(WRKDIR)/.$(2).control
+ICONTROL_$(1)_DEV?= $(WRKDIR)/.$(2)-dev.control
 $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
 	@echo "Package: $$(shell echo $(2) | tr '_' '-')" > $(WRKDIR)/.$(2).control
 	@echo "Section: $(6)" >> $(WRKDIR)/.$(2).control
@@ -151,6 +155,13 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
 	@for file in conffiles preinst postinst prerm postrm; do \
 		[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
 	done
+ifneq (,$(filter dev,$(7)))
+	echo "Package: $$(shell echo $(2) | tr '_' '-')-dev" > $(WRKDIR)/.$(2)-dev.control
+	echo "Section: devel" >> $(WRKDIR)/.$(2)-dev.control
+	echo "Description: development files for $(2)" >> $(WRKDIR)/.$(2)-dev.control
+	${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)_DEV} $${ICONTROL_$(1)_DEV} $(3) ${CPU_ARCH}
+	echo "Depends: $$(shell echo $(2) | tr '_' '-')" >> $${IDIR_$(1)_DEV}/CONTROL/control
+endif
 
 $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE}
 ifeq ($(ADK_DEBUG),)
@@ -222,9 +233,14 @@ ifeq (,$(filter noscripts,$(7)))
 endif
 ifeq (,$(filter libmix,$(7)))
 ifeq (,$(filter libonly,$(7)))
+ifeq (,$(filter devonly,$(7)))
 	$${PKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE)
 endif
 endif
+endif
+ifneq (,$(filter dev,$(7)))
+	$${PKG_BUILD} $${IDIR_$(1)_DEV} $${PACKAGE_DIR} $(MAKE_TRACE)
+endif
 
 clean-targets: clean-dev-$(1)
 
@@ -241,6 +257,9 @@ endif
 
 $$(INFO_$(1)): $$(IPKG_$(1))
 	$(PKG_INSTALL) $$(IPKG_$(1))
+ifneq (,$(filter dev,$(7)))
+	$(PKG_INSTALL) $$(IPKG_$(1)_DEV)
+endif
 endef
 
 install-targets:

mk/pkg-bottom.mk

@@ -12,6 +12,7 @@
 #   are required, but the do-foo: magic is done here
 
 REORDER_DEPENDENCIES=	${TOPDIR}/scripts/automake.dep
+PKG_LIBNAME?=	$(PKG_NAME)
 
 pre-configure:
 do-configure:
@@ -142,6 +143,7 @@ else
 	@echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
 	@exit 1
 endif
+	@rm -f '${STAGING_PKG_DIR}/${PKG_NAME}.scripts'
 	@for a in ${WRKINST}/usr/bin/*-config*; do \
 		[[ -e $$a ]] || continue; \
 		sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \
@@ -166,6 +168,23 @@ ifeq (,$(filter noremove,${PKG_OPTS}))
 	fi
 endif
 	@rm -f '${STAGING_PKG_DIR}/${PKG_NAME}'
+ifneq (,$(filter dev,${PKG_OPTS}))
+	mkdir -p  $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include
+	test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \
+	    find . -name \*.h | \
+ 	    $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include
+	mkdir -p  $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig
+	test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \
+	    find . -name \*.pc | \
+ 	    $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig
+	for a in ${WRKINST}/usr/bin/*-config*; do \
+		[[ -e $$a ]] || continue; \
+		mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \
+		cp $$a $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \
+		chmod 755 $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin/$$(basename $$a); \
+	done
+	#env ${MAKE_ENV} ${MAKE} ${PKG_LIBNAME}-dev-install $(MAKE_TRACE)
+endif
 	@-cd ${WRKINST}; \
 	    if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \
 	    find lib \( -name lib\*.so\* -o -name lib\*.a \) \

package/.templatelib/Makefile

@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		@PKG@
+PKG_VERSION:=		@VER@
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		add md5sum of package here
+PKG_DESCR:=		add short description
+PKG_SECTION:=		libs
+PKG_URL:=		add project url
+PKG_SITES:=		add download url without package name
+PKG_OPTS:=		dev
+
+# if downloaded package is not ending with .tar.gz use following
+#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+@PKG@-install:
+	$(INSTALL_DIR) $(IDIR_@UPKG@)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/@PKG@*.so* \
+		$(IDIR_@UPKG@)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/.templateprog/Makefile

@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		@PKG@
+PKG_VERSION:=		@VER@
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		add md5sum of package here
+PKG_DESCR:=		add short description
+PKG_SECTION:=		add section
+PKG_DEPENDS:=		add dependendant package names
+PKG_BUILDDEP:=		add packages which need to be compiled
+PKG_URL:=		add project url
+PKG_SITES:=		add download url without package name
+
+# if downloaded package is not ending with .tar.gz use following
+#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+@PKG@-install:
+	$(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \
+		$(IDIR_@UPKG@)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/DirectFB/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		DirectFB
 PKG_VERSION:=		1.6.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_EXTRAVER:=		1.6-0
 PKG_MD5SUM:=		641e8e999c017770da647f9b5b890906
 PKG_DESCR:=		Thin graphic library for the Linux framebuffer devices
@@ -14,15 +14,12 @@ PKG_DEPENDS:=		libpng libjpeg libfreetype
 PKG_BUILDDEP:=		libpng jpeg freetype
 PKG_URL:=		http://www.directfb.org/
 PKG_SITES:=		http://directfb.org/downloads/Core/DirectFB-1.6/
-
-PKG_SUBPKGS:=		DIRECTFB DIRECTFB_DEV
-PKGSD_DIRECTFB_DEV:=	development files for DirectFB
-PKGSC_DIRECTFB_DEV:=	devel
+PKG_LIBNAME:=		directfb
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,DIRECTFB_DEV,directfb-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DIRECTFB_DEV},${PKGSC_DIRECTFB_DEV}))
+$(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 CONFIGURE_ARGS+=	--with-inputdrivers=linuxinput,keyboard,ps2mouse \
@@ -47,7 +44,7 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
 XAKE_FLAGS+=		LDFLAGS=$(ADK_TARGET_ABI_CFLAGS)
 endif
 
-post-install:
+directfb-install:
 	${INSTALL_DIR} ${IDIR_DIRECTFB}/etc
 	${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc
 	$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm}
@@ -67,11 +64,4 @@ post-install:
 	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider/*.so \
 		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider
 
-directfb-dev-install:
-	${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/directfb ${IDIR_DIRECTFB_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/directfb-config \
-		${IDIR_DIRECTFB_DEV}/usr/bin
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/MesaLib/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		MesaLib
 PKG_VERSION:=		8.0.5
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		cda5d101f43b8784fa60bdeaca4056f2
 PKG_DESCR:=		MESA library
 PKG_SECTION:=		libs
@@ -15,10 +15,7 @@ PKG_BUILDDEP+=		dri2proto glproto expat libXext
 PKG_URL:=		http://www.mesa3d.org/
 PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/
 PKG_NEED_CXX:=		1
-
-PKG_SUBPKGS:=		MESALIB MESALIB_DEV
-PKGSD_MESALIB_DEV:=	MESA headers
-PKGSC_MESALIB_DEV:=	devel
+PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el arm
 
@@ -26,8 +23,7 @@ WRKDIST=		${WRKDIR}/Mesa-${PKG_VERSION}
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,MESALIB_DEV,mesalib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MESALIB_DEV},${PKGSC_MESALIB_DEV}))
+$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
@@ -76,12 +72,4 @@ ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
 		${IDIR_MESALIB}/usr/lib/dri/
 endif
 
-mesalib-dev-install:
-	$(INSTALL_DIR) $(IDIR_MESALIB_DEV)/usr/include
-	${CP} ${WRKINST}/usr/include/* \
-		$(IDIR_MESALIB_DEV)/usr/include
-	$(INSTALL_DIR) $(IDIR_MESALIB_DEV)/usr/lib/pkgconfig
-	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		$(IDIR_MESALIB_DEV)/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/SDL_gfx/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		SDL_gfx
 PKG_VERSION:=		2.0.22
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		330f291f1f09a1bdf397c9b40d92ca41
 PKG_DESCR:=		SDL GFX library
 PKG_SECTION:=		libs
@@ -13,17 +13,14 @@ PKG_DEPENDS:=		libsdl
 PKG_BUILDDEP:=		sdl
 PKG_URL:=		http://www.ferzkopp.net/joomla/content/view/19/14/
 PKG_SITES:=		http://www.ferzkopp.net/Software/SDL_gfx-2.0/
+PKG_LIBNAME:=		libsdl-gfx
+PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!m68k
 
-PKG_SUBPKGS:=		LIBSDL_GFX LIBSDL_GFX_DEV
-PKGSD_LIBSDL_GFX_DEV:=	development files for SDL_gfx
-PKGSC_LIBSDL_GFX_DEV:=	devel
-
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSDL_GFX_DEV,libsdl-gfx-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_GFX_DEV},${PKGSC_LIBSDL_GFX_DEV}))
+$(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-mmx
 
@@ -31,8 +28,4 @@ libsdl-gfx-install:
 	$(INSTALL_DIR) $(IDIR_LIBSDL_GFX)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libSDL_gfx.so* $(IDIR_LIBSDL_GFX)/usr/lib
 
-libsdl-gfx-dev-install:
-	$(INSTALL_DIR) $(IDIR_LIBSDL_GFX_DEV)/usr/include
-	$(CP) $(WRKINST)/usr/include/* $(IDIR_LIBSDL_GFX_DEV)/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/SDL_ttf/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		SDL_ttf
 PKG_VERSION:=		2.0.10
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		814e6e17e8879254208d23b3b7e0354b
 PKG_DESCR:=		TrueType fonts in your SDL applications
 PKG_SECTION:=		libs
@@ -13,27 +13,17 @@ PKG_DEPENDS:=		libsdl libfreetype
 PKG_BUILDDEP:=		sdl freetype gettext-tiny
 PKG_URL:=		http://www.libsdl.org/projects/SDL_ttf/
 PKG_SITES:=		http://www.libsdl.org/projects/SDL_ttf/release/
+PKG_LIBNAME:=		libsdl-ttf
+PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=      !m68k
 
-PKG_SUBPKGS:=		LIBSDL_TTF LIBSDL_TTF_DEV
-PKGSD_LIBSDL_TTF_DEV:=	development files
-PKGSC_LIBSDL_TTF_DEV:=	devel
-
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSDL_TTF_DEV,libsdl-ttf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_TTF_DEV},${PKGSC_LIBSDL_TTF_DEV}))
+$(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libsdl-ttf-install:
 	$(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib
 
-libsdl-ttf-dev-install:
-	$(INSTALL_DIR) $(IDIR_LIBSDL_TTF_DEV)/usr/include
-	$(CP) $(WRKINST)/usr/include/* $(IDIR_LIBSDL_TTF_DEV)/usr/include
-	$(INSTALL_DIR) $(IDIR_LIBSDL_TTF_DEV)/usr/lib/pkgconfig
-	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
-		$(IDIR_LIBSDL_TTF_DEV)/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/alsa-lib/Makefile

@@ -11,19 +11,15 @@ PKG_DESCR:=		ALSA sound library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.alsa-project.org/
 PKG_SITES:=		ftp://ftp.alsa-project.org/pub/lib/
+PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!m68k
 
-PKG_SUBPKGS:=		ALSA_LIB ALSA_LIB_DEV
-PKGSD_ALSA_LIB_DEV:=	development files for ALSA
-PKGSC_ALSA_LIB_DEV:=	devel
-
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ALSA_LIB_DEV,alsa-lib-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ALSA_LIB_DEV},${PKGSC_ALSA_LIB_DEV}))
+$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CPPFLAGS+=	-D_POSIX_C_SOURCE=1
 CONFIGURE_ARGS+=	--disable-python
@@ -33,11 +29,4 @@ alsa-lib-install:
 	${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib
 	${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa
 
-alsa-lib-dev-install:
-	${INSTALL_DIR} ${IDIR_ALSA_LIB_DEV}/usr/include/{sys,alsa}
-	${CP} ${WRKINST}/usr/include/sys/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/sys
-	${CP} ${WRKINST}/usr/include/alsa/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/alsa
-	${INSTALL_DIR} ${IDIR_ALSA_LIB_DEV}/usr/lib/pkgconfig
-	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc ${IDIR_ALSA_LIB_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/apr/Makefile

@@ -5,25 +5,21 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		apr
 PKG_VERSION:=		1.4.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		76cc4457fbb71eefdafa27dba8f511fb
 PKG_DESCR:=		Apache Portable Runtime library
 PKG_SECTION:=		libs
 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_OPTS:=		dev
 
 PKG_FLAVOURS_APR:=	WITH_IPV6
 PKGFD_WITH_IPV6:=	enable IPv6 support
 
 include ${TOPDIR}/mk/package.mk
 
-$(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}))
+$(eval $(call PKG_template,APR,apr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 
@@ -57,8 +53,4 @@ apr-install:
 	${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1
 	${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1/
 
-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

@@ -5,37 +5,28 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		atk
 PKG_VERSION:=		1.33.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		4338e0c94f767714f4786878112750dd
 PKG_DESCR:=		atk library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		${MASTER_SITE_GNOME:=/atk/1.33/}
+PKG_LIBNAME:=		libatk
+PKG_OPTS:=		dev
 
 #DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
 
-PKG_SUBPKGS:=		LIBATK LIBATK_DEV
-PKGSC_LIBATK_DEV:=	devel
-PKGSD_LIBATK_DEV:=	libatk headers
-
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 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/avahi/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		avahi
 PKG_VERSION:=		0.6.30
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		e4db89a2a403ff4c47d66ac66fad1f43
 PKG_DESCR:=		mDNS daemon
 PKG_SECTION:=		dhcp
@@ -13,6 +13,8 @@ PKG_BUILDDEP:=		libdaemon expat gdbm glib gettext-tiny gtk+ dbus
 PKG_URL:=		http://avahi.org/
 PKG_SITES:=		http://avahi.org/download/
 PKG_NEED_CXX:=		1
+PKG_LIBNAME:=		libavahi
+PKG_OPTS:=		dev
 
 PKG_SUBPKGS:=		AVAHI_DAEMON AVAHI_DNSCONFD LIBAVAHI
 PKGSS_AVAHI_DAEMON:=	libavahi libdaemon libexpat libintl libgtk dbus
@@ -25,7 +27,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DAEMON},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI}))
+$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--enable-glib \
 			--enable-gtk2 \

package/bigreqsproto/Makefile

@@ -5,21 +5,15 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		bigreqsproto
 PKG_VERSION:=		1.1.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_DESCR:=		Big Requests Extension headers
-PKG_SECTION:=		x11/devel
+PKG_SECTION:=		devel
 PKG_MD5SUM:=		9b83369ac7a5eb2bf54c8f34db043a0e
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=		dev devonly
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BIGREQSPROTO,bigreqsproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-post-install:
-	${INSTALL_DIR} ${IDIR_BIGREQSPROTO}/usr/include
-	${CP} ${WRKINST}/usr/include/X11 ${IDIR_BIGREQSPROTO}/usr/include
-	${INSTALL_DIR} ${IDIR_BIGREQSPROTO}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/bigreqsproto.pc \
-		${IDIR_BIGREQSPROTO}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/boost/Makefile

@@ -5,22 +5,19 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		boost
 PKG_VERSION:=		1.54.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		efbfbff5a85a9330951f243d0a46e4b9
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.boost.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
+PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!avr32 !m68k
 
 DISTFILES:=		boost_1_54_0.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_1_54_0
 
-PKG_SUBPKGS:=		BOOST BOOST_DEV
-PKGSD_BOOST_DEV:=	boost header files
-PKGSC_BOOST_DEV:=	devel
-
 PKG_FLAVOURS_BOOST:=	date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave
 
 PKGFD_date_time:=	with date-time
@@ -42,8 +39,7 @@ PKGFD_wave:=	with wave
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BOOST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,BOOST_DEV,boost-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BOOST_DEV},${PKGSC_BOOST_DEV}))
+$(eval $(call PKG_template,BOOST,boost,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual

package/cairo/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
 PKG_VERSION:=		1.10.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f101a9e88b783337b20b2e26dfd26d5f
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
@@ -15,21 +15,17 @@ PKG_BUILDDEP:=		libpng pixman freetype fontconfig libX11 libXrender glib
 PKG_BUILDDEP+=		libXext
 PKG_URL:=		http://cairographics.org/
 PKG_SITES:=		http://cairographics.org/releases/
+PKG_OPTS:=		dev
 
 #DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
-PKG_SUBPKGS:=		CAIRO CAIRO_DEV
-PKGSC_CAIRO_DEV:=	devel
-PKGSD_CAIRO_DEV:=	cairo headers
-
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(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}))
+$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS},${PKG_OPTS}))
 
 ifeq (,$(filter arm,$(TARGET_ARCH)))
 TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))

package/compositeproto/Makefile

@@ -8,18 +8,12 @@ PKG_VERSION:=		0.4.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2dea7c339432b3363faf2d29c208e7b5
 PKG_DESCR:=		X11 composite headers
-PKG_SECTION:=		x11/devel
+PKG_SECTION:=		devel
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=		dev devonly
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,COMPOSITEPROTO,compositeproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-post-install:
-	${INSTALL_DIR} ${IDIR_COMPOSITEPROTO}/usr/include
-	${CP} ${WRKINST}/usr/include/X11 ${IDIR_COMPOSITEPROTO}/usr/include
-	${INSTALL_DIR} ${IDIR_COMPOSITEPROTO}/usr/lib/pkgconfig
-	${CP} ${WRKINST}/usr/lib/pkgconfig/compositeproto.pc \
-		${IDIR_COMPOSITEPROTO}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/cryptsetup/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cryptsetup
 PKG_VERSION:=		1.3.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		1f5b5a9d538e8a3c191fb7dd85b9b013
 PKG_DESCR:=		LUKS cryptsetup tools
 PKG_SECTION:=		crypto
@@ -15,9 +15,7 @@ PKG_DEPENDS+=		kmod-crypto-sha256 kmod-blk-dev-dm libgcc
 PKG_BUILDDEP:=		libgcrypt popt e2fsprogs lvm
 PKG_URL:=		http://cryptsetup.googlecode.com/
 PKG_SITES:=		http://cryptsetup.googlecode.com/files/
-
-PKG_SUBPKGS:=		CRYPTSETUP CRYPTSETUP_DEV
-PKGSC_CRYPTSETUP_DEV:=	devel
+PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!cris
 
@@ -25,22 +23,16 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,CRYPTSETUP_DEV,cryptsetup-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_CRYPTSETUP_DEV}))
+$(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-selinux
 
-post-install:
+cryptsetup-install:
 	${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcryptsetup.so* \
 		${IDIR_CRYPTSETUP}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/cryptsetup \
 		${IDIR_CRYPTSETUP}/usr/sbin
 
-cryptsetup-dev-install:
-	${INSTALL_DIR} ${IDIR_CRYPTSETUP_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* \
-		${IDIR_CRYPTSETUP_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/cups/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cups
 PKG_VERSION:=		1.4.4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		8776403ad60fea9e85eab9c04d88560d
 PKG_DESCR:=		Common Unix Printing System
 PKG_SECTION:=		net/misc
@@ -14,16 +14,13 @@ PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.cups.org/
 PKG_SITES:=		ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/
 PKG_NEED_CXX:=		1
+PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
 
-PKG_SUBPKGS:=		CUPS CUPS_DEV
-PKGSC_CUPS_DEV:=	devel
-
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,CUPS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_CUPS_DEV}))
+$(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
 			OPTIM='-fPIC'
@@ -53,7 +50,7 @@ else
 XAKE_FLAGS+=		OPTIM='-fPIC'
 endif
 
-post-install:
+cups-install:
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/bin
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin
 	${INSTALL_DIR} ${IDIR_CUPS}/etc/cups
@@ -84,8 +81,4 @@ post-install:
 	${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/
 	${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/
 
-cups-dev-install:
-	${INSTALL_DIR} ${IDIR_CUPS_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_CUPS_DEV}/usr/include
-	
 include ${TOPDIR}/mk/pkg-bottom.mk

package/curl/Makefile

@@ -13,13 +13,13 @@ PKG_DEPENDS:=		libcurl
 PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://curl.haxx.se/
 PKG_SITES:=		http://curl.haxx.se/download/
+PKG_LIBNAME:=		libcurl
+PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		CURL LIBCURL LIBCURL_DEV
+PKG_SUBPKGS:=		CURL LIBCURL
 PKGSD_LIBCURL:=		a client-side URL transfer library
 PKGSC_LIBCURL:=		libs
 PKGSS_LIBCURL:=		zlib
-PKGSD_LIBCURL_DEV:=	development files for libcurl
-PKGSC_LIBCURL_DEV:=	devel
 
 PKG_FLAVOURS_CURL:=	WITH_IPV6
 PKGFD_WITH_IPV6:=	enable IPv6 support
@@ -36,8 +36,7 @@ PKGCB_WITH_GNUTLS:=	gnutls
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL}))
-$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV}))
+$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL},${PKG_OPTS}))
 
 ifeq (${ADK_PACKAGE_LIBCURL_WITHOUT_SSL},y)
 CONFIGURE_ARGS+=	--without-ssl \
@@ -90,14 +89,4 @@ libcurl-install:
 	${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib
 
-libcurl-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libcurl.a ${IDIR_LIBCURL_DEV}/usr/lib
-	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
-	${CP} ${WRKINST}/usr/include/curl/*.h \
-		${IDIR_LIBCURL_DEV}/usr/include/curl
-	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/curl-config \
-		${IDIR_LIBCURL_DEV}/usr/bin
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/cxxtools/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cxxtools
 PKG_VERSION:=		2.1.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2026a2bb23b966f13893167b4dbc5d70
 PKG_DESCR:=		a collection of general-purpose C++ classes (libraries)
 PKG_SECTION:=		libs
@@ -15,17 +15,13 @@ PKG_URL:=		http://www.tntnet.org/
 PKG_SITES:=		http://www.tntnet.org/download/
 PKG_NEED_CXX:=		1
 PKG_CXX:=		CXXTOOLS
+PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!arm !avr32
 
-PKG_SUBPKGS:=		CXXTOOLS CXXTOOLS_DEV
-PKGSC_CXXTOOLS_DEV:=	devel
-PKGSD_CXXTOOLS_DEV:=	a collection of general-purpose C++ classes (headers)
-
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,CXXTOOLS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
@@ -45,11 +41,4 @@ cxxtools-install:
 	${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcxxtools.so* ${IDIR_CXXTOOLS}/usr/lib
 
-cxxtools-dev-install:
-	${INSTALL_DIR} ${IDIR_CXXTOOLS_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* \
-		${IDIR_CXXTOOLS_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_CXXTOOLS_DEV}/usr/bin
-	${CP} ${WRKINST}/usr/bin/cxxtools-config ${IDIR_CXXTOOLS_DEV}/usr/bin
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/cyrus-sasl/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cyrus-sasl
 PKG_VERSION:=		2.1.23
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2eb0e48106f0e9cd8001e654f267ecbc
 PKG_DESCR:=		a general purpose authentication library
 PKG_SECTION:=		libs
@@ -14,15 +14,12 @@ PKG_DEPENDS:=		libopenssl
 PKG_URL:=		http://asg.web.cmu.edu/sasl/
 PKG_SITES:=		http://ftp.andrew.cmu.edu/pub/cyrus-mail/
 PKG_NOPARALLEL:=	1
-
-PKG_SUBPKGS:=		LIBSASL2 LIBSASL2_DEV
-PKGSD_LIBSASL2_DEV:=	sasl2 headers
-PKGSC_LIBSASL2_DEV:=	devel
+PKG_LIBNAME:=		libsasl2
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSASL2_DEV,libsasl2-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSASL2_DEV},${PKGSC_LIBSASL2_DEV}))
+$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--enable-staticdlopen \
 			--enable-cram \
@@ -78,8 +75,4 @@ libsasl2-install:
 	${CP} ${WRKINST}/usr/lib/sasl2/lib*.so* \
 		${IDIR_LIBSASL2}/usr/lib/sasl2
 
-libsasl2-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBSASL2_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBSASL2_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/damageproto/Makefile

@@ -8,18 +8,12 @@ PKG_VERSION:=		1.2.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		bf8c47b7f48625230cff155180f8ddce
 PKG_DESCR:=		X DAMAGE Extension headers
-PKG_SECTION:=		x11/devel
+PKG_SECTION:=		devel
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=              dev devonly
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DAMAGEPROTO,damageproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-post-install:
-	${INSTALL_DIR} ${IDIR_DAMAGEPROTO}/usr/include
-	${CP} ${WRKINST}/usr/include/X11 ${IDIR_DAMAGEPROTO}/usr/include
-	${INSTALL_DIR} ${IDIR_DAMAGEPROTO}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/damageproto.pc \
-		${IDIR_DAMAGEPROTO}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/db/Makefile

@@ -5,24 +5,20 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		db
 PKG_VERSION:=		5.3.21
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		3fda0b004acdaa6fa350bfc41a3b95ca
 PKG_DESCR:=		disk file format database which stores key/data-pairs in single files
 PKG_SECTION:=		db
 PKG_URL:=		http://www.oracle.com/technology/software/products/berkeley-db
 PKG_SITES:=		http://www.openadk.org/distfiles/
 PKG_NEED_CXX:=		1
-
-PKG_SUBPKGS:=		LIBDB LIBDB_DEV
-PKGSC_LIBDB_DEV:=	devel
-PKGSD_LIBDB_DEV:=	libdb headers
+PKG_OPTS:=		dev
 
 WRKBUILD=		${WRKSRC}/build_unix
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBDB_DEV,libdb-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBDB_DEV},${PKGSC_LIBDB_DEV}))
+$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_PROG:=	dist/configure
@@ -45,8 +41,4 @@ libdb-install:
 	${INSTALL_DIR} ${IDIR_LIBDB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libdb*.so ${IDIR_LIBDB}/usr/lib
 
-libdb-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBDB_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBDB_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/dbus-glib/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dbus-glib
 PKG_VERSION:=		0.86
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		cd0ab148fb0c786fc88be49d19971f50
 PKG_DESCR:=		DBUS glib bindings
 PKG_SECTION:=		libs
@@ -13,15 +13,11 @@ PKG_DEPENDS:=		dbus glib
 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
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(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}))
+$(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-checks
@@ -32,15 +28,4 @@ dbus-glib-install:
 	$(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
-	$(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/dbus-binding-tool \
-		$(IDIR_DBUS_GLIB_DEV)/usr/bin
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/dbus/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dbus
 PKG_VERSION:=		1.6.12
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		a70edc50524f258eaf5c9a9994ed8748
 PKG_DESCR:=		DBUS library and daemon
 PKG_SECTION:=		libs
@@ -13,19 +13,15 @@ PKG_DEPENDS:=		libexpat libx11 libuuid
 PKG_BUILDDEP:=		expat libX11 util-linux
 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
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
 $(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}))
 
 TARGET_LDFLAGS+=	-luuid
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
@@ -56,15 +52,10 @@ dbus-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-uuidgen ${IDIR_DBUS}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-send ${IDIR_DBUS}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-monitor ${IDIR_DBUS}/usr/bin
-
-dbus-dev-install:
-	${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_DBUS_DEV}/usr/include
+	# workaround for dev subpackage
 	${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/dri2proto/Makefile

@@ -8,18 +8,12 @@ PKG_VERSION:=		2.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		873142af5db695537cfe05e01d13541f
 PKG_DESCR:=		DRI protocol headers
-PKG_SECTION:=		x11/devel
+PKG_SECTION:=		devel
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=              dev devonly
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DRI2PROTO,dri2proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-post-install:
-	${INSTALL_DIR} ${IDIR_DRI2PROTO}/usr/include
-	${CP} ${WRKINST}/usr/include/X11 ${IDIR_DRI2PROTO}/usr/include
-	${INSTALL_DIR} ${IDIR_DRI2PROTO}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/dri2proto.pc \
-		${IDIR_DRI2PROTO}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/e2fsprogs/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		e2fsprogs
 PKG_VERSION:=		1.42.8
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		8ef664b6eb698aa6b733df59b17b9ed4
 PKG_DESCR:=		Ext2/3/4 filesystem utilities
 PKG_SECTION:=		fs
@@ -13,22 +13,18 @@ PKG_DEPENDS:=		libcom-err libuuid libblkid libpthread
 PKG_BUILDDEP:=		util-linux
 PKG_URL:=		http://e2fsprogs.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
+PKG_OPTS:=		dev
 
 PKG_CFLINE_E2FSPROGS:=	default y if ADK_TARGET_ROOTFS_CF
 
 PKG_SUBPKGS:=		LIBE2FS LIBCOM_ERR LIBSS E2FSCK_STATIC
-PKG_SUBPKGS+=		LIBCOM_ERR_DEV LIBSS_DEV
 PKG_SUBPKGS+=		RESIZE2FS TUNE2FS E2FSCK MKE2FS
 PKGSD_LIBE2FS:=		e2fsprogs library
 PKGSC_LIBE2FS:=		libs
 PKGSD_LIBCOM_ERR:=	Common error library
 PKGSC_LIBCOM_ERR:=	libs
-PKGSD_LIBCOM_ERR_DEV:=	Common error headers
-PKGSC_LIBCOM_ERR_DEV:=	devel
 PKGSD_LIBSS:=		Subsystem command parsing library
 PKGSC_LIBSS:=		libs
-PKGSD_LIBSS_DEV:=	Subsystem command parsing headers
-PKGSC_LIBSS_DEV:=	devel
 PKGSD_E2FSCK_STATIC:=	Static build of e2fsck
 PKGSC_E2FSCK_STATIC:=	fs
 PKGSD_RESIZE2FS:=	Resize FS utility
@@ -46,11 +42,11 @@ PKGSS_MKE2FS:=		libe2fs
 
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call PKG_template,E2FSPROGS,e2fsprogs,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS}))
 $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR}))
 $(eval $(call PKG_template,LIBCOM_ERR_DEV,libcom-err-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR_DEV},${PKGSC_LIBCOM_ERR_DEV}))
 $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS}))
-$(eval $(call PKG_template,LIBSS_DEV,libss-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS_DEV},${PKGSC_LIBSS_DEV}))
 $(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
 $(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS}))
 $(eval $(call PKG_template,RESIZE2FS,resize2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_RESIZE2FS),${PKGSD_RESIZE2FS},${PKGSC_RESIZE2FS}))
@@ -75,6 +71,11 @@ ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),)
 	${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin
 endif
 
+e2fsprogs-install:
+	# workaround for dev subpackage
+	${CP} ${WRKINST}/usr/bin/compile_et \
+		${IDIR_E2FSPROGS_DEV}/usr/bin
+
 libe2fs-install:
 	${INSTALL_DIR} ${IDIR_LIBE2FS}/etc
 	${INSTALL_DATA} ${WRKBUILD}/misc/mke2fs.conf ${IDIR_LIBE2FS}/etc
@@ -105,25 +106,12 @@ libcom-err-install:
 		${IDIR_LIBCOM_ERR}/usr/lib
 	${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_HOST_DIR}/bin
 
-libcom-err-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBCOM_ERR_DEV}/usr/include/et
-	${CP} ${WRKINST}/usr/include/et/com_err.h \
-		${IDIR_LIBCOM_ERR_DEV}/usr/include/et
-	${INSTALL_DIR} ${IDIR_LIBCOM_ERR_DEV}/usr/bin
-	${CP} ${WRKINST}/usr/bin/compile_et \
-		${IDIR_LIBCOM_ERR_DEV}/usr/bin
-
 libss-install:
 	${INSTALL_DIR} ${IDIR_LIBSS}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libss.so* \
 		${IDIR_LIBSS}/usr/lib
 	${CP} ${WRKINST}/usr/bin/mk_cmds ${STAGING_HOST_DIR}/bin
 
-libss-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBSS_DEV}/usr/include/ss
-	${CP} ${WRKINST}/usr/include/ss/ss*.h \
-		${IDIR_LIBSS_DEV}/usr/include/ss
-
 e2fsck-static-install:
 ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),)
 	${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin

package/eglibc/Config.in.manual

@@ -15,12 +15,3 @@ config ADK_PACKAGE_EGLIBC_STATIC
 	depends on ADK_TARGET_LIB_EGLIBC
 	help
 	  embedded GNU C library (static version).
-
-config ADK_PACKAGE_EGLIBC_DEV
-	prompt "eglibc-dev........... C library development files"
-	tristate
-	default n
-	depends on ADK_TARGET_LIB_EGLIBC
-	help
-	  embedded GNU C library header files.
-

package/expat/Makefile

@@ -5,32 +5,24 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		expat
 PKG_VERSION:=		2.0.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		ee8b492592568805593f81f8cdf2a04c
 PKG_DESCR:=		a XML parsing library
 PKG_SECTION:=		libs
 PKG_URL:=		http://expat.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=expat/}
-
-PKG_SUBPKGS:=		LIBEXPAT LIBEXPAT_DEV
-PKGSD_LIBEXPAT_DEV:=	development files for expat
-PKGSC_LIBEXPAT_DEV:=	devel
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBEXPAT_DEV,libexpat-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEXPAT_DEV},${PKGSC_LIBEXPAT_DEV}))
 
-post-install:
+libexpat-install:
 	${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/
 
-libexpat-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBEXPAT_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBEXPAT_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/faac/Makefile

@@ -11,12 +11,12 @@ PKG_DESCR:=		AAC encoder
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.audiocoding.com/faac.html
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=faac/}
-
-PKG_SUBPKGS:=		LIBFAAC
+PKG_LIBNAME:=		libfaac
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBFAAC,libfaac,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFAAC,libfaac,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--without-mp4v2
 

package/faad2/Makefile

@@ -11,12 +11,12 @@ PKG_DESCR:=		A MP4 decoding library
 PKG_SECTION:=		libs
 PKG_URL:=		http://sourceforge.net/projects/faac/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=faac/}
-
-PKG_SUBPKGS:=		LIBFAAD2
+PKG_LIBNAME:=		libfaad2
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 # check for lrintf fails on Darwin, don't know why
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=	--without-mpeg4ip \
 			--without-xmms
 TARGET_LDFLAGS+=	-lm
 
-post-install:
+libfaad2-install:
 	${INSTALL_DIR} ${IDIR_LIBFAAD2}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libfaad.so* ${IDIR_LIBFAAD2}/usr/lib/
 

package/file/Makefile

@@ -13,18 +13,17 @@ PKG_DEPENDS:=		libmagic
 PKG_URL:=		http://www.darwinsys.com/file
 PKG_SITES:=		ftp://ftp.fu-berlin.de/unix/tools/file/ \
 			ftp://ftp.astron.com/pub/file/
+PKG_LIBNAME:=		libmagic
+PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		FILE LIBMAGIC LIBMAGIC_DEV
+PKG_SUBPKGS:=		FILE LIBMAGIC
 PKGSD_LIBMAGIC:=	file type guesser library
 PKGSC_LIBMAGIC:=	libs
-PKGSD_LIBMAGIC_DEV:=	file type guesser headers
-PKGSC_LIBMAGIC_DEV:=	devel
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBMAGIC,libmagic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC},${PKGSD_LIBMAGIC},${PKGSC_LIBMAGIC}))
-$(eval $(call PKG_template,LIBMAGIC_DEV,libmagic-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC_DEV},${PKGSD_LIBMAGIC_DEV},${PKGSC_LIBMAGIC_DEV}))
+$(eval $(call PKG_template,LIBMAGIC,libmagic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC},${PKGSD_LIBMAGIC},${PKGSC_LIBMAGIC},${PKG_OPTS}))
 
 pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
@@ -46,8 +45,4 @@ libmagic-install:
 	${INSTALL_DIR} ${IDIR_LIBMAGIC}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libmagic.so* ${IDIR_LIBMAGIC}/usr/lib
 
-libmagic-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBMAGIC_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBMAGIC_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/fixesproto/Makefile

@@ -7,19 +7,13 @@ PKG_NAME:=		fixesproto
 PKG_VERSION:=		5.0
 PKG_RELEASE:=		1
 PKG_DESCR:=		XFIXES Extension headers
-PKG_SECTION:=		x11/devel
+PKG_SECTION:=		devel
 PKG_MD5SUM:=		1b3115574cadd4cbea1f197faa7c1de4
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=              dev devonly
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FIXESPROTO,fixesproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-post-install:
-	${INSTALL_DIR} ${IDIR_FIXESPROTO}/usr/include
-	${CP} ${WRKINST}/usr/include/X11 ${IDIR_FIXESPROTO}/usr/include
-	${INSTALL_DIR} ${IDIR_FIXESPROTO}/usr/lib/pkgconfig
-	${CP} ${WRKINST}/usr/lib/pkgconfig/fixesproto.pc \
-		${IDIR_FIXESPROTO}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/flex/Makefile

@@ -11,24 +11,18 @@ PKG_DESCR:=		fast lexical analyzer
 PKG_SECTION:=		lang
 PKG_URL:=		http://flex.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
-
-PKG_SUBPKGS:=		FLEX FLEX_DEV
-PKGSD_FLEX_DEV:=	fast lexical analyzer (static library)
-PKGSC_FLEX_DEV:=	devel
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FLEX_DEV,flex-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FLEX_DEV},${PKGSC_FLEX_DEV}))
+$(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 flex-install:
 	${INSTALL_DIR} ${IDIR_FLEX}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin
-
-flex-dev-install:
+	# workaround for dev subpackage
 	${INSTALL_DIR} ${IDIR_FLEX_DEV}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libfl.a \
 		${IDIR_FLEX_DEV}/usr/lib
 
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/font-util/Makefile

@@ -5,21 +5,17 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		font-util
 PKG_VERSION:=		1.1.1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		171ebfd3733aeae3af91ad57d126d29d
 PKG_DESCR:=		font util
 PKG_SECTION:=		x11/apps
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		FONT_UTIL FONT_UTIL_DEV
-PKGSC_FONT_UTIL_DEV:=	devel
-PKGSD_FONT_UTIL_DEV:=	font util headers
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,FONT_UTIL_DEV,font-util-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FONT_UTIL_DEV},${PKGSC_FONT_UTIL_DEV},${PKG_OPTS}))
 
 # XXX: Push the mapping files to a place where we can find them
 # again when compiling the actual fonts. This is ugly as hell,
@@ -41,9 +37,4 @@ font-util-install:
 	${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
 		${IDIR_FONT_UTIL}/usr/share/fonts/X11/util
 
-font-util-dev-install:
-	${INSTALL_DIR} ${IDIR_FONT_UTIL_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/fontutil.pc \
-		${IDIR_FONT_UTIL_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/fontcacheproto/Makefile

@@ -7,8 +7,12 @@ PKG_NAME:=		fontcacheproto
 PKG_VERSION:=		0.1.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		dc8c34a8c3559bf3b008bcdf7ba5a743
+PKG_SECTION:=		devel
 PKG_SITES:=		${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
+PKG_OPTS:=              dev devonly
 
 include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FONTCACHEPROTO,fontcacheproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/fontconfig/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		fontconfig
 PKG_VERSION:=		2.10.91
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		0a8edc63aa79377b2bf44e469d5bbbb7
 PKG_DESCR:=		library for configuring and customizing font access
 PKG_SECTION:=		libs
@@ -13,19 +13,15 @@ PKG_DEPENDS:=		libxml2 libiconv
 PKG_BUILDDEP:=		freetype libxml2 libiconv
 PKG_URL:=		http://fontconfig.org/
 PKG_SITES:=		http://fontconfig.org/release/
-
-PKG_SUBPKGS:=		FONTCONFIG FONTCONFIG_DEV
-PKGSD_FONTCONFIG_DEV:=	configuring and customizing font access headers
-PKGSC_FONTCONFIG_DEV:=	devel
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,FONTCONFIG_DEV,fontconfig-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FONTCONFIG_DEV},${PKGSC_FONTCONFIG_DEV},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_LDFLAGS+=	-liconv
@@ -38,12 +34,4 @@ fontconfig-install:
 	${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib
 	$(CP) ${WRKINST}/etc/fonts/* ${IDIR_FONTCONFIG}/etc/fonts
 
-fontconfig-dev-install:
-	${INSTALL_DIR} ${IDIR_FONTCONFIG_DEV}/usr/lib/pkgconfig
-	${CP} ${WRKINST}/usr/lib/pkgconfig/fontconfig.pc \
-		${IDIR_FONTCONFIG_DEV}/usr/lib/pkgconfig
-	${INSTALL_DIR} ${IDIR_FONTCONFIG_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* \
-		${IDIR_FONTCONFIG_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/fontsproto/Makefile

@@ -8,18 +8,12 @@ PKG_VERSION:=		2.1.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		642a8c5700519a84efe28944afe5cbdc
 PKG_DESCR:=		Fonts extension headers
-PKG_SECTION:=		x11/devel
+PKG_SECTION:=		devel
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=		dev devonly
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONTSPROTO,fontsproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-post-install:
-	${INSTALL_DIR} ${IDIR_FONTSPROTO}/usr/include
-	${CP} ${WRKINST}/usr/include/X11 ${IDIR_FONTSPROTO}/usr/include
-	${INSTALL_DIR} ${IDIR_FONTSPROTO}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/fontsproto.pc \
-		${IDIR_FONTSPROTO}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/freetype/Makefile

@@ -13,32 +13,19 @@ PKG_DEPENDS:=		zlib
 PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.freetype.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freetype/}
-
-PKG_SUBPKGS:=		LIBFREETYPE LIBFREETYPE_DEV
-PKGSD_LIBFREETYPE_DEV:=	FreeType headers
-PKGSC_LIBFREETYPE_DEV:=	devel
+PKG_LIBNAME:=		libfreetype
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBFREETYPE_DEV,libfreetype-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBFREETYPE_DEV},${PKGSC_LIBFREETYPE_DEV},${PKG_OPTS}))
 
 libfreetype-install:
 	${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libfreetype.so* ${IDIR_LIBFREETYPE}/usr/lib
 
-libfreetype-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBFREETYPE_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBFREETYPE_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBFREETYPE_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/freetype2.pc \
-		${IDIR_LIBFREETYPE_DEV}/usr/lib/pkgconfig
-	${INSTALL_DIR} ${IDIR_LIBFREETYPE_DEV}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/freetype-config \
-		${IDIR_LIBFREETYPE_DEV}/usr/bin
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/fuse/Makefile

@@ -12,18 +12,17 @@ PKG_SECTION:=		fs
 PKG_DEPENDS:=		kmod-fuse-fs libfuse
 PKG_URL:=		http://fuse.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
+PKG_LIBNAME:=		libfuse
+PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		FUSE_UTILS LIBFUSE LIBFUSE_DEV
+PKG_SUBPKGS:=		FUSE_UTILS LIBFUSE
 PKGSD_LIBFUSE:=		FUSE library
 PKGSC_LIBFUSE:=		libs
-PKGSD_LIBFUSE_DEV:=	FUSE headers
-PKGSC_LIBFUSE_DEV:=	devel
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBFUSE,libfuse,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBFUSE},${PKGSC_LIBFUSE}))
-$(eval $(call PKG_template,LIBFUSE_DEV,libfuse-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBFUSE_DEV},${PKGSC_LIBFUSE_DEV}))
+$(eval $(call PKG_template,LIBFUSE,libfuse,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBFUSE},${PKGSC_LIBFUSE},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--enable-lib \
 			--enable-util \
@@ -44,14 +43,4 @@ libfuse-install:
 	${CP} ${WRKINST}/usr/lib/libulockmgr.so* \
 		${IDIR_LIBFUSE}/usr/lib
 
-libfuse-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBFUSE_DEV}/usr/lib/pkgconfig
-	${INSTALL_DIR} ${IDIR_LIBFUSE_DEV}/usr/include/fuse
-	${INSTALL_DATA} ${WRKINST}/usr/include/*.h \
-		${IDIR_LIBFUSE_DEV}/usr/include
-	${INSTALL_DATA} ${WRKINST}/usr/include/fuse/*.h \
-		${IDIR_LIBFUSE_DEV}/usr/include/fuse
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/fuse.pc \
-		${IDIR_LIBFUSE_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/gcc/Makefile

@@ -4,7 +4,7 @@
 include ${TOPDIR}/rules.mk
 include ${TOPDIR}/toolchain/gcc/Makefile.inc
 
-PKG_DESCR:=		GNU compiler collection
+PKG_DESCR:=		GNU C compiler
 PKG_SECTION:=		lang
 PKG_OPTS:=		noremove
 PKG_DEPENDS:=		libmpc libgmp mpfr
@@ -12,11 +12,15 @@ PKG_BUILDDEP:=		libmpc gmp mpfr
 
 PKG_ARCH_DEPENDS:=	!avr32
 
+PKG_SUBPKGS:=		GCC GXX
+PKGSD_GXX:=		GNU C++ compiler
+
 WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,GCC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GXX,g++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CPPFLAGS:=	''
 TARGET_CFLAGS:=		''
@@ -26,15 +30,19 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
 CONFIGURE_ARGS+=       --with-abi=$(ADK_TARGET_ABI)
 endif
 
+ifeq ($(ADK_PACKAGE_GXX),y)
+CONFIGURE_ARGS+=	--enable-languages=c,c++
+else
+CONFIGURE_ARGS+=	--enable-languages=c
+endif
+
 CONFIGURE_ENV+=		have_sys_sdt_h=no
-CONFIGURE_ARGS+=	--enable-languages=c,c++ \
-			--host=$(REAL_GNU_TARGET_NAME) \
+CONFIGURE_ARGS+=	--host=$(REAL_GNU_TARGET_NAME) \
 			--target=$(REAL_GNU_TARGET_NAME) \
 			--disable-__cxa_atexit \
 			--without-headers \
 			--libexecdir=/usr/lib \
 			--disable-libssp \
-			--disable-nls \
 			--disable-sjlj-exceptions \
 			--disable-biarch \
 			--disable-libmudflap \
@@ -46,17 +54,24 @@ CONFIGURE_ARGS+=	--enable-languages=c,c++ \
 # disable honour cflags stuff
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-post-install:
+pre-configure:
+	$(SED) 's@\./fixinc\.sh@-c true@' $(WRKSRC)/gcc/Makefile.in
+
+gcc-install:
 	${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin
-	${INSTALL_DIR} ${IDIR_GCC}/lib ${IDIR_GCC}/usr/include/c++
+	${INSTALL_DIR} ${IDIR_GCC}/lib
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/g++ ${IDIR_GCC}/usr/bin/
-	cd ${IDIR_GCC}/usr/bin/ && ln -sf g++ c++
 	cd ${IDIR_GCC}/usr/bin/ && ln -sf gcc cc
 	${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/
-	${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/
 	cd ${IDIR_GCC}/lib && ln -sf ../usr/bin/cpp .
 	${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/
 	rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools
 
+g++-install:
+	${INSTALL_DIR} ${IDIR_GCC}/usr/bin
+	${INSTALL_DIR} ${IDIR_GCC}/usr/include/c++
+	${INSTALL_BIN} ${WRKINST}/usr/bin/g++ ${IDIR_GCC}/usr/bin/
+	cd ${IDIR_GCC}/usr/bin/ && ln -sf g++ c++
+	${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/gdbm/Makefile

@@ -5,21 +5,17 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gdbm
 PKG_VERSION:=		1.8.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		1d1b1d5c0245b1c00aff92da751e9aa1
 PKG_DESCR:=		disk file format database
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.gnu.org/software/gdbm/
 PKG_SITES:=		${MASTER_SITE_GNU:=gdbm/}
-
-PKG_SUBPKGS:=		LIBGDBM LIBGDBM_DEV
-PKGSC_LIBGDBM_DEV:=	devel
-PKGSD_LIBGDBM_DEV:=	libgdbm headers
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGDBM_DEV,libgdbm-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGDBM_DEV},${PKGSC_LIBGDBM_DEV}))
+$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 XAKE_FLAGS+=		BINOWN=`id -u` \
 			BINGRP=`id -g` \
@@ -29,8 +25,4 @@ libgdbm-install:
 	${INSTALL_DIR} ${IDIR_LIBGDBM}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgdbm.so* ${IDIR_LIBGDBM}/usr/lib
 
-libgdbm-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBGDBM_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBGDBM_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/gdk-pixbuf/Makefile

@@ -5,23 +5,20 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		gdk-pixbuf
 PKG_VERSION:=		2.24.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		bd7c2a9d23b573db467e39833f12103d
 PKG_DESCR:=		GDK pixbuf library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		jpeg libtiff
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/
 PKG_NEED_CXX:=		1
-
-PKG_SUBPKGS:=		GDK_PIXBUF GDK_PIXBUF_DEV
-PKGSC_GDK_PIXBUF_DEV:=	devel
+PKG_OPTS:=		dev
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,GDK_PIXBUF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,GDK_PIXBUF_DEV,gdk-pixbuf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_GDK_PIXBUF_DEV}))
+$(eval $(call PKG_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ENV+=		gio_can_sniff=no
 
@@ -34,12 +31,4 @@ gdk-pixbuf-install:
 	$(CP) ./files/loaders.cache \
 		 $(IDIR_GDK_PIXBUF)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
-gdk-pixbuf-dev-install:
-	$(INSTALL_DIR) $(IDIR_GDK_PIXBUF_DEV)/usr/lib/pkgconfig
-	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
-		$(IDIR_GDK_PIXBUF_DEV)/usr/lib/pkgconfig
-	$(INSTALL_DIR) $(IDIR_GDK_PIXBUF_DEV)/usr/include
-	$(CP) $(WRKINST)/usr/include/* \
-		$(IDIR_GDK_PIXBUF_DEV)/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/gettext/Makefile

@@ -1,86 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME=		gettext
-PKG_VERSION=		0.18.1.1
-PKG_RELEASE=		2
-PKG_MD5SUM:=		3dd55b952826d2b32f51308f2f91aa89
-PKG_DESCR:=		internationalisation library
-PKG_SECTION:=		libs
-PKG_BUILDDEP:=		libiconv
-PKG_DEPENDS:=		libiconv libpthread
-PKG_URL:=		http://www.gnu.org/software/gettext/
-PKG_SITES:=		${MASTER_SITE_GNU:=gettext/}
-
-PKG_SUBPKGS:=		LIBINTL LIBINTL_DEV GETTEXT MSGFMT
-PKGSD_LIBINTL_DEV:=	libintl headers
-PKGSC_LIBINTL_DEV:=	devel
-PKGSD_GETTEXT:=		gettext utility
-PKGSC_GETTEXT:=		misc
-PKGSS_GETTEXT:=		libintl
-PKGSD_MSGFMT:=		msgfmt utility
-PKGSC_MSGFMT:=		misc
-PKGSS_MSGFMT:=		libintl
-
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
-endif
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,LIBINTL,libintl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBINTL_DEV,libintl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBINTL_DEV},${PKGSC_LIBINTL_DEV},${PKG_OPTS}))
-$(eval $(call PKG_template,GETTEXT,gettext,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GETTEXT},${PKGSD_GETTEXT},${PKGSC_GETTEXT}))
-$(eval $(call PKG_template,MSGFMT,msgfmt,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MSGFMT},${PKGSD_MSGFMT},${PKGSC_MSGFMT}))
-
-CONFIGURE_ARGS+=	--disable-java \
-			--disable-native-java \
-			--disable-csharp \
-			--disable-libasprintf \
-			--disable-rpath \
-			--enable-threads=posix \
-			--enable-nls \
-			--disable-openmp \
-			--with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' \
-			--with-included-gettext \
-			--without-emacs
-CONFIGURE_ENV+=		nls_cv_use_gnu_gettext=yes \
-			ac_cv_gnu_library_2=no \
-			gt_use_preinstalled_gnugettext=no
-
-INSTALL_STYLE:=		manual
-
-post-build:
-	${INSTALL_DIR} ${STAGING_DIR}/usr/include ${STAGING_DIR}/usr/lib
-	$(CP) $(WRKBUILD)/gettext-runtime/intl/libintl.h ${STAGING_DIR}/usr/include
-	${CP} ${WRKBUILD}/gettext-runtime/intl/.libs/libintl.so* \
-			${STAGING_DIR}/usr/lib
-
-do-install:
-	${INSTALL_DIR} ${IDIR_LIBINTL}/usr/lib
-	${CP} ${WRKBUILD}/gettext-runtime/intl/.libs/libintl.so* \
-		${IDIR_LIBINTL}/usr/lib
-	${INSTALL_DIR} ${IDIR_LIBINTL_DEV}/usr/include
-	${INSTALL_DATA} ${WRKBUILD}/gettext-runtime/intl/libintl.h \
-		${IDIR_LIBINTL_DEV}/usr/include
-	${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
-	${INSTALL_DIR} ${IDIR_MSGFMT}/usr/bin
-	${INSTALL_DIR} ${IDIR_MSGFMT}/usr/lib
-	${CP} ${WRKBUILD}/gettext-tools/libgettextpo/.libs/libgettextpo.so* \
-		${IDIR_MSGFMT}/usr/lib
-	${CP} ${WRKBUILD}/gettext-tools/gnulib-lib/.libs/libgettextlib*so* \
-		${IDIR_MSGFMT}/usr/lib
-	${CP} ${WRKBUILD}/gettext-tools/src/.libs/libgettextsrc*so* \
-		${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/gettext/patches/patch-build-aux_ltmain_sh

@@ -1,39 +0,0 @@
---- gettext-0.18.1.1.orig/build-aux/ltmain.sh	2010-06-06 14:49:57.000000000 +0200
-+++ gettext-0.18.1.1/build-aux/ltmain.sh	2011-01-14 12:26:11.000000000 +0100
-@@ -4901,7 +4901,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-@@ -5652,27 +5652,6 @@ func_mode_link ()
- 	      esac
- 	    fi
- 
--	    # Hardcode the library path.
--	    # Skip directories that are in the system default run-time
--	    # search path.
--	    case " $sys_lib_dlsearch_path " in
--	    *" $absdir "*) ;;
--	    *)
--	      case "$compile_rpath " in
--	      *" $absdir "*) ;;
--	      *) compile_rpath="$compile_rpath $absdir"
--	      esac
--	      ;;
--	    esac
--	    case " $sys_lib_dlsearch_path " in
--	    *" $libdir "*) ;;
--	    *)
--	      case "$finalize_rpath " in
--	      *" $libdir "*) ;;
--	      *) finalize_rpath="$finalize_rpath $libdir"
--	      esac
--	      ;;
--	    esac
- 	  fi # $linkmode,$pass = prog,link...
- 
- 	  if test "$alldeplibs" = yes &&

package/gettext/patches/patch-gettext-runtime_gnulib-lib_stdio_in_h

@@ -1,10 +0,0 @@
---- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h	2010-05-17 21:56:12.000000000 +0200
-+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h	2012-07-31 11:28:12.000000000 +0200
-@@ -141,7 +141,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not 
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h

@@ -1,11 +0,0 @@
---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/libxml/xmlversion.in.h	2010-06-06 14:49:58.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/libxml/xmlversion.in.h	2011-10-17 03:58:30.336558512 +0200
-@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
-  *
-  * Whether iconv support is available
-  */
--#if 1
-+#if 0
- #define LIBXML_ICONV_ENABLED
- #endif
- 

package/gettext/patches/patch-gettext-tools_gnulib-lib_spawn_in_h

@@ -1,11 +0,0 @@
---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/spawn.in.h	2010-05-24 11:42:46.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn.in.h	2011-02-04 19:21:02.000000000 +0100
-@@ -31,7 +31,7 @@
- 
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
-    But avoid namespace pollution on glibc systems.  */
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) || defined(__UCLIBC__)
- # include <sched.h>
- # include <signal.h>
- #endif

package/gettext/patches/patch-gettext-tools_gnulib-lib_stdio_in_h

@@ -1,10 +0,0 @@
---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h	2010-05-24 11:42:46.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h	2012-07-31 11:29:05.000000000 +0200
-@@ -141,7 +141,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not 
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

package/gettext/patches/patch-gettext-tools_libgettextpo_stdio_in_h

@@ -1,10 +0,0 @@
---- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h	2010-05-17 21:58:03.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h	2012-07-31 11:31:22.000000000 +0200
-@@ -141,7 +141,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not 
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

package/giblib/Makefile

@@ -5,17 +5,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		giblib
 PKG_VERSION:=		1.2.4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		c810ef5389baf24882a1caca2954385e
 PKG_DESCR:=		imlib2 wrapper library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		imlib2
 PKG_BUILDDEP:=		imlib2
 PKG_SITES:=		http://linuxbrit.co.uk/downloads/
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,GIBLIB,giblib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GIBLIB,giblib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 giblib-install:
 	$(INSTALL_DIR) $(IDIR_GIBLIB)/usr/lib

package/giflib/Makefile

@@ -5,28 +5,22 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		giflib
 PKG_VERSION:=		4.1.6
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		4ff2ecec336b9724c5190f06e8a40f9e
 PKG_DESCR:=		GIF graphics library
 PKG_SECTION:=		libs
 PKG_URL:=		http://sourceforge.net/projects/giflib/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/}
+PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		GIFLIB GIFLIB_DEV
-PKGSC_GIFLIB_DEV:=	devel
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,GIFLIB_DEV,giflib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_GIFLIB_DEV}))
+$(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 giflib-install:
 	$(INSTALL_DIR) $(IDIR_GIFLIB)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libgif.so* \
 		$(IDIR_GIFLIB)/usr/lib
 
-giflib-dev-install:
-	${INSTALL_DIR} ${IDIR_GIFLIB_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/*.h ${IDIR_GIFLIB_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/glib/Makefile

@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		glib
 PKG_VERSION:=		2.28.1
 PKG_EXTRAVER:=		2.28
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		9f6e85e1e38490c3956f4415bcd33e6e
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
@@ -15,21 +15,17 @@ PKG_BUILDDEP:=		gettext-tiny libiconv dbus
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
 PKG_NOPARALLEL:=	1
+PKG_OPTS:=		dev
 
 #DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
-PKG_SUBPKGS:=		GLIB GLIB_DEV
-PKGSC_GLIB_DEV:=	devel
-PKGSD_GLIB_DEV:=	glib headers
-
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,GLIB_DEV,glib-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLIB_DEV},${PKGSC_GLIB_DEV},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--enable-debug=no \
@@ -66,8 +62,7 @@ glib-install:
 	${CP} ${WRKINST}/usr/lib/libgobject*.so* ${IDIR_GLIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgmodule*.so* ${IDIR_GLIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgthread*.so* ${IDIR_GLIB}/usr/lib
-
-glib-dev-install:
+	# workaround for dev subpackage
 	${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/include
 	${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/lib/glib-2.0/include
 	${CP} ${WRKINST}/usr/lib/glib-2.0/include/glibconfig.h \

package/glibc/Config.in.manual

@@ -7,13 +7,3 @@ config ADK_PACKAGE_GLIBC
 	select ADK_PACKAGE_TZDATA
 	help
 	  GNU C library.
-
-config ADK_PACKAGE_GLIBC_DEV
-	prompt "glibc-dev................ development files"
-	tristate
-	default n
-	depends on ADK_TARGET_LIB_GLIBC
-	help
-	  GNU C library header files.
-
-

package/glibc/Makefile

@@ -29,16 +29,6 @@ INSTALL_STYLE:=		manual
 
 # compile nothing, glibc is already build in toolchain directory
 do-install:
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
-	for abi in $(TABI); do \
-		${INSTALL_DIR} $(IDIR_GLIBC)/lib$${abi/*:/} $(IDIR_GLIBC)/usr/lib$${abi/*:/} ; \
-		$(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_GLIBC)/lib$${abi/*:/} ; \
-		-for file in libc libcrypt libdl libm libresolv libutil libnsl libnss_dns libnss_files; do \
-			$(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/$$file.so* $(IDIR_GLIBC)/lib$${abi/*:/}; \
-			$(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib$${abi/*:/}; \
-		done ; \
-	done
-else
 	${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH)
 	$(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH)
 	for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_compat libnss_dns libnss_files; do \
@@ -49,7 +39,6 @@ else
 	$(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_GLIBC)/usr/bin
 ifeq ($(ADK_LOCALES),y)
 	$(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_GLIBC)/usr/bin
-endif
 endif
 	${INSTALL_DIR} ${IDIR_GLIBC}/etc
 	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc

package/glproto/Makefile

@@ -7,19 +7,13 @@ PKG_NAME:=		glproto
 PKG_VERSION:=		1.4.15
 PKG_RELEASE:=		1
 PKG_DESCR:=		OpenGL headers
-PKG_SECTION:=		x11/devel
+PKG_SECTION:=		devel
 PKG_MD5SUM:=		be7c4e3c289db480b9e1238c03637eb7
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=		dev devonly
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GLPROTO,glproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-post-install:
-	${INSTALL_DIR} ${IDIR_GLPROTO}/usr/include
-	${CP} ${WRKINST}/usr/include/GL ${IDIR_GLPROTO}/usr/include
-	${INSTALL_DIR} ${IDIR_GLPROTO}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/glproto.pc \
-		${IDIR_GLPROTO}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/gmp/Makefile

@@ -4,25 +4,19 @@
 include ${TOPDIR}/rules.mk
 include ${TOPDIR}/toolchain/gmp/Makefile.inc
 
+PKG_NAME:=		gmp
 PKG_DESCR:=		GNU multiprecision arithmetic library
 PKG_SECTION:=		libs
 PKG_URL:=		http://gmplib.org/
-
-PKG_SUBPKGS:=		LIBGMP LIBGMP_DEV
-PKGSC_LIBGMP_DEV:=	devel
-PKGSD_LIBGMP_DEV:=	libgmp headers
+PKG_LIBNAME:=		libgmp
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGMP_DEV,libgmp-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGMP_DEV},${PKGSC_LIBGMP_DEV}))
+$(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libgmp-install:
 	${INSTALL_DIR} ${IDIR_LIBGMP}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgmp.so* ${IDIR_LIBGMP}/usr/lib
 
-libgmp-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBGMP_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBGMP_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/gtk+/Makefile

@@ -16,21 +16,18 @@ PKG_BUILDDEP+=		gdk-pixbuf libXcomposite libXdamage
 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 LIBGTK_DEV
-PKGSC_LIBGTK_DEV:=	devel
-PKGSD_LIBGTK_DEV:=	GTK+ headers
+PKG_LIBNAME:=		libgtk
+PKG_OPTS:=		dev
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 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 \
@@ -48,14 +45,9 @@ libgtk-install:
 	${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
+	# workaround dev subpackage
 	${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/inputproto/Makefile

@@ -7,19 +7,13 @@ PKG_NAME:=		inputproto
 PKG_VERSION:=		2.2
 PKG_RELEASE:=		1
 PKG_DESCR:=		X Input Extension headers
-PKG_SECTION:=		x11/devel
+PKG_SECTION:=		devel
 PKG_MD5SUM:=		e0047823230413e67d74e92af77fbe58
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=		dev devonly
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,INPUTPROTO,inputproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-post-install:
-	${INSTALL_DIR} ${IDIR_INPUTPROTO}/usr/include
-	${CP} ${WRKINST}/usr/include/X11 ${IDIR_INPUTPROTO}/usr/include
-	${INSTALL_DIR} ${IDIR_INPUTPROTO}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/inputproto.pc \
-		${IDIR_INPUTPROTO}/usr/lib/pkgconfig	
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/iptables/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		iptables
 PKG_VERSION:=		1.4.20
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		387b92d3efcf4f07fe31c3bf0f1d18f5
 PKG_DESCR:=		The netfilter firewalling software
 PKG_SECTION:=		firewall
@@ -18,9 +18,7 @@ PKG_DEPENDS+=		kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6
 PKG_DEPENDS+=		kmod-ip6-nf-filter kmod-ip6-nf-target-reject
 PKG_URL:=		http://www.netfilter.org/
 PKG_SITES:=		http://www.netfilter.org/projects/iptables/files/
-
-PKG_SUBPKGS:=		IPTABLES IPTABLES_DEV
-PKGSC_IPTABLES_DEV:=	devel
+PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
@@ -30,8 +28,7 @@ include ${TOPDIR}/mk/package.mk
 # use --disable-static in CONFIGURE_ARGS to change and optimize package
 #include ${LINUX_DIR}/.config
 
-$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,IPTABLES_DEV,iptables-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKGSC_IPTABLES_DEV}))
+$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_LDFLAGS+=	-fPIC
 CONFIGURE_ARGS+=	--enable-devel
@@ -49,8 +46,4 @@ iptables-install:
 	${CP} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IPTABLES}/usr/sbin
 	${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IPTABLES}/usr/lib
 
-iptables-dev-install:
-	${INSTALL_DIR} ${IDIR_IPTABLES_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_IPTABLES_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/jpeg/Makefile

@@ -5,34 +5,26 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		jpeg
 PKG_VERSION:=		8d
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		52654eb3b2e60c35731ea8fc87f1bd29
 PKG_DESCR:=		The Independent JPEG Groups JPEG runtime library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.ijg.org/
 PKG_SITES:=		http://www.ijg.org/files/
-
-PKG_SUBPKGS:=		LIBJPEG LIBJPEG_DEV
-PKGSD_LIBJPEG_DEV:=	development files for libjpeg
-PKGSC_LIBJPEG_DEV:=	devel
+PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}src.v${PKG_VERSION}.tar.gz
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBJPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBJPEG_DEV},${PKGSC_LIBJPEG_DEV}))
 
 libjpeg-install:
 	${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/
 
-libjpeg-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBJPEG_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBJPEG_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/kbproto/Makefile

@@ -7,19 +7,13 @@ PKG_NAME:=		kbproto
 PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		1
 PKG_DESCR:=		X11 keyboard protocol headers
-PKG_SECTION:=		x11/devel
+PKG_SECTION:=		devel
 PKG_MD5SUM:=		9c650b7947fe59b3f144518400e8d029
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=		dev devonly
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,KBPROTO,kbproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-post-install:
-	${INSTALL_DIR} ${IDIR_KBPROTO}/usr/include
-	${CP} ${WRKINST}/usr/include/X11 ${IDIR_KBPROTO}/usr/include
-	${INSTALL_DIR} ${IDIR_KBPROTO}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/kbproto.pc \
-		${IDIR_KBPROTO}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/krb5/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		krb5
 PKG_VERSION:=		1.11.3
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		56f0ae274b285320b8a597cb89442449
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		crypto
@@ -15,12 +15,12 @@ PKG_BUILDDEP:=		ncurses e2fsprogs gettext-tiny
 PKG_URL:=		http://web.mit.edu/kerberos/
 PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.11/
 PKG_NOPARALLEL:=	1
+PKG_LIBNAME:=		libkrb5
+PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		KRB5_SERVER KRB5_CLIENT KRB5_UTIL LIBKRB5 LIBKRB5_DEV
+PKG_SUBPKGS:=		KRB5_SERVER KRB5_CLIENT KRB5_UTIL LIBKRB5
 PKGSD_LIBKRB5:=		MIT kerberos libraries
 PKGSC_LIBKRB5:=		libs
-PKGSD_LIBKRB5_DEV:=	MIT kerberos headers
-PKGSC_LIBKRB5_DEV:=	devel
 PKGSD_KRB5_CLIENT:=	MIT kerberos client tools
 PKGSC_KRB5_CLIENT:=	crypto
 PKGSS_KRB5_CLIENT:=	libkrb5 libncurses libss libcom-err
@@ -40,8 +40,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,KRB5_CLIENT,krb5-client,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_KRB5_CLIENT},${PKGSD_KRB5_CLIENT},${PKGSC_KRB5_CLIENT}))
 $(eval $(call PKG_template,KRB5_UTIL,krb5-util,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_KRB5_UTIL},${PKGSD_KRB5_UTIL},${PKGSC_KRB5_UTIL}))
-$(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5}))
-$(eval $(call PKG_template,LIBKRB5_DEV,libkrb5-dev,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5_DEV},${PKGSC_LIBKRB5_DEV}))
+$(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-static \
 			--disable-profiled \
@@ -96,12 +95,4 @@ libkrb5-install:
 	echo '/usr/lib/libgssapi_krb5.so		mechglue_internal_krb5_init' \
 		> ${IDIR_LIBKRB5}/etc/gssapi_mech.conf
 
-libkrb5-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBKRB5_DEV}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/krb5-config \
-		${IDIR_LIBKRB5_DEV}/usr/bin
-	${INSTALL_DIR} ${IDIR_LIBKRB5_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* \
-		${IDIR_LIBKRB5_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libICE/Makefile

@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libICE
 PKG_VERSION:=		1.0.8
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		4b8dae73fce37e994c3a6fa05d6db7ca
 PKG_DESCR:=		Inter-Client Exchange library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xtrans xproto
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBICE LIBICE_DEV
-PKGSD_LIBICE_DEV:=	Inter-Client Exchange headers
-PKGSC_LIBICE_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBICE_DEV,libice-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBICE_DEV},${PKGSC_LIBICE_DEV}))
+$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 
@@ -27,11 +23,4 @@ libice-install:
 	${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libICE.so* ${IDIR_LIBICE}/usr/lib
 
-libice-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBICE_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBICE_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBICE_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBICE_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libIDL/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libIDL
 PKG_VERSION:=		0.8.14
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		531fbc1b40b80dd1d6f3b5e76b99067c
 PKG_DESCR:=		libraries for Interface Definition Language files
 PKG_SECTION:=		libs
@@ -13,32 +13,17 @@ PKG_DEPENDS:=		glib
 PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
-
-PKG_SUBPKGS:=		LIBIDL LIBIDL_DEV
-PKGSD_LIBIDL_DEV:=	libidl headers
-PKGSC_LIBIDL_DEV:=	devel
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
 CONFIGURE_ENV+=		libIDL_cv_long_long_format=ll
 
-$(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBIDL_DEV,libidl-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIDL_DEV},${PKGSC_LIBIDL_DEV}))
+$(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libidl-install:
 	$(INSTALL_DIR) $(IDIR_LIBIDL)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libIDL*.so* \
 		$(IDIR_LIBIDL)/usr/lib
 
-libidl-dev-install:
-	$(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/include
-	$(CP) $(WRKINST)/usr/include/* \
-		$(IDIR_LIBIDL_DEV)/usr/include
-	$(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/libIDL-config-2 \
-		$(IDIR_LIBIDL_DEV)/usr/bin
-	$(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		$(IDIR_LIBIDL_DEV)/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libSM/Makefile

@@ -5,32 +5,21 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libSM
 PKG_VERSION:=		1.2.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		1d507651e9fa50aab7ef11be9e0e2f20
 PKG_DESCR:=		X11 Session Management library
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libuuid
 PKG_BUILDDEP:=		libICE util-linux
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBSM LIBSM_DEV
-PKGSD_LIBSM_DEV:=	X11 Session Management headers
-PKGSC_LIBSM_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSM_DEV,libsm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSM_DEV},${PKGSC_LIBSM_DEV}))
+$(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libsm-install:
 	${INSTALL_DIR} ${IDIR_LIBSM}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libSM.so* ${IDIR_LIBSM}/usr/lib
 
-libsm-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBSM_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBSM_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBSM_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBSM_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libX11/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libX11
 PKG_VERSION:=		1.5.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		395455e4d3a51459374fe5ca8420aae8
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
@@ -13,19 +13,15 @@ PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau xcb-proto
 PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto libxcb
 PKG_DEPENDS:=		libxdmcp libxcb libxau
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBX11 LIBX11_DEV
-PKGSD_LIBX11_DEV:=	X11 headers
-PKGSC_LIBX11_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBX11_DEV},${PKGSC_LIBX11_DEV},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--enable-xlocale \
 			--disable-specs \
@@ -39,11 +35,4 @@ libx11-install:
 	${CP} ${WRKINST}/usr/share/X11/XErrorDB ${IDIR_LIBX11}/usr/share/X11
 	${CP} ${WRKINST}/usr/share/X11/locale ${IDIR_LIBX11}/usr/share/X11
 
-libx11-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/include/X11
-	${CP} ${WRKINST}/usr/include/X11/*.h ${IDIR_LIBX11_DEV}/usr/include/X11
-	${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/lib/pkgconfig
-	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBX11_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXScrnSaver/Makefile

@@ -5,21 +5,22 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXScrnSaver
 PKG_VERSION:=		1.2.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		8e459e544298caa27fc7c7e5a56e2a6d
 PKG_DESCR:=		X.Org XScrnSaver library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		scrnsaverproto libXext
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXSCRNSAVER,libxscrnsaver,$(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},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--enable-malloc0returnsnull
 
-post-install:
+libxscrnsaver-install:
 	$(INSTALL_DIR) $(IDIR_LIBXSCRNSAVER)/usr/lib
 	${CP} $(WRKINST)/usr/lib/libXss.so* \
 		$(IDIR_LIBXSCRNSAVER)/usr/lib/

package/libXau/Makefile

@@ -5,36 +5,24 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXau
 PKG_VERSION:=		1.0.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		3ab7a4d1aac1b7f8ccc6b9755a19f252
 PKG_DESCR:=		X11 authorisation library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xproto
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXAU LIBXAU_DEV
-PKGSD_LIBXAU_DEV:=	Xauth headers
-PKGSC_LIBXAU_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXAU_DEV,libxau-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXAU_DEV},${PKGSC_LIBXAU_DEV},${PKG_OPTS}))
 
-post-install:
+libxau-install:
 	${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/
 
-libxau-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXAU_DEV}/usr/include/X11/
-	${CP} ${WRKINST}/usr/include/X11/* \
-		${IDIR_LIBXAU_DEV}/usr/include/X11/
-	${INSTALL_DIR} ${IDIR_LIBXAU_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xau.pc \
-		${IDIR_LIBXAU_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXaw/Makefile

@@ -5,28 +5,20 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXaw
 PKG_VERSION:=		1.0.11
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		c487a810a8a9b0eb5091f382790b4e75
 PKG_DESCR:=		X11 Athena Widget library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libXext libXmu libXpm
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXAW LIBXAW_DEV
-PKGSC_LIBXAW_DEV:=	x11/devel
-PKGSD_LIBXAW_DEV:=	X11 Athena Widget headers
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXAW_DEV,libxaw-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXAW_DEV},${PKGSC_LIBXAW_DEV}))
+$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libxaw-install:
 	${INSTALL_DIR} ${IDIR_LIBXAW}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXaw*.so* ${IDIR_LIBXAW}/usr/lib
 
-libxaw-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXAW_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXAW_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXcomposite/Makefile

@@ -5,36 +5,24 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXcomposite
 PKG_VERSION:=		0.4.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b93dac50c86db6eba3f72e949f5bed2a
 PKG_DESCR:=		X composite library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libX11 compositeproto libXfixes
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXCOMPOSITE LIBXCOMPOSITE_DEV
-PKGSD_LIBXCOMPOSITE_DEV:=	X11 composite headers
-PKGSC_LIBXCOMPOSITE_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXCOMPOSITE,libxcomposite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXCOMPOSITE_DEV,libxcomposite-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXCOMPOSITE_DEV},${PKGSC_LIBXCOMPOSITE_DEV},${PKG_OPTS}))
 
 libxcomposite-install:
 	${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXcomposite.so* ${IDIR_LIBXCOMPOSITE}/usr/lib/
 
-libxcomposite-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE_DEV}/usr/lib/pkgconfig
-	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBXCOMPOSITE_DEV}/usr/lib/pkgconfig
-	${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE_DEV}/usr/include/X11/extensions
-	${CP} ${WRKINST}/usr/include/X11/extensions/*.h \
-		${IDIR_LIBXCOMPOSITE_DEV}/usr/include/X11/extensions
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXcursor/Makefile

@@ -5,33 +5,21 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXcursor
 PKG_VERSION:=		1.1.13
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		38a6c7ce393cb5bc10e67de087f9d582
 PKG_DESCR:=		xcursor library
 PKG_SECTION:=		x11/libs
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_BUILDDEP:=		libXfixes libXrender
-
-PKG_SUBPKGS:=		LIBXCURSOR LIBXCURSOR_DEV
-PKGSC_LIBXCURSOR_DEV:=	x11/devel
-PKGSD_LIBXCURSOR_DEV:=	libXcursor development files
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXCURSOR,libxcursor,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXCURSOR_DEV,libxcursor-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXCURSOR,libxcursor,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libxcursor-install:
 	$(INSTALL_DIR) $(IDIR_LIBXCURSOR)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libXcursor*.so* \
 		$(IDIR_LIBXCURSOR)/usr/lib
 
-libxcursor-dev-install:
-	$(INSTALL_DIR) $(IDIR_LIBXCURSOR_DEV)/usr/lib/pkgconfig
-	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
-		$(IDIR_LIBXCURSOR_DEV)/usr/lib/pkgconfig
-	$(INSTALL_DIR) $(IDIR_LIBXCURSOR_DEV)/usr/include
-	$(CP) $(WRKINST)/usr/include/* \
-		$(IDIR_LIBXCURSOR_DEV)/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXdamage/Makefile

@@ -5,33 +5,21 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXdamage
 PKG_VERSION:=		1.1.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		5e54789fd1c56392d38d29c6b8dad142
 PKG_DESCR:=		X Window System client interface to the DAMAGE extension to the X protocol
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libXfixes damageproto
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXDAMAGE LIBXDAMAGE_DEV
-PKGSC_LIBXDAMAGE_DEV:=	x11/devel
-PKGSD_LIBXDAMAGE_DEV:=	DAMAGE extension headers
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXDAMAGE,libxdamage,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXDAMAGE_DEV,libxdamage-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDAMAGE_DEV},${PKGSC_LIBXDAMAGE_DEV}))
+$(eval $(call PKG_template,LIBXDAMAGE,libxdamage,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libxdamage-install:
 	$(INSTALL_DIR) $(IDIR_LIBXDAMAGE)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libXdamage*.so* \
 		$(IDIR_LIBXDAMAGE)/usr/lib
 
-libxdamage-dev-install:
-	$(INSTALL_DIR) $(IDIR_LIBXDAMAGE_DEV)/usr/include
-	$(CP) $(WRKINST)/usr/include/* \
-		$(IDIR_LIBXDAMAGE_DEV)/usr/include
-	$(INSTALL_DIR) $(IDIR_LIBXDAMAGE_DEV)/usr/lib/pkgconfig
-	$(INSTALL_DATA) $(WRKINST)/usr/lib/pkgconfig/*.pc \
-		$(IDIR_LIBXDAMAGE_DEV)/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXdmcp/Makefile

@@ -5,37 +5,24 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXdmcp
 PKG_VERSION:=		1.1.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		194f30d2bb67b23dc33351e128db40a9
 PKG_DESCR:=		X11 display manager control protocol library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xproto
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXDMCP LIBXDMCP_DEV
-PKGSB_LIBXDMCP:=	xproto
-PKGSD_LIBXDMCP_DEV:=	XDMCP headers
-PKGSC_LIBXDMCP_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXDMCP_DEV,libxdmcp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDMCP_DEV},${PKGSC_LIBXDMCP_DEV},${PKG_OPTS}))
 
 libxdmcp-install:
 	${INSTALL_DIR} ${IDIR_LIBXDMCP}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXdmcp.so* ${IDIR_LIBXDMCP}/usr/lib
 
-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/libXext/Makefile

@@ -5,26 +5,21 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXext
 PKG_VERSION:=		1.3.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		249478eae5c4fab7722894cb99565405
 PKG_DESCR:=		X client interface to extensions of the X protocol
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libX11 xextproto
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXEXT LIBXEXT_DEV
-PKGSD_LIBXEXT_DEV:=	X11 extension headers
-PKGSC_LIBXEXT_DEV:=	x11/devel
-PKGSS_LIBXEXT_DEV:=	xextproto
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBXEXT_DEV},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
@@ -32,12 +27,4 @@ libxext-install:
 	${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/
 
-libxext-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions
-	${CP} ${WRKINST}/usr/include/X11/extensions/*.h \
-		${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions
-	${INSTALL_DIR} ${IDIR_LIBXEXT_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xext.pc \
-		${IDIR_LIBXEXT_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXfixes/Makefile

@@ -5,34 +5,22 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXfixes
 PKG_VERSION:=		5.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		0a2139e91df4758218e0fddbd549e13c
 PKG_DESCR:=		X Fixes Library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		fixesproto xextproto xproto libX11
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXFIXES LIBXFIXES_DEV
-PKGSC_LIBXFIXES_DEV:=	x11/devel
-PKGSD_LIBXFIXES_DEV:=	X Fixes headers
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXFIXES,libxfixes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXFIXES_DEV,libxfixes-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFIXES_DEV},${PKGSC_LIBXFIXES_DEV}))
+$(eval $(call PKG_template,LIBXFIXES,libxfixes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libxfixes-install:
 	$(INSTALL_DIR) $(IDIR_LIBXFIXES)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libXfixes*.so* \
 		$(IDIR_LIBXFIXES)/usr/lib
 
-libxfixes-dev-install:
-	$(INSTALL_DIR) $(IDIR_LIBXFIXES_DEV)/usr/include/X11/extensions
-	$(CP) $(WRKINST)/usr/include/X11/extensions/Xfixes.h \
-		$(IDIR_LIBXFIXES_DEV)/usr/include/X11/extensions
-	$(INSTALL_DIR) $(IDIR_LIBXFIXES_DEV)/usr/lib/pkgconfig
-	$(CP) $(WRKINST)/usr/lib/pkgconfig/xfixes.pc \
-		$(IDIR_LIBXFIXES_DEV)/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXfont/Makefile

@@ -5,22 +5,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXfont
 PKG_VERSION:=		1.4.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		a54dea0debecf232a346c22e71d76836
 PKG_DESCR:=		X font Library
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libfreetype
 PKG_BUILDDEP:=		freetype fontcacheproto fontsproto libfontenc xtrans
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXFONT LIBXFONT_DEV
-PKGSD_LIBXFONT_DEV:=	X font headers
-PKGSC_LIBXFONT_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXFONT_DEV,libxfont-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFONT_DEV},${PKGSC_LIBXFONT_DEV}))
+$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ENV+=		ac_cv_path_XMLTO=true
 
@@ -28,12 +24,4 @@ libxfont-install:
 	${INSTALL_DIR} ${IDIR_LIBXFONT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXfont.so* ${IDIR_LIBXFONT}/usr/lib
 
-libxfont-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXFONT_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* \
-		${IDIR_LIBXFONT_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBXFONT_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xfont.pc \
-		${IDIR_LIBXFONT_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXft/Makefile

@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXft
 PKG_VERSION:=		2.3.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		946a157090eec5c3041cf17530d93f59
 PKG_DESCR:=		X FreeType library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libXrender fontconfig
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXFT LIBXFT_DEV
-PKGSD_LIBXFT_DEV:=	X FreeType headers
-PKGSC_LIBXFT_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXFT_DEV,libxft-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFT_DEV},${PKGSC_LIBXFT_DEV}))
+$(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 
@@ -27,11 +23,4 @@ libxft-install:
 	${INSTALL_DIR} ${IDIR_LIBXFT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXft.so* ${IDIR_LIBXFT}/usr/lib
 
-libxft-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXFT_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXFT_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBXFT_DEV}/usr/lib/pkgconfig
-	$(CP) ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBXFT_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXi/Makefile

@@ -5,37 +5,28 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXi
 PKG_VERSION:=		1.6.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		d024a9de73191628f9772893f02054d8
 PKG_DESCR:=		X Window System client interface to the XINPUT extension to the X protocol.
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xproto xextproto libXext
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXI LIBXI_DEV
-PKGSS_LIBXI_DEV:=	inputproto
-PKGSC_LIBXI_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
-$(eval $(call PKG_template,LIBXI_DEV,libxi-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBXI_DEV},${PKG_DESCR},${PKGSC_LIBXI_DEV},$(PKG_OPTS)))
 
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
-post-install:
+libxi-install:
 	$(INSTALL_DIR) $(IDIR_LIBXI)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libXi*.so* \
 		$(IDIR_LIBXI)/usr/lib
 
-libxi-dev-install:
-	$(INSTALL_DIR) $(IDIR_LIBXI_DEV)/usr/include
-	$(CP) $(WRKINST)/usr/include/* \
-		$(IDIR_LIBXI_DEV)/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXinerama/Makefile

@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXinerama
 PKG_VERSION:=		1.1.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		29a813b3850d499a3524a8d5d5ecb099
 PKG_DESCR:=		Xinerama library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xineramaproto
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXINERAMA LIBXINERAMA_DEV
-PKGSD_LIBXINERAMA_DEV:=	Xinerama headers
-PKGSC_LIBXINERAMA_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXINERAMA_DEV,libxinerama-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXINERAMA_DEV},${PKGSC_LIBXINERAMA_DEV}))
+$(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
 
@@ -27,11 +23,4 @@ libxinerama-install:
 	${INSTALL_DIR} ${IDIR_LIBXINERAMA}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXinerama.so* ${IDIR_LIBXINERAMA}/usr/lib
 
-libxinerama-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXINERAMA_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXINERAMA_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBXINERAMA_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBXINERAMA_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXmu/Makefile

@@ -5,32 +5,21 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXmu
 PKG_VERSION:=		1.1.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		53fd02bc7174dd643a26bcc88147c146
 PKG_DESCR:=		miscellaneous utility functions for X libraries
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libXt libXext
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXMU LIBXMU_DEV
-PKGSD_LIBXMU_DEV:=	X miscellaneous utility function headers
-PKGSC_LIBXMU_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXMU_DEV,libxmu-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libxmu-install:
 	${INSTALL_DIR} ${IDIR_LIBXMU}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXmu.so* ${IDIR_LIBXMU}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXmuu.so* ${IDIR_LIBXMU}/usr/lib
 
-libxmu-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXMU_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXMU_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBXMU_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBXMU_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXp/Makefile

@@ -5,30 +5,20 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXp
 PKG_VERSION:=		1.0.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		a960c831f11e6b4249fde78a5b969000
 PKG_DESCR:=		X Print library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libXext printproto
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXP LIBXP_DEV
-PKGSD_LIBXP_DEV:=	X Print headers
-PKGSC_LIBXP_DEV:=	x11/devel
-PKGSS_LIBXP_DEV:=	printproto
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXP,libxp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXP_DEV,libxp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXP_DEV},${PKGSC_LIBXP_DEV}))
+$(eval $(call PKG_template,LIBXP,libxp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libxp-install:
 	${INSTALL_DIR} ${IDIR_LIBXP}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXp.so* ${IDIR_LIBXP}/usr/lib
 
-libxp-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXP_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKBUILD}/*.pc \
-		${IDIR_LIBXP_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXpm/Makefile

@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXpm
 PKG_VERSION:=		3.5.10
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		a70507638d74541bf30a771f1e5938bb
 PKG_DESCR:=		common operation for the XPM pixmap format
 PKG_BUILDDEP:=		libX11 libXt
 PKG_SECTION:=		x11/libs
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXPM LIBXPM_DEV
-PKGSD_LIBXPM_DEV:=	XPM pixmap format headers
-PKGSC_LIBXPM_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXPM_DEV,libxpm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXPM_DEV},${PKGSC_LIBXPM_DEV}))
+$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ENV+=		ac_cv_search_gettext=no
 
@@ -27,11 +23,4 @@ libxpm-install:
 	${INSTALL_DIR} ${IDIR_LIBXPM}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXpm.so* ${IDIR_LIBXPM}/usr/lib
 
-libxpm-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXPM_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXPM_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBXPM_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBXPM_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXrandr/Makefile

@@ -5,21 +5,16 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXrandr
 PKG_VERSION:=		1.3.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		edacf83655be2e48348b626c0dc454f3
 PKG_DESCR:=		Xrandr library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		randrproto
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_SUBPKGS:=		LIBXRANDR LIBXRANDR_DEV
-PKGSD_LIBXRANDR_DEV:=	Xrandr headers
-PKGSC_LIBXRANDR_DEV:=	x11/devel
-
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXRANDR,libxrandr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXRANDR_DEV,libxrandr-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXRANDR_DEV},${PKGSC_LIBXRANDR_DEV}))
+$(eval $(call PKG_template,LIBXRANDR,libxrandr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
 
@@ -27,11 +22,4 @@ libxrandr-install:
 	${INSTALL_DIR} ${IDIR_LIBXRANDR}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXrandr.so* ${IDIR_LIBXRANDR}/usr/lib
 
-libxrandr-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXRANDR_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXRANDR_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBXRANDR_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBXRANDR_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXrender/Makefile

@@ -5,25 +5,21 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXrender
 PKG_VERSION:=		0.9.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b6702e6f56f9d9103dc688f4336529a9
 PKG_DESCR:=		X11 rendering library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		renderproto libX11
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXRENDER LIBXRENDER_DEV
-PKGSD_LIBXRENDER_DEV:=	X11 rendering headers
-PKGSC_LIBXRENDER_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXRENDER,libxrender,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXRENDER_DEV,libxrender-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXRENDER_DEV},${PKGSC_LIBXRENDER_DEV},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
@@ -31,11 +27,4 @@ libxrender-install:
 	${INSTALL_DIR} ${IDIR_LIBXRENDER}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXrender.so* ${IDIR_LIBXRENDER}/usr/lib
 
-libxrender-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXRENDER_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXRENDER_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBXRENDER_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xrender.pc \
-		${IDIR_LIBXRENDER_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXt/Makefile

@@ -5,22 +5,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXt
 PKG_VERSION:=		1.1.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		7a80ed7aba06668b12ebd0910318a1f1
 PKG_DESCR:=		X Toolkit Intrinsics libraries
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libsm libice libuuid libx11 libxau libxdmcp libxcb
 PKG_BUILDDEP:=		libSM libX11 kbproto
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXT LIBXT_DEV
-PKGSD_LIBXT_DEV:=	X Toolkit Intrinsics headers
-PKGSC_LIBXT_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXT_DEV,libxt-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXT_DEV},${PKGSC_LIBXT_DEV}))
+$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
@@ -29,11 +25,4 @@ libxt-install:
 	${INSTALL_DIR} ${IDIR_LIBXT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXt.so* ${IDIR_LIBXT}/usr/lib
 
-libxt-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXT_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXT_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBXT_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBXT_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXtst/Makefile

@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXtst
 PKG_VERSION:=		1.2.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		8918809e47c29b44d25eb16b1586a15b
 PKG_DESCR:=		Xtst library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		recordproto libXi
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXTST LIBXTST_DEV
-PKGSD_LIBXTST_DEV:=	Xtst headers
-PKGSC_LIBXTST_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXTST_DEV,libxtst-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXTST_DEV},${PKGSC_LIBXTST_DEV}))
+$(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
 
@@ -27,11 +23,4 @@ libxtst-install:
 	${INSTALL_DIR} ${IDIR_LIBXTST}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXtst.so* ${IDIR_LIBXTST}/usr/lib
 
-libxtst-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXTST_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXTST_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBXTST_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBXTST_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXv/Makefile

@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXv
 PKG_VERSION:=		1.0.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		066145bab1f182476589af0ee9c18152
 PKG_DESCR:=		X11 Xvideo extensions library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libX11 videoproto libXext
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXV LIBXV_DEV
-PKGSD_LIBXV_DEV:=	X11 Xvideo extensions headers
-PKGSC_LIBXV_DEV:=	x11/devel
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXV,libxv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXV_DEV,libxv-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXV_DEV},${PKGSC_LIBXV_DEV}))
+$(eval $(call PKG_template,LIBXV,libxv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
@@ -27,12 +23,4 @@ libxv-install:
 	${INSTALL_DIR} ${IDIR_LIBXV}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXv.so* ${IDIR_LIBXV}/usr/lib/
 
-libxv-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXV_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* \
-		${IDIR_LIBXV_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBXV_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBXV_DEV}/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXxf86dga/Makefile

@@ -5,20 +5,21 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXxf86dga
 PKG_VERSION:=		1.1.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		3d58873171c7765956ce257e6a7e4865
 PKG_DESCR:=		client library for the XFree86-DGA extension
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xf86dgaproto libXext libXaw
 PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
 
-post-install:
+libxxf86dga-install:
 	${INSTALL_DIR} ${IDIR_LIBXXF86DGA}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXxf86dga.so* ${IDIR_LIBXXF86DGA}/usr/lib/
 

package/libXxf86vm/Makefile

@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXxf86vm
 PKG_VERSION:=		1.1.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		84d26e26c07f8cbcb5f447590df5b5c3
 PKG_DESCR:=		an interface to the XFree86-VidModeExtension extension
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xf86vidmodeproto libXext
 PKG_SITES:=		${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:=		LIBXXF86VM LIBXXF86VM_DEV
-PKGSC_LIBXXF86VM_DEV:=	devel
-PKSSD_LIBXXF86VM_DEV:=	XFree86-VidModeExtension headers
+PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXXF86VM,libxxf86vm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXXF86VM_DEV,libxxf86vm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKSSD_LIBXXF86VM_DEV},${PKGSC_LIBXXF86VM_DEV}))
+$(eval $(call PKG_template,LIBXXF86VM,libxxf86vm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
@@ -28,12 +24,4 @@ libxxf86vm-install:
 	${CP} $(WRKINST)/usr/lib/libXxf86vm*.so* \
 		$(IDIR_LIBXXF86VM)/usr/lib
 
-libxxf86vm-dev-install:
-	$(INSTALL_DIR) $(IDIR_LIBXXF86VM_DEV)/usr/include
-	${CP} $(WRKINST)/usr/include/* \
-		$(IDIR_LIBXXF86VM_DEV)/usr/include
-	$(INSTALL_DIR) $(IDIR_LIBXXF86VM_DEV)/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		$(IDIR_LIBXXF86VM_DEV)/usr/lib/pkgconfig
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libaio/Makefile

@@ -5,23 +5,23 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libaio
 PKG_VERSION:=		0.3.109
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		435a5b16ca6198eaf01155263d855756
 PKG_DESCR:=		Asynchronous I/O library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.kernel.org
 PKG_SITES:=		http://openadk.org/distfiles/
+PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBAIO,libaio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAIO,libaio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIG_STYLE:=		manual
 XAKE_FLAGS+=         	prefix='${WRKINST}/usr'
 
-
 libaio-install:
 	$(INSTALL_DIR) $(IDIR_LIBAIO)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libaio*so* \

package/libantlr3c/Makefile

@@ -5,15 +5,16 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libantlr3c
 PKG_VERSION:=		3.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		674646e1d1bf5c6015435480cead725a
 PKG_DESCR:=		ANother Tool for Language Recognition
 PKG_SECTION:=		libs
 PKG_SITES:=		http://www.antlr.org/download/C/
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBANTLR3C,libantlr3c,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBANTLR3C,libantlr3c,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ENV+=		OPTIMFLAGS="$(TARGET_CFLAGS)"
 

package/libao/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libao
 PKG_VERSION:=		0.8.8
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		b92cba3cbcf1ee9bc221118a85d23dcd
 PKG_DESCR:=		A cross platform audio library
 PKG_SECTION:=		libs
@@ -13,17 +13,18 @@ PKG_DEPENDS:=		esound
 PKG_BUILDDEP:=		esound
 PKG_URL:=		http://www.xiph.org/ao
 PKG_SITES:=		http://downloads.xiph.org/releases/ao/
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBAO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--enable-esd \
 			--disable-arts \
 			--disable-nas \
 			--disable-polyp
 
-post-install:
+libao-install:
 	${INSTALL_DIR} ${IDIR_LIBAO}/usr/lib/ao/plugins-2
 	${CP} ${WRKINST}/usr/lib/libao.so* ${IDIR_LIBAO}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/ao/plugins-2/*.so \

package/libart/Makefile

@@ -5,22 +5,23 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libart
 PKG_VERSION:=		2.3.17
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f1f6b3e5490f382535dccb288f5d8b14
 PKG_DESCR:=		An high-performance 2D graphics library
 PKG_SECTION:=		libs
 PKG_SITES:=		${MASTER_SITE_GNOME:=libart_lgpl/2.3/}
+PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}_lgpl-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_lgpl-${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 MAKE_ENV+=		HOSTCC=$(CC_FOR_BUILD)
 
-post-install:
+libart-install:
 	${INSTALL_DIR} ${IDIR_LIBART}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libart_lgpl_2.so* ${IDIR_LIBART}/usr/lib/
 

package/libass/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libass
 PKG_VERSION:=		0.10.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		0f54b1f3a24fa897ebbbcc5bc744b32a
 PKG_DESCR:=		a portable subtitle renderer for the ASS/SSA format
 PKG_SECTION:=		libs
@@ -13,12 +13,13 @@ PKG_DEPENDS:=		fribidi fontconfig
 PKG_BUILDDEP:=		fribidi fontconfig
 PKG_URL:=		http://code.google.com/p/libass/
 PKG_SITES:=		http://libass.googlecode.com/files/
+PKG_OPTS:=		dev
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBASS,libass,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBASS,libass,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libass-install:
 	$(INSTALL_DIR) $(IDIR_LIBASS)/usr/lib

package/libaudiofile/Makefile

@@ -5,21 +5,18 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		audiofile
 PKG_VERSION:=		0.2.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		a39be317a7b1971b408805dc5e371862
 PKG_DESCR:=		audiofile library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.68k.org/~michael/audiofile/
 PKG_SITES:=		http://www.68k.org/~michael/audiofile/
-
-PKG_SUBPKGS:=		LIBAUDIOFILE LIBAUDIOFILE_DEV
-PKGSC_LIBAUDIOFILE_DEV:=devel
-PKGSD_LIBAUDIOFILE_DEV:=audiofile headers
+PKG_LIBNAME:=		libaudiofile
+PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBAUDIOFILE,libaudiofile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAUDIOFILE_DEV,libaudiofile-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAUDIOFILE_DEV},${PKGSC_LIBAUDIOFILE_DEV}))
+$(eval $(call PKG_template,LIBAUDIOFILE,libaudiofile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
 CONFIGURE_ARGS+=	--with-build-cc=${CC_FOR_BUILD}
@@ -28,11 +25,4 @@ libaudiofile-install:
 	${INSTALL_DIR} ${IDIR_LIBAUDIOFILE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libaudiofile.so* ${IDIR_LIBAUDIOFILE}/usr/lib/
 
-libaudiofile-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBAUDIOFILE_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBAUDIOFILE_DEV}/usr/lib/pkgconfig
-	${INSTALL_DIR} ${IDIR_LIBAUDIOFILE_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBAUDIOFILE_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk