Update to version 1.2.0.

PR:		9900
Reviewed by:	maintainer

44 files changed, 154 insertions, 121 deletions

diff --git a/net/openldap/Makefile b/net/openldap/Makefile
index b8324a263765..048c431a9786 100644
--- a/net/openldap/Makefile
+++ b/net/openldap/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.1.2
+# Version required:     1.2.0
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.3 1999/01/02 19:49:15 steve Exp $
+# $Id: Makefile,v 1.4 1999/01/04 15:49:04 dirk Exp $
 #
 
-DISTNAME=       openldap-1.1.2
-CATEGORIES=	net
+DISTNAME=	openldap-1.2.0
+CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
@@ -19,7 +19,8 @@ MAINTAINER=     ulmo@earthling.net
 WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/manpages"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
 
 pre-build:
 	cd ${WRKSRC} ; make depend
@@ -35,6 +36,6 @@ post-install:
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
 	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
-	${PREFIX}/bin/ldapmodify
+	${PREFIX}/bin/ldapmodify ${PREFIX}/bin/ldappasswd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openldap/distinfo b/net/openldap/distinfo
index 92244e8cd63a..6f1e6c6c2541 100644
--- a/net/openldap/distinfo
+++ b/net/openldap/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
+MD5 (openldap-1.2.0.tgz) = 387418c7d1214116894bab3b9e8ef746
diff --git a/net/openldap/files/manpages b/net/openldap/files/manpages
index 5e5e1e79140f..f36399dbc70a 100644
--- a/net/openldap/files/manpages
+++ b/net/openldap/files/manpages
@@ -1,6 +1,7 @@
 MAN1+=	ldapdelete.1
 MAN1+=	ldapmodify.1
 MAN1+=	ldapmodrdn.1
+MAN1+=	ldappasswd.1
 MAN1+=	ldapsearch.1
 MAN1+=	ud.1
 MAN3+=	cldap_close.3
@@ -58,6 +59,7 @@ MAN8+=	mail500.8
 MAN8+=	rcpt500.8
 MAN8+=	slapd.8
 MAN8+=	slurpd.8
+MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldap.3 cldap.3
 MLINKS+=	ldap_add.3 ldap_add_s.3
 MLINKS+=	ldap_bind.3 ldap_bind_s.3
@@ -157,7 +159,6 @@ MLINKS+=	ldap_url.3 ldap_url_parse.3
 MLINKS+=	ldap_url.3 ldap_url_search.3
 MLINKS+=	ldap_url.3 ldap_url_search_s.3
 MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldif2ldbm.8 ldif2id2children.8
 MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
 MLINKS+=	ldif2ldbm.8 ldif2index.8
diff --git a/net/openldap/pkg-plist b/net/openldap/pkg-plist
index 0c11bdd93441..66e69eca12ae 100644
--- a/net/openldap/pkg-plist
+++ b/net/openldap/pkg-plist
@@ -2,6 +2,7 @@ bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
+bin/ldappasswd
 bin/ldapsearch
 bin/ud
 etc/openldap/ldap.conf.default
diff --git a/net/openldap12/Makefile b/net/openldap12/Makefile
index b8324a263765..048c431a9786 100644
--- a/net/openldap12/Makefile
+++ b/net/openldap12/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.1.2
+# Version required:     1.2.0
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.3 1999/01/02 19:49:15 steve Exp $
+# $Id: Makefile,v 1.4 1999/01/04 15:49:04 dirk Exp $
 #
 
-DISTNAME=       openldap-1.1.2
-CATEGORIES=	net
+DISTNAME=	openldap-1.2.0
+CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
@@ -19,7 +19,8 @@ MAINTAINER=     ulmo@earthling.net
 WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/manpages"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
 
 pre-build:
 	cd ${WRKSRC} ; make depend
@@ -35,6 +36,6 @@ post-install:
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
 	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
