diff --git a/net/openldap/Makefile b/net/openldap/Makefile
index 91d17b253b8b..d91dcde99d60 100644
--- a/net/openldap/Makefile
+++ b/net/openldap/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/10 04:40:45 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
-.include "files/manpages"
+.include "${.CURDIR}/files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
@@ -34,6 +31,7 @@ post-install:
 	${PREFIX}/libexec/slurpd ${PREFIX}/sbin/centipede \
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
-	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm
+	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
+	${PREFIX}/bin/ldapmodify
 
 .include <bsd.port.mk>
diff --git a/net/openldap/distinfo b/net/openldap/distinfo
index e4ea03816940..92244e8cd63a 100644
--- a/net/openldap/distinfo
+++ b/net/openldap/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
diff --git a/net/openldap/files/manpages b/net/openldap/files/manpages
index 5cf07a5e7a8d..5e5e1e79140f 100644
--- a/net/openldap/files/manpages
+++ b/net/openldap/files/manpages
@@ -35,7 +35,7 @@ MAN3+=	ldap_searchprefs.3
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff --git a/net/openldap/files/patch-aa b/net/openldap/files/patch-aa
deleted file mode 100644
index 335c36f7f2d6..000000000000
--- a/net/openldap/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- Make-common.orig	Fri Oct 16 18:59:29 1998
-+++ Make-common	Fri Oct 16 19:08:04 1998
-@@ -189,7 +189,7 @@
- 
- # Locations of auxilary programs
- # (excepts to below are generally defined in Make-platform)
--LDAP_SENDMAIL?=/usr/lib/sendmail
-+LDAP_SENDMAIL?=/usr/sbin/sendmail
- LDAP_EDITOR?=/usr/ucb/vi
- LDAP_FINGER?=/usr/ucb/finger
- 
-@@ -261,10 +261,10 @@
- # LDAP_ACLGROUP=-DACLGROUP
- 
- # uncomment these lines to enable support for CRYPT passwords in LDBM.
--# LDAP_CRYPT=-DLDAP_CRYPT
-+LDAP_CRYPT=-DLDAP_CRYPT
- # LDAP_CRYPT_LIB?=
- # and comment this line out
--LDAP_CRYPT_LIB=
-+# LDAP_CRYPT_LIB=
- 
- # uncomment these lines to enable support fro tcp_wrappers in servers.
- # Requires tcp_wrappers.
diff --git a/net/openldap/files/patch-ab b/net/openldap/files/patch-ab
deleted file mode 100644
index 9007987a52b3..000000000000
--- a/net/openldap/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/platforms/freebsd2-gcc/Make-platform.orig	Wed Sep 16 11:55:05 1998
-+++ build/platforms/freebsd2-gcc/Make-platform	Fri Oct 16 18:59:41 1998
-@@ -6,7 +6,7 @@
- #
- # add any platform-specific overrides below here
- #
--EXTRACFLAGS=-O -g
-+EXTRACFLAGS?=-O -g
- LDBMBACKEND=-DLDBM_USE_DBBTREE
- LDBMINCLUDE=-I/usr/include
- 
diff --git a/net/openldap/files/patch-ac b/net/openldap/files/patch-ac
deleted file mode 100644
index 847a4bf0a165..000000000000
--- a/net/openldap/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- build/platforms/freebsd3-gcc/Make-platform.orig	Wed Sep 16 11:55:05 1998
-+++ build/platforms/freebsd3-gcc/Make-platform	Fri Oct 16 19:06:39 1998
-@@ -30,8 +30,8 @@
- THREADS= -DPOSIX_THREADS -D_THREAD_SAFE -DPTHREAD_PREEMPTIVE
- 
- # use special gcc flag to include libc_r.a
--THREADSLIB= -pthread
--#THREADSLIB= -lc_r
-+#THREADSLIB= -pthread
-+THREADSLIB= -lc_r
- 
- # if you built/installed with -DNOLIBC_R, you'll need uncomment
- # out the following
diff --git a/net/openldap/pkg-plist b/net/openldap/pkg-plist
index c62b9f0c8ca3..0c11bdd93441 100644
--- a/net/openldap/pkg-plist
+++ b/net/openldap/pkg-plist
@@ -4,24 +4,22 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldap.conf.default
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +29,7 @@ libexec/rcpt500
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +38,7 @@ sbin/ldif2id2children
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help
+@dirrm share/openldap
diff --git a/net/openldap12/Makefile b/net/openldap12/Makefile
index 91d17b253b8b..d91dcde99d60 100644
--- a/net/openldap12/Makefile
+++ b/net/openldap12/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/10 04:40:45 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
-.include "files/manpages"
+.include "${.CURDIR}/files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
@@ -34,6 +31,7 @@ post-install:
 	${PREFIX}/libexec/slurpd ${PREFIX}/sbin/centipede \
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
-	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm
+	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
+	${PREFIX}/bin/ldapmodify
 
 .include <bsd.port.mk>
