From b4b676ce7436ce3e6f9f6b20cc2004d3d721ea6e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 4 Mar 2011 19:49:01 +0100 Subject: rename package to db, add subpkg for development files --- package/bogofilter/Makefile | 2 +- package/db/Makefile | 53 ++++++++++++++++++++++++++++++ package/db/patches/patch-dist_ltmain_sh | 11 +++++++ package/heimdal/Makefile | 4 +-- package/libdb/Makefile | 46 -------------------------- package/libdb/patches/patch-dist_ltmain_sh | 11 ------- package/openldap/Makefile | 2 +- 7 files changed, 68 insertions(+), 61 deletions(-) create mode 100644 package/db/Makefile create mode 100644 package/db/patches/patch-dist_ltmain_sh delete mode 100644 package/libdb/Makefile delete mode 100644 package/libdb/patches/patch-dist_ltmain_sh (limited to 'package') diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index 4b6f589fc..43d257564 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 39d27c13eae8a5064d68e20d585e60de PKG_DESCR:= mail filter PKG_SECTION:= mail +PKG_BUILDDEP:= libiconv db PKG_DEPENDS:= libiconv libdb -PKG_BUILDDEP:= libiconv libdb PKG_URL:= http://bogofilter.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bogofilter/} PKG_NEED_CXX:= 1 diff --git a/package/db/Makefile b/package/db/Makefile new file mode 100644 index 000000000..9038b74eb --- /dev/null +++ b/package/db/Makefile @@ -0,0 +1,53 @@ +# 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:= db +PKG_VERSION:= 4.7.25 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ec2b87e833779681a0c3a814aa71359e +PKG_DESCR:= disk file format database which stores key/data-pairs in single files +PKG_SECTION:= libs +PKG_URL:= http://www.oracle.com/technology/software/products/berkeley-db +PKG_SITES:= http://www.openadk.org/distfiles/ +PKG_NEED_CXX:= 1 + +PKG_SUBPKGS:= LIBDB LIBDB_DEV +PKGSC_LIBDB_DEV:= devel +PKGSD_LIBDB_DEV:= libdb headers + +WRKBUILD= ${WRKSRC}/build_unix + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBDB_DEV,libdb-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBDB_DEV},${PKGSC_LIBDB_DEV})) + +CONFIGURE_PROG:= dist/configure +CONFIGURE_ARGS+= --enable-smallbuild \ + --disable-debug_rop \ + --disable-debug_wop \ + --disable-diagnostic \ + --disable-java \ + --disable-cxx \ + --disable-posixmutexes \ + --disable-uimutexes \ + --disable-tcl \ + --disable-rpc \ + --disable-compat185 \ + --disable-statistics \ + --disable-replication \ + --disable-cryptography \ + --disable-queue \ + --with-mutex=UNIX/fcntl + +libdb-install: + ${INSTALL_DIR} ${IDIR_LIBDB}/usr/lib + ${CP} ${WRKINST}/usr/lib/libdb*.so ${IDIR_LIBDB}/usr/lib + +libdb-dev-install: + ${INSTALL_DIR} ${IDIR_LIBDB_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBDB_DEV}/usr/include + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/db/patches/patch-dist_ltmain_sh b/package/db/patches/patch-dist_ltmain_sh new file mode 100644 index 000000000..e9ff24a13 --- /dev/null +++ b/package/db/patches/patch-dist_ltmain_sh @@ -0,0 +1,11 @@ +--- db-4.7.25.orig/dist/ltmain.sh 2006-06-27 03:03:33.000000000 +0200 ++++ db-4.7.25/dist/ltmain.sh 2011-01-14 19:32:22.000000000 +0100 +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 8d4fb4e7d..68d329112 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 31d08bbf47a77827fe97ef3f52b4c9c4 PKG_DESCR:= Kerberos 5 server PKG_SECTION:= crypto -PKG_DEPENDS:= libheimdal libheimdal-client libncurses libcom-err libreadline PKG_BUILDDEP:= openssl ncurses e2fsprogs readline +PKG_DEPENDS:= libheimdal libheimdal-client libncurses libcom-err libreadline PKG_URL:= http://www.h5l.org/ PKG_SITES:= http://www.h5l.org/dist/src/ PKG_NOPARALLEL:= 1 @@ -30,7 +30,7 @@ PKGCS_WITH_LDAP:= libopenldap PKGCB_WITH_LDAP:= openldap PKGCD_WITH_BDB:= use Berkeley DB as database backend PKGCS_WITH_BDB:= libdb -PKGCB_WITH_BDB:= libdb +PKGCB_WITH_BDB:= db include $(TOPDIR)/mk/package.mk diff --git a/package/libdb/Makefile b/package/libdb/Makefile deleted file mode 100644 index bdebbd510..000000000 --- a/package/libdb/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# 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:= libdb -PKG_VERSION:= 4.7.25 -PKG_RELEASE:= 1 -PKG_MD5SUM:= ec2b87e833779681a0c3a814aa71359e -PKG_DESCR:= disk file format database which stores key/data-pairs in single files -PKG_SECTION:= libs -PKG_URL:= http://www.oracle.com/technology/software/products/berkeley-db -PKG_SITES:= http://www.openadk.org/distfiles/ -PKG_NEED_CXX:= 1 - -DISTFILES:= db-${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/db-${PKG_VERSION} -WRKBUILD= ${WRKSRC}/build_unix - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,LIBDB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_PROG:= dist/configure -CONFIGURE_ARGS+= --enable-smallbuild \ - --disable-debug_rop \ - --disable-debug_wop \ - --disable-diagnostic \ - --disable-java \ - --disable-cxx \ - --disable-posixmutexes \ - --disable-uimutexes \ - --disable-tcl \ - --disable-rpc \ - --disable-compat185 \ - --disable-statistics \ - --disable-replication \ - --disable-cryptography \ - --disable-queue \ - --with-mutex=UNIX/fcntl - -post-install: - ${INSTALL_DIR} ${IDIR_LIBDB}/usr/lib - ${CP} ${WRKINST}/usr/lib/libdb*.so ${IDIR_LIBDB}/usr/lib/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libdb/patches/patch-dist_ltmain_sh b/package/libdb/patches/patch-dist_ltmain_sh deleted file mode 100644 index e9ff24a13..000000000 --- a/package/libdb/patches/patch-dist_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- db-4.7.25.orig/dist/ltmain.sh 2006-06-27 03:03:33.000000000 +0200 -+++ db-4.7.25/dist/ltmain.sh 2011-01-14 19:32:22.000000000 +0100 -@@ -1623,7 +1623,7 @@ EOF - # -pg pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ -- -t[45]*|-txscale*|@*) -+ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 0a080bce7..c543380d3 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 90150b8c0d0192e10b30157e68844ddf PKG_DESCR:= OpenLDAP client libraries PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libsasl2 -PKG_BUILDDEP:= cyrus-sasl openssl libdb +PKG_BUILDDEP:= cyrus-sasl openssl db PKG_URL:= http://www.openldap.org/ PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ PKG_NEED_CXX:= 1 -- cgit v1.2.3