-	${PREFIX}/bin/ldapmodify
+	${PREFIX}/bin/ldapmodify ${PREFIX}/bin/ldappasswd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openldap12/distinfo b/net/openldap12/distinfo
index 92244e8cd63a..6f1e6c6c2541 100644
--- a/net/openldap12/distinfo
+++ b/net/openldap12/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
+MD5 (openldap-1.2.0.tgz) = 387418c7d1214116894bab3b9e8ef746
diff --git a/net/openldap12/files/manpages b/net/openldap12/files/manpages
index 5e5e1e79140f..f36399dbc70a 100644
--- a/net/openldap12/files/manpages
+++ b/net/openldap12/files/manpages
@@ -1,6 +1,7 @@
 MAN1+=	ldapdelete.1
 MAN1+=	ldapmodify.1
 MAN1+=	ldapmodrdn.1
+MAN1+=	ldappasswd.1
 MAN1+=	ldapsearch.1
 MAN1+=	ud.1
 MAN3+=	cldap_close.3
@@ -58,6 +59,7 @@ MAN8+=	mail500.8
 MAN8+=	rcpt500.8
 MAN8+=	slapd.8
 MAN8+=	slurpd.8
+MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldap.3 cldap.3
 MLINKS+=	ldap_add.3 ldap_add_s.3
 MLINKS+=	ldap_bind.3 ldap_bind_s.3
@@ -157,7 +159,6 @@ MLINKS+=	ldap_url.3 ldap_url_parse.3
 MLINKS+=	ldap_url.3 ldap_url_search.3
 MLINKS+=	ldap_url.3 ldap_url_search_s.3
 MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldif2ldbm.8 ldif2id2children.8
 MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
 MLINKS+=	ldif2ldbm.8 ldif2index.8
diff --git a/net/openldap12/pkg-plist b/net/openldap12/pkg-plist
index 0c11bdd93441..66e69eca12ae 100644
--- a/net/openldap12/pkg-plist
+++ b/net/openldap12/pkg-plist
@@ -2,6 +2,7 @@ bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
+bin/ldappasswd
 bin/ldapsearch
 bin/ud
 etc/openldap/ldap.conf.default
diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile
index b8324a263765..048c431a9786 100644
--- a/net/openldap2/Makefile
+++ b/net/openldap2/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.1.2
+# Version required:     1.2.0
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.3 1999/01/02 19:49:15 steve Exp $
+# $Id: Makefile,v 1.4 1999/01/04 15:49:04 dirk Exp $
 #
 
-DISTNAME=       openldap-1.1.2
-CATEGORIES=	net
+DISTNAME=	openldap-1.2.0
+CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
@@ -19,7 +19,8 @@ MAINTAINER=     ulmo@earthling.net
 WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/manpages"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
 
 pre-build:
 	cd ${WRKSRC} ; make depend
@@ -35,6 +36,6 @@ post-install:
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
 	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
-	${PREFIX}/bin/ldapmodify
+	${PREFIX}/bin/ldapmodify ${PREFIX}/bin/ldappasswd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openldap2/distinfo b/net/openldap2/distinfo
index 92244e8cd63a..6f1e6c6c2541 100644
--- a/net/openldap2/distinfo
+++ b/net/openldap2/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
+MD5 (openldap-1.2.0.tgz) = 387418c7d1214116894bab3b9e8ef746
diff --git a/net/openldap2/files/manpages b/net/openldap2/files/manpages
index 5e5e1e79140f..f36399dbc70a 100644
--- a/net/openldap2/files/manpages
+++ b/net/openldap2/files/manpages
@@ -1,6 +1,7 @@
 MAN1+=	ldapdelete.1
 MAN1+=	ldapmodify.1
 MAN1+=	ldapmodrdn.1
+MAN1+=	ldappasswd.1
 MAN1+=	ldapsearch.1
 MAN1+=	ud.1
 MAN3+=	cldap_close.3
@@ -58,6 +59,7 @@ MAN8+=	mail500.8
 MAN8+=	rcpt500.8
 MAN8+=	slapd.8
 MAN8+=	slurpd.8
+MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldap.3 cldap.3
 MLINKS+=	ldap_add.3 ldap_add_s.3
 MLINKS+=	ldap_bind.3 ldap_bind_s.3
@@ -157,7 +159,6 @@ MLINKS+=	ldap_url.3 ldap_url_parse.3
 MLINKS+=	ldap_url.3 ldap_url_search.3
 MLINKS+=	ldap_url.3 ldap_url_search_s.3
 MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldif2ldbm.8 ldif2id2children.8
 MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
 MLINKS+=	ldif2ldbm.8 ldif2index.8
diff --git a/net/openldap2/pkg-plist b/net/openldap2/pkg-plist
index 0c11bdd93441..66e69eca12ae 100644
--- a/net/openldap2/pkg-plist
+++ b/net/openldap2/pkg-plist
@@ -2,6 +2,7 @@ bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
+bin/ldappasswd
 bin/ldapsearch
 bin/ud
 etc/openldap/ldap.conf.default
diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile
index b8324a263765..048c431a9786 100644
--- a/net/openldap20-server/Makefile
+++ b/net/openldap20-server/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.1.2
+# Version required:     1.2.0
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.3 1999/01/02 19:49:15 steve Exp $
+# $Id: Makefile,v 1.4 1999/01/04 15:49:04 dirk Exp $
 #
 
-DISTNAME=       openldap-1.1.2
-CATEGORIES=	net
+DISTNAME=	openldap-1.2.0
+CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
@@ -19,7 +19,8 @@ MAINTAINER=     ulmo@earthling.net
 WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/manpages"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
 
 pre-build:
 	cd ${WRKSRC} ; make depend
@@ -35,6 +36,6 @@ post-install:
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
 	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
-	${PREFIX}/bin/ldapmodify
+	${PREFIX}/bin/ldapmodify ${PREFIX}/bin/ldappasswd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openldap20-server/distinfo b/net/openldap20-server/distinfo
index 92244e8cd63a..6f1e6c6c2541 100644
--- a/net/openldap20-server/distinfo
+++ b/net/openldap20-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
+MD5 (openldap-1.2.0.tgz) = 387418c7d1214116894bab3b9e8ef746
diff --git a/net/openldap20-server/files/manpages b/net/openldap20-server/files/manpages
index 5e5e1e79140f..f36399dbc70a 100644
--- a/net/openldap20-server/files/manpages
+++ b/net/openldap20-server/files/manpages
@@ -1,6 +1,7 @@
 MAN1+=	ldapdelete.1
 MAN1+=	ldapmodify.1
 MAN1+=	ldapmodrdn.1
+MAN1+=	ldappasswd.1
 MAN1+=	ldapsearch.1
 MAN1+=	ud.1
 MAN3+=	cldap_close.3
@@ -58,6 +59,7 @@ MAN8+=	mail500.8
 MAN8+=	rcpt500.8
 MAN8+=	slapd.8
 MAN8+=	slurpd.8
+MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldap.3 cldap.3
 MLINKS+=	ldap_add.3 ldap_add_s.3
 MLINKS+=	ldap_bind.3 ldap_bind_s.3
@@ -157,7 +159,6 @@ MLINKS+=	ldap_url.3 ldap_url_parse.3
 MLINKS+=	ldap_url.3 ldap_url_search.3
 MLINKS+=	ldap_url.3 ldap_url_search_s.3
 MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldif2ldbm.8 ldif2id2children.8
 MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
 MLINKS+=	ldif2ldbm.8 ldif2index.8
diff --git a/net/openldap20-server/pkg-plist b/net/openldap20-server/pkg-plist
index 0c11bdd93441..66e69eca12ae 100644
--- a/net/openldap20-server/pkg-plist
+++ b/net/openldap20-server/pkg-plist
@@ -2,6 +2,7 @@ bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
+bin/ldappasswd
 bin/ldapsearch
 bin/ud
 etc/openldap/ldap.conf.default
diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile
index b8324a263765..048c431a9786 100644
--- a/net/openldap20/Makefile
+++ b/net/openldap20/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.1.2
+# Version required:     1.2.0
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.3 1999/01/02 19:49:15 steve Exp $
+# $Id: Makefile,v 1.4 1999/01/04 15:49:04 dirk Exp $
 #
 
-DISTNAME=       openldap-1.1.2
-CATEGORIES=	net
+DISTNAME=	openldap-1.2.0
+CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
@@ -19,7 +19,8 @@ MAINTAINER=     ulmo@earthling.net
 WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/manpages"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
 
 pre-build:
 	cd ${WRKSRC} ; make depend
@@ -35,6 +36,6 @@ post-install:
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
 	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
-	${PREFIX}/bin/ldapmodify
+	${PREFIX}/bin/ldapmodify ${PREFIX}/bin/ldappasswd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openldap20/distinfo b/net/openldap20/distinfo
index 92244e8cd63a..6f1e6c6c2541 100644
--- a/net/openldap20/distinfo
+++ b/net/openldap20/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
+MD5 (openldap-1.2.0.tgz) = 387418c7d1214116894bab3b9e8ef746
diff --git a/net/openldap20/files/manpages b/net/openldap20/files/manpages
index 5e5e1e79140f..f36399dbc70a 100644
--- a/net/openldap20/files/manpages
+++ b/net/openldap20/files/manpages
@@ -1,6 +1,7 @@
 MAN1+=	ldapdelete.1
 MAN1+=	ldapmodify.1
 MAN1+=	ldapmodrdn.1
+MAN1+=	ldappasswd.1
 MAN1+=	ldapsearch.1
 MAN1+=	ud.1
 MAN3+=	cldap_close.3
@@ -58,6 +59,7 @@ MAN8+=	mail500.8
 MAN8+=	rcpt500.8
 MAN8+=	slapd.8
 MAN8+=	slurpd.8
+MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldap.3 cldap.3
 MLINKS+=	ldap_add.3 ldap_add_s.3
 MLINKS+=	ldap_bind.3 ldap_bind_s.3
@@ -157,7 +159,6 @@ MLINKS+=	ldap_url.3 ldap_url_parse.3
 MLINKS+=	ldap_url.3 ldap_url_search.3
 MLINKS+=	ldap_url.3 ldap_url_search_s.3
 MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldif2ldbm.8 ldif2id2children.8
 MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
 MLINKS+=	ldif2ldbm.8 ldif2index.8
diff --git a/net/openldap20/pkg-plist b/net/openldap20/pkg-plist
index 0c11bdd93441..66e69eca12ae 100644
--- a/net/openldap20/pkg-plist
+++ b/net/openldap20/pkg-plist
@@ -2,6 +2,7 @@ bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
+bin/ldappasswd
 bin/ldapsearch
 bin/ud
 etc/openldap/ldap.conf.default
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index b8324a263765..048c431a9786 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.1.2
+# Version required:     1.2.0
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.3 1999/01/02 19:49:15 steve Exp $
+# $Id: Makefile,v 1.4 1999/01/04 15:49:04 dirk Exp $
 #
 
-DISTNAME=       openldap-1.1.2
-CATEGORIES=	net
+DISTNAME=	openldap-1.2.0
+CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
@@ -19,7 +19,8 @@ MAINTAINER=     ulmo@earthling.net
 WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/manpages"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
 
 pre-build:
 	cd ${WRKSRC} ; make depend
@@ -35,6 +36,6 @@ post-install:
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
 	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
