summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-26 20:16:25 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-26 20:16:25 +0100
commit503e9c8f13e8da18f2e81530ba7f086d3ea04de4 (patch)
tree4229e7938850b63d462526be86d90b3e8fd1ce75 /package
parent83687368fdcf0004e377584b3b3e73d4f991e27e (diff)
add somemissing dependencies
Diffstat (limited to 'package')
-rw-r--r--package/libX11/Makefile1
-rw-r--r--package/libxcb/Makefile4
-rw-r--r--package/libxslt/Makefile13
-rw-r--r--package/xcb-proto/Makefile4
-rw-r--r--package/xrdb/Makefile2
5 files changed, 21 insertions, 3 deletions
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 6d7f9b644..97d1e0b4b 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= X11 client-side library
PKG_SECTION:= x11/libs
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
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index a0e544e13..9f7b71508 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= f715e53c9c1b25f856d14d6123663d96
PKG_DESCR:= X11 keyboard library
PKG_SECTION:= x11/libs
-PKG_BUILDDEP:= python2 libpthread-stubs
+PKG_BUILDDEP:= python2 libpthread-stubs libxslt libXau
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_SUBPKGS:= LIBXCB LIBXCB_DEVEL
@@ -25,6 +25,8 @@ $(eval $(call PKG_template,LIBXCB_DEVEL,${PKG_NAME}-devel,${PKG_VERSION}-${PKG_R
include $(TOPDIR)/mk/python.mk
+CONFIGURE_ENV+= PYTHON=$(PYTHON)
+
libxcb-install:
${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib
${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib/
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 8000a5d5a..d5c3fcb84 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -14,9 +14,14 @@ PKG_BUILDDEP:= libxml2
PKG_URL:= http://xmlsoft.org/XSLT
PKG_SITES:= http://xmlsoft.org/sources/
+PKG_SUBPKGS:= LIBXSLT XSLTPROC
+PKGSD_XSLTPROC:= xslt processor utility
+PKGSC_XSLTPROC:= misc
+
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBXSLT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XSLTPROC,xsltproc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XSLTPROC},${PKGSC_XSLTPROC}))
CONFIGURE_ARGS+= --with-libxml-prefix="${STAGING_TARGET_DIR}/usr" \
--with-libxml-include-prefix="${STAGING_TARGET_DIR}/usr/include/libxml2" \
@@ -27,7 +32,11 @@ CONFIGURE_ARGS+= --with-libxml-prefix="${STAGING_TARGET_DIR}/usr" \
--without-mem-debug \
--without-debugger
-post-install:
+xsltproc-install:
+ ${INSTALL_DIR} ${IDIR_XSLTPROC}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/xsltproc ${IDIR_XSLTPROC}/usr/bin
+
+libxslt-install:
${INSTALL_DIR} ${IDIR_LIBXSLT}/usr/lib
${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib/
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 9a477a1a6..f4b7004fc 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -16,6 +16,10 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+include $(TOPDIR)/mk/python.mk
+
+CONFIGURE_ENV+= PYTHON=$(PYTHON)
+
post-install:
${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share
${CP} ${WRKINST}/usr/share/xcb ${IDIR_XCB_PROTO}/usr/share
diff --git a/package/xrdb/Makefile b/package/xrdb/Makefile
index a1084e965..e663a6a48 100644
--- a/package/xrdb/Makefile
+++ b/package/xrdb/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 146c009e7abc52b611db4cac4883488e
PKG_DESCR:= X resource database management tools
PKG_SECTION:= x11/apps
+PKG_DEPENDS:= libx11 libxmu
+PKG_BUILDDEP:= libX11 libXmu
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk