From 1be9ca26a0239ccbe31df858953216874c93aa8e Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 2 Jun 2010 12:23:47 +0000 Subject: Fix buildling with db5; revbump for db4 update --- databases/yap2lc/Makefile | 13 ++++++++----- databases/yap2lc/distinfo | 3 +-- databases/yap2lc/patches/patch-aa | 22 ---------------------- 3 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 databases/yap2lc/patches/patch-aa (limited to 'databases/yap2lc') diff --git a/databases/yap2lc/Makefile b/databases/yap2lc/Makefile index 81e0810479d..05e86e1eab6 100644 --- a/databases/yap2lc/Makefile +++ b/databases/yap2lc/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2008/09/06 20:54:32 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/02 12:23:47 adam Exp $ DISTNAME= yap2lc-0.5.9 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yap2lc/} @@ -11,7 +11,9 @@ COMMENT= Yet Another Passwd 2 LDIF Converter PKG_DESTDIR_SUPPORT= user-destdir +BDB_ACCEPTED= db4 db5 GNU_CONFIGURE= YES +CONFIGURE_ENV+= BDB_TYPE="${BDB_TYPE}" INSTALLATION_DIRS= bin share/doc/yap2lc share/examples/yap2lc @@ -19,9 +21,10 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/yap2lc ${DESTDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/yap2lc ${INSTALL_DATA} ${WRKSRC}/samples/ldif.template \ - ${DESTDIR}${PREFIX}/share/examples/yap2lc + ${DESTDIR}${PREFIX}/share/examples/yap2lc ${INSTALL_DATA} ${WRKSRC}/samples/yap2lc.conf \ - ${DESTDIR}${PREFIX}/share/examples/yap2lc + ${DESTDIR}${PREFIX}/share/examples/yap2lc -.include "../../databases/db4/buildlink3.mk" +BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} +.include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/yap2lc/distinfo b/databases/yap2lc/distinfo index 49e1d4bff26..dae771442c6 100644 --- a/databases/yap2lc/distinfo +++ b/databases/yap2lc/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/08/22 17:32:07 tron Exp $ +$NetBSD: distinfo,v 1.2 2010/06/02 12:23:47 adam Exp $ SHA1 (yap2lc-0.5.9.tar.gz) = c63b36ec5068793b53c0a84db207209fc30be277 RMD160 (yap2lc-0.5.9.tar.gz) = c5538663917bd46dbda1e71834a8ccf145bbb4af Size (yap2lc-0.5.9.tar.gz) = 58651 bytes -SHA1 (patch-aa) = a2abfd8dcd49f3119af143f30503a60d5ef5e2d2 diff --git a/databases/yap2lc/patches/patch-aa b/databases/yap2lc/patches/patch-aa deleted file mode 100644 index a0475e5ba7d..00000000000 --- a/databases/yap2lc/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/08/22 17:32:07 tron Exp $ - ---- configure.orig 2003-12-22 18:50:00.000000000 +0000 -+++ configure 2007-08-22 18:00:42.000000000 +0100 -@@ -3418,7 +3418,7 @@ - withval="$with_bdb" - CFLAGS="${CFLAGS} -DBDB" - else -- LDFLAGS="${LDFLAGS} -ldb" -+ LDFLAGS="${LDFLAGS} -ldb4" - fi; - - -@@ -3427,7 +3427,7 @@ - withval="$with_old_bdb" - CFLAGS="${CFLAGS} -DOLD_BDB" - else -- LDFLAGS="${LDFLAGS} -ldb" -+ LDFLAGS="${LDFLAGS} -ldb4" - fi; - - -- cgit v1.2.3