-	${PREFIX}/bin/ldapmodify
+	${PREFIX}/bin/ldapmodify ${PREFIX}/bin/ldappasswd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openldap21-server/distinfo b/net/openldap21-server/distinfo
index 92244e8cd63a..6f1e6c6c2541 100644
--- a/net/openldap21-server/distinfo
+++ b/net/openldap21-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
+MD5 (openldap-1.2.0.tgz) = 387418c7d1214116894bab3b9e8ef746
diff --git a/net/openldap21-server/files/manpages b/net/openldap21-server/files/manpages
index 5e5e1e79140f..f36399dbc70a 100644
--- a/net/openldap21-server/files/manpages
+++ b/net/openldap21-server/files/manpages
@@ -1,6 +1,7 @@
 MAN1+=	ldapdelete.1
 MAN1+=	ldapmodify.1
 MAN1+=	ldapmodrdn.1
+MAN1+=	ldappasswd.1
 MAN1+=	ldapsearch.1
 MAN1+=	ud.1
 MAN3+=	cldap_close.3
@@ -58,6 +59,7 @@ MAN8+=	mail500.8
 MAN8+=	rcpt500.8
 MAN8+=	slapd.8
 MAN8+=	slurpd.8
+MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldap.3 cldap.3
 MLINKS+=	ldap_add.3 ldap_add_s.3
 MLINKS+=	ldap_bind.3 ldap_bind_s.3
@@ -157,7 +159,6 @@ MLINKS+=	ldap_url.3 ldap_url_parse.3
 MLINKS+=	ldap_url.3 ldap_url_search.3
 MLINKS+=	ldap_url.3 ldap_url_search_s.3
 MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldif2ldbm.8 ldif2id2children.8
 MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
 MLINKS+=	ldif2ldbm.8 ldif2index.8
diff --git a/net/openldap21-server/pkg-plist b/net/openldap21-server/pkg-plist
index 0c11bdd93441..66e69eca12ae 100644
--- a/net/openldap21-server/pkg-plist
+++ b/net/openldap21-server/pkg-plist
@@ -2,6 +2,7 @@ bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
+bin/ldappasswd
 bin/ldapsearch
 bin/ud
 etc/openldap/ldap.conf.default
diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile
index b8324a263765..048c431a9786 100644
--- a/net/openldap21/Makefile
+++ b/net/openldap21/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.1.2
+# Version required:     1.2.0
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.3 1999/01/02 19:49:15 steve Exp $
+# $Id: Makefile,v 1.4 1999/01/04 15:49:04 dirk Exp $
 #
 
-DISTNAME=       openldap-1.1.2
-CATEGORIES=	net
+DISTNAME=	openldap-1.2.0
+CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
@@ -19,7 +19,8 @@ MAINTAINER=     ulmo@earthling.net
 WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/manpages"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
 
 pre-build:
 	cd ${WRKSRC} ; make depend
@@ -35,6 +36,6 @@ post-install:
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
 	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
-	${PREFIX}/bin/ldapmodify
+	${PREFIX}/bin/ldapmodify ${PREFIX}/bin/ldappasswd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openldap21/distinfo b/net/openldap21/distinfo
index 92244e8cd63a..6f1e6c6c2541 100644
--- a/net/openldap21/distinfo
+++ b/net/openldap21/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
+MD5 (openldap-1.2.0.tgz) = 387418c7d1214116894bab3b9e8ef746
diff --git a/net/openldap21/files/manpages b/net/openldap21/files/manpages
index 5e5e1e79140f..f36399dbc70a 100644
--- a/net/openldap21/files/manpages
+++ b/net/openldap21/files/manpages
@@ -1,6 +1,7 @@
 MAN1+=	ldapdelete.1
 MAN1+=	ldapmodify.1
 MAN1+=	ldapmodrdn.1
+MAN1+=	ldappasswd.1
 MAN1+=	ldapsearch.1
 MAN1+=	ud.1
 MAN3+=	cldap_close.3
@@ -58,6 +59,7 @@ MAN8+=	mail500.8
 MAN8+=	rcpt500.8
 MAN8+=	slapd.8
 MAN8+=	slurpd.8
+MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldap.3 cldap.3
 MLINKS+=	ldap_add.3 ldap_add_s.3
 MLINKS+=	ldap_bind.3 ldap_bind_s.3
