make native builds of x11 apps work

mk/pkg-bottom.mk

@@ -144,10 +144,12 @@ else
 	@echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
 	@exit 1
 endif
+ifeq ($(ADK_NATIVE),)
 	@for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \
 		[[ -e $$a ]] || continue; \
 		$(SED) "s,^prefix=.*,prefix=${STAGING_DIR}/usr," $$a; \
 	done
+endif
 ifeq (,$(filter noremove,${PKG_OPTS}))
 	@if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \
 		cd '${STAGING_DIR}'; \

package/libX11/Makefile

@@ -5,11 +5,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libX11
 PKG_VERSION:=		1.3.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		b68aebbfcac1174c4c95d260e9369766
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto
+PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau 
+PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_SUBPKGS:=		LIBX11 LIBX11_DEV
@@ -44,7 +45,5 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 libx11-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/include/X11
 	${CP} ${WRKINST}/usr/include/X11/*.h ${IDIR_LIBX11_DEV}/usr/include/X11
-	${CP} ${STAGING_DIR}/usr/include/xproto/X11/*.h \
-		${IDIR_LIBX11_DEV}/usr/include/X11
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXau/Makefile

@@ -5,12 +5,16 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXau
 PKG_VERSION:=		1.0.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		1a421d9376f43596fe068ce209a70b84
 PKG_DESCR:=		X11 authorisation library
 PKG_SECTION:=		x11/libs
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+PKG_SUBPKGS:=		LIBXAU LIBXAU_DEV
+PKGSD_LIBXAU_DEV:=	Xauth headers
+PKGSC_LIBXAU_DEV:=	devel
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -18,9 +22,20 @@ 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}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBXAU_DEV}+=libxau-dev-install
 
-post-install:
+
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${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/
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXdmcp/Makefile

@@ -5,12 +5,16 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXdmcp
 PKG_VERSION:=		1.0.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		c3f1bce1affc7dfbc222145e00e1310e
 PKG_DESCR:=		X11 display manager control protocol library
 PKG_SECTION:=		x11/libs
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+PKG_SUBPKGS:=		LIBXDMCP LIBXDMCP_DEV
+PKGSD_LIBXDMCP_DEV:=	XDMCP headers
+PKGSC_LIBXDMCP_DEV:=	devel
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -18,9 +22,20 @@ 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}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBXDMCP_DEV}+=libxdmcp-dev-install
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${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/
+	
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXext/Makefile

@@ -39,7 +39,5 @@ 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
-	${CP} ${STAGING_DIR}/usr/include/X11/extensions/*.h \
-                ${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/x11-headers/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:=		x11-headers
+PKG_VERSION:=		1.0
+PKG_RELEASE:=		1
+PKG_DESCR:=		X11 header files
+PKG_BUILDDEP:=		xproto xtrans xextproto
+PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto
+PKG_SECTION:=		devel
+
+NO_DISTFILES:=		1
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,X11_HEADERS,x11-headers,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-install: 
+	${INSTALL_DIR} ${IDIR_X11_HEADERS}/usr/include
+	${CP} ${STAGING_DIR}/usr/include/X11 ${IDIR_X11_HEADERS}/usr/include
+
+include ${TOPDIR}/mk/pkg-bottom.mk