[pkgsrc/trunk]: pkgsrc/mail/cucipop add optional db2 support via PKG_OPTIONS....

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90dff1c55f50
branches:  trunk
changeset: 480232:90dff1c55f50
user:      grant <grant%pkgsrc.org@localhost>
date:      Thu Sep 02 10:39:04 2004 +0000

description:
add optional db2 support via PKG_OPTIONS.cucipop=db2. fix some bugs in
db2 code using hints from debian's fix.

makevpopdb works now, but there are still bugs lurking in the virtual
domain code.

no PKGREVISION bump as db2 is not enabled by default.

diffstat:

 mail/cucipop/Makefile         |  17 ++++++++++++++++-
 mail/cucipop/distinfo         |   4 +++-
 mail/cucipop/patches/patch-af |  13 +++++++++++++
 mail/cucipop/patches/patch-ag |  13 +++++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)

diffs (92 lines):

diff -r d24eff403205 -r 90dff1c55f50 mail/cucipop/Makefile
--- a/mail/cucipop/Makefile     Thu Sep 02 09:49:03 2004 +0000
+++ b/mail/cucipop/Makefile     Thu Sep 02 10:39:04 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/09/02 09:39:26 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/09/02 10:39:04 grant Exp $
 #
 
 DISTNAME=      cucipop-1.31
@@ -13,6 +13,7 @@
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 COMMENT=       The Cubic Circle POP3 mail server
 
+USE_BUILDLINK3=        YES
 USE_PKGINSTALL=        YES
 
 LICENSE=       shareware
@@ -25,6 +26,17 @@
 MAKE_DIRS+=    ${PREFIX}/share/cucipop/bulletins
 SPECIAL_PERMS+=        ${PREFIX}/sbin/cucipop ${ROOT_USER} ${ROOT_GROUP} 2755
 
+PKG_OPTIONS_VAR=       PKG_OPTIONS.cucipop
+PKG_SUPPORTED_OPTIONS= db
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdb)
+BDB_ACCEPTED=  db2
+CFLAGS+=       -DUSE_DB
+MAKE_ENV+=     LIBS=${BUILDLINK_LIBS.bdb}
+.endif
+
 .include "../../mk/bsd.prefs.mk"
 
 # to be friendly with pre-1.5 systems
@@ -49,4 +61,7 @@
        ${INSTALL_MAN} ${WRKSRC}/cucipop.8 ${PREFIX}/man/man8
        ${INSTALL_MAN} ${WRKSRC}/makevpopdb.8 ${PREFIX}/man/man8
 
+.if !empty(PKG_OPTIONS:Mdb)
+.  include "../../mk/bdb.buildlink3.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"
diff -r d24eff403205 -r 90dff1c55f50 mail/cucipop/distinfo
--- a/mail/cucipop/distinfo     Thu Sep 02 09:49:03 2004 +0000
+++ b/mail/cucipop/distinfo     Thu Sep 02 10:39:04 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/07/15 17:32:33 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2004/09/02 10:39:04 grant Exp $
 
 SHA1 (cucipop-1.31.tar.gz) = d9b5dc2960e96ad1ee63f0a6f8879165f4477434
 Size (cucipop-1.31.tar.gz) = 35508 bytes
@@ -9,3 +9,5 @@
 SHA1 (patch-ac) = 5d768b6b0badf8357bdb6668efb144bc14f98318
 SHA1 (patch-ad) = 2acb395d031e5919cacbcf178d58fe8ec4a75e0b
 SHA1 (patch-ae) = 30715d0e00ed4862601ea0cb69fdb797a9eb234a
+SHA1 (patch-af) = 3521a623741f7dda8d8c837e9dd46e070b1719a4
+SHA1 (patch-ag) = 9c6bb228b5a00ef241cd3edd57a7d523f5474f42
diff -r d24eff403205 -r 90dff1c55f50 mail/cucipop/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cucipop/patches/patch-af     Thu Sep 02 10:39:04 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2004/09/02 10:39:04 grant Exp $
+
+--- dbops.c.orig       1998-05-14 02:57:39.000000000 +1000
++++ dbops.c
+@@ -117,7 +117,7 @@ struct stateinfo*getstate(const char*key
+      if(lastcheck!=curt)
+       { lastcheck=curt;
+       if(!cs)
+-       { db->cursor(db,0,&cs);d.data="";d.size=1;
++       { db->cursor(db,0,&cs,0);d.data="";d.size=1;
+          if(!db->get(db,0,&d,&k,0))
+             cs->c_get(cs,&k,&d,DB_SET);
+        }
diff -r d24eff403205 -r 90dff1c55f50 mail/cucipop/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cucipop/patches/patch-ag     Thu Sep 02 10:39:04 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2004/09/02 10:39:04 grant Exp $
+
+--- makevpopdb.c.orig  1998-05-12 10:50:53.000000000 +1000
++++ makevpopdb.c
+@@ -49,7 +49,7 @@ main(int argc,const char*argv[])
+    }
+   dbname=argv[1];
+   memset(&dbenv,0,sizeof dbenv);
+-  if(!db_appinit(0,0,&dbenv,0))
++  if(db_appinit(0,0,&dbenv,0))
+      fprintf(stderr,"makedb2: Can't init db subsystem\n"),retval=EX_CANTCREAT;
+   else
+    { if(db_open(dbname,DB_HASH,DB_CREATE|DB_TRUNCATE,0666,&dbenv,(void*)0,&db))