@@ -157,7 +159,6 @@ MLINKS+=	ldap_url.3 ldap_url_parse.3
 MLINKS+=	ldap_url.3 ldap_url_search.3
 MLINKS+=	ldap_url.3 ldap_url_search_s.3
 MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldif2ldbm.8 ldif2id2children.8
 MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
 MLINKS+=	ldif2ldbm.8 ldif2index.8
diff --git a/net/openldap21/pkg-plist b/net/openldap21/pkg-plist
index 0c11bdd93441..66e69eca12ae 100644
--- a/net/openldap21/pkg-plist
+++ b/net/openldap21/pkg-plist
@@ -2,6 +2,7 @@ bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
+bin/ldappasswd
 bin/ldapsearch
 bin/ud
 etc/openldap/ldap.conf.default
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index b8324a263765..048c431a9786 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.1.2
+# Version required:     1.2.0
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.3 1999/01/02 19:49:15 steve Exp $
+# $Id: Makefile,v 1.4 1999/01/04 15:49:04 dirk Exp $
 #
 
-DISTNAME=       openldap-1.1.2
-CATEGORIES=	net
+DISTNAME=	openldap-1.2.0
+CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
@@ -19,7 +19,8 @@ MAINTAINER=     ulmo@earthling.net
 WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/manpages"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
 
 pre-build:
 	cd ${WRKSRC} ; make depend
@@ -35,6 +36,6 @@ post-install:
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
 	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
-	${PREFIX}/bin/ldapmodify
+	${PREFIX}/bin/ldapmodify ${PREFIX}/bin/ldappasswd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openldap22-server/distinfo b/net/openldap22-server/distinfo
index 92244e8cd63a..6f1e6c6c2541 100644
--- a/net/openldap22-server/distinfo
+++ b/net/openldap22-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
+MD5 (openldap-1.2.0.tgz) = 387418c7d1214116894bab3b9e8ef746
diff --git a/net/openldap22-server/files/manpages b/net/openldap22-server/files/manpages
index 5e5e1e79140f..f36399dbc70a 100644
--- a/net/openldap22-server/files/manpages
+++ b/net/openldap22-server/files/manpages
@@ -1,6 +1,7 @@
 MAN1+=	ldapdelete.1
 MAN1+=	ldapmodify.1
 MAN1+=	ldapmodrdn.1
+MAN1+=	ldappasswd.1
 MAN1+=	ldapsearch.1
 MAN1+=	ud.1
 MAN3+=	cldap_close.3
@@ -58,6 +59,7 @@ MAN8+=	mail500.8
 MAN8+=	rcpt500.8
 MAN8+=	slapd.8
 MAN8+=	slurpd.8
+MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldap.3 cldap.3
 MLINKS+=	ldap_add.3 ldap_add_s.3
 MLINKS+=	ldap_bind.3 ldap_bind_s.3
@@ -157,7 +159,6 @@ MLINKS+=	ldap_url.3 ldap_url_parse.3
 MLINKS+=	ldap_url.3 ldap_url_search.3
 MLINKS+=	ldap_url.3 ldap_url_search_s.3
 MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldif2ldbm.8 ldif2id2children.8
 MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
 MLINKS+=	ldif2ldbm.8 ldif2index.8
diff --git a/net/openldap22-server/pkg-plist b/net/openldap22-server/pkg-plist
index 0c11bdd93441..66e69eca12ae 100644
--- a/net/openldap22-server/pkg-plist
+++ b/net/openldap22-server/pkg-plist
@@ -2,6 +2,7 @@ bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
+bin/ldappasswd
 bin/ldapsearch
 bin/ud
 etc/openldap/ldap.conf.default
diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile
index b8324a263765..048c431a9786 100644
--- a/net/openldap22/Makefile
+++ b/net/openldap22/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.1.2
+# Version required:     1.2.0
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.3 1999/01/02 19:49:15 steve Exp $
+# $Id: Makefile,v 1.4 1999/01/04 15:49:04 dirk Exp $
 #
 
