Fix building with db5; revision bump for db4 update

6 files changed, 9 insertions, 74 deletions

diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 4678df6765c..d19cec2e1d1 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/01/17 12:02:24 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.27 2010/06/02 13:05:01 adam Exp $
 
 DISTNAME=	isync-1.0.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isync/}
 
@@ -13,16 +12,14 @@ COMMENT=	Synchronize a maildir with an imap server
 LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-INSTALLATION_DIRS+=	share/examples/isync
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	YES
-
+BDB_ACCEPTED=		db4 db5
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 LDFLAGS+=		-lcrypto
 
-.include "../../security/openssl/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
+INSTALLATION_DIRS+=	share/examples/isync
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/mbsyncrc.sample \
@@ -30,4 +27,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/compat/isyncrc.sample \
 		${DESTDIR}${PREFIX}/share/examples/isync/isyncrc.sample
 
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index ae28c30b9f0..402becca5ed 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.9 2009/07/12 20:26:59 tonio Exp $
+$NetBSD: distinfo,v 1.10 2010/06/02 13:05:01 adam Exp $
 
 SHA1 (isync-1.0.4.tar.gz) = a327cc5b81946c7ccb3a26ddd971933e2e006ed3
 RMD160 (isync-1.0.4.tar.gz) = 23475533ff9848c38b95911eae6191ca03132185
 Size (isync-1.0.4.tar.gz) = 170264 bytes
-SHA1 (patch-aa) = 5ac207f7d7b634673e60ce34cc9a921846d205da
-SHA1 (patch-ab) = bee5b091f89a670b584b73ef58774ae992bb6637
-SHA1 (patch-ac) = d06d1444f66eaeab1fdf22e1aa2f1b9184abccfa
-SHA1 (patch-ad) = c4a86de19b3004752dc51da9453b702945fe6578
 SHA1 (patch-ae) = 2fddc575e8824ecbbb4b8c51a56193840b43d647
 SHA1 (patch-af) = 12fc0ec1b2292c422e7c3347b37167438866728d
diff --git a/mail/isync/patches/patch-aa b/mail/isync/patches/patch-aa
deleted file mode 100644
index fc564fe7b7e..00000000000
--- a/mail/isync/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/Makefile.am.orig	2005-03-05 21:49:31.000000000 +0100
-+++ src/Makefile.am	2005-03-05 21:49:55.000000000 +0100
-@@ -6,11 +6,11 @@
- bin_PROGRAMS = mbsync mdconvert
- 
- mbsync_SOURCES = main.c sync.c config.c util.c drv_imap.c drv_maildir.c
--mbsync_LDADD = -ldb $(SSL_LIBS) $(SOCK_LIBS)
-+mbsync_LDADD = -ldb4 $(SSL_LIBS) $(SOCK_LIBS)
- noinst_HEADERS = isync.h
- 
- mdconvert_SOURCES = mdconvert.c
--mdconvert_LDADD = -ldb
-+mdconvert_LDADD = -ldb4
- 
- man_MANS = mbsync.1 mdconvert.1
- EXTRA_DIST = mbsyncrc.sample $(man_MANS)
diff --git a/mail/isync/patches/patch-ab b/mail/isync/patches/patch-ab
deleted file mode 100644
index 887a3258d45..00000000000
--- a/mail/isync/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/Makefile.in.orig	2005-03-05 21:49:24.000000000 +0100
-+++ src/Makefile.in	2005-03-05 21:49:44.000000000 +0100
-@@ -165,10 +165,10 @@
- @with_compat_TRUE@compat_dir = compat
- SUBDIRS = $(compat_dir)
- mbsync_SOURCES = main.c sync.c config.c util.c drv_imap.c drv_maildir.c
--mbsync_LDADD = -ldb $(SSL_LIBS) $(SOCK_LIBS)
-+mbsync_LDADD = -ldb4 $(SSL_LIBS) $(SOCK_LIBS)
- noinst_HEADERS = isync.h
- mdconvert_SOURCES = mdconvert.c
--mdconvert_LDADD = -ldb
-+mdconvert_LDADD = -ldb4
- man_MANS = mbsync.1 mdconvert.1
- EXTRA_DIST = mbsyncrc.sample $(man_MANS)
- all: all-recursive
diff --git a/mail/isync/patches/patch-ac b/mail/isync/patches/patch-ac
deleted file mode 100644
index c478d0791de..00000000000
--- a/mail/isync/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/compat/Makefile.am.orig	2005-03-05 21:50:09.000000000 +0100
-+++ src/compat/Makefile.am	2005-03-05 21:50:18.000000000 +0100
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = isync
- 
- isync_SOURCES = main.c config.c convert.c util.c
--isync_LDADD = -ldb
-+isync_LDADD = -ldb4
- noinst_HEADERS = isync.h
- 
- man_MANS = isync.1
diff --git a/mail/isync/patches/patch-ad b/mail/isync/patches/patch-ad
deleted file mode 100644
index 50fbf687230..00000000000
--- a/mail/isync/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/compat/Makefile.in.orig	2005-03-05 21:50:06.000000000 +0100
-+++ src/compat/Makefile.in	2005-03-05 21:50:33.000000000 +0100
-@@ -152,7 +152,7 @@
- with_compat_FALSE = @with_compat_FALSE@
- with_compat_TRUE = @with_compat_TRUE@
- isync_SOURCES = main.c config.c convert.c util.c
--isync_LDADD = -ldb
-+isync_LDADD = -ldb4
- noinst_HEADERS = isync.h
- man_MANS = isync.1
- EXTRA_DIST = isyncrc.sample $(man_MANS)