DESTDIR support for openldap.

5 files changed, 25 insertions, 17 deletions

diff --git a/databases/openldap-client/Makefile b/databases/openldap-client/Makefile
index a49d7214cf6..df2c40fddd2 100644
--- a/databases/openldap-client/Makefile
+++ b/databases/openldap-client/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2007/01/02 11:29:15 ghen Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/04 11:42:30 ghen Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 COMMENT=		Lightweight Directory Access Protocol libraries and client programs
 
 CONFLICTS+=		openldap<2.3.23nb1
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFIGURE_ARGS+=	--disable-slapd
 CONFIGURE_ARGS+=	--disable-slurpd
 
diff --git a/databases/openldap-doc/Makefile b/databases/openldap-doc/Makefile
index b9d8089b9e3..4446a1c3d3f 100644
--- a/databases/openldap-doc/Makefile
+++ b/databases/openldap-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/11/18 19:46:16 ghen Exp $
+# $NetBSD: Makefile,v 1.9 2008/01/04 11:42:30 ghen Exp $
 
 DISTNAME=		openldap-2.3.39
 PKGNAME=		${DISTNAME:S/-/-doc-/}
@@ -24,6 +24,8 @@ MAINTAINER=		ghen@NetBSD.org
 HOMEPAGE=		http://www.openldap.org/
 COMMENT=		Lightweight Directory Access Protocol documentation
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DISTINFO_FILE=		${.CURDIR}/../../databases/openldap/distinfo
 
 NO_CONFIGURE=		yes
@@ -35,17 +37,17 @@ IMAGES+=		config_repl.gif config_x500fe.gif config_x500ref.gif
 IMAGES+=		intro_dctree.gif intro_tree.gif replication.gif
 
 do-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}/admin
-	${INSTALL_DATA_DIR} ${DOCDIR}/images
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/COPYRIGHT ${DOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/LICENSE ${DOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/README ${DOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/images/LDAPlogo.gif ${DOCDIR}/images/
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/images/LDAPwww.gif ${DOCDIR}/images/
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/guide.html ${DOCDIR}/admin/
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/admin
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/doc/guide/COPYRIGHT ${DESTDIR}${DOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/guide/LICENSE ${DESTDIR}${DOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/guide/README ${DESTDIR}${DOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/guide/images/LDAPlogo.gif ${DESTDIR}${DOCDIR}/images/
+	${INSTALL_DATA} ${WRKSRC}/doc/guide/images/LDAPwww.gif ${DESTDIR}${DOCDIR}/images/
+	${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/guide.html ${DESTDIR}${DOCDIR}/admin/
 .for file in ${IMAGES}
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/${file} ${DOCDIR}/admin/
+	${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/${file} ${DESTDIR}${DOCDIR}/admin/
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile
index 7b28e0d350f..ce75756b76f 100644
--- a/databases/openldap-server/Makefile
+++ b/databases/openldap-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/09/02 13:04:38 ghen Exp $
+# $NetBSD: Makefile,v 1.10 2008/01/04 11:42:30 ghen Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 COMMENT=		Lightweight Directory Access Protocol server suite
@@ -7,6 +7,8 @@ CONFLICTS+=		openldap<2.3.23nb1
 
 DEPENDS+=		openldap-client>=2.3.27nb1:../../databases/openldap-client
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # slapd options
 CONFIGURE_ARGS+=	--enable-slapd
 CONFIGURE_ARGS+=	--enable-crypt
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index d16255cb8db..bee18d6961b 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2007/11/18 19:46:15 ghen Exp $
+# $NetBSD: Makefile,v 1.123 2008/01/04 11:42:29 ghen Exp $
 
 DISTNAME=		openldap-${OPENLDAP_VERSION}
 OPENLDAP_VERSION=	2.3.39
@@ -14,6 +14,8 @@ DEPENDS+=		openldap-client>=${OPENLDAP_VERSION}:../../databases/openldap-client
 DEPENDS+=		openldap-server>=${OPENLDAP_VERSION}:../../databases/openldap-server
 DEPENDS+=		openldap-doc>=${OPENLDAP_VERSION}:../../databases/openldap-doc
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_ONLY=		# yes
 NO_CHECKSUM=		yes
 NO_CONFIGURE=		yes
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 874174685a4..44fefa3d5cc 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2007/11/23 08:38:05 dsainty Exp $
+# $NetBSD: Makefile.common,v 1.13 2008/01/04 11:42:29 ghen Exp $
 
 # please stick to the "stable" releases as much as possible!
 DISTNAME=		openldap-2.3.39
@@ -113,6 +113,6 @@ INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
 # Set the correct file modes for the example config files.
 post-install:
 .for file in ${CNFS} ${CNFS_PERMS} ${DB_CONFIG}
-	${CHMOD} ${SHAREMODE} ${EGDIR}/${file:Q}
-	${RM} -f ${EGDIR}/${file:Q}.default
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${EGDIR}/${file:Q}
+	${RM} -f ${DESTDIR}${EGDIR}/${file:Q}.default
 .endfor