diff options
94 files changed, 971 insertions, 207 deletions
diff --git a/mk/build.mk b/mk/build.mk index d324d6579..553d90f9b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -134,23 +134,23 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) ${BASH} ${TOPDIR}/scripts/ipkg-make-index.sh . >Packages endif -${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}: - mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/include,usr/lib} \ +${STAGING_DIR} ${STAGING_DIR}/etc ${STAGING_HOST_DIR}: + mkdir -p ${STAGING_DIR}/{bin,etc,lib,usr/include,usr/lib} \ ${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib} -${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc +${STAGING_DIR}/etc/ipkg.conf: ${STAGING_DIR}/etc ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) - echo "dest root /" >${STAGING_TARGET_DIR}/etc/ipkg.conf - echo "option offline_root ${TARGET_DIR}" >>$(STAGING_TARGET_DIR)/etc/ipkg.conf + echo "dest root /" >${STAGING_DIR}/etc/ipkg.conf + echo "option offline_root ${TARGET_DIR}" >>$(STAGING_DIR)/etc/ipkg.conf endif -package/%: ${STAGING_TARGET_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk +package/%: ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk $(MAKE) -C package $(patsubst package/%,%,$@) target/%: $(MAKE) -C target $(patsubst target/%,%,$@) -toolchain/%: ${STAGING_TARGET_DIR} +toolchain/%: ${STAGING_DIR} $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@) tools/%: @@ -211,7 +211,7 @@ clean: for d in ${STAGING_PKG_DIR}; do \ for f in $$(ls $$d/[a-z]* 2>/dev/null); do \ while read file ; do \ - rm ${STAGING_TARGET_DIR}/$$file 2>/dev/null;\ + rm ${STAGING_DIR}/$$file 2>/dev/null;\ done < $$f ; \ rm $$f ; \ done \ @@ -237,7 +237,7 @@ cleantarget: @$(TRACE) cleantarget @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) - rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_HOST_DIR) $(STAGING_TARGET_DIR) $(STAGING_PKG_DIR) + rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_HOST_DIR) $(STAGING_DIR) $(STAGING_PKG_DIR) rm -f .tmpconfig.h all.config .defconfig distclean: diff --git a/mk/package.mk b/mk/package.mk index 9b2b77559..df05e98ae 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -18,12 +18,11 @@ CONFIGURE_ENV+= GCC_HONOUR_COPTS=s \ CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \ LDFLAGS='$(strip ${TARGET_LDFLAGS})' \ ${HOST_CONFIGURE_OPTS} \ - PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' -ifeq ($(ADK_NATIVE),) -CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \ - cross_compiling=yes \ + PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \ ac_cv_func_realloc_0_nonnull=yes \ ac_cv_func_malloc_0_nonnull=yes +ifeq ($(ADK_NATIVE),) +CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} cross_compiling=yes endif CONFIGURE_PROG?= configure @@ -172,10 +171,10 @@ ifeq (${ADK_INSTALL_PACKAGE_INIT_SCRIPTS},y) done endif @mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}' \ - '$${STAGING_TARGET_DIR}/scripts' + '$${STAGING_DIR}/scripts' ifeq (,$(filter noremove,$(7))) @if test -s '$${STAGING_PKG_DIR}/$(1)'; then \ - cd '$${STAGING_TARGET_DIR}'; \ + cd '$${STAGING_DIR}'; \ while read fn; do \ rm -f "$$$$fn"; \ done <'$${STAGING_PKG_DIR}/$(1)'; \ @@ -195,8 +194,8 @@ endif find usr ! -type d 2>/dev/null | \ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '$${STAGING_PKG_DIR}/$(1)' | \ - $(TOOLS_DIR)/cpio -padlmu '$${STAGING_TARGET_DIR}' - @cd '$${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$$$' \ + $(TOOLS_DIR)/cpio -padlmu '$${STAGING_DIR}' + @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ '$${STAGING_PKG_DIR}/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_TARGET_DIR)/usr/lib,g" $$$$fn; \ @@ -223,7 +222,7 @@ clean-targets: clean-dev-$(1) clean-dev-$(1): ifeq (,$(filter noremove,$(7))) @if test -s '$${STAGING_PKG_DIR}/$(1)'; then \ - cd '$${STAGING_TARGET_DIR}'; \ + cd '$${STAGING_DIR}'; \ while read fn; do \ rm -f "$$$$fn"; \ done <'$${STAGING_PKG_DIR}/$(1)'; \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index f91e1bb45..436a0cbee 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -130,7 +130,7 @@ post-install: spkg-install: ${ALL_POSTINST} ${_FAKE_COOKIE}: ${_BUILD_COOKIE} -rm -f ${_ALL_CONTROLS} - @mkdir -p '${STAGING_PKG_DIR}' ${WRKINST} '${STAGING_TARGET_DIR}/scripts' + @mkdir -p '${STAGING_PKG_DIR}' ${WRKINST} '${STAGING_DIR}/scripts' @mkdir -p ${WRKINST}/{sbin,bin,etc,lib} ${WRKINST}/usr/{sbin,bin,lib} @${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE) @env ${MAKE_ENV} ${MAKE} pre-install $(MAKE_TRACE) @@ -155,7 +155,7 @@ ifeq ($(ADK_NATIVE),) endif ifeq (,$(filter noremove,${PKG_OPTS})) @if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \ - cd '${STAGING_TARGET_DIR}'; \ + cd '${STAGING_DIR}'; \ while read fn; do \ rm -f "$$fn"; \ done <'${STAGING_PKG_DIR}/${PKG_NAME}'; \ @@ -170,14 +170,14 @@ endif find usr ! -type d 2>/dev/null | \ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \ - $(TOOLS_DIR)/cpio -padlmu '${STAGING_TARGET_DIR}' - @cd '${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$' \ + $(TOOLS_DIR)/cpio -padlmu '${STAGING_DIR}' + @cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \ '${STAGING_PKG_DIR}/${PKG_NAME}' | while read fn; do \ chmod u+w $$fn; \ $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_TARGET_DIR)/usr/lib,g" $$fn; \ done ifeq (,$(filter noscripts,${PKG_OPTS})) - @cd '${STAGING_TARGET_DIR}'; grep 'usr/s*bin/' \ + @cd '${STAGING_DIR}'; grep 'usr/s*bin/' \ '${STAGING_PKG_DIR}/${PKG_NAME}' | \ while read fn; do \ b="$$(dd if="$$fn" bs=2 count=1 2>/dev/null)"; \ @@ -240,7 +240,7 @@ clean-targets: clean-dev-generic clean-dev-generic: ifeq (,$(filter noremove,${PKG_OPTS})) @if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \ - cd '${STAGING_TARGET_DIR}'; \ + cd '${STAGING_DIR}'; \ while read fn; do \ rm -f "$$fn"; \ done <'${STAGING_PKG_DIR}/${PKG_NAME}'; \ diff --git a/mk/vars.mk b/mk/vars.mk index 61e71de1d..d83f7eca8 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -26,6 +26,7 @@ else STAGING_TARGET_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC} SCRIPT_TARGET_DIR:= ${STAGING_TARGET_DIR}/scripts endif +STAGING_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC} STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_* # relation from STAGING_HOST_DIR to STAGING_TARGET_DIR (for gcc to find # its sysroot while staying relocatable) diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 74b9cb474..67850ceb9 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -15,7 +15,9 @@ PKG_BUILDDEP+= dri2proto glproto expat PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.2/ -PKG_SUBPKGS:= MESALIB GLXINFO GLXGEARS +PKG_SUBPKGS:= MESALIB MESALIB_DEV GLXINFO GLXGEARS +PKGSD_MESALIB_DEV:= MESA headers +PKGSC_MESALIB_DEV:= devel PKGSD_GLXINFO:= Display various GLX information PKGSC_GLXINFO:= x11/apps PKGSD_GLXGEARS:= Nice little OpenGL demo application @@ -28,6 +30,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,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXINFO},${PKGSC_GLXINFO})) $(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXGEARS},${PKGSC_GLXGEARS})) @@ -43,6 +46,9 @@ CONFIGURE_ARGS+= --disable-static \ --with-demos=xdemos XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile +ifeq ($(ADK_NATIVE),y) +XAKE_FLAGS+= RANLIB=ranlib AR=ar +endif post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ @@ -58,25 +64,33 @@ post-extract: ${STAGING_HOST_DIR}/bin/glslcompile ${MAKE} -C ${WRKBUILD}/src/glsl clean -pre-configure: - $(SED) "s#@@RANLIB@@#${TARGET_CROSS}ranlib#" ${WRKBUILD}/configs/default - $(SED) "s#@@AR@@#${TARGET_CROSS}ar#" ${WRKBUILD}/configs/default - -post-install: +mesalib-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri $(CP) $(WRKINST)/usr/lib/libGL*.so* \ $(IDIR_MESALIB)/usr/lib + ${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \ + ${IDIR_MESALIB}/usr/lib/dri/ ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) ${CP} $(WRKINST)/usr/lib/dri/i915_dri.so \ ${IDIR_MESALIB}/usr/lib/dri/ endif - ${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \ - ${IDIR_MESALIB}/usr/lib/dri/ + +glxinfo-install: ${INSTALL_DIR} ${IDIR_GLXINFO}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/progs/xdemos/glxinfo \ ${IDIR_GLXINFO}/usr/bin/ + +glxgears-install: ${INSTALL_DIR} ${IDIR_GLXGEARS}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/progs/xdemos/glxgears \ ${IDIR_GLXGEARS}/usr/bin/ +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 diff --git a/package/bdftopcf/Makefile b/package/bdftopcf/Makefile new file mode 100644 index 000000000..f807f9d48 --- /dev/null +++ b/package/bdftopcf/Makefile @@ -0,0 +1,24 @@ +# 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:= bdftopcf +PKG_VERSION:= 1.0.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f2d5c8a7813c3f9902e163c620a83dd4 +PKG_DESCR:= bdftopcf font utility +PKG_BUILDDEP:= libXfont +PKG_SECTION:= x11/apps +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,BDFTOPCF,bdftopcf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +bdftopcf-install: + $(INSTALL_DIR) $(IDIR_BDFTOPCF)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/bdftopcf \ + $(IDIR_BDFTOPCF)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile index fb7cc7f97..454ff1b60 100644 --- a/package/bigreqsproto/Makefile +++ b/package/bigreqsproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,BIGREQSPROTO,bigreqsproto,$(PKG_VERSION)-${PKG_RELEAS 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 diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile index 423327db7..ee4012569 100644 --- a/package/compositeproto/Makefile +++ b/package/compositeproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,COMPOSITEPROTO,compositeproto,$(PKG_VERSION)-${PKG_RE 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 diff --git a/package/curl/Makefile b/package/curl/Makefile index 4e1dd6bf5..8a1535a41 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -70,5 +70,8 @@ libcurl-dev-install: ${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 diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile index ae3e008e1..aef34a4de 100644 --- a/package/damageproto/Makefile +++ b/package/damageproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,DAMAGEPROTO,damageproto,$(PKG_VERSION)-${PKG_RELEASE} 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 diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile index 204d27bd3..b9fe8271a 100644 --- a/package/dri2proto/Makefile +++ b/package/dri2proto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,DRI2PROTO,dri2proto,$(PKG_VERSION)-${PKG_RELEASE},${P 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 diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 017cd1f28..74c40a61a 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -60,23 +60,23 @@ MAKE_FLAGS+= BUILD_CC="${CC_FOR_BUILD}" \ post-build: ${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static ${INSTALL_DIR} ${WRKINST}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin/ + ${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin e2fsprogs-install: ${INSTALL_DIR} ${IDIR_E2FSPROGS}/etc - ${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_E2FSPROGS}/etc/ + ${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_E2FSPROGS}/etc ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib ${IDIR_E2FSPROGS}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin/ + ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin cd $(IDIR_E2FSPROGS)/usr/sbin && ln -sf e2fsck fsck.ext2 - ${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin/ - ${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin/ + ${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin ${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \ - ${IDIR_E2FSPROGS}/usr/lib/ + ${IDIR_E2FSPROGS}/usr/lib libblkid-install: ${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib ${CP} ${WRKINST}/usr/lib/libblkid.so* \ - ${IDIR_LIBBLKID}/usr/lib/ + ${IDIR_LIBBLKID}/usr/lib libblkid-dev-install: ${INSTALL_DIR} ${IDIR_LIBBLKID_DEV}/usr/include/blkid @@ -86,7 +86,7 @@ libblkid-dev-install: libcom-err-install: ${INSTALL_DIR} ${IDIR_LIBCOM_ERR}/usr/lib ${CP} ${WRKINST}/usr/lib/libcom_err.so* \ - ${IDIR_LIBCOM_ERR}/usr/lib/ + ${IDIR_LIBCOM_ERR}/usr/lib ${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_HOST_DIR}/bin libcom-err-dev-install: @@ -97,7 +97,8 @@ libcom-err-dev-install: libss-install: ${INSTALL_DIR} ${IDIR_LIBSS}/usr/lib ${CP} ${WRKINST}/usr/lib/libss.so* \ - ${IDIR_LIBSS}/usr/lib/ + ${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 @@ -107,10 +108,10 @@ libss-dev-install: libuuid-install: ${INSTALL_DIR} ${IDIR_LIBUUID}/usr/lib ${CP} ${WRKINST}/usr/lib/libuuid.so* \ - ${IDIR_LIBUUID}/usr/lib/ - ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/uuid + ${IDIR_LIBUUID}/usr/lib + ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ - ${STAGING_TARGET_DIR}/usr/include/uuid + ${STAGING_DIR}/usr/include/uuid libuuid-dev-install: ${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include diff --git a/package/file/Makefile b/package/file/Makefile index faf974214..86147ed4e 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -14,14 +14,17 @@ PKG_URL:= http://www.darwinsys.com/file PKG_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \ ftp://ftp.astron.com/pub/file/ -PKG_SUBPKGS:= FILE LIBMAGIC +PKG_SUBPKGS:= FILE LIBMAGIC LIBMAGIC_DEV 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})) pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ @@ -43,4 +46,8 @@ 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 diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile index b3a9185d6..eff63024c 100644 --- a/package/fixesproto/Makefile +++ b/package/fixesproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,FIXESPROTO,fixesproto,$(PKG_VERSION)-${PKG_RELEASE},$ 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 diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile index 74e104d67..5ebdf3793 100644 --- a/package/fluxbox/Makefile +++ b/package/fluxbox/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= e0be927617be4ffc1ddc79513f4eb0f9 PKG_DESCR:= Fluxbox is an X11 window manager featuring tabs and an iconbar PKG_SECTION:= x11/apps PKG_DEPENDS:= libstdcxx -PKG_BUILDDEP:= libXpm +PKG_BUILDDEP:= libXpm libXft PKG_URL:= http://www.fluxbox.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} diff --git a/package/font-util/Makefile b/package/font-util/Makefile index e71db6670..8d8c37e13 100644 --- a/package/font-util/Makefile +++ b/package/font-util/Makefile @@ -5,16 +5,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= font-util PKG_VERSION:= 1.1.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 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 + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FONT_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(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},${PKG_DESCR},${PKG_SECTION},${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, @@ -22,13 +25,23 @@ $(eval $(call PKG_template,FONT_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$ # calling pkg-config (which we don't provide) in order to # automatically find the mappings. fonts-hack: - ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/fonts/X11/util + ${INSTALL_DIR} ${STAGING_DIR}/usr/share/fonts/X11/util ${CP} ${WRKINST}/usr/share/fonts/X11/util/* \ - ${STAGING_TARGET_DIR}/usr/share/fonts/X11/util + ${STAGING_DIR}/usr/share/fonts/X11/util -post-install: fonts-hack +font-util-install: fonts-hack + ${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/ucs2any \ + ${IDIR_FONT_UTIL}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/bdftruncate \ + ${IDIR_FONT_UTIL}/usr/bin ${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/share/fonts/X11/util ${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 diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 9762afca1..0aa2e0552 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -14,20 +14,33 @@ PKG_BUILDDEP:= freetype libxml2 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 + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FONTCONFIG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(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})) CONFIGURE_ARGS+= --with-arch=${ARCH} \ --disable-docs -post-install: +fontconfig-install: ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib ${IDIR_FONTCONFIG}/etc/fonts ${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 diff --git a/package/fontconfig/patches/patch-configure b/package/fontconfig/patches/patch-configure new file mode 100644 index 000000000..2c3e4162c --- /dev/null +++ b/package/fontconfig/patches/patch-configure @@ -0,0 +1,18 @@ +--- fontconfig-2.8.0.orig/configure 2009-11-19 00:49:41.000000000 +0100 ++++ fontconfig-2.8.0/configure 2011-02-24 14:32:50.000000000 +0100 +@@ -817,6 +817,7 @@ ICONV_LIBS + ARCHITECTURE + EXEEXT_FOR_BUILD + CC_FOR_BUILD ++CFLAGS_FOR_BUILD + CROSS_COMPILING_FALSE + CROSS_COMPILING_TRUE + WARN_CFLAGS +@@ -11872,6 +11873,7 @@ if test "${ac_cv_prog_CC_FOR_BUILD+set}" + else + if test -n "$CC_FOR_BUILD"; then + ac_cv_prog_CC_FOR_BUILD="$CC_FOR_BUILD" # Let the user override the test. ++ ac_cv_prog_CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH diff --git a/package/fontconfig/patches/patch-fc-arch_Makefile_in b/package/fontconfig/patches/patch-fc-arch_Makefile_in index fd4d60d5f..1544ea22e 100644 --- a/package/fontconfig/patches/patch-fc-arch_Makefile_in +++ b/package/fontconfig/patches/patch-fc-arch_Makefile_in @@ -1,10 +1,20 @@ --- fontconfig-2.8.0.orig/fc-arch/Makefile.in 2009-11-19 00:49:37.000000000 +0100 -+++ fontconfig-2.8.0/fc-arch/Makefile.in 2009-12-04 20:07:55.995064329 +0100 -@@ -114,10 +114,10 @@ AWK = @AWK@ ++++ fontconfig-2.8.0/fc-arch/Makefile.in 2011-02-24 14:37:06.000000000 +0100 +@@ -82,7 +82,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) + AM_V_CC = $(am__v_CC_$(V)) + am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) + am__v_CC_0 = @echo " CC " $@; +@@ -114,10 +114,11 @@ AWK = @AWK@ CC = @CC_FOR_BUILD@ CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ +CFLAGS = CONFDIR = @CONFDIR@ CPP = @CPP@ @@ -13,7 +23,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -@@ -154,7 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -154,7 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -22,3 +32,12 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +@@ -249,7 +250,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + TMPL = fcarch.tmpl.h + STMPL = ${top_srcdir}/fc-arch/fcarch.tmpl.h diff --git a/package/fontconfig/patches/patch-fc-case_Makefile_in b/package/fontconfig/patches/patch-fc-case_Makefile_in index cc0e60571..ed5a403ed 100644 --- a/package/fontconfig/patches/patch-fc-case_Makefile_in +++ b/package/fontconfig/patches/patch-fc-case_Makefile_in @@ -1,7 +1,11 @@ --- fontconfig-2.8.0.orig/fc-case/Makefile.in 2009-11-19 00:49:38.000000000 +0100 -+++ fontconfig-2.8.0/fc-case/Makefile.in 2009-12-04 20:03:05.536919385 +0100 -@@ -87,17 +87,17 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++++ fontconfig-2.8.0/fc-case/Makefile.in 2011-02-24 14:30:29.000000000 +0100 +@@ -84,20 +84,20 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) AM_V_CC = $(am__v_CC_$(V)) am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; @@ -26,7 +30,7 @@ CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ -+CFLAGS = ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CONFDIR = @CONFDIR@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ diff --git a/package/fontconfig/patches/patch-fc-glyphname_Makefile_in b/package/fontconfig/patches/patch-fc-glyphname_Makefile_in index c8573a2e2..eed138f85 100644 --- a/package/fontconfig/patches/patch-fc-glyphname_Makefile_in +++ b/package/fontconfig/patches/patch-fc-glyphname_Makefile_in @@ -1,10 +1,20 @@ --- fontconfig-2.8.0.orig/fc-glyphname/Makefile.in 2009-11-19 00:49:38.000000000 +0100 -+++ fontconfig-2.8.0/fc-glyphname/Makefile.in 2009-12-04 20:06:40.117024551 +0100 -@@ -114,10 +114,10 @@ AWK = @AWK@ ++++ fontconfig-2.8.0/fc-glyphname/Makefile.in 2011-02-24 14:35:52.000000000 +0100 +@@ -82,7 +82,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) + AM_V_CC = $(am__v_CC_$(V)) + am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) + am__v_CC_0 = @echo " CC " $@; +@@ -114,10 +114,11 @@ AWK = @AWK@ CC = @CC_FOR_BUILD@ CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ +CFLAGS = CONFDIR = @CONFDIR@ CPP = @CPP@ @@ -13,7 +23,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -@@ -154,7 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -154,7 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -22,3 +32,12 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +@@ -249,7 +250,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + TMPL = fcglyphname.tmpl.h + STMPL = ${top_srcdir}/fc-glyphname/${TMPL} diff --git a/package/fontconfig/patches/patch-fc-lang_Makefile_in b/package/fontconfig/patches/patch-fc-lang_Makefile_in index da9bc5435..c557e64ab 100644 --- a/package/fontconfig/patches/patch-fc-lang_Makefile_in +++ b/package/fontconfig/patches/patch-fc-lang_Makefile_in @@ -1,7 +1,11 @@ --- fontconfig-2.8.0.orig/fc-lang/Makefile.in 2009-11-19 00:49:38.000000000 +0100 -+++ fontconfig-2.8.0/fc-lang/Makefile.in 2009-12-04 21:43:12.000000000 +0100 -@@ -85,14 +85,14 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++++ fontconfig-2.8.0/fc-lang/Makefile.in 2011-02-24 14:34:36.000000000 +0100 +@@ -82,17 +82,17 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) AM_V_CC = $(am__v_CC_$(V)) am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; @@ -17,11 +21,12 @@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -@@ -114,10 +114,10 @@ AWK = @AWK@ +@@ -114,10 +114,11 @@ AWK = @AWK@ CC = @CC_FOR_BUILD@ CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ +CFLAGS = CONFDIR = @CONFDIR@ CPP = @CPP@ @@ -30,7 +35,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -@@ -154,7 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -154,7 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -39,3 +44,12 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +@@ -249,7 +250,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + TMPL = fclang.tmpl.h + STMPL = ${top_srcdir}/fc-lang/fclang.tmpl.h diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile index dd62362e2..66cbe2a36 100644 --- a/package/fontsproto/Makefile +++ b/package/fontsproto/Makefile @@ -7,8 +7,19 @@ PKG_NAME:= fontsproto PKG_VERSION:= 2.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 6819fc82585daac68cec17938b659bf0 +PKG_DESCR:= Fonts extension headers +PKG_SECTION:= x11/devel PKG_SITES:= ${MASTER_SITE_XORG} -PKG_SUBPKGS:= 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 diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 913f99d52..fa0488195 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -14,7 +14,9 @@ PKG_BUILDDEP:= zlib PKG_URL:= http://www.freetype.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/} -PKG_SUBPKGS:= LIBFREETYPE +PKG_SUBPKGS:= LIBFREETYPE LIBFREETYPE_DEV +PKGSD_LIBFREETYPE_DEV:= FreeType headers +PKGSC_LIBFREETYPE_DEV:= devel ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly @@ -23,9 +25,20 @@ 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})) -post-install: +libfreetype-install: ${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib - ${CP} ${WRKINST}/usr/lib/libfreetype.so* ${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 diff --git a/package/fuse/Makefile b/package/fuse/Makefile index c861a06d0..01164ec2c 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -5,31 +5,52 @@ include ${TOPDIR}/rules.mk PKG_NAME:= fuse PKG_VERSION:= 2.7.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 4879f06570d2225667534c37fea04213 PKG_DESCR:= Filesystem in Userspace (utilities) PKG_SECTION:= fs -PKG_DEPENDS:= kmod-fuse-fs +PKG_DEPENDS:= kmod-fuse-fs libfuse PKG_URL:= http://fuse.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} -PKG_SUBPKGS:= FUSE_UTILS +PKG_SUBPKGS:= FUSE_UTILS LIBFUSE LIBFUSE_DEV +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})) CONFIGURE_ARGS+= --enable-lib \ - --disable-shared \ - --enable-static \ --enable-util \ --enable-example \ --disable-auto-modprobe \ --disable-mtab \ --disable-kernel-module -post-install: +fuse-utils-install: ${INSTALL_DIR} ${IDIR_FUSE_UTILS}/usr/bin ${CP} ${WRKINST}/usr/bin/fusermount ${IDIR_FUSE_UTILS}/usr/bin +libfuse-install: + ${INSTALL_DIR} ${IDIR_LIBFUSE}/usr/lib + ${CP} ${WRKINST}/usr/lib/libfuse.so* \ + ${IDIR_LIBFUSE}/usr/lib + ${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 diff --git a/package/glib/Makefile b/package/glib/Makefile index 3c8045392..807303ca1 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib PKG_VERSION:= 2.27.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= ad9c80adb624a1ffe3d9753bab8a578a PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs @@ -14,13 +14,18 @@ PKG_BUILDDEP:= gettext libiconv PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/2.27/ +PKG_SUBPKGS:= GLIB GLIB_DEV +PKGSC_GLIB_DEV:= devel +PKGSD_GLIB_DEV:= glib headers + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(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})) CONFIGURE_ARGS+= --enable-debug=no \ --disable-mem-pools \ @@ -52,7 +57,7 @@ ifneq ($(OStype),Darwin) ${MAKE} -C ${WRKBUILD} clean endif -post-install: +glib-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib ${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib ${CP} ${WRKINST}/usr/lib/libglib*.so* ${IDIR_GLIB}/usr/lib @@ -60,4 +65,15 @@ post-install: ${CP} ${WRKINST}/usr/lib/libgmodule*.so* ${IDIR_GLIB}/usr/lib ${CP} ${WRKINST}/usr/lib/libgthread*.so* ${IDIR_GLIB}/usr/lib +glib-dev-install: + ${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 \ + ${IDIR_GLIB_DEV}/usr/lib/glib-2.0/include + ${CP} ${WRKINST}/usr/include/* \ + ${IDIR_GLIB_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_GLIB_DEV}/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/glproto/Makefile b/package/glproto/Makefile index 19a1086cb..c4c970f09 100644 --- a/package/glproto/Makefile +++ b/package/glproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,GLPROTO,glproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D 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 diff --git a/package/gmp/patches/patch-Makefile_in b/package/gmp/patches/patch-Makefile_in new file mode 100644 index 000000000..d066b4d9b --- /dev/null +++ b/package/gmp/patches/patch-Makefile_in @@ -0,0 +1,38 @@ +--- gmp-4.3.2.orig/Makefile.in 2010-01-07 21:09:42.000000000 +0100 ++++ gmp-4.3.2/Makefile.in 2011-02-16 21:17:52.000000000 +0100 +@@ -1313,7 +1313,7 @@ mpz/fac_ui.h: gen-fac_ui$(EXEEXT_FOR_BUI + ./gen-fac_ui $(BITS_PER_MP_LIMB) $(GMP_NAIL_BITS) >mpz/fac_ui.h || (rm -f mpz/fac_ui.h; exit 1) + + gen-fac_ui$(EXEEXT_FOR_BUILD): gen-fac_ui$(U_FOR_BUILD).c dumbmp.c +- $(CC_FOR_BUILD) `test -f 'gen-fac_ui$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fac_ui$(U_FOR_BUILD).c -o gen-fac_ui$(EXEEXT_FOR_BUILD) ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) `test -f 'gen-fac_ui$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fac_ui$(U_FOR_BUILD).c -o gen-fac_ui$(EXEEXT_FOR_BUILD) + + gen-fac_ui_.c: gen-fac_ui.c $(ANSI2KNR) + $(CPP_FOR_BUILD) `if test -f $(srcdir)/gen-fac_ui.c; then echo $(srcdir)/gen-fac_ui.c; else echo gen-fac_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gen-fac_ui_.c || rm -f gen-fac_ui_.c +@@ -1325,7 +1325,7 @@ mpn/fib_table.c: gen-fib$(EXEEXT_FOR_BUI + ./gen-fib table $(BITS_PER_MP_LIMB) $(GMP_NAIL_BITS) >mpn/fib_table.c || (rm -f mpn/fib_table.c; exit 1) + + gen-fib$(EXEEXT_FOR_BUILD): gen-fib$(U_FOR_BUILD).c dumbmp.c +- $(CC_FOR_BUILD) `test -f 'gen-fib$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fib$(U_FOR_BUILD).c -o gen-fib$(EXEEXT_FOR_BUILD) ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) `test -f 'gen-fib$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fib$(U_FOR_BUILD).c -o gen-fib$(EXEEXT_FOR_BUILD) + + gen-fib_.c: gen-fib.c $(ANSI2KNR) + $(CPP_FOR_BUILD) `if test -f $(srcdir)/gen-fib.c; then echo $(srcdir)/gen-fib.c; else echo gen-fib.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gen-fib_.c || rm -f gen-fib_.c +@@ -1337,7 +1337,7 @@ mpn/mp_bases.c: gen-bases$(EXEEXT_FOR_BU + ./gen-bases table $(BITS_PER_MP_LIMB) $(GMP_NAIL_BITS) >mpn/mp_bases.c || (rm -f mpn/mp_bases.c; exit 1) + + gen-bases$(EXEEXT_FOR_BUILD): gen-bases$(U_FOR_BUILD).c dumbmp.c +- $(CC_FOR_BUILD) `test -f 'gen-bases$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-bases$(U_FOR_BUILD).c -o gen-bases$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD) ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) `test -f 'gen-bases$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-bases$(U_FOR_BUILD).c -o gen-bases$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD) + + gen-bases_.c: gen-bases.c $(ANSI2KNR) + $(CPP_FOR_BUILD) `if test -f $(srcdir)/gen-bases.c; then echo $(srcdir)/gen-bases.c; else echo gen-bases.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gen-bases_.c || rm -f gen-bases_.c +@@ -1346,7 +1346,7 @@ mpn/perfsqr.h: gen-psqr$(EXEEXT_FOR_BUIL + ./gen-psqr $(BITS_PER_MP_LIMB) $(GMP_NAIL_BITS) >mpn/perfsqr.h || (rm -f mpn/perfsqr.h; exit 1) + + gen-psqr$(EXEEXT_FOR_BUILD): gen-psqr$(U_FOR_BUILD).c dumbmp.c +- $(CC_FOR_BUILD) `test -f 'gen-psqr$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-psqr$(U_FOR_BUILD).c -o gen-psqr$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD) ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) `test -f 'gen-psqr$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-psqr$(U_FOR_BUILD).c -o gen-psqr$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD) + + gen-psqr_.c: gen-psqr.c $(ANSI2KNR) + $(CPP_FOR_BUILD) `if test -f $(srcdir)/gen-psqr.c; then echo $(srcdir)/gen-psqr.c; else echo gen-psqr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gen-psqr_.c || rm -f gen-psqr_.c diff --git a/package/gnupg/patches/patch-doc_Makefile_in b/package/gnupg/patches/patch-doc_Makefile_in new file mode 100644 index 000000000..dd8797231 --- /dev/null +++ b/package/gnupg/patches/patch-doc_Makefile_in @@ -0,0 +1,11 @@ +--- gnupg-1.4.10.orig/doc/Makefile.in 2009-09-02 18:20:22.000000000 +0200 ++++ gnupg-1.4.10/doc/Makefile.in 2011-02-24 15:30:49.000000000 +0100 +@@ -833,7 +833,7 @@ uninstall-man: uninstall-man1 uninstall- + + + yat2m: Makefile yat2m.c +- $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/yat2m.c + + yat2m-stamp: $(myman_sources) + @rm -f yat2m-stamp.tmp diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 025e525b2..ac51120f5 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -15,6 +15,7 @@ PKG_SITES:= http://download.berlios.de/gpsd/ PKG_URL:= http://gpsd.berlios.de/ PKG_CXX:= GPSD PKG_NEED_CXX:= 1 +PKG_CFLINE_GPSD:= depends on !ADK_NATIVE PKG_SUBPKGS:= GPSD GPSD_CLIENTS PKGSD_GPSD_CLIENTS:= GPS client utilities diff --git a/package/imlib2/Makefile b/package/imlib2/Makefile index 0bf66f4a0..166d9cd40 100644 --- a/package/imlib2/Makefile +++ b/package/imlib2/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 20d59c7cda06742015baade6f5975415 PKG_DESCR:= Version 2 of an advanced replacement library for libraries like libXpm PKG_SECTION:= libs -PKG_DEPENDS:= libfreetype -PKG_BUILDDEP:= freetype +PKG_DEPENDS:= libfreetype zlib libpng libtiff +PKG_BUILDDEP:= freetype zlib libpng libtiff PKG_URL:= http://www.enlightenment.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} @@ -22,8 +22,8 @@ post-install: $(INSTALL_DIR) $(IDIR_IMLIB2)/usr/lib/imlib2/{filters,loaders} ${CP} $(WRKINST)/usr/lib/libImlib2.so* $(IDIR_IMLIB2)/usr/lib ${CP} $(WRKINST)/usr/lib/imlib2/filters/*.so \ - $(IDIR_IMLIB2)/usr/lib/imlib2/filters/ + $(IDIR_IMLIB2)/usr/lib/imlib2/filters ${CP} $(WRKINST)/usr/lib/imlib2/loaders/*.so \ - $(IDIR_IMLIB2)/usr/lib/imlib2/loaders/ + $(IDIR_IMLIB2)/usr/lib/imlib2/loaders include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile index 09cccadd3..c72d957ce 100644 --- a/package/inputproto/Makefile +++ b/package/inputproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,INPUTPROTO,inputproto,$(PKG_VERSION)-${PKG_RELEASE},$ 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 diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index 911e5c474..4f12836d5 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -12,9 +12,9 @@ PKG_SECTION:= libs PKG_URL:= http://www.ijg.org/ PKG_SITES:= http://www.ijg.org/files/ -PKG_SUBPKGS:= LIBJPEG JPEG_DEV -PKGSD_JPEG_DEV:= development files for jpeg -PKGSC_JPEG_DEV:= devel +PKG_SUBPKGS:= LIBJPEG LIBJPEG_DEV +PKGSD_LIBJPEG_DEV:= development files for libjpeg +PKGSC_LIBJPEG_DEV:= devel DISTFILES:= ${PKG_NAME}src.v${PKG_VERSION}.tar.gz @@ -25,14 +25,14 @@ 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,JPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_JPEG_DEV},${PKGSC_JPEG_DEV})) +$(eval $(call PKG_template,LIBJPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBJPEG_DEV},${PKGSC_LIBJPEG_DEV})) -post-install: +libjpeg-install: ${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib ${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/ -jpeg-dev-install: - ${INSTALL_DIR} ${IDIR_JPEG_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/*.h ${IDIR_JPEG_DEV}/usr/include +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 diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile index 764a3417b..e1bd153f7 100644 --- a/package/kbproto/Makefile +++ b/package/kbproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,KBPROTO,kbproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D 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 diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 73fcc246e..2a352e419 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://web.mit.edu/kerberos/ PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/${PKG_VERSION}/ PKG_NOPARALLEL:= 1 -PKG_SUBPKGS:= KRB5_SERVER KRB5_CLIENT LIBKRB5 LIBKRB5_DEV +PKG_SUBPKGS:= KRB5_SERVER KRB5_CLIENT KRB5_UTIL LIBKRB5 LIBKRB5_DEV PKGSD_LIBKRB5:= MIT kerberos libraries PKGSC_LIBKRB5:= libs PKGSD_LIBKRB5_DEV:= MIT kerberos headers @@ -23,6 +23,9 @@ PKGSC_LIBKRB5_DEV:= devel PKGSD_KRB5_CLIENT:= MIT kerberos client tools PKGSC_KRB5_CLIENT:= crypto PKGSS_KRB5_CLIENT:= libkrb5 libncurses libss libcom-err +PKGSD_KRB5_UTIL:= MIT kerberos utility (ktutil) +PKGSC_KRB5_UTIL:= crypto +PKGSS_KRB5_UTIL:= libkrb5 libncurses libss libcom-err DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-signed.tar WRKSRC= ${WRKDIST}/src @@ -35,6 +38,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})) @@ -56,13 +60,18 @@ pre-build: # fix nm call in script, we need the GNU version of nm $(SED) "s#@@NM@@#${NM}#" ${WRKSRC}/util/export-check.pl +krb5-util-install: + ${INSTALL_DIR} ${IDIR_KRB5_UTIL}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/ktutil \ + ${IDIR_KRB5_UTIL}/usr/bin + krb5-server-install: ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/sbin ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib/krb5/plugins/kdb ${INSTALL_DATA} ./files/kdc.conf ${IDIR_KRB5_SERVER}/etc/krb5kdc ${INSTALL_DATA} ./files/kadm5.acl ${IDIR_KRB5_SERVER}/etc/krb5kdc - ${INSTALL_BIN} ${WRKINST}/usr/bin/{ktutil,kadmin} \ + ${INSTALL_BIN} ${WRKINST}/usr/bin/kadmin \ ${IDIR_KRB5_SERVER}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/{kdb5_util,krb5kdc,kadmind,kadmin.local} \ ${IDIR_KRB5_SERVER}/usr/sbin diff --git a/package/libICE/Makefile b/package/libICE/Makefile index 7502e80e8..183543a2c 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -12,12 +12,24 @@ 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 + 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})) -post-install: +libice-install: ${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib - ${CP} ${WRKINST}/usr/lib/libICE.so* ${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 diff --git a/package/libSM/Makefile b/package/libSM/Makefile index 33c09cf6e..0b733dcc0 100644 --- a/package/libSM/Makefile +++ b/package/libSM/Makefile @@ -13,12 +13,24 @@ PKG_DEPENDS:= libuuid PKG_BUILDDEP:= libICE PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBSM LIBSM_DEV +PKGSD_LIBSM_DEV:= X11 Session Management headers +PKGSC_LIBSM_DEV:= x11/devel + 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})) -post-install: +libsm-install: ${INSTALL_DIR} ${IDIR_LIBSM}/usr/lib - ${CP} ${WRKINST}/usr/lib/libSM.so* ${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 diff --git a/package/libX11/Makefile b/package/libX11/Makefile index c2118216f..b6849296e 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -32,13 +32,17 @@ CONFIGURE_ARGS+= --enable-xlocale \ --disable-xf86bigfont \ --disable-malloc0returnsnull -post-install: +libx11-install: ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11 ${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libX11-xcb* ${IDIR_LIBX11}/usr/lib/ ${CP} ${WRKINST}/usr/share/X11/XErrorDB ${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 diff --git a/package/libXau/Makefile b/package/libXau/Makefile index 469affdf7..2fb248b80 100644 --- a/package/libXau/Makefile +++ b/package/libXau/Makefile @@ -33,5 +33,8 @@ 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 diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile index ba6d24f92..d4211c992 100644 --- a/package/libXaw/Makefile +++ b/package/libXaw/Makefile @@ -12,12 +12,19 @@ PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXext libXmu libXpm PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXAW LIBXAW_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},${PKG_DESCR},${PKG_SECTION})) -post-install: +libxaw-install: ${INSTALL_DIR} ${IDIR_LIBXAW}/usr/lib - ${CP} ${WRKINST}/usr/lib/libXaw*.so* ${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 diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile index b9f482c02..6fb285b24 100644 --- a/package/libXcomposite/Makefile +++ b/package/libXcomposite/Makefile @@ -25,9 +25,7 @@ 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})) -CONFIGURE_ARGS+= --disable-malloc0returnsnull - -post-install: +libxcomposite-install: ${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE}/usr/lib ${CP} ${WRKINST}/usr/lib/libXcomposite.so* ${IDIR_LIBXCOMPOSITE}/usr/lib/ diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile index 05f30993f..aff71cd56 100644 --- a/package/libXdamage/Makefile +++ b/package/libXdamage/Makefile @@ -12,13 +12,24 @@ PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXfixes damageproto PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXDAMAGE LIBXDAMAGE_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},${PKG_DESCR},${PKG_SECTION})) -post-install: +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 diff --git a/package/libXext/Makefile b/package/libXext/Makefile index 64fec7852..6caddfc93 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -27,7 +27,7 @@ $(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE} CONFIGURE_ARGS+= --disable-malloc0returnsnull -post-install: +libxext-install: ${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib ${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/ @@ -35,5 +35,8 @@ 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 diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile index 7895a0a3c..9a6f5b308 100644 --- a/package/libXfixes/Makefile +++ b/package/libXfixes/Makefile @@ -10,16 +10,27 @@ PKG_MD5SUM:= 556ffa2e75f2a3b5d92d004a6b124a6d PKG_DESCR:= X Fixes Library PKG_SECTION:= x11/libs PKG_BUILDDEP:= fixesproto xextproto xproto libX11 -PKG_URL:= http://xorg.freedesktop.org -PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ +PKG_URL:= http://xorg.freedesktop.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +PKG_SUBPKGS:= LIBXFIXES LIBXFIXES_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},${PKG_DESCR},${PKG_SECTION})) -post-install: +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 diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index 0122fb89a..092155f91 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -13,14 +13,24 @@ 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 + 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})) CONFIGURE_ENV+= ac_cv_path_XMLTO=true -post-install: +libxfont-install: ${INSTALL_DIR} ${IDIR_LIBXFONT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libXfont.so* ${IDIR_LIBXFONT}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libXfont.so* ${IDIR_LIBXFONT}/usr/lib + +libxfont-dev-install: + ${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 diff --git a/package/libXft/Makefile b/package/libXft/Makefile index ea477afaa..50f3fc68d 100644 --- a/package/libXft/Makefile +++ b/package/libXft/Makefile @@ -12,15 +12,24 @@ PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXrender PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXFT LIBXFT_DEV +PKGSD_LIBXFT_DEV:= X FreeType headers +PKGSC_LIBXFT_DEV:= x11/devel + 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})) CONFIGURE_ARGS+= --disable-malloc0returnsnull \ --disable-install-makestrs -post-install: +libxft-install: ${INSTALL_DIR} ${IDIR_LIBXFT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libXft.so* ${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 include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile index 2d7c3cc3c..d00b6eea8 100644 --- a/package/libXmu/Makefile +++ b/package/libXmu/Makefile @@ -12,13 +12,25 @@ PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXt PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXMU LIBXMU_DEV +PKGSD_LIBXMU_DEV:= X miscellaneous utility function headers +PKGSC_LIBXMU_DEV:= x11/devel + 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})) -post-install: +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/ + ${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 diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile index 5e9f033ff..e3b12fc2d 100644 --- a/package/libXpm/Makefile +++ b/package/libXpm/Makefile @@ -11,14 +11,26 @@ PKG_DESCR:= common operation for the XPM pixmap format 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 + 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})) CONFIGURE_ENV+= ac_cv_search_gettext=no -post-install: +libxpm-install: ${INSTALL_DIR} ${IDIR_LIBXPM}/usr/lib - ${CP} ${WRKINST}/usr/lib/libXpm.so* ${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 diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile index ecffa3bcd..3e9804449 100644 --- a/package/libXrender/Makefile +++ b/package/libXrender/Makefile @@ -12,6 +12,10 @@ PKG_SECTION:= x11/libs PKG_BUILDDEP:= renderproto PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXRENDER LIBXRENDER_DEV +PKGSD_LIBXRENDER_DEV:= X11 rendering headers +PKGSC_LIBXRENDER_DEV:= x11/devel + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif @@ -19,11 +23,19 @@ 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 -post-install: +libxrender-install: ${INSTALL_DIR} ${IDIR_LIBXRENDER}/usr/lib - ${CP} ${WRKINST}/usr/lib/libXrender.so* ${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 diff --git a/package/libXt/Makefile b/package/libXt/Makefile index b58822b89..559c19521 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -7,20 +7,31 @@ PKG_NAME:= libXt PKG_VERSION:= 1.0.9 PKG_RELEASE:= 1 PKG_MD5SUM:= 091ed356b8ab9ca4fcbb471f738ca544 -PKG_DESCR:= X Toolkit Intrinsics +PKG_DESCR:= X Toolkit Intrinsics libraries PKG_SECTION:= x11/libs PKG_BUILDDEP:= libSM PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXT LIBXT_DEV +PKGSD_LIBXT_DEV:= X Toolkit Intrinsics headers +PKGSC_LIBXT_DEV:= x11/devel + 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})) -CONFIGURE_ARGS+= --disable-malloc0returnsnull \ - --disable-install-makestrs +CONFIGURE_ARGS+= --disable-malloc0returnsnull -post-install: +libxt-install: ${INSTALL_DIR} ${IDIR_LIBXT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libXt.so* ${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 diff --git a/package/libXv/Makefile b/package/libXv/Makefile index dbbda7f86..8d58326e5 100644 --- a/package/libXv/Makefile +++ b/package/libXv/Makefile @@ -7,19 +7,32 @@ PKG_NAME:= libXv PKG_VERSION:= 1.0.6 PKG_RELEASE:= 1 PKG_MD5SUM:= a7184aa3e3f405792a09ccd6447caf67 -PKG_DESCR:= X11 Xvideo extensions +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 + 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})) CONFIGURE_ARGS+= --disable-malloc0returnsnull -post-install: +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 diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile index e881b4be4..1ad227777 100644 --- a/package/libXxf86vm/Makefile +++ b/package/libXxf86vm/Makefile @@ -12,15 +12,28 @@ 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 + 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})) CONFIGURE_ARGS+= --disable-malloc0returnsnull -post-install: +libxxf86vm-install: $(INSTALL_DIR) $(IDIR_LIBXXF86VM)/usr/lib ${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 diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile index e681dbee8..c8c514c4b 100644 --- a/package/libaudiofile/Makefile +++ b/package/libaudiofile/Makefile @@ -12,15 +12,27 @@ 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 + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBAUDIOFILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(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})) CONFIGURE_ENV+= ac_cv_linux_vers=2 CONFIGURE_ARGS+= --with-build-cc=${CC_FOR_BUILD} -post-install: +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 diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile index ebe03f276..e38044d53 100644 --- a/package/libdnet/Makefile +++ b/package/libdnet/Makefile @@ -12,15 +12,28 @@ PKG_SECTION:= libs PKG_URL:= http://libdnet.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=$(PKG_NAME)/} +PKG_SUBPKGS:= LIBDNET LIBDNET_DEV +PKGSD_LIBDNET_DEV:= headers for a low-level networking library +PKGSC_LIBDNET_DEV:= devel + include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBDNET,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBDNET_DEV,libdnet-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBDNET_DEV},${PKGSC_LIBDNET_DEV})) CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no CONFIGURE_ARGS+= --without-check -post-install: +libdnet-install: $(INSTALL_DIR) $(IDIR_LIBDNET)/usr/lib - $(CP) $(WRKINST)/usr/lib/libdnet.so* $(IDIR_LIBDNET)/usr/lib/ + $(CP) $(WRKINST)/usr/lib/libdnet.so* $(IDIR_LIBDNET)/usr/lib + +libdnet-dev-install: + $(INSTALL_DIR) $(IDIR_LIBDNET_DEV)/usr/bin + $(CP) $(WRKINST)/usr/bin/dnet-config $(IDIR_LIBDNET_DEV)/usr/bin + $(INSTALL_DIR) $(IDIR_LIBDNET_DEV)/usr/include + $(CP) $(WRKINST)/usr/include/* \ + $(IDIR_LIBDNET_DEV)/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile index 87230cfd2..5a63a01b2 100644 --- a/package/libdrm/Makefile +++ b/package/libdrm/Makefile @@ -13,13 +13,26 @@ PKG_BUILDDEP:= libpthread-stubs PKG_URL:= http://dri.freedesktop.org/wiki/ PKG_SITES:= http://dri.freedesktop.org/libdrm/ +PKG_SUBPKGS:= LIBDRM LIBDRM_DEV +PKGSD_LIBDRM_DEV:= DRM headers +PKGSC_LIBDRM_DEV:= devel + include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBDRM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBDRM,libdrm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBDRM_DEV,libdrm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBDRM_DEV},${PKGSC_LIBDRM_DEV})) -post-install: +libdrm-install: $(INSTALL_DIR) $(IDIR_LIBDRM)/usr/lib $(CP) $(WRKINST)/usr/lib/libdrm*.so* \ $(IDIR_LIBDRM)/usr/lib +libdrm-dev-install: + $(INSTALL_DIR) $(IDIR_LIBDRM_DEV)/usr/lib/pkgconfig + $(INSTALL_DATA) ${WRKINST}/usr/lib/pkgconfig/*.pc \ + $(IDIR_LIBDRM_DEV)/usr/lib/pkgconfig + $(INSTALL_DIR) $(IDIR_LIBDRM_DEV)/usr/include + ${CP} ${WRKINST}/usr/include/* \ + $(IDIR_LIBDRM_DEV)/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libevent/Makefile b/package/libevent/Makefile index 25897ad61..43452e092 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -18,10 +18,10 @@ PKGSC_LIBEVENT_DEV:= devel include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBEVENT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBEVENT_DEV,libevent-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEVENT_DEV},${PKGSC_LIBEVENT_DEV})) -post-install: +libevent-install: $(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib $(CP) $(WRKINST)/usr/lib/libevent*.so* $(IDIR_LIBEVENT)/usr/lib diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile index 5f038aee5..bc40cd015 100644 --- a/package/libfontenc/Makefile +++ b/package/libfontenc/Makefile @@ -16,9 +16,17 @@ PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBFONTENC_DEV,libfontenc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -post-install: +libfontenc-install: ${INSTALL_DIR} ${IDIR_LIBFONTENC}/usr/lib - ${CP} ${WRKINST}/usr/lib/libfontenc.so* ${IDIR_LIBFONTENC}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libfontenc.so* ${IDIR_LIBFONTENC}/usr/lib + +libfontenc-dev-install: + ${INSTALL_DIR} ${IDIR_LIBFONTENC_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBFONTENC_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBFONTENC_DEV}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/fontenc.pc \ + ${IDIR_LIBFONTENC_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 9600093f4..3da73861c 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -14,16 +14,26 @@ PKG_BUILDDEP:= libgpg-error PKG_URL:= http://directory.fsf.org/project/libgcrypt PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ +PKG_SUBPKGS:= LIBGCRYPT LIBGCRYPT_DEV +PKGSD_LIBGCRYPT_DEV:= GNU crypto headers +PKGSC_LIBGCRYPT_DEV:= devel + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGCRYPT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBGCRYPT_DEV,libgcrypt-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGCRYPT_DEV},${PKGSC_LIBGCRYPT_DEV})) CONFIGURE_ARGS+= --disable-asm \ --with-gpg-error-prefix="${STAGING_TARGET_DIR}/usr" -post-install: +libgcrypt-install: ${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/lib ${CP} ${WRKINST}/usr/lib/libgcrypt.so* \ - ${IDIR_LIBGCRYPT}/usr/lib/ + ${IDIR_LIBGCRYPT}/usr/lib + +libgcrypt-dev-install: + ${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/include + ${CP} ${WRKINST}/usr/include/* \ + ${IDIR_LIBGCRYPT}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index f0c126cf8..9f19388ac 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -12,15 +12,28 @@ PKG_SECTION:= libs PKG_URL:= http://www.gnupg.org/ PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ +PKG_SUBPKGS:= LIBGPG_ERROR LIBGPG_ERROR_DEV +PKGSD_LIBGPG_ERROR_DEV:=common error code and description headers +PKGSC_LIBGPG_ERROR_DEV:=devel + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGPG_ERROR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBGPG_ERROR_DEV,libgpg-error-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGPG_ERROR_DEV},${PKGSC_LIBGPG_ERROR_DEV})) -post-install: +libgpg-error-install: ${INSTALL_DIR} ${IDIR_LIBGPG_ERROR}/usr/lib ${CP} ${WRKINST}/usr/lib/libgpg-error.so* \ - ${IDIR_LIBGPG_ERROR}/usr/lib/ + ${IDIR_LIBGPG_ERROR}/usr/lib + +libgpg-error-dev-install: + ${INSTALL_DIR} ${IDIR_LIBGPG_ERROR_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/gpg-error.h \ + ${IDIR_LIBGPG_ERROR_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBGPG_ERROR_DEV}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/gpg-error-config \ + ${IDIR_LIBGPG_ERROR_DEV}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile index 5aecc028b..fb8011912 100644 --- a/package/liblzo/Makefile +++ b/package/liblzo/Makefile @@ -12,17 +12,24 @@ PKG_SECTION:= libs PKG_URL:= http://www.oberhumer.com/opensource/lzo PKG_SITES:= http://www.oberhumer.com/opensource/lzo/download/ -PKG_SUBPKGS:= LIBLZO +PKG_SUBPKGS:= LIBLZO LIBLZO_DEV +PKGSD_LIBLZO_DEV:= lzo library headers +PKGSC_LIBLZO_DEV:= devel include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBLZO_DEV,liblzo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBLZO_DEV},${PKGSC_LIBLZO_DEV})) CONFIGURE_ARGS+= --enable-static MAKE_FLAGS+= CFLAGS_O="${TARGET_CFLAGS}" -post-install: - ${INSTALL_DIR} ${IDIR_LIBLZO}/usr/lib/ +liblzo-install: + ${INSTALL_DIR} ${IDIR_LIBLZO}/usr/lib ${CP} ${WRKINST}/usr/lib/liblzo2.so* ${IDIR_LIBLZO}/usr/lib +liblzo-dev-install: + ${INSTALL_DIR} ${IDIR_LIBLZO_DEV}/usr/include/lzo + ${CP} ${WRKINST}/usr/include/lzo/*.h ${IDIR_LIBLZO_DEV}/usr/include/lzo + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libogg/Makefile b/package/libogg/Makefile index f9d5e5fe9..473812746 100644 --- a/package/libogg/Makefile +++ b/package/libogg/Makefile @@ -23,7 +23,7 @@ $(eval $(call PKG_template,LIBOGG_DEV,libogg-dev,${PKG_VERSION}-${PKG_RELEASE},$ post-install: ${INSTALL_DIR} ${IDIR_LIBOGG}/usr/lib - ${CP} ${WRKINST}/usr/lib/libogg.so* ${IDIR_LIBOGG}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libogg.so* ${IDIR_LIBOGG}/usr/lib libogg-dev-install: ${INSTALL_DIR} ${IDIR_LIBOGG_DEV}/usr/include/ogg diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index eee796502..6b2f09072 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -12,12 +12,17 @@ PKG_SECTION:= libs PKG_URL:= http://www.tcpdump.org/ PKG_SITES:= http://www.tcpdump.org/release/ +PKG_SUBPKGS:= LIBPCAP LIBPCAP_DEV +PKGSD_LIBPCAP_DEV:= headers for a low-level packet capture library +PKGSC_LIBPCAP_DEV:= devel + PKG_FLAVOURS_LIBPCAP:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBPCAP,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBPCAP_DEV,libpcap-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCAP_DEV},${PKGSC_LIBPCAP_DEV})) CONFIGURE_ENV+= ac_cv_linux_vers=26 CONFIGURE_ARGS+= --disable-yydebug \ @@ -33,8 +38,12 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -post-install: - ${INSTALL_DIR} ${IDIR_LIBPCAP}/usr/lib/ - ${CP} ${WRKINST}/usr/lib/libpcap.so* ${IDIR_LIBPCAP}/usr/lib/ +libpcap-install: + ${INSTALL_DIR} ${IDIR_LIBPCAP}/usr/lib + ${CP} ${WRKINST}/usr/lib/libpcap.so* ${IDIR_LIBPCAP}/usr/lib + +libpcap-dev-install: + ${INSTALL_DIR} ${IDIR_LIBPCAP_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPCAP_DEV}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile index 1e06f6940..06fe50386 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -7,17 +7,30 @@ PKG_NAME:= libpciaccess PKG_VERSION:= 0.11.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 8f7ea197384e5ddd1c355f55e639f677 -PKG_DESCR:= X.org libpciaccess library +PKG_DESCR:= X.org PCI access library PKG_SECTION:= x11/libs -PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ +PKG_SITES:= ${MASTER_SITE_XORG} + +PKG_SUBPKGS:= LIBPCIACCESS LIBPCIACCESS_DEV +PKGSD_LIBPCIACCESS_DEV:=X.org PCI access headers +PKGSC_LIBPCIACCESS_DEV:=devel include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBPCIACCESS,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBPCIACCESS_DEV,libpciaccess-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCIACCESS_DEV},${PKGSC_LIBPCIACCESS_DEV})) -post-install: +libpciaccess-install: ${INSTALL_DIR} ${IDIR_LIBPCIACCESS}/usr/lib ${CP} ${WRKINST}/usr/lib/libpciaccess.so* \ - ${IDIR_LIBPCIACCESS}/usr/lib/ + ${IDIR_LIBPCIACCESS}/usr/lib + +libpciaccess-dev-install: + ${INSTALL_DIR} ${IDIR_LIBPCIACCESS_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/pciaccess.h \ + ${IDIR_LIBPCIACCESS_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBPCIACCESS_DEV}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/pciaccess.pc \ + ${IDIR_LIBPCIACCESS_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile index 0a0693fb9..4896008b8 100644 --- a/package/libpthread-stubs/Makefile +++ b/package/libpthread-stubs/Makefile @@ -17,6 +17,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) post-install: - ${INSTALL_DIR} ${IDIR_LIBPTHREAD_STUBS}/usr + ${INSTALL_DIR} ${IDIR_LIBPTHREAD_STUBS}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/pthread-stubs.pc \ + ${IDIR_LIBPTHREAD_STUBS}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index 27060c07f..0782930e6 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -3,7 +3,7 @@ include ${TOPDIR}/rules.mk -PKG_NAME:= libtiff +PKG_NAME:= tiff PKG_VERSION:= 3.9.4 PKG_RELEASE:= 3 PKG_MD5SUM:= 2006c1bdd12644dbf02956955175afd6 @@ -16,9 +16,6 @@ PKG_SUBPKGS:= LIBTIFF LIBTIFF_DEV PKGSD_LIBTIFF_DEV:= development files for libtiff PKGSC_LIBTIFF_DEV:= devel -DISTFILES:= tiff-${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/tiff-${PKG_VERSION} - ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif @@ -28,7 +25,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBTIFF_DEV,libtiff-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBTIFF_DEV},${PKGSC_LIBTIFF_DEV},${PKG_OPTS})) -CONFIGURE_ARGS+= --disable-cxx --disable-rpath +CONFIGURE_ARGS+= --disable-cxx \ + --disable-rpath post-install: ${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index 7e4c59366..98f9aca9b 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -13,11 +13,14 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://pupnp.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pupnp/} +PKG_SUBPKGS:= LIBUPNP LIBUPNP_DEV + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBUPNP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBUPNP,libupnp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBUPNP_DEV,libupnp-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TARGET_CFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-samples @@ -26,8 +29,12 @@ post-build: sed -i -e 's#^libdir=.*#libdir=#' \ ${WRKBUILD}/threadutil/libthreadutil.la -post-install: +libupnp-install: ${INSTALL_DIR} ${IDIR_LIBUPNP}/usr/lib - ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBUPNP}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBUPNP}/usr/lib + +libupnp-dev-install: + ${INSTALL_DIR} ${IDIR_LIBUPNP_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBUPNP_DEV}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libusb/Makefile b/package/libusb/Makefile index 189329275..8818e6310 100644 --- a/package/libusb/Makefile +++ b/package/libusb/Makefile @@ -27,12 +27,15 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBUSB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBUSB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_DEV},${PKGSC_LIBUSB_DEV},${PKG_OPTS})) -post-install: +libusb-install: ${INSTALL_DIR} ${IDIR_LIBUSB}/usr/lib - ${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib libusb-dev-install: ${INSTALL_DIR} ${IDIR_LIBUSB_DEV}/usr/include ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBUSB_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBUSB_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_LIBUSB_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index 5684df06b..b854a4b4f 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -14,14 +14,14 @@ PKG_SITES:= ${MASTER_SITE_XORG} PKG_SUBPKGS:= LIBXCB LIBXCB_DEVEL -PKGSD_LIBXCB_DEVEL:= XML-XCB protocol headers -PKGSS_LIBXCB_DEVEL:= libxcb -PKGSC_LIBXCB_DEVEL:= x11/devel +PKGSD_LIBXCB_DEV:= XML-XCB protocol headers +PKGSS_LIBXCB_DEV:= libxcb +PKGSC_LIBXCB_DEV:= x11/devel include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXCB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBXCB_DEVEL,${PKG_NAME}-devel,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXCB_DEVEL},${PKGSD_LIBXCB_DEVEL},${PKGSC_LIBXCB_DEVEL})) +$(eval $(call PKG_template,LIBXCB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXCB_DEV},${PKGSD_LIBXCB_DEV},${PKGSC_LIBXCB_DEV})) include $(TOPDIR)/mk/python.mk @@ -31,8 +31,11 @@ libxcb-install: ${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib ${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib/ -libxcb-devel-install: - ${INSTALL_DIR} ${IDIR_LIBXCB_DEVEL}/usr/include - ${CP} ${WRKINST}/usr/include/xcb ${IDIR_LIBXCB_DEVEL}/usr/include +libxcb-dev-install: + ${INSTALL_DIR} ${IDIR_LIBXCB_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/xcb ${IDIR_LIBXCB_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBXCB_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_LIBXCB_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile index 2dc277b09..a2de15f21 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -12,12 +12,25 @@ PKG_SECTION:= x11/libs PKG_BUILDDEP:= kbproto libX11 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXKBFILE LIBXKBFILE_DEV +PKGSD_LIBXKBFILE_DEV:= X11 keyboard configuration extension headers +PKGSC_LIBXKBFILE_DEV:= devel + include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXKBFILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBXKBFILE_DEV,libxkbfile-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXKBFILE_DEV},${PKGSC_LIBXKBFILE_DEV})) -post-install: +libxkbfile-install: ${INSTALL_DIR} ${IDIR_LIBXKBFILE}/usr/lib - ${CP} ${WRKINST}/usr/lib/libxkbfile.so* ${IDIR_LIBXKBFILE}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libxkbfile.so* ${IDIR_LIBXKBFILE}/usr/lib + +libxkbfile-dev-install: + ${INSTALL_DIR} ${IDIR_LIBXKBFILE_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* \ + ${IDIR_LIBXKBFILE_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBXKBFILE_DEV}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xkbfile.pc \ + ${IDIR_LIBXKBFILE_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index f2def369f..19f12828d 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -58,5 +58,11 @@ libxml2-install: libxml2-dev-install: ${INSTALL_DIR} ${IDIR_LIBXML2_DEV}/usr/include ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXML2_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBXML2_DEV}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/libxml-2.0.pc \ + ${IDIR_LIBXML2_DEV}/usr/lib/pkgconfig + ${INSTALL_DIR} ${IDIR_LIBXML2_DEV}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/xml2-config \ + ${IDIR_LIBXML2_DEV}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index d5c3fcb84..130e98685 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -14,13 +14,16 @@ PKG_BUILDDEP:= libxml2 PKG_URL:= http://xmlsoft.org/XSLT PKG_SITES:= http://xmlsoft.org/sources/ -PKG_SUBPKGS:= LIBXSLT XSLTPROC -PKGSD_XSLTPROC:= xslt processor utility +PKG_SUBPKGS:= LIBXSLT LIBXSLT_DEV XSLTPROC +PKGSD_LIBXSLT_DEV:= XSLT headers +PKGSC_LIBXSLT_DEV:= devel +PKGSD_XSLTPROC:= XSLT processor utility PKGSC_XSLTPROC:= misc include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBXSLT_DEV,libxslt-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXSLT_DEV},${PKGSC_LIBXSLT_DEV})) $(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" \ @@ -38,6 +41,13 @@ xsltproc-install: libxslt-install: ${INSTALL_DIR} ${IDIR_LIBXSLT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib + +libxslt-dev-install: + ${INSTALL_DIR} ${IDIR_LIBXSLT_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXSLT_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBXSLT_DEV}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/xslt-config \ + ${IDIR_LIBXSLT_DEV}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/neon/Makefile b/package/neon/Makefile index 6a4b4de73..39f77a483 100644 --- a/package/neon/Makefile +++ b/package/neon/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= neon -PKG_VERSION:= 0.29.4 +PKG_VERSION:= 0.29.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 29438dbdaee84db2d7fbc73248a92d93 +PKG_MD5SUM:= ff369e69ef0f0143beb5626164e87ae2 PKG_DESCR:= HTTP and WebDAV library PKG_SECTION:= libs PKG_DEPENDS:= libpthread libxml2 libopenssl zlib @@ -14,16 +14,29 @@ PKG_BUILDDEP:= libpthread libxml2 openssl zlib PKG_URL:= http://webdav.org/neon/ PKG_SITES:= http://webdav.org/neon/ +PKG_SUBPKGS:= NEON NEON_DEV +PKGSC_NEON_DEV:= devel +PKGSD_NEON_DEV:= HTTP and WebDAV headers + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NEON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,NEON,neon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,NEON_DEV,neon-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_NEON_DEV},${PKGSC_NEON_DEV})) CONFIGURE_ARGS+= --with-ssl=openssl \ --without-gssapi \ --with-libxml2 -post-install: +neon-install: ${INSTALL_DIR} ${IDIR_NEON}/usr/lib - $(CP) ${WRKINST}/usr/lib/lib*.so* ${IDIR_NEON}/usr/lib + $(CP) ${WRKINST}/usr/lib/libneon.so* ${IDIR_NEON}/usr/lib + +neon-dev-install: + ${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/lib/pkgconfig + ${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/include/neon + ${INSTALL_DATA} ${WRKINST}/usr/include/neon/*.h \ + ${IDIR_NEON_DEV}/usr/include/neon + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/neon.pc \ + ${IDIR_NEON_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcre/Makefile b/package/pcre/Makefile index af078446e..5bf61fae9 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -12,17 +12,27 @@ PKG_SECTION:= libs PKG_URL:= http://www.pcre.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/} -PKG_SUBPKGS:= LIBPCRE +PKG_SUBPKGS:= LIBPCRE LIBPCRE_DEV include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBPCRE_DEV,libpcre-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --disable-cpp XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} -post-install: +libpcre-install: ${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib ${CP} ${WRKINST}/usr/lib/libpcre{,posix}.so* ${IDIR_LIBPCRE}/usr/lib/ +libpcre-dev-install: + ${INSTALL_DIR} ${IDIR_LIBPCRE_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/*.h \ + ${IDIR_LIBPCRE_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBPCRE_DEV}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_LIBPCRE_DEV}/usr/lib/pkgconfig + + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pixman/Makefile b/package/pixman/Makefile index d79684b2d..50b61a3a9 100644 --- a/package/pixman/Makefile +++ b/package/pixman/Makefile @@ -11,16 +11,29 @@ PKG_DESCR:= Pixel manipulation library PKG_SECTION:= x11/libs PKG_SITES:= http://www.cairographics.org/releases/ +PKG_SUBPKGS:= PIXMAN PIXMAN_DEV +PKGSC_PIXMAN_DEV:= devel +PKGSD_PIXMAN_DEV:= Pixel manipulation headers + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,PIXMAN,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,PIXMAN_DEV,pixman-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PIXMAN_DEV},${PKGSC_PIXMAN_DEV},${PKG_OPTS})) -post-install: +pixman-install: ${INSTALL_DIR} ${IDIR_PIXMAN}/usr/lib ${CP} ${WRKINST}/usr/lib/libpixman-1.so* ${IDIR_PIXMAN}/usr/lib/ +pixman-dev-install: + ${INSTALL_DIR} ${IDIR_PIXMAN_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* \ + ${IDIR_PIXMAN_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_PIXMAN_DEV}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_PIXMAN_DEV}/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/quagga/patches/patch-configure b/package/quagga/patches/patch-configure new file mode 100644 index 000000000..3780d661a --- /dev/null +++ b/package/quagga/patches/patch-configure @@ -0,0 +1,20 @@ +--- quagga-0.99.17.orig/configure 2010-08-19 11:43:02.000000000 +0200 ++++ quagga-0.99.17/configure 2011-02-16 22:51:51.000000000 +0100 +@@ -14188,7 +14188,7 @@ if test "${ac_cv_func_malloc_0_nonnull+s + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +- ac_cv_func_malloc_0_nonnull=no ++ ac_cv_func_malloc_0_nonnull=yes + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -14640,7 +14640,7 @@ if test "${ac_cv_func_realloc_0_nonnull+ + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +- ac_cv_func_realloc_0_nonnull=no ++ ac_cv_func_realloc_0_nonnull=yes + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile index 88d098170..9a7d64aab 100644 --- a/package/randrproto/Makefile +++ b/package/randrproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,RANDRPROTO,randrproto,$(PKG_VERSION)-${PKG_RELEASE},$ post-install: ${INSTALL_DIR} ${IDIR_RANDRPROTO}/usr/include ${CP} ${WRKINST}/usr/include/X11 ${IDIR_RANDRPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_RANDRPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/randrproto.pc \ + ${IDIR_RANDRPROTO}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/readline/Makefile b/package/readline/Makefile index 3126e9a33..bbd9f6c2b 100644 --- a/package/readline/Makefile +++ b/package/readline/Makefile @@ -13,17 +13,25 @@ PKG_DEPENDS:= libncurses PKG_BUILDDEP:= ncurses PKG_SITES:= ${MASTER_SITE_GNU:=readline/} -PKG_SUBPKGS:= LIBREADLINE +PKG_SUBPKGS:= LIBREADLINE LIBREADLINE_DEV +PKGSD_LIBREADLINE_DEV:= readline headers +PKGSC_LIBREADLINE_DEV:= devel include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBREADLINE,libreadline,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBREADLINE_DEV,libreadline-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBREADLINE_DEV},${PKGSC_LIBREADLINE_DEV})) CONFIGURE_ARGS+= --with-curses -post-install: +libreadline-install: ${INSTALL_DIR} ${IDIR_LIBREADLINE}/usr/lib - ${CP} ${WRKINST}/usr/lib/libhistory.so* ${IDIR_LIBREADLINE}/usr/lib/ - ${CP} ${WRKINST}/usr/lib/libreadline.so* ${IDIR_LIBREADLINE}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libhistory.so* ${IDIR_LIBREADLINE}/usr/lib + ${CP} ${WRKINST}/usr/lib/libreadline.so* ${IDIR_LIBREADLINE}/usr/lib + +libreadline-dev-install: + ${INSTALL_DIR} ${IDIR_LIBREADLINE_DEV}/usr/include/readline + ${CP} ${WRKINST}/usr/include/readline/*.h \ + ${IDIR_LIBREADLINE_DEV}/usr/include/readline include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/recordproto/Makefile b/package/recordproto/Makefile index 03a54e599..b2fc60d8f 100644 --- a/package/recordproto/Makefile +++ b/package/recordproto/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= recordproto PKG_VERSION:= 1.14.1 PKG_RELEASE:= 1 -PKG_DESCR:= X headers +PKG_DESCR:= RECORD extension headers PKG_SECTION:= x11/devel PKG_MD5SUM:= a558e1c6f67871e3fb94d65d67eb2f3b PKG_SITES:= ${MASTER_SITE_XORG} @@ -18,5 +18,8 @@ $(eval $(call PKG_template,RECORDPROTO,recordproto,$(PKG_VERSION)-${PKG_RELEASE} post-install: ${INSTALL_DIR} ${IDIR_RECORDPROTO}/usr/include ${CP} ${WRKINST}/usr/include/X11 ${IDIR_RECORDPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_RECORDPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/recordproto.pc \ + ${IDIR_RECORDPROTO}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/renderproto/Makefile b/package/renderproto/Makefile index e24f8529f..0bb539050 100644 --- a/package/renderproto/Makefile +++ b/package/renderproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,RENDERPROTO,renderproto,$(PKG_VERSION)-${PKG_RELEASE} post-install: ${INSTALL_DIR} ${IDIR_RENDERPROTO}/usr/include ${CP} ${WRKINST}/usr/include/X11 ${IDIR_RENDERPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_RENDERPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/renderproto.pc \ + ${IDIR_RENDERPROTO}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/resourceproto/Makefile b/package/resourceproto/Makefile index 01f66fead..639dae213 100644 --- a/package/resourceproto/Makefile +++ b/package/resourceproto/Makefile @@ -6,9 +6,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:= resourceproto PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 +PKG_DESCR:= Resource extension headers +PKG_SECTION:= x11/devel PKG_MD5SUM:= 587333b4995a3e11ebe4c8ba2742efaf PKG_SITES:= ${MASTER_SITE_XORG} -PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,RESOURCEPROTO,resourceproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +post-install: + ${INSTALL_DIR} ${IDIR_RESOURCEPROTO}/usr/include + ${CP} ${WRKINST}/usr/include/X11 ${IDIR_RESOURCEPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_RESOURCEPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/resourceproto.pc \ + ${IDIR_RESOURCEPROTO}/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/scrnsaverproto/Makefile b/package/scrnsaverproto/Makefile index b3c8bf170..c983baca2 100644 --- a/package/scrnsaverproto/Makefile +++ b/package/scrnsaverproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,SCRNSAVERPROTO,scrnsaverproto,$(PKG_VERSION)-${PKG_RE post-install: ${INSTALL_DIR} ${IDIR_SCRNSAVERPROTO}/usr/include ${CP} ${WRKINST}/usr/include/X11 ${IDIR_SCRNSAVERPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_SCRNSAVERPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/scrnsaverproto.pc \ + ${IDIR_SCRNSAVERPROTO}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/videoproto/Makefile b/package/videoproto/Makefile index 3aeac6a4c..3c16b7e7e 100644 --- a/package/videoproto/Makefile +++ b/package/videoproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,VIDEOPROTO,videoproto,$(PKG_VERSION)-${PKG_RELEASE},$ post-install: ${INSTALL_DIR} ${IDIR_VIDEOPROTO}/usr/include ${CP} ${WRKINST}/usr/include/X11 ${IDIR_VIDEOPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_VIDEOPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/videoproto.pc \ + ${IDIR_VIDEOPROTO}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index f553ca74d..2f3c756c6 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -15,15 +15,24 @@ PKG_SITES:= ${MASTER_SITE_XORG} 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})) +$(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) include $(TOPDIR)/mk/python.mk CONFIGURE_ENV+= PYTHON=$(PYTHON) -post-install: +xcb-proto-install: ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share/ ${CP} ${WRKINST}/usr/share/xcb ${IDIR_XCB_PROTO}/usr/share - ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/xcb - ${CP} ${WRKINST}/usr/share/xcb/* ${STAGING_TARGET_DIR}/usr/share/xcb + ${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb + ${CP} ${WRKINST}/usr/share/xcb/* ${STAGING_DIR}/usr/share/xcb + ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xcb-proto.pc \ + ${IDIR_XCB_PROTO}/usr/lib/pkgconfig + +xcb-python-install: + ${INSTALL_DIR} ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ + ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xcmiscproto/Makefile b/package/xcmiscproto/Makefile index 7bddac765..4121d8a31 100644 --- a/package/xcmiscproto/Makefile +++ b/package/xcmiscproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,XCMISCPROTO,xcmiscproto,$(PKG_VERSION)-${PKG_RELEASE} post-install: ${INSTALL_DIR} ${IDIR_XCMISCPROTO}/usr/include ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XCMISCPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_XCMISCPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xcmiscproto.pc \ + ${IDIR_XCMISCPROTO}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile index 579a79e06..54c5283fa 100644 --- a/package/xextproto/Makefile +++ b/package/xextproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,XEXTPROTO,xextproto,$(PKG_VERSION)-${PKG_RELEASE},${P post-install: ${INSTALL_DIR} ${IDIR_XEXTPROTO}/usr/include ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XEXTPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_XEXTPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xextproto.pc \ + ${IDIR_XEXTPROTO}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xf86dgaproto/Makefile b/package/xf86dgaproto/Makefile index 7582fda4a..05a2ed6f4 100644 --- a/package/xf86dgaproto/Makefile +++ b/package/xf86dgaproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,XF86DGAPROTO,xf86dgaproto,$(PKG_VERSION)-${PKG_RELEAS post-install: ${INSTALL_DIR} ${IDIR_XF86DGAPROTO}/usr/include ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XF86DGAPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_XF86DGAPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xf86dgaproto.pc \ + ${IDIR_XF86DGAPROTO}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xf86driproto/Makefile b/package/xf86driproto/Makefile index 77a292ac8..e61a4faa6 100644 --- a/package/xf86driproto/Makefile +++ b/package/xf86driproto/Makefile @@ -6,11 +6,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xf86driproto PKG_VERSION:= 2.1.0 PKG_RELEASE:= 1 +PKG_DESCR:= X DRI Protocol headers +PKG_SECTION:= x11/devel PKG_MD5SUM:= 309d552732666c3333d7dc63e80d042f -PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/ -PKG_SUBPKGS:= +PKG_SITES:= ${MASTER_SITE_XORG} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XF86DRIPROTO,xf86driproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +post-install: + ${INSTALL_DIR} ${IDIR_XF86DRIPROTO}/usr/include + ${CP} ${WRKINST}/usr/include/* \ + ${IDIR_XF86DRIPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_XF86DRIPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xf86driproto.pc \ + ${IDIR_XF86DRIPROTO}/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xf86vidmodeproto/Makefile b/package/xf86vidmodeproto/Makefile index 22ba8d867..f4bbc01d7 100644 --- a/package/xf86vidmodeproto/Makefile +++ b/package/xf86vidmodeproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,XF86VIDMODEPROTO,xf86vidmodeproto,$(PKG_VERSION)-${PK post-install: ${INSTALL_DIR} ${IDIR_XF86VIDMODEPROTO}/usr/include ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XF86VIDMODEPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_XF86VIDMODEPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xf86vidmodeproto.pc \ + ${IDIR_XF86VIDMODEPROTO}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 37fcb2df7..28abb1d5d 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -20,6 +20,8 @@ PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto recordproto PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= XORG_SERVER XORG_SERVER_DEV + PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA PKG_FLAVOURS_XORG_SERVER:= WITH_DRI @@ -27,9 +29,26 @@ PKGFS_WITH_DRI:= mesalib PKGFD_WITH_DRI:= enable DRI/DRI2 support PKGFB_WITH_DRI:= xf86driproto glproto dri2proto MesaLib +PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_CRYPTO +PKGCD_WITH_GCRYPT:= use libgcrypt for SHA1 +PKGCS_WITH_GCRYPT:= libgcrypt +PKGCB_WITH_GCRYPT:= libgcrypt +PKGCD_WITH_CRYPTO:= use openssl libcrypto for SHA1 +PKGCS_WITH_CRYPTO:= libopenssl +PKGCB_WITH_CRYPTO:= openssl + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y) +CONFIGURE_ARGS+= --with-sha1=libgcrypt +endif + +ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_CRYPTO},y) +CONFIGURE_ARGS+= --with-sha1=libcrypto +endif CONFIGURE_ENV+= V=1 CONFIGURE_ARGS+= --with-fontdir=/usr/share/fonts/X11 \ @@ -68,7 +87,7 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) CONFIGURE_ARGS+= --with-int10=stub endif -post-install: +xorg-server-install: $(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11 $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions @@ -90,4 +109,12 @@ ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions endif +xorg-server-dev-install: + $(INSTALL_DIR) $(IDIR_XORG_SERVER_DEV)/usr/include/xorg + ${CP} ${WRKINST}/usr/include/xorg/* \ + $(IDIR_XORG_SERVER_DEV)/usr/include/xorg + $(INSTALL_DIR) $(IDIR_XORG_SERVER_DEV)/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/xorg-server.pc \ + $(IDIR_XORG_SERVER_DEV)/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xproto/Makefile b/package/xproto/Makefile index 399c5d89b..8e3cb19f9 100644 --- a/package/xproto/Makefile +++ b/package/xproto/Makefile @@ -18,5 +18,8 @@ $(eval $(call PKG_template,XPROTO,xproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP post-install: ${INSTALL_DIR} ${IDIR_XPROTO}/usr/include ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XPROTO}/usr/include + ${INSTALL_DIR} ${IDIR_XPROTO}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xproto.pc \ + ${IDIR_XPROTO}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xterm/Makefile b/package/xterm/Makefile index 2ddda31f2..f9f3e97d7 100644 --- a/package/xterm/Makefile +++ b/package/xterm/Makefile @@ -9,7 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 3945ab70cfa2a9e95804157ee1b0f8e8 PKG_DESCR:= Terminal Emulator for X Windows PKG_SECTION:= x11/apps -PKG_DEPENDS:= xorg-server libxaw +PKG_DEPENDS:= xorg-server libxaw libxt +PKG_BUILDDEP:= libXt libXmu libXaw PKG_URL:= http://invisible-island.net/xterm/xterm.html PKG_SITES:= ftp://invisible-island.net/xterm/ diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile index bc65d64d0..7f23582dc 100644 --- a/package/xtrans/Makefile +++ b/package/xtrans/Makefile @@ -20,5 +20,8 @@ CONFIGURE_ARGS+= --datadir=/usr/lib post-install: ${INSTALL_DIR} ${IDIR_XTRANS}/usr/include ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XTRANS}/usr/include + ${INSTALL_DIR} ${IDIR_XTRANS}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xtrans.pc \ + ${IDIR_XTRANS}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 948e8c0be..e817ee41c 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -24,6 +24,12 @@ out=0 . $topdir/.config if [[ -n $ADK_NATIVE ]];then + if [[ -n $ADK_PACKAGE_NEON ]];then + NEED_LIBXML2_DEV="$NEED_LIBXML2_DEV neon" + fi + if [[ -n $ADK_PACKAGE_LZOP ]];then + NEED_LZODEV="$NEED_LZODEV lzop" + fi if [[ -n $ADK_PACKAGE_LIBIMAGEMAGICK ]];then NEED_JPEGDEV="$NEED_JPEGDEV libimagemagick" NEED_TIFFDEV="$NEED_TIFFDEV libimagemagick" @@ -153,6 +159,13 @@ if [[ -n $NEED_LIBTIRPCDEV ]];then fi fi +if [[ -n $NEED_LIBXML2_DEV ]];then + if ! test -f /usr/include/libxml2/libxml/xmlversion.h >/dev/null; then + echo >&2 You need libxml2 headers to build $NEED_LIBXML2_DEV + out=1 + fi +fi + if [[ -n $NEED_LIBKRB5DEV ]];then if ! test -f /usr/include/krb5.h >/dev/null; then echo >&2 You need krb5 headers to build $NEED_LIBKRB5DEV @@ -171,14 +184,21 @@ fi if [[ -n $NEED_TIFFDEV ]];then if ! test -f /usr/include/tiff.h >/dev/null; then - echo >&2 You need tiff headers to build $NEED_TIFFDEV + echo >&2 You need libtiff headers to build $NEED_TIFFDEV out=1 fi fi if [[ -n $NEED_JPEGDEV ]];then if ! test -f /usr/include/jpeglib.h >/dev/null; then - echo >&2 You need jpeg headers to build $NEED_JPEGDEV + echo >&2 You need libjpeg headers to build $NEED_JPEGDEV + out=1 + fi +fi + +if [[ -n $NEED_LZODEV ]];then + if ! test -f /usr/include/lzo/lzo1.h >/dev/null; then + echo >&2 You need liblzo headers to build $NEED_LZODEV out=1 fi fi diff --git a/target/config/Config.in b/target/config/Config.in index b8fab0255..7dd6c1947 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -275,6 +275,7 @@ config ADK_TARGET_SUFFIX default "gnu" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && !ADK_EABI default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI default "uclibc" if ADK_TARGET_LIB_UCLIBC && !ADK_EABI + default "gnu" choice prompt "Target firmware type" |