-DISTNAME=       openldap-1.1.2
-CATEGORIES=	net
+DISTNAME=	openldap-1.2.0
+CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
@@ -19,7 +19,8 @@ MAINTAINER=     ulmo@earthling.net
 WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/manpages"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
 
 pre-build:
 	cd ${WRKSRC} ; make depend
@@ -35,6 +36,6 @@ post-install:
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
 	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
-	${PREFIX}/bin/ldapmodify
+	${PREFIX}/bin/ldapmodify ${PREFIX}/bin/ldappasswd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openldap22/distinfo b/net/openldap22/distinfo
index 92244e8cd63a..6f1e6c6c2541 100644
--- a/net/openldap22/distinfo
+++ b/net/openldap22/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
+MD5 (openldap-1.2.0.tgz) = 387418c7d1214116894bab3b9e8ef746
diff --git a/net/openldap22/files/manpages b/net/openldap22/files/manpages
index 5e5e1e79140f..f36399dbc70a 100644
--- a/net/openldap22/files/manpages
+++ b/net/openldap22/files/manpages
@@ -1,6 +1,7 @@
 MAN1+=	ldapdelete.1
 MAN1+=	ldapmodify.1
 MAN1+=	ldapmodrdn.1
+MAN1+=	ldappasswd.1
 MAN1+=	ldapsearch.1
 MAN1+=	ud.1
 MAN3+=	cldap_close.3
@@ -58,6 +59,7 @@ MAN8+=	mail500.8
 MAN8+=	rcpt500.8
 MAN8+=	slapd.8
 MAN8+=	slurpd.8
+MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldap.3 cldap.3
 MLINKS+=	ldap_add.3 ldap_add_s.3
 MLINKS+=	ldap_bind.3 ldap_bind_s.3
@@ -157,7 +159,6 @@ MLINKS+=	ldap_url.3 ldap_url_parse.3
 MLINKS+=	ldap_url.3 ldap_url_search.3
 MLINKS+=	ldap_url.3 ldap_url_search_s.3
 MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldif2ldbm.8 ldif2id2children.8
 MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
 MLINKS+=	ldif2ldbm.8 ldif2index.8
diff --git a/net/openldap22/pkg-plist b/net/openldap22/pkg-plist
index 0c11bdd93441..66e69eca12ae 100644
--- a/net/openldap22/pkg-plist
+++ b/net/openldap22/pkg-plist
@@ -2,6 +2,7 @@ bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
+bin/ldappasswd
 bin/ldapsearch
 bin/ud
 etc/openldap/ldap.conf.default
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index b8324a263765..048c431a9786 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.1.2
+# Version required:     1.2.0
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.3 1999/01/02 19:49:15 steve Exp $
+# $Id: Makefile,v 1.4 1999/01/04 15:49:04 dirk Exp $
 #
 
-DISTNAME=       openldap-1.1.2
-CATEGORIES=	net
+DISTNAME=	openldap-1.2.0
+CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
@@ -19,7 +19,8 @@ MAINTAINER=     ulmo@earthling.net
 WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/manpages"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
 
 pre-build:
 	cd ${WRKSRC} ; make depend
@@ -35,6 +36,6 @@ post-install:
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
 	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
-	${PREFIX}/bin/ldapmodify
+	${PREFIX}/bin/ldapmodify ${PREFIX}/bin/ldappasswd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openldap23-server/distinfo b/net/openldap23-server/distinfo
index 92244e8cd63a..6f1e6c6c2541 100644
--- a/net/openldap23-server/distinfo
+++ b/net/openldap23-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
+MD5 (openldap-1.2.0.tgz) = 387418c7d1214116894bab3b9e8ef746
diff --git a/net/openldap23-server/files/manpages b/net/openldap23-server/files/manpages
index 5e5e1e79140f..f36399dbc70a 100644
--- a/net/openldap23-server/files/manpages
+++ b/net/openldap23-server/files/manpages
@@ -1,6 +1,7 @@
 MAN1+=	ldapdelete.1
 MAN1+=	ldapmodify.1
 MAN1+=	ldapmodrdn.1
