diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/libX11/Makefile | 7 | ||||
| -rw-r--r-- | package/libXau/Makefile | 19 | ||||
| -rw-r--r-- | package/libXdmcp/Makefile | 19 | ||||
| -rw-r--r-- | package/libXext/Makefile | 2 | ||||
| -rw-r--r-- | package/x11-headers/Makefile | 28 |
5 files changed, 65 insertions, 10 deletions
diff --git a/package/libX11/Makefile b/package/libX11/Makefile index e219ed49e..153a08f12 100644 --- a/package/libX11/Makefile +++ b/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 diff --git a/package/libXau/Makefile b/package/libXau/Makefile index 0f00fe064..21d31154e 100644 --- a/package/libXau/Makefile +++ b/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 diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile index 330990163..f4a731f9c 100644 --- a/package/libXdmcp/Makefile +++ b/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 diff --git a/package/libXext/Makefile b/package/libXext/Makefile index a1e1259e2..3763d444f 100644 --- a/package/libXext/Makefile +++ b/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 diff --git a/package/x11-headers/Makefile b/package/x11-headers/Makefile new file mode 100644 index 000000000..3b5327c35 --- /dev/null +++ b/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 |