Fix plist to handle *.conf files properly as apache13* ports do.

Submitted by:	bento

22 files changed, 187 insertions, 0 deletions

diff --git a/net/openldap/Makefile b/net/openldap/Makefile
index e73d39f..b0c3cd1 100644
--- a/net/openldap/Makefile
+++ b/net/openldap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap/pkg-plist b/net/openldap/pkg-plist
index 78121f3..692835f 100644
--- a/net/openldap/pkg-plist
+++ b/net/openldap/pkg-plist
@@ -5,13 +5,29 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
+@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
+@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
+@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
 etc/openldap/ldapfilter.conf.default
+@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
+@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
 etc/openldap/ldapsearchprefs.conf.default
+@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
+@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
 etc/openldap/ldaptemplates.conf.default
+@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
+@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
 etc/openldap/slapd.at.conf.default
+@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
+@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
+@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
+@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
 etc/openldap/slapd.oc.conf.default
+@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
+@dirrm etc/openldap
+etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h
 include/ldap.h
diff --git a/net/openldap12/Makefile b/net/openldap12/Makefile
index e73d39f..b0c3cd1 100644
--- a/net/openldap12/Makefile
+++ b/net/openldap12/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap12/pkg-plist b/net/openldap12/pkg-plist
index 78121f3..692835f 100644
--- a/net/openldap12/pkg-plist
+++ b/net/openldap12/pkg-plist
@@ -5,13 +5,29 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
+@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
+@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
+@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
 etc/openldap/ldapfilter.conf.default
+@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
+@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
 etc/openldap/ldapsearchprefs.conf.default
+@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
+@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
 etc/openldap/ldaptemplates.conf.default
+@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
+@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
 etc/openldap/slapd.at.conf.default
+@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
+@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
+@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
+@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
 etc/openldap/slapd.oc.conf.default
+@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
+@dirrm etc/openldap
+etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h
 include/ldap.h
diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile
index e73d39f..b0c3cd1 100644
--- a/net/openldap2/Makefile
+++ b/net/openldap2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap2/pkg-plist b/net/openldap2/pkg-plist
index 78121f3..692835f 100644
--- a/net/openldap2/pkg-plist
+++ b/net/openldap2/pkg-plist
@@ -5,13 +5,29 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
+@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
+@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
+@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
 etc/openldap/ldapfilter.conf.default
+@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
+@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
 etc/openldap/ldapsearchprefs.conf.default
+@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
+@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
 etc/openldap/ldaptemplates.conf.default
+@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
+@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
 etc/openldap/slapd.at.conf.default
+@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
+@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
+@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
+@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
 etc/openldap/slapd.oc.conf.default
+@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
+@dirrm etc/openldap
+etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h
 include/ldap.h
diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile
index e73d39f..b0c3cd1 100644
--- a/net/openldap20-server/Makefile
+++ b/net/openldap20-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap20-server/pkg-plist b/net/openldap20-server/pkg-plist
index 78121f3..692835f 100644
--- a/net/openldap20-server/pkg-plist
+++ b/net/openldap20-server/pkg-plist
@@ -5,13 +5,29 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
+@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
+@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
+@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
 etc/openldap/ldapfilter.conf.default
+@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
+@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
 etc/openldap/ldapsearchprefs.conf.default
+@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
+@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
 etc/openldap/ldaptemplates.conf.default
+@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
+@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
 etc/openldap/slapd.at.conf.default
+@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
+@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
+@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
+@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
 etc/openldap/slapd.oc.conf.default
+@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
+@dirrm etc/openldap
+etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h
 include/ldap.h
diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile
index e73d39f..b0c3cd1 100644
--- a/net/openldap20/Makefile
+++ b/net/openldap20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap20/pkg-plist b/net/openldap20/pkg-plist
index 78121f3..692835f 100644
--- a/net/openldap20/pkg-plist
+++ b/net/openldap20/pkg-plist
@@ -5,13 +5,29 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
+@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
+@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
+@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
 etc/openldap/ldapfilter.conf.default
+@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
+@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
 etc/openldap/ldapsearchprefs.conf.default
+@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
+@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
 etc/openldap/ldaptemplates.conf.default
+@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
+@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
 etc/openldap/slapd.at.conf.default
+@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
+@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
+@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
+@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
 etc/openldap/slapd.oc.conf.default
+@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
+@dirrm etc/openldap
+etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h
 include/ldap.h
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index e73d39f..b0c3cd1 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap21-server/pkg-plist b/net/openldap21-server/pkg-plist
index 78121f3..692835f 100644
--- a/net/openldap21-server/pkg-plist
+++ b/net/openldap21-server/pkg-plist
@@ -5,13 +5,29 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
+@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
+@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
+@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
 etc/openldap/ldapfilter.conf.default