diff --git a/net/openldap12/distinfo b/net/openldap12/distinfo
index e4ea03816940..92244e8cd63a 100644
--- a/net/openldap12/distinfo
+++ b/net/openldap12/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
diff --git a/net/openldap12/files/manpages b/net/openldap12/files/manpages
index 5cf07a5e7a8d..5e5e1e79140f 100644
--- a/net/openldap12/files/manpages
+++ b/net/openldap12/files/manpages
@@ -35,7 +35,7 @@ MAN3+=	ldap_searchprefs.3
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff --git a/net/openldap12/files/patch-aa b/net/openldap12/files/patch-aa
deleted file mode 100644
index 335c36f7f2d6..000000000000
--- a/net/openldap12/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- Make-common.orig	Fri Oct 16 18:59:29 1998
-+++ Make-common	Fri Oct 16 19:08:04 1998
-@@ -189,7 +189,7 @@
- 
- # Locations of auxilary programs
- # (excepts to below are generally defined in Make-platform)
--LDAP_SENDMAIL?=/usr/lib/sendmail
-+LDAP_SENDMAIL?=/usr/sbin/sendmail
- LDAP_EDITOR?=/usr/ucb/vi
- LDAP_FINGER?=/usr/ucb/finger
- 
-@@ -261,10 +261,10 @@
- # LDAP_ACLGROUP=-DACLGROUP
- 
- # uncomment these lines to enable support for CRYPT passwords in LDBM.
--# LDAP_CRYPT=-DLDAP_CRYPT
-+LDAP_CRYPT=-DLDAP_CRYPT
- # LDAP_CRYPT_LIB?=
- # and comment this line out
--LDAP_CRYPT_LIB=
-+# LDAP_CRYPT_LIB=
- 
- # uncomment these lines to enable support fro tcp_wrappers in servers.
- # Requires tcp_wrappers.
diff --git a/net/openldap12/files/patch-ab b/net/openldap12/files/patch-ab
deleted file mode 100644
index 9007987a52b3..000000000000
--- a/net/openldap12/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/platforms/freebsd2-gcc/Make-platform.orig	Wed Sep 16 11:55:05 1998
-+++ build/platforms/freebsd2-gcc/Make-platform	Fri Oct 16 18:59:41 1998
-@@ -6,7 +6,7 @@
- #
- # add any platform-specific overrides below here
- #
--EXTRACFLAGS=-O -g
-+EXTRACFLAGS?=-O -g
- LDBMBACKEND=-DLDBM_USE_DBBTREE
- LDBMINCLUDE=-I/usr/include
- 
diff --git a/net/openldap12/files/patch-ac b/net/openldap12/files/patch-ac
deleted file mode 100644
index 847a4bf0a165..000000000000
--- a/net/openldap12/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- build/platforms/freebsd3-gcc/Make-platform.orig	Wed Sep 16 11:55:05 1998
-+++ build/platforms/freebsd3-gcc/Make-platform	Fri Oct 16 19:06:39 1998
-@@ -30,8 +30,8 @@
- THREADS= -DPOSIX_THREADS -D_THREAD_SAFE -DPTHREAD_PREEMPTIVE
- 
- # use special gcc flag to include libc_r.a
--THREADSLIB= -pthread
--#THREADSLIB= -lc_r
-+#THREADSLIB= -pthread
-+THREADSLIB= -lc_r
- 
- # if you built/installed with -DNOLIBC_R, you'll need uncomment
- # out the following
diff --git a/net/openldap12/pkg-plist b/net/openldap12/pkg-plist
index c62b9f0c8ca3..0c11bdd93441 100644
--- a/net/openldap12/pkg-plist
+++ b/net/openldap12/pkg-plist
@@ -4,24 +4,22 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldap.conf.default
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +29,7 @@ libexec/rcpt500
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +38,7 @@ sbin/ldif2id2children
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help
+@dirrm share/openldap
diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile
index 91d17b253b8b..d91dcde99d60 100644
--- a/net/openldap2/Makefile
+++ b/net/openldap2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/10 04:40:45 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
-.include "files/manpages"
+.include "${.CURDIR}/files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
@@ -34,6 +31,7 @@ post-install:
 	${PREFIX}/libexec/slurpd ${PREFIX}/sbin/centipede \
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
-	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm
+	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
+	${PREFIX}/bin/ldapmodify
 
 .include <bsd.port.mk>
