Fix buildling with db5; revbump for db4 update; clean-up

4 files changed, 26 insertions, 38 deletions

diff --git a/databases/openldap-cloak/Makefile b/databases/openldap-cloak/Makefile
index 6575f2d9418..c9702e2830b 100644
--- a/databases/openldap-cloak/Makefile
+++ b/databases/openldap-cloak/Makefile
@@ -1,31 +1,27 @@
-# $NetBSD: Makefile,v 1.6 2010/02/19 20:49:29 ghen Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/02 12:16:37 adam Exp $
 
-PKGNAME=		${DISTNAME:S/-/-cloak-/}
-COMMENT=		Remove null-ops for OpenLDAP
+PKGNAME=	${DISTNAME:S/-/-cloak-/}
+PKGREVISION=	1
+COMMENT=	Remove null-ops for OpenLDAP
 
-CONFLICTS+=		openldap<2.3.23nb1
-
-DEPENDS+=		openldap-server>=2.4.13nb1:../../databases/openldap-server
+CONFLICTS+=	openldap<2.3.23nb1
+DEPENDS+=	openldap-server>=2.4.13nb1:../../databases/openldap-server
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 
 BUILD_DIRS=		include contrib/slapd-modules/cloak
-
 INSTALLATION_DIRS=	lib/openldap ${PKGMANDIR}/man5
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/contrib/slapd-modules/cloak/slapo-cloak.5\
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
-	${LIBTOOL} --mode=install 					\
-		   ${INSTALL_DATA}					\
-		   ${WRKSRC}/contrib/slapd-modules/cloak/cloak.la		\
+	${LIBTOOL} --mode=install ${INSTALL_DATA}			\
+		   ${WRKSRC}/contrib/slapd-modules/cloak/cloak.la	\
 		   ${DESTDIR}${PREFIX}/lib/openldap
 
 .include "../../databases/openldap/Makefile.common"
-
-.include "../../databases/db4/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
-
+.include "../../databases/openldap-server/options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap-cloak/PLIST b/databases/openldap-cloak/PLIST
index 9a061e78939..2a0d540fefd 100644
--- a/databases/openldap-cloak/PLIST
+++ b/databases/openldap-cloak/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:43:19 joerg Exp $
-lib/openldap/cloak.a
+@comment $NetBSD: PLIST,v 1.3 2010/06/02 12:16:37 adam Exp $
 lib/openldap/cloak.la
 man/man5/slapo-cloak.5
diff --git a/databases/openldap-nops/Makefile b/databases/openldap-nops/Makefile
index 47cabb9c4d5..22ef38ca0f6 100644
--- a/databases/openldap-nops/Makefile
+++ b/databases/openldap-nops/Makefile
@@ -1,31 +1,27 @@
-# $NetBSD: Makefile,v 1.8 2010/02/19 20:49:29 ghen Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/02 12:17:22 adam Exp $
 
-PKGNAME=		${DISTNAME:S/-/-nops-/}
-COMMENT=		Remove null-ops for OpenLDAP
+PKGNAME=	${DISTNAME:S/-/-nops-/}
+PKGREVISION=	1
+COMMENT=	Remove null-ops for OpenLDAP
 
-CONFLICTS+=		openldap<2.3.23nb1
-
-DEPENDS+=		openldap-server>=2.4.13nb1:../../databases/openldap-server
+CONFLICTS+=	openldap<2.3.23nb1
+DEPENDS+=	openldap-server>=2.4.13nb1:../../databases/openldap-server
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 
 BUILD_DIRS=		include contrib/slapd-modules/nops
-
 INSTALLATION_DIRS=	lib/openldap ${PKGMANDIR}/man5
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/contrib/slapd-modules/nops/slapo-nops.5\
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
-	${LIBTOOL} --mode=install 					\
-		   ${INSTALL_DATA}					\
+	${LIBTOOL} --mode=install ${INSTALL_DATA}			\
 		   ${WRKSRC}/contrib/slapd-modules/nops/nops.la		\
 		   ${DESTDIR}${PREFIX}/lib/openldap
 
 .include "../../databases/openldap/Makefile.common"
-
-.include "../../databases/db4/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
-
+.include "../../databases/openldap-server/options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap-smbk5pwd/Makefile b/databases/openldap-smbk5pwd/Makefile
index 2f1b0bc4f88..eb09a286ec1 100644
--- a/databases/openldap-smbk5pwd/Makefile
+++ b/databases/openldap-smbk5pwd/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2010/02/19 20:49:29 ghen Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/02 12:17:22 adam Exp $
 
-PKGNAME=		${DISTNAME:S/-/-smbk5pwd-/}
-COMMENT=		Samba and Kerberos password sync for OpenLDAP
+PKGNAME=	${DISTNAME:S/-/-smbk5pwd-/}
+PKGREVISION=	1
+COMMENT=	Samba and Kerberos password sync for OpenLDAP
 
-CONFLICTS+=		openldap<2.3.23nb1
-
-DEPENDS+=		openldap-server>=2.4.13nb1:../../databases/openldap-server
+CONFLICTS+=	openldap<2.3.23nb1
+DEPENDS+=	openldap-server>=2.4.13nb1:../../databases/openldap-server
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -15,15 +15,12 @@ BUILD_DIRS=		include contrib/slapd-modules/smbk5pwd
 
 do-install:
 	${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/openldap
-	${LIBTOOL} --mode=install 					\
-		   ${INSTALL_DATA}					\
+	${LIBTOOL} --mode=install ${INSTALL_DATA}			\
 		   ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la	\
 		   ${DESTDIR}${PREFIX}/lib/openldap
 
 .include "../../databases/openldap/Makefile.common"
-
-.include "../../databases/db4/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
+.include "../../databases/openldap-server/options.mk"
 .include "../../mk/krb5.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"