5 files changed, 4 insertions, 43 deletions

diff --git a/net/openldap/Makefile b/net/openldap/Makefile
index 7529ff2c9572..121482e3e9d4 100644
--- a/net/openldap/Makefile
+++ b/net/openldap/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.2.7
+# Version required:     1.2.8
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
 # $FreeBSD$
 #
 
-DISTNAME=	openldap-1.2.7
+DISTNAME=	openldap-1.2.8
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
@@ -21,8 +21,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     ulmo@earthling.net
 
-WRKSRC=		${WRKDIR}/ldap
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS= --prefix=${PREFIX} --localstatedir=/var/run
 
 .include <bsd.port.pre.mk>
 .include "${FILESDIR}/manpages"
diff --git a/net/openldap/distinfo b/net/openldap/distinfo
index f29985c25458..2650bea9261e 100644
--- a/net/openldap/distinfo
+++ b/net/openldap/distinfo
@@ -1 +1 @@
-MD5 (openldap-1.2.7.tgz) = be5866cfa50fdf083f5230b3837181e8
+MD5 (openldap-1.2.8.tgz) = aa2b56cb5947721757aecab2e85b801d
diff --git a/net/openldap/files/patch-aa b/net/openldap/files/patch-aa
deleted file mode 100644
index 93f071d8a12b..000000000000
--- a/net/openldap/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- servers/slapd/add.c.orig	Fri Jan 29 00:11:49 1999
-+++ servers/slapd/add.c	Sat Oct 23 13:31:43 1999
-@@ -180,6 +180,9 @@
- 		bv.bv_len = strlen( bv.bv_val );
- 	}
- 	attr_merge( e, "creatorsname", bvals );
-+	/* Netscape Communicator 4.5 seems to expect modification information
-+	   to be present within newly created items. */
-+	attr_merge( e, "modifiersname", bvals );
- 
- 	ldap_pvt_thread_mutex_lock( &currenttime_mutex );
- #ifndef LDAP_LOCALTIME
-@@ -194,4 +197,7 @@
- 	bv.bv_val = buf;
- 	bv.bv_len = strlen( bv.bv_val );
- 	attr_merge( e, "createtimestamp", bvals );
-+	/* Netscape Communicator 4.5 seems to expect modification information
-+	   to be present within newly created items. */
-+	attr_merge( e, "modifytimestamp", bvals );
- }
diff --git a/net/openldap/files/patch-ab b/net/openldap/files/patch-ab
deleted file mode 100644
index e1dad257389e..000000000000
--- a/net/openldap/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig      Mon Nov  1 09:24:55 1999
-+++ configure   Mon Nov  1 09:25:14 1999
-@@ -112,7 +112,7 @@
- datadir='${prefix}/share'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir='/var/run'
- libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
diff --git a/net/openldap/pkg-plist b/net/openldap/pkg-plist
index 5aef80ee1133..66e69eca12ae 100644
--- a/net/openldap/pkg-plist
+++ b/net/openldap/pkg-plist
@@ -5,19 +5,12 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
-etc/openldap/ldap.conf
 etc/openldap/ldap.conf.default
-etc/openldap/ldapfilter.conf
 etc/openldap/ldapfilter.conf.default
-etc/openldap/ldapsearchprefs.conf
 etc/openldap/ldapsearchprefs.conf.default
-etc/openldap/ldaptemplates.conf
 etc/openldap/ldaptemplates.conf.default
-etc/openldap/slapd.at.conf
 etc/openldap/slapd.at.conf.default
-etc/openldap/slapd.conf
 etc/openldap/slapd.conf.default
-etc/openldap/slapd.oc.conf
 etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
@@ -49,5 +42,4 @@ sbin/ldif2ldbm
 share/openldap/go500gw.help
 share/openldap/ldapfriendly
 share/openldap/rcpt500.help
-@dirrm etc/openldap
 @dirrm share/openldap