diff --git a/net/openldap2/distinfo b/net/openldap2/distinfo
index e4ea03816940..92244e8cd63a 100644
--- a/net/openldap2/distinfo
+++ b/net/openldap2/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
diff --git a/net/openldap2/files/manpages b/net/openldap2/files/manpages
index 5cf07a5e7a8d..5e5e1e79140f 100644
--- a/net/openldap2/files/manpages
+++ b/net/openldap2/files/manpages
@@ -35,7 +35,7 @@ MAN3+=	ldap_searchprefs.3
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff --git a/net/openldap2/pkg-plist b/net/openldap2/pkg-plist
index c62b9f0c8ca3..0c11bdd93441 100644
--- a/net/openldap2/pkg-plist
+++ b/net/openldap2/pkg-plist
@@ -4,24 +4,22 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldap.conf.default
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +29,7 @@ libexec/rcpt500
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +38,7 @@ sbin/ldif2id2children
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help
+@dirrm share/openldap
diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile
index 91d17b253b8b..d91dcde99d60 100644
--- a/net/openldap20-server/Makefile
+++ b/net/openldap20-server/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/10 04:40:45 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
-.include "files/manpages"
+.include "${.CURDIR}/files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
@@ -34,6 +31,7 @@ post-install:
 	${PREFIX}/libexec/slurpd ${PREFIX}/sbin/centipede \
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
-	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm
+	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
+	${PREFIX}/bin/ldapmodify
 
 .include <bsd.port.mk>
diff --git a/net/openldap20-server/distinfo b/net/openldap20-server/distinfo
index e4ea03816940..92244e8cd63a 100644
--- a/net/openldap20-server/distinfo
+++ b/net/openldap20-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
diff --git a/net/openldap20-server/files/manpages b/net/openldap20-server/files/manpages
index 5cf07a5e7a8d..5e5e1e79140f 100644
--- a/net/openldap20-server/files/manpages
+++ b/net/openldap20-server/files/manpages
@@ -35,7 +35,7 @@ MAN3+=	ldap_searchprefs.3
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff --git a/net/openldap20-server/pkg-plist b/net/openldap20-server/pkg-plist
index c62b9f0c8ca3..0c11bdd93441 100644
--- a/net/openldap20-server/pkg-plist
+++ b/net/openldap20-server/pkg-plist
@@ -4,24 +4,22 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldap.conf.default
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +29,7 @@ libexec/rcpt500
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +38,7 @@ sbin/ldif2id2children
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help
+@dirrm share/openldap
diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile
index 91d17b253b8b..d91dcde99d60 100644
--- a/net/openldap20/Makefile
+++ b/net/openldap20/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/10 04:40:45 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
-.include "files/manpages"
+.include "${.CURDIR}/files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
@@ -34,6 +31,7 @@ post-install:
 	${PREFIX}/libexec/slurpd ${PREFIX}/sbin/centipede \
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
-	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm
+	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
+	${PREFIX}/bin/ldapmodify
 
 .include <bsd.port.mk>
diff --git a/net/openldap20/distinfo b/net/openldap20/distinfo
index e4ea03816940..92244e8cd63a 100644
--- a/net/openldap20/distinfo
+++ b/net/openldap20/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
diff --git a/net/openldap20/files/manpages b/net/openldap20/files/manpages
index 5cf07a5e7a8d..5e5e1e79140f 100644
--- a/net/openldap20/files/manpages
+++ b/net/openldap20/files/manpages
@@ -35,7 +35,7 @@ MAN3+=	ldap_searchprefs.3
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff --git a/net/openldap20/pkg-plist b/net/openldap20/pkg-plist
index c62b9f0c8ca3..0c11bdd93441 100644
--- a/net/openldap20/pkg-plist
+++ b/net/openldap20/pkg-plist
@@ -4,24 +4,22 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldap.conf.default
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +29,7 @@ libexec/rcpt500
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +38,7 @@ sbin/ldif2id2children
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help
+@dirrm share/openldap
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index 91d17b253b8b..d91dcde99d60 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/10 04:40:45 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
-.include "files/manpages"
+.include "${.CURDIR}/files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
@@ -34,6 +31,7 @@ post-install:
 	${PREFIX}/libexec/slurpd ${PREFIX}/sbin/centipede \
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
-	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm
+	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
+	${PREFIX}/bin/ldapmodify
 
 .include <bsd.port.mk>