+MAN1+=	ldappasswd.1
 MAN1+=	ldapsearch.1
 MAN1+=	ud.1
 MAN3+=	cldap_close.3
@@ -58,6 +59,7 @@ MAN8+=	mail500.8
 MAN8+=	rcpt500.8
 MAN8+=	slapd.8
 MAN8+=	slurpd.8
+MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldap.3 cldap.3
 MLINKS+=	ldap_add.3 ldap_add_s.3
 MLINKS+=	ldap_bind.3 ldap_bind_s.3
@@ -157,7 +159,6 @@ MLINKS+=	ldap_url.3 ldap_url_parse.3
 MLINKS+=	ldap_url.3 ldap_url_search.3
 MLINKS+=	ldap_url.3 ldap_url_search_s.3
 MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldif2ldbm.8 ldif2id2children.8
 MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
 MLINKS+=	ldif2ldbm.8 ldif2index.8
diff --git a/net/openldap23-server/pkg-plist b/net/openldap23-server/pkg-plist
index 0c11bdd93441..66e69eca12ae 100644
--- a/net/openldap23-server/pkg-plist
+++ b/net/openldap23-server/pkg-plist
@@ -2,6 +2,7 @@ bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
+bin/ldappasswd
 bin/ldapsearch
 bin/ud
 etc/openldap/ldap.conf.default
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index b8324a263765..048c431a9786 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.1.2
+# Version required:     1.2.0
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.3 1999/01/02 19:49:15 steve Exp $
+# $Id: Makefile,v 1.4 1999/01/04 15:49:04 dirk Exp $
 #
 
-DISTNAME=       openldap-1.1.2
-CATEGORIES=	net
+DISTNAME=	openldap-1.2.0
+CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
@@ -19,7 +19,8 @@ MAINTAINER=     ulmo@earthling.net
 WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/manpages"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
 
 pre-build:
 	cd ${WRKSRC} ; make depend
@@ -35,6 +36,6 @@ post-install:
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
 	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
-	${PREFIX}/bin/ldapmodify
+	${PREFIX}/bin/ldapmodify ${PREFIX}/bin/ldappasswd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index 92244e8cd63a..6f1e6c6c2541 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
+MD5 (openldap-1.2.0.tgz) = 387418c7d1214116894bab3b9e8ef746
diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages
index 5e5e1e79140f..f36399dbc70a 100644
--- a/net/openldap24-server/files/manpages
+++ b/net/openldap24-server/files/manpages
@@ -1,6 +1,7 @@
 MAN1+=	ldapdelete.1
 MAN1+=	ldapmodify.1
 MAN1+=	ldapmodrdn.1
+MAN1+=	ldappasswd.1
 MAN1+=	ldapsearch.1
 MAN1+=	ud.1
 MAN3+=	cldap_close.3
@@ -58,6 +59,7 @@ MAN8+=	mail500.8
 MAN8+=	rcpt500.8
 MAN8+=	slapd.8
 MAN8+=	slurpd.8
+MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldap.3 cldap.3
 MLINKS+=	ldap_add.3 ldap_add_s.3
 MLINKS+=	ldap_bind.3 ldap_bind_s.3
@@ -157,7 +159,6 @@ MLINKS+=	ldap_url.3 ldap_url_parse.3
 MLINKS+=	ldap_url.3 ldap_url_search.3
 MLINKS+=	ldap_url.3 ldap_url_search_s.3
 MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
 MLINKS+=	ldif2ldbm.8 ldif2id2children.8
 MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
 MLINKS+=	ldif2ldbm.8 ldif2index.8
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index 0c11bdd93441..66e69eca12ae 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -2,6 +2,7 @@ bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
 bin/ldapmodrdn
+bin/ldappasswd
 bin/ldapsearch
 bin/ud
 etc/openldap/ldap.conf.default