diff options
Diffstat (limited to 'package')
24 files changed, 332 insertions, 26 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile new file mode 100644 index 000000000..648befeeb --- /dev/null +++ b/package/ImageMagick/Makefile @@ -0,0 +1,68 @@ +# 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:= ImageMagick +PKG_VERSION:= 6.6.5 +PKG_EXTRAVER:= 10 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a07a97cfb28b588cbcf83ffa9ec92e3f +PKG_DESCR:= image processing and converting utility +PKG_SECTION:= multimedia +PKG_BUILDDEP:= jpeg libtiff +PKG_DEPENDS:= libjpeg libtiff +PKG_URL:= http://www.imagemagick.org/ +PKG_SITES:= http://image_magick.veidrodis.com/image_magick/ + +PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK +PKGSD_LIBIMAGEMAGICK:= imagemagick library +PKGSC_LIBIMAGEMAGICK:= libs +PKGSD_CONVERT:= image processing and converting utility +PKGSC_CONVERT:= multimedia +PKGSS_CONVERT:= libimagemagick +PKGSD_DISPLAY:= image display application +PKGSC_DISPLAY:= multimedia +PKGSS_DISPLAY:= libimagemagick +PKGSB_DISPLAY:= libX11 + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIMAGEMAGICK},${PKGSC_LIBIMAGEMAGICK})) +$(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT})) +$(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_CONVERT}+= convert-install +SUB_INSTALLS-${ADK_PACKAGE_DISPLAY}+= display-install + +CONFIGURE_ARGS+= --with-magick-plus-plus=no + +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} + $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib + $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config + $(INSTALL_DATA) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config/* \ + $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config + $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/share/${PKG_NAME}-${PKG_VERSION}/config + $(INSTALL_DATA) $(WRKINST)/usr/share/${PKG_NAME}-${PKG_VERSION}/config/* \ + $(IDIR_LIBIMAGEMAGICK)/usr/share/${PKG_NAME}-${PKG_VERSION}/config + $(CP) $(WRKINST)/usr/lib/libMagickCore.so* \ + $(IDIR_LIBIMAGEMAGICK)/usr/lib + $(CP) $(WRKINST)/usr/lib/libMagickWand.so* \ + $(IDIR_LIBIMAGEMAGICK)/usr/lib + +convert-install: + $(INSTALL_DIR) $(IDIR_CONVERT)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/convert \ + $(IDIR_CONVERT)/usr/bin + +display-install: + $(INSTALL_DIR) $(IDIR_DISPLAY)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/display \ + $(IDIR_DISPLAY)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index edccc86d0..e22c7d566 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -727,7 +727,7 @@ config BUSYBOX_TR config BUSYBOX_FEATURE_TR_CLASSES bool "Enable character classes (such as [:upper:])" - default n + default y depends on BUSYBOX_TR help Enable character classes, enabling commands such as: @@ -735,7 +735,7 @@ config BUSYBOX_FEATURE_TR_CLASSES config BUSYBOX_FEATURE_TR_EQUIV bool "Enable equivalence classes" - default n + default y depends on BUSYBOX_TR help Enable equivalence classes, which essentially add the enclosed diff --git a/package/drbd/Makefile b/package/drbd/Makefile new file mode 100644 index 000000000..c8d69e2a0 --- /dev/null +++ b/package/drbd/Makefile @@ -0,0 +1,32 @@ +# 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:= drbd +PKG_VERSION:= 8.3.8.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 551dae488006af86a33eab1eba407f48 +PKG_DESCR:= DRBD admin tools +PKG_SECTION:= fs +PKG_URL:= http://www.drbd.org/ +PKG_SITES:= http://oss.linbit.com/drbd/8.3/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,DRBD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --with-distro=generic \ + --without-km \ + --without-xen \ + --without-udev + +post-install: + $(INSTALL_DIR) $(IDIR_DRBD)/usr/lib/drbd + $(INSTALL_DIR) $(IDIR_DRBD)/usr/sbin + $(CP) $(WRKINST)/usr/lib/drbd/* \ + $(IDIR_DRBD)/usr/lib/drbd/ + $(INSTALL_BIN) $(WRKINST)/sbin/drbd* \ + $(IDIR_DRBD)/usr/sbin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/drbd/patches/patch-Makefile_in b/package/drbd/patches/patch-Makefile_in new file mode 100644 index 000000000..bce8496a1 --- /dev/null +++ b/package/drbd/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- drbd-8.3.8.1.orig/Makefile.in 2010-07-09 10:13:59.000000000 +0200 ++++ drbd-8.3.8.1/Makefile.in 2010-11-26 19:00:49.000000000 +0100 +@@ -47,7 +47,7 @@ WITH_BASHCOMPLETION = @WITH_BASHCOMPLETI + # and not in e.g. dash. I'm too lazy to fix it to be compatible. + SHELL=/bin/bash + +-SUBDIRS = user scripts documentation drbd ++SUBDIRS = user scripts drbd + + REL_VERSION := $(shell $(SED) -ne '/^\#define REL_VERSION/{s/^[^"]*"\([^ "]*\).*/\1/;p;q;}' drbd/linux/drbd_config.h) + ifdef FORCE diff --git a/package/drbd/patches/patch-drbd_Makefile b/package/drbd/patches/patch-drbd_Makefile new file mode 100644 index 000000000..809caca26 --- /dev/null +++ b/package/drbd/patches/patch-drbd_Makefile @@ -0,0 +1,11 @@ +--- drbd-8.3.8.1.orig/drbd/Makefile 2010-07-06 09:47:59.000000000 +0200 ++++ drbd-8.3.8.1/drbd/Makefile 2010-11-26 18:59:47.000000000 +0100 +@@ -132,7 +132,7 @@ else + echo -e "\treturn \"GIT-hash: $$GITHEAD$$GITDIFF\""; \ + fi ; \ + echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}"; \ +- mv --force $@.new $@ ++ mv -f $@.new $@ + + kbuild: drbd_buildtag.c + @rm -f .drbd_kernelrelease* diff --git a/package/drbd/patches/patch-drbd_drbd_buildtag_c b/package/drbd/patches/patch-drbd_drbd_buildtag_c new file mode 100644 index 000000000..7a8358ea7 --- /dev/null +++ b/package/drbd/patches/patch-drbd_drbd_buildtag_c @@ -0,0 +1,9 @@ +--- drbd-8.3.8.1.orig/drbd/drbd_buildtag.c 2010-07-09 10:19:05.000000000 +0200 ++++ drbd-8.3.8.1/drbd/drbd_buildtag.c 2010-11-26 18:59:58.000000000 +0100 +@@ -3,5 +3,5 @@ + const char *drbd_buildtag(void) + { + return "GIT-hash: 0d8589fcc32c874df57c930ca1691399b55ec893" +- " build by lars@soda, 2010-07-09 10:19:24"; ++ " build by wbx@neon.lan, 2010-11-26 18:59:58"; + } diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile index d88504298..5e7b2ce62 100644 --- a/package/evilwm/Makefile +++ b/package/evilwm/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= evilwm PKG_VERSION:= 1.0.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 8fd9256c635cce2289b648a01d54202c PKG_DESCR:= A minimalist window manager for the X Window System PKG_SECTION:= x11/apps diff --git a/package/evilwm/patches/patch-keymap_h b/package/evilwm/patches/patch-keymap_h new file mode 100644 index 000000000..fe06ccf74 --- /dev/null +++ b/package/evilwm/patches/patch-keymap_h @@ -0,0 +1,41 @@ +--- evilwm-1.0.1.orig/keymap.h 2009-03-30 12:37:06.000000000 +0200 ++++ evilwm-1.0.1/keymap.h 2010-11-27 00:37:21.000000000 +0100 +@@ -2,29 +2,29 @@ + #define _KEYMAP_H + + #define KEY_NEXT XK_Tab +-#define KEY_NEW XK_Return +-#define KEY_TOPLEFT XK_y +-#define KEY_TOPRIGHT XK_u +-#define KEY_BOTTOMLEFT XK_b +-#define KEY_BOTTOMRIGHT XK_n ++#define KEY_NEW XK_e ++#define KEY_TOPLEFT XK_a ++#define KEY_TOPRIGHT XK_s ++#define KEY_BOTTOMLEFT XK_y ++#define KEY_BOTTOMRIGHT XK_x + #define KEY_LEFT XK_h + #define KEY_RIGHT XK_l + #define KEY_DOWN XK_j +-#define KEY_UP XK_k ++#define KEY_UP XK_g + #define KEY_LOWER XK_Insert + #define KEY_ALTLOWER XK_KP_Insert + #define KEY_INFO XK_i + #define KEY_MAXVERT XK_equal +-#define KEY_MAX XK_x ++#define KEY_MAX XK_m + #ifdef VWM +-# define KEY_FIX XK_f ++# define KEY_FIX XK_d + # define KEY_PREVDESK XK_Left + # define KEY_NEXTDESK XK_Right + #endif + /* Mixtures of Ctrl, Alt an Escape are used for things like VMWare and + * XFree86/Cygwin, so the KILL key is an option in the Makefile */ + #ifndef KEY_KILL +-#define KEY_KILL XK_Escape ++#define KEY_KILL XK_k + #endif + + #endif diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index 4b91d88b3..2ab0d4941 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -5,14 +5,16 @@ include ${TOPDIR}/rules.mk PKG_NAME:= jpeg PKG_VERSION:= 7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 382ef33b339c299b56baf1296cda9785 PKG_DESCR:= The Independent JPEG Groups JPEG runtime library PKG_SECTION:= libs PKG_URL:= http://www.ijg.org/ PKG_SITES:= http://www.ijg.org/files/ -PKG_SUBPKGS:= LIBJPEG +PKG_SUBPKGS:= LIBJPEG JPEG_DEV +PKGSD_JPEG_DEV:= development files for jpeg +PKGSC_JPEG_DEV:= devel DISTFILES:= ${PKG_NAME}src.v${PKG_VERSION}.tar.gz @@ -23,9 +25,18 @@ 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})) -post-install: +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_JPEG_DEV}+= jpeg-dev-install + +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${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 + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 4d7e7794e..153a08f12 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -5,14 +5,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libX11 PKG_VERSION:= 1.3.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= b68aebbfcac1174c4c95d260e9369766 PKG_DESCR:= X11 client-side library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto +PKG_BUILDDEP:= xproto xextproto xtrans libXdmcp libXau +PKG_BUILDDEP+= xcmiscproto bigreqsproto kbproto inputproto PKG_SITES:= ${MASTER_SITE_XORG} PKG_SUBPKGS:= LIBX11 LIBX11_DEV +PKGSD_LIBX11_DEV:= X11 headers +PKGSC_LIBX11_DEV:= devel ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly @@ -21,7 +24,7 @@ endif include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBX11_DEV},${PKGSC_LIBX11_DEV},${PKG_OPTS})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= @@ -42,7 +45,5 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} libx11-dev-install: ${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/include/X11 ${CP} ${WRKINST}/usr/include/X11/*.h ${IDIR_LIBX11_DEV}/usr/include/X11 - ${CP} ${STAGING_DIR}/usr/include/xproto/X11/*.h \ - ${IDIR_LIBX11_DEV}/usr/include/X11 include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXScrnSaver/Makefile b/package/libXScrnSaver/Makefile index d87b396ff..271982407 100644 --- a/package/libXScrnSaver/Makefile +++ b/package/libXScrnSaver/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 72ca7f37e4a1794acbdd9ab047821e8b PKG_DESCR:= X.Org XScrnSaver library -PKG_SECTION:= libs +PKG_SECTION:= x11/libs PKG_BUILDDEP:= scrnsaverproto PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/libXau/Makefile b/package/libXau/Makefile index 0f00fe064..21d31154e 100644 --- a/package/libXau/Makefile +++ b/package/libXau/Makefile @@ -5,12 +5,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXau PKG_VERSION:= 1.0.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 1a421d9376f43596fe068ce209a70b84 PKG_DESCR:= X11 authorisation library PKG_SECTION:= x11/libs PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXAU LIBXAU_DEV +PKGSD_LIBXAU_DEV:= Xauth headers +PKGSC_LIBXAU_DEV:= devel + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif @@ -18,9 +22,20 @@ endif include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBXAU_DEV,libxau-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXAU_DEV},${PKGSC_LIBXAU_DEV},${PKG_OPTS})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBXAU_DEV}+=libxau-dev-install -post-install: + +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib ${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/ +libxau-dev-install: + ${INSTALL_DIR} ${IDIR_LIBXAU_DEV}/usr/include/X11/ + ${CP} ${WRKINST}/usr/include/X11/* \ + ${IDIR_LIBXAU_DEV}/usr/include/X11/ + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile index d81ed113f..8e795c2cf 100644 --- a/package/libXdamage/Makefile +++ b/package/libXdamage/Makefile @@ -8,9 +8,8 @@ PKG_VERSION:= 1.1.2 PKG_RELEASE:= 1 PKG_MD5SUM:= f8f19f747c8445213d5409ae8b8b2f0a PKG_DESCR:= X Window System client interface to the DAMAGE extension to the X protocol -PKG_SECTION:= libs +PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXfixes damageproto -PKG_URL:= add project url PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ include $(TOPDIR)/mk/package.mk diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile index 330990163..f4a731f9c 100644 --- a/package/libXdmcp/Makefile +++ b/package/libXdmcp/Makefile @@ -5,12 +5,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXdmcp PKG_VERSION:= 1.0.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c3f1bce1affc7dfbc222145e00e1310e PKG_DESCR:= X11 display manager control protocol library PKG_SECTION:= x11/libs PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXDMCP LIBXDMCP_DEV +PKGSD_LIBXDMCP_DEV:= XDMCP headers +PKGSC_LIBXDMCP_DEV:= devel + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif @@ -18,9 +22,20 @@ endif include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBXDMCP_DEV,libxdmcp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDMCP_DEV},${PKGSC_LIBXDMCP_DEV},${PKG_OPTS})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBXDMCP_DEV}+=libxdmcp-dev-install -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_LIBXDMCP}/usr/lib ${CP} ${WRKINST}/usr/lib/libXdmcp.so* ${IDIR_LIBXDMCP}/usr/lib/ +libxdmcp-dev-install: + ${INSTALL_DIR} ${IDIR_LIBXDMCP_DEV}/usr/include/X11/ + ${CP} ${WRKINST}/usr/include/X11/* \ + ${IDIR_LIBXDMCP_DEV}/usr/include/X11/ + + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXext/Makefile b/package/libXext/Makefile index f7011ddad..3763d444f 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -12,6 +12,10 @@ PKG_SECTION:= x11/libs PKG_BUILDDEP:= libX11 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXEXT LIBXEXT_DEV +PKGSD_LIBXEXT_DEV:= X11 extension headers +PKGSC_LIBXEXT_DEV:= devel + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif @@ -19,11 +23,21 @@ endif include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBXEXT_DEV}+=libxext-dev-install CONFIGURE_ARGS+= --disable-malloc0returnsnull -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib ${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/ +libxext-dev-install: + ${INSTALL_DIR} ${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions + ${CP} ${WRKINST}/usr/include/X11/extensions/*.h \ + ${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile index 27ad3da19..0bf1fe8d4 100644 --- a/package/libXfixes/Makefile +++ b/package/libXfixes/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 4.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 86eb4b916cd5948c0e20d279107b3331 PKG_DESCR:= X Fixes Library -PKG_SECTION:= libs +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/ diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile index 4e2f8ea0e..3d5d6edcb 100644 --- a/package/libXxf86vm/Makefile +++ b/package/libXxf86vm/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libXxf86vm PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 52b49483eccbdd1566b8c560fe7f76e8 -PKG_DESCR:= add short description -PKG_SECTION:= libs +PKG_DESCR:= an interface to the XFree86-VidModeExtension extension +PKG_SECTION:= x11/libs PKG_BUILDDEP:= xf86vidmodeproto libXext PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index b06ba0058..ebd9988bf 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -5,13 +5,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtiff PKG_VERSION:= 3.9.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 2006c1bdd12644dbf02956955175afd6 PKG_DESCR:= A library for reading/writing TIFF images PKG_SECTION:= libs PKG_URL:= http://www.libtiff.org/ PKG_SITES:= ftp://ftp.remotesensing.org/pub/libtiff/ +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} @@ -22,11 +26,20 @@ endif 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})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBTIFF_DEV}+= libtiff-dev-install CONFIGURE_ARGS+= --disable-cxx -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib ${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/ +libtiff-dev-install: + ${INSTALL_DIR} ${IDIR_LIBTIFF_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBTIFF_DEV}/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sudo/Makefile b/package/sudo/Makefile new file mode 100644 index 000000000..cdde122fe --- /dev/null +++ b/package/sudo/Makefile @@ -0,0 +1,32 @@ +# 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:= sudo +PKG_VERSION:= 1.7.4p4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 55d9906535d70a1de347cd3d3550ee87 +PKG_DESCR:= su do +PKG_SECTION:= misc +PKG_URL:= http://www.courtesan.com/sudo/ +PKG_SITES:= http://www.courtesan.com/sudo/dist/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,SUDO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --without-pam + +post-install: + $(INSTALL_DIR) $(IDIR_SUDO)/usr/bin + $(INSTALL_DIR) $(IDIR_SUDO)/usr/sbin + $(INSTALL_DIR) $(IDIR_SUDO)/etc + $(INSTALL_DATA) ./files/sudoers $(IDIR_SUDO)/etc + chmod 440 $(IDIR_SUDO)/etc/sudoers + $(INSTALL_BIN) $(WRKINST)/usr/bin/sudo \ + $(IDIR_SUDO)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/visudo \ + $(IDIR_SUDO)/usr/sbin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sudo/files/sudo.postinst b/package/sudo/files/sudo.postinst new file mode 100644 index 000000000..300ea80ef --- /dev/null +++ b/package/sudo/files/sudo.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +chmod u+s /usr/bin/sudo diff --git a/package/sudo/files/sudoers b/package/sudo/files/sudoers new file mode 100644 index 000000000..9e839c9cb --- /dev/null +++ b/package/sudo/files/sudoers @@ -0,0 +1,3 @@ +## sudoers file. +root ALL=(ALL) ALL +%root ALL=(ALL) ALL diff --git a/package/x11-headers/Makefile b/package/x11-headers/Makefile new file mode 100644 index 000000000..3b5327c35 --- /dev/null +++ b/package/x11-headers/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= x11-headers +PKG_VERSION:= 1.0 +PKG_RELEASE:= 1 +PKG_DESCR:= X11 header files +PKG_BUILDDEP:= xproto xtrans xextproto +PKG_BUILDDEP+= xcmiscproto bigreqsproto kbproto inputproto +PKG_SECTION:= devel + +NO_DISTFILES:= 1 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,X11_HEADERS,x11-headers,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +do-install: + ${INSTALL_DIR} ${IDIR_X11_HEADERS}/usr/include + ${CP} ${STAGING_DIR}/usr/include/X11 ${IDIR_X11_HEADERS}/usr/include + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 465ffb99a..503a59988 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xorg-server PKG_VERSION:= 1.7.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2 PKG_DESCR:= Xorg server PKG_SECTION:= x11/server @@ -80,7 +80,6 @@ post-install: ${CP} ${WRKINST}/usr/lib/xorg/protocol.txt \ $(IDIR_XORG_SERVER)/usr/lib/xorg/ ${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin - chmod u+s $(IDIR_XORG_SERVER)/usr/bin/Xorg ${CP} ${WRKINST}/usr/lib/xorg/modules/*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \ diff --git a/package/xorg-server/files/xorg-server.postinst b/package/xorg-server/files/xorg-server.postinst index 386bf95c2..0d8bd0d14 100644 --- a/package/xorg-server/files/xorg-server.postinst +++ b/package/xorg-server/files/xorg-server.postinst @@ -2,3 +2,4 @@ . $IPKG_INSTROOT/etc/functions.sh gid=$(get_next_gid) add_group video $gid +chmod u+s /usr/bin/X |