diff --git a/net/openldap21-server/distinfo b/net/openldap21-server/distinfo
index e4ea03816940..92244e8cd63a 100644
--- a/net/openldap21-server/distinfo
+++ b/net/openldap21-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
diff --git a/net/openldap21-server/files/manpages b/net/openldap21-server/files/manpages
index 5cf07a5e7a8d..5e5e1e79140f 100644
--- a/net/openldap21-server/files/manpages
+++ b/net/openldap21-server/files/manpages
@@ -35,7 +35,7 @@ MAN3+=	ldap_searchprefs.3
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff --git a/net/openldap21-server/pkg-plist b/net/openldap21-server/pkg-plist
index c62b9f0c8ca3..0c11bdd93441 100644
--- a/net/openldap21-server/pkg-plist
+++ b/net/openldap21-server/pkg-plist
@@ -4,24 +4,22 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldap.conf.default
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +29,7 @@ libexec/rcpt500
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +38,7 @@ sbin/ldif2id2children
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help
+@dirrm share/openldap
diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile
index 91d17b253b8b..d91dcde99d60 100644
--- a/net/openldap21/Makefile
+++ b/net/openldap21/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/10 04:40:45 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
-.include "files/manpages"
+.include "${.CURDIR}/files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
@@ -34,6 +31,7 @@ post-install:
 	${PREFIX}/libexec/slurpd ${PREFIX}/sbin/centipede \
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
-	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm
+	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
+	${PREFIX}/bin/ldapmodify
 
 .include <bsd.port.mk>
diff --git a/net/openldap21/distinfo b/net/openldap21/distinfo
index e4ea03816940..92244e8cd63a 100644
--- a/net/openldap21/distinfo
+++ b/net/openldap21/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
diff --git a/net/openldap21/files/manpages b/net/openldap21/files/manpages
index 5cf07a5e7a8d..5e5e1e79140f 100644
--- a/net/openldap21/files/manpages
+++ b/net/openldap21/files/manpages
@@ -35,7 +35,7 @@ MAN3+=	ldap_searchprefs.3
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff --git a/net/openldap21/pkg-plist b/net/openldap21/pkg-plist
index c62b9f0c8ca3..0c11bdd93441 100644
--- a/net/openldap21/pkg-plist
+++ b/net/openldap21/pkg-plist
@@ -4,24 +4,22 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldap.conf.default
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +29,7 @@ libexec/rcpt500
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +38,7 @@ sbin/ldif2id2children
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help
+@dirrm share/openldap
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 91d17b253b8b..d91dcde99d60 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/10 04:40:45 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
-.include "files/manpages"
+.include "${.CURDIR}/files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
@@ -34,6 +31,7 @@ post-install:
 	${PREFIX}/libexec/slurpd ${PREFIX}/sbin/centipede \
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
-	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm
+	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
+	${PREFIX}/bin/ldapmodify
 
 .include <bsd.port.mk>
diff --git a/net/openldap22-server/distinfo b/net/openldap22-server/distinfo
index e4ea03816940..92244e8cd63a 100644
--- a/net/openldap22-server/distinfo
+++ b/net/openldap22-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
diff --git a/net/openldap22-server/files/manpages b/net/openldap22-server/files/manpages
index 5cf07a5e7a8d..5e5e1e79140f 100644
--- a/net/openldap22-server/files/manpages
+++ b/net/openldap22-server/files/manpages
@@ -35,7 +35,7 @@ MAN3+=	ldap_searchprefs.3
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff --git a/net/openldap22-server/pkg-plist b/net/openldap22-server/pkg-plist
index c62b9f0c8ca3..0c11bdd93441 100644
--- a/net/openldap22-server/pkg-plist
+++ b/net/openldap22-server/pkg-plist
@@ -4,24 +4,22 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldap.conf.default
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +29,7 @@ libexec/rcpt500
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +38,7 @@ sbin/ldif2id2children
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help
+@dirrm share/openldap
diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile
index 91d17b253b8b..d91dcde99d60 100644
--- a/net/openldap22/Makefile
+++ b/net/openldap22/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/10 04:40:45 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
-.include "files/manpages"
+.include "${.CURDIR}/files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
@@ -34,6 +31,7 @@ post-install:
 	${PREFIX}/libexec/slurpd ${PREFIX}/sbin/centipede \
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
-	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm
+	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
+	${PREFIX}/bin/ldapmodify
 
 .include <bsd.port.mk>
