pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/postfix Use bdb.buildlink3.mk to get the DB libra...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a5b5b3019e36
branches: trunk
changeset: 484901:a5b5b3019e36
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Nov 30 20:54:38 2004 +0000
description:
Use bdb.buildlink3.mk to get the DB library to use for the "hash" map
type. All platforms now support the "hash" map type as a result.
Remove the explicit dependencies on db4 and db2 on non-Linux and Linux,
respectively. Bump the PKGREVISION.
diffstat:
mail/postfix/Makefile | 3 +-
mail/postfix/distinfo | 4 +-
mail/postfix/options.mk | 32 +++++++++++-------------
mail/postfix/patches/patch-ai | 55 ++++++++++++++++++++++++++++++++++++++----
4 files changed, 68 insertions(+), 26 deletions(-)
diffs (158 lines):
diff -r 70fbe24308d5 -r a5b5b3019e36 mail/postfix/Makefile
--- a/mail/postfix/Makefile Tue Nov 30 20:30:19 2004 +0000
+++ b/mail/postfix/Makefile Tue Nov 30 20:54:38 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.151 2004/11/25 04:02:35 xtraeme Exp $
+# $NetBSD: Makefile,v 1.152 2004/11/30 20:54:38 jlam Exp $
DISTNAME= postfix-2.1.5
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
DIST_SUBDIR= postfix
diff -r 70fbe24308d5 -r a5b5b3019e36 mail/postfix/distinfo
--- a/mail/postfix/distinfo Tue Nov 30 20:30:19 2004 +0000
+++ b/mail/postfix/distinfo Tue Nov 30 20:54:38 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2004/09/23 16:10:07 martti Exp $
+$NetBSD: distinfo,v 1.77 2004/11/30 20:54:38 jlam Exp $
SHA1 (postfix/postfix-2.1.5.tar.gz) = bbc65c9fdc1cbd8e553816a5549b2685255cf69d
Size (postfix/postfix-2.1.5.tar.gz) = 1971931 bytes
@@ -11,4 +11,4 @@
SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
SHA1 (patch-ab) = c506a08b694f94ef4884fa97eec51e44c92812dd
SHA1 (patch-ag) = d5e9aab43b5d3be6df9ad8e3f03572b9a228f784
-SHA1 (patch-ai) = e7284d9b3d7b83def7994269867e443fc0394d40
+SHA1 (patch-ai) = f166c2d52bfb8a441db22a9090312c0a2de56a6f
diff -r 70fbe24308d5 -r a5b5b3019e36 mail/postfix/options.mk
--- a/mail/postfix/options.mk Tue Nov 30 20:30:19 2004 +0000
+++ b/mail/postfix/options.mk Tue Nov 30 20:54:38 2004 +0000
@@ -1,12 +1,25 @@
-# $NetBSD: options.mk,v 1.11 2004/11/17 19:34:31 xtraeme Exp $
+# $NetBSD: options.mk,v 1.12 2004/11/30 20:54:38 jlam Exp $
# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.postfix
-PKG_SUPPORTED_OPTIONS= inet6 ldap mysql mysql4 pcre pgsql sasl tls
+PKG_SUPPORTED_OPTIONS= bdb inet6 ldap mysql mysql4 pcre pgsql sasl tls
.include "../../mk/bsd.options.mk"
###
+### Support "hash" (Berkeley DB) map type.
+###
+.if empty(PKG_OPTIONS:Mbdb)
+PKG_OPTIONS+= bdb # "hash" map type is mandatory
+.endif
+.if !empty(PKG_OPTIONS:Mbdb)
+USE_DB185= no
+. include "../../mk/bdb.buildlink3.mk"
+CCARGS+= -DHAS_DB
+AUXLIBS+= ${BUILDLINK_LDFLAGS.${BDB_TYPE}} ${BDB_LIBS}
+.endif
+
+###
### IPv6 and STARTTLS support (http://www.ipnet6.org/postfix/)
###
.if !empty(PKG_OPTIONS:Minet6)
@@ -69,13 +82,6 @@
AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \
${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \
-lldap -llber
-. if ${OPSYS} != "Linux"
-. include "../../databases/db4/buildlink3.mk"
-CCARGS+= -I${BUILDLINK_PREFIX.db4}/include/db4
-AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \
- -ldb4
-. endif
.endif
###
@@ -142,11 +148,3 @@
MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR}
.endif
-
-.if ${OPSYS} == "Linux"
-. include "../../databases/db/buildlink3.mk"
-CCARGS+= -I${BUILDLINK_PREFIX.db2}/include/db2
-AUXLIBS+= -L${BUILDLINK_PREFIX.db2}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \
- -ldb2
-.endif
diff -r 70fbe24308d5 -r a5b5b3019e36 mail/postfix/patches/patch-ai
--- a/mail/postfix/patches/patch-ai Tue Nov 30 20:30:19 2004 +0000
+++ b/mail/postfix/patches/patch-ai Tue Nov 30 20:54:38 2004 +0000
@@ -1,9 +1,26 @@
-$NetBSD: patch-ai,v 1.11 2004/06/21 16:13:24 martti Exp $
+$NetBSD: patch-ai,v 1.12 2004/11/30 20:54:38 jlam Exp $
---- makedefs.orig 2004-04-14 14:59:43.000000000 -0400
-+++ makedefs 2004-05-23 22:53:06.000000000 -0400
-@@ -182,22 +182,6 @@
- SYSLIBS="-ldb"
+--- makedefs.orig 2004-11-30 13:50:37.000000000 -0500
++++ makedefs
+@@ -141,13 +141,6 @@ case "$SYSTEM.$RELEASE" in
+ esac
+ ;;
+ ULTRIX.4*) SYSTYPE=ULTRIX4
+- if [ -f /usr/local/lib/libdb.a ]; then
+- SYSLIBS="$SYSLIBS -ldb"
+- CCARGS="$CCARGS -DHAS_DB"
+- if [ -d /usr/local/include/db ]; then
+- CCARGS="$CCARGS -I/usr/local/include/db"
+- fi
+- fi
+ for l in syslog resolv; do
+ if [ -f /usr/local/lib/lib$l.a ]; then
+ SYSLIBS="$SYSLIBS -l$l"
+@@ -179,25 +172,8 @@ case "$SYSTEM.$RELEASE" in
+ esac;;
+ # Tested with RedHat 3.03 on 20020729.
+ Linux.1*) SYSTYPE=LINUX1
+- SYSLIBS="-ldb"
;;
Linux.2*) SYSTYPE=LINUX2
- # Postfix no longer needs DB 1.85 compatibility
@@ -25,7 +42,7 @@
# GDBM locks the DBM .pag file after open. This breaks postmap.
# if [ -f /usr/include/gdbm-ndbm.h ]
# then
-@@ -208,7 +192,6 @@
+@@ -208,7 +184,6 @@ case "$SYSTEM.$RELEASE" in
# CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
# GDBM_LIBS=gdbm
# fi
@@ -33,3 +50,29 @@
for name in nsl resolv $GDBM_LIBS
do
for lib in /usr/lib64 /lib64 /usr/lib /lib
+@@ -233,25 +208,13 @@ case "$SYSTEM.$RELEASE" in
+ HP-UX.A.09.*) SYSTYPE=HPUX9
+ SYSLIBS=-ldbm
+ CCARGS="$CCARGS -DMISSING_USLEEP"
+- if [ -f /usr/lib/libdb.a ]; then
+- CCARGS="$CCARGS -DHAS_DB"
+- SYSLIBS="$SYSLIBS -ldb"
+- fi
+ ;;
+ HP-UX.B.10.*) SYSTYPE=HPUX10
+ CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
+ (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
+- if [ -f /usr/lib/libdb.a ]; then
+- CCARGS="$CCARGS -DHAS_DB"
+- SYSLIBS=-ldb
+- fi
+ ;;
+ HP-UX.B.11.*) SYSTYPE=HPUX11
+ SYSLIBS=-lnsl
+- if [ -f /usr/lib/libdb.a ]; then
+- CCARGS="$CCARGS -DHAS_DB"
+- SYSLIBS="$SYSLIBS -ldb"
+- fi
+ ;;
+ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
+ RANLIB=echo
Home |
Main Index |
Thread Index |
Old Index