summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/bogofilter/Makefile2
-rw-r--r--package/db/Makefile (renamed from package/libdb/Makefile)19
-rw-r--r--package/db/patches/patch-dist_ltmain_sh (renamed from package/libdb/patches/patch-dist_ltmain_sh)0
-rw-r--r--package/heimdal/Makefile4
-rw-r--r--package/openldap/Makefile2
5 files changed, 17 insertions, 10 deletions
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/libdb/Makefile b/package/db/Makefile
index bdebbd510..9038b74eb 100644
--- a/package/libdb/Makefile
+++ b/package/db/Makefile
@@ -3,7 +3,7 @@
include ${TOPDIR}/rules.mk
-PKG_NAME:= libdb
+PKG_NAME:= db
PKG_VERSION:= 4.7.25
PKG_RELEASE:= 1
PKG_MD5SUM:= ec2b87e833779681a0c3a814aa71359e
@@ -13,13 +13,16 @@ 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}
+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,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(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 \
@@ -39,8 +42,12 @@ CONFIGURE_ARGS+= --enable-smallbuild \
--disable-queue \
--with-mutex=UNIX/fcntl
-post-install:
+libdb-install:
${INSTALL_DIR} ${IDIR_LIBDB}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libdb*.so ${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/libdb/patches/patch-dist_ltmain_sh b/package/db/patches/patch-dist_ltmain_sh
index e9ff24a13..e9ff24a13 100644
--- a/package/libdb/patches/patch-dist_ltmain_sh
+++ b/package/db/patches/patch-dist_ltmain_sh
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/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