+@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
+@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
 etc/openldap/ldapsearchprefs.conf.default
+@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
+@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
 etc/openldap/ldaptemplates.conf.default
+@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
+@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
 etc/openldap/slapd.at.conf.default
+@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
+@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
+@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
+@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
 etc/openldap/slapd.oc.conf.default
+@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
+@dirrm etc/openldap
+etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h
 include/ldap.h
diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile
index e73d39f..b0c3cd1 100644
--- a/net/openldap21/Makefile
+++ b/net/openldap21/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap21/pkg-plist b/net/openldap21/pkg-plist
index 78121f3..692835f 100644
--- a/net/openldap21/pkg-plist
+++ b/net/openldap21/pkg-plist
@@ -5,13 +5,29 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
+@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
+@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
+@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
 etc/openldap/ldapfilter.conf.default
+@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
+@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
 etc/openldap/ldapsearchprefs.conf.default
+@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
+@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
 etc/openldap/ldaptemplates.conf.default
+@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
+@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
 etc/openldap/slapd.at.conf.default
+@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
+@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
+@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
+@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
 etc/openldap/slapd.oc.conf.default
+@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
+@dirrm etc/openldap
+etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h
 include/ldap.h
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index e73d39f..b0c3cd1 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap22-server/pkg-plist b/net/openldap22-server/pkg-plist
index 78121f3..692835f 100644
--- a/net/openldap22-server/pkg-plist
+++ b/net/openldap22-server/pkg-plist
@@ -5,13 +5,29 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
+@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
+@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
+@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
 etc/openldap/ldapfilter.conf.default
+@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
+@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
 etc/openldap/ldapsearchprefs.conf.default
+@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
+@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
 etc/openldap/ldaptemplates.conf.default
+@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
+@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
 etc/openldap/slapd.at.conf.default
+@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
+@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
+@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
+@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
 etc/openldap/slapd.oc.conf.default
+@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
+@dirrm etc/openldap
+etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h
 include/ldap.h
diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile
index e73d39f..b0c3cd1 100644
--- a/net/openldap22/Makefile
+++ b/net/openldap22/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap22/pkg-plist b/net/openldap22/pkg-plist
index 78121f3..692835f 100644
--- a/net/openldap22/pkg-plist
+++ b/net/openldap22/pkg-plist
@@ -5,13 +5,29 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
+@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
+@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
+@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
 etc/openldap/ldapfilter.conf.default
+@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
+@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
 etc/openldap/ldapsearchprefs.conf.default
+@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
+@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
 etc/openldap/ldaptemplates.conf.default
+@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
+@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
 etc/openldap/slapd.at.conf.default
+@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
+@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
+@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
+@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
 etc/openldap/slapd.oc.conf.default
+@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
+@dirrm etc/openldap
+etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h
 include/ldap.h
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index e73d39f..b0c3cd1 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap23-server/pkg-plist b/net/openldap23-server/pkg-plist
index 78121f3..692835f 100644
--- a/net/openldap23-server/pkg-plist
+++ b/net/openldap23-server/pkg-plist
@@ -5,13 +5,29 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
+@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
+@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
+@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
 etc/openldap/ldapfilter.conf.default
+@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
+@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
 etc/openldap/ldapsearchprefs.conf.default
+@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
+@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
 etc/openldap/ldaptemplates.conf.default
+@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
+@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
 etc/openldap/slapd.at.conf.default
+@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
+@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
+@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
+@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
 etc/openldap/slapd.oc.conf.default
+@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
+@dirrm etc/openldap
+etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h
 include/ldap.h
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index e73d39f..b0c3cd1 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \
 		ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index 78121f3..692835f 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -5,13 +5,29 @@ bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
 bin/ud
+@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
+@exec [ ! -f %B/ldap.conf ] && cp %B/%f %B/ldap.conf
+@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
 etc/openldap/ldapfilter.conf.default
+@exec [ ! -f %B/ldapfilter.conf ] && cp %B/%f %B/ldapfilter.conf
+@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
 etc/openldap/ldapsearchprefs.conf.default
+@exec [ ! -f %B/ldapsearchprefs.conf ] && cp %B/%f %B/ldapsearchprefs.conf
+@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
 etc/openldap/ldaptemplates.conf.default
+@exec [ ! -f %B/ldaptemplates.conf ] && cp %B/%f %B/ldaptemplates.conf
+@unexec if cmp -s %D/etc/openldap/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
 etc/openldap/slapd.at.conf.default
+@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
+@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
+@exec [ ! -f %B/slapd.conf ] && cp %B/%f %B/slapd.conf
+@unexec if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
 etc/openldap/slapd.oc.conf.default
+@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
+@dirrm etc/openldap
+etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h
 include/ldap.h