diff --git a/net/openldap22/distinfo b/net/openldap22/distinfo
index e4ea03816940..92244e8cd63a 100644
--- a/net/openldap22/distinfo
+++ b/net/openldap22/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
diff --git a/net/openldap22/files/manpages b/net/openldap22/files/manpages
index 5cf07a5e7a8d..5e5e1e79140f 100644
--- a/net/openldap22/files/manpages
+++ b/net/openldap22/files/manpages
@@ -35,7 +35,7 @@ MAN3+=	ldap_searchprefs.3
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff --git a/net/openldap22/pkg-plist b/net/openldap22/pkg-plist
index c62b9f0c8ca3..0c11bdd93441 100644
--- a/net/openldap22/pkg-plist
+++ b/net/openldap22/pkg-plist
@@ -4,24 +4,22 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldap.conf.default
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +29,7 @@ libexec/rcpt500
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +38,7 @@ sbin/ldif2id2children
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help
+@dirrm share/openldap
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 91d17b253b8b..d91dcde99d60 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/10 04:40:45 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
-.include "files/manpages"
+.include "${.CURDIR}/files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
@@ -34,6 +31,7 @@ post-install:
 	${PREFIX}/libexec/slurpd ${PREFIX}/sbin/centipede \
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
-	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm
+	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
+	${PREFIX}/bin/ldapmodify
 
 .include <bsd.port.mk>
diff --git a/net/openldap23-server/distinfo b/net/openldap23-server/distinfo
index e4ea03816940..92244e8cd63a 100644
--- a/net/openldap23-server/distinfo
+++ b/net/openldap23-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
diff --git a/net/openldap23-server/files/manpages b/net/openldap23-server/files/manpages
index 5cf07a5e7a8d..5e5e1e79140f 100644
--- a/net/openldap23-server/files/manpages
+++ b/net/openldap23-server/files/manpages
@@ -35,7 +35,7 @@ MAN3+=	ldap_searchprefs.3
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff --git a/net/openldap23-server/pkg-plist b/net/openldap23-server/pkg-plist
index c62b9f0c8ca3..0c11bdd93441 100644
--- a/net/openldap23-server/pkg-plist
+++ b/net/openldap23-server/pkg-plist
@@ -4,24 +4,22 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldap.conf.default
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +29,7 @@ libexec/rcpt500
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +38,7 @@ sbin/ldif2id2children
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help
+@dirrm share/openldap
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 91d17b253b8b..d91dcde99d60 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/10 04:40:45 steve Exp $
+# $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
-.include "files/manpages"
+.include "${.CURDIR}/files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
@@ -34,6 +31,7 @@ post-install:
 	${PREFIX}/libexec/slurpd ${PREFIX}/sbin/centipede \
 	${PREFIX}/sbin/ldbmcat ${PREFIX}/sbin/ldbmtest ${PREFIX}/sbin/ldif \
 	${PREFIX}/sbin/ldif2id2children ${PREFIX}/sbin/ldif2id2entry \
-	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm
+	${PREFIX}/sbin/ldif2index ${PREFIX}/sbin/ldif2ldbm \
+	${PREFIX}/bin/ldapmodify
 
 .include <bsd.port.mk>
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index e4ea03816940..92244e8cd63a 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.2.tgz) = 6d350f4da0aaca4fed8390bb3459cab7
diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages
index 5cf07a5e7a8d..5e5e1e79140f 100644
--- a/net/openldap24-server/files/manpages
+++ b/net/openldap24-server/files/manpages
@@ -35,7 +35,7 @@ MAN3+=	ldap_searchprefs.3
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index c62b9f0c8ca3..0c11bdd93441 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -4,24 +4,22 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldap.conf.default
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +29,7 @@ libexec/rcpt500
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +38,7 @@ sbin/ldif2id2children
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help
+@dirrm share/openldap