1 files changed, 17 insertions, 19 deletions

diff --git a/net/openldap22-server/pkg-plist b/net/openldap22-server/pkg-plist
index 01b9157e87f0..35e14c96310e 100644
--- a/net/openldap22-server/pkg-plist
+++ b/net/openldap22-server/pkg-plist
@@ -7,51 +7,49 @@ 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
+@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
+@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
+@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.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
+@exec [ -f %B/ldaptemplates.conf ] || cp %B/%f %B/ldaptemplates.conf
 @unexec if cmp -s %D/etc/openldap/schema/corba.schema %D/etc/openldap/schema/corba.schema.default; then rm -f %D/etc/openldap/schema/corba.schema; fi
 etc/openldap/schema/corba.schema.default
-@exec [ ! -f %B/corba.schema ] && cp %B/%f %B/corba.schema
+@exec [ -f %B/corba.schema ] || cp %B/%f %B/corba.schema
 @unexec if cmp -s %D/etc/openldap/schema/core.schema %D/etc/openldap/schema/core.schema.default; then rm -f %D/etc/openldap/schema/core.schema; fi
 etc/openldap/schema/core.schema.default
-@exec [ ! -f %B/core.schema ] && cp %B/%f %B/core.schema
+@exec [ -f %B/core.schema ] || cp %B/%f %B/core.schema
 @unexec if cmp -s %D/etc/openldap/schema/cosine.schema %D/etc/openldap/schema/cosine.schema.default; then rm -f %D/etc/openldap/schema/cosine.schema; fi
 etc/openldap/schema/cosine.schema.default
-@exec [ ! -f %B/cosine.schema ] && cp %B/%f %B/cosine.schema
+@exec [ -f %B/cosine.schema ] || cp %B/%f %B/cosine.schema
 @unexec if cmp -s %D/etc/openldap/schema/inetorgperson.schema %D/etc/openldap/schema/inetorgperson.schema.default; then rm -f %D/etc/openldap/schema/inetorgperson.schema; fi
 etc/openldap/schema/inetorgperson.schema.default
-@exec [ ! -f %B/inetorgperson.schema ] && cp %B/%f %B/inetorgperson.schema
+@exec [ -f %B/inetorgperson.schema ] || cp %B/%f %B/inetorgperson.schema
 @unexec if cmp -s %D/etc/openldap/schema/java.schema %D/etc/openldap/schema/java.schema.default; then rm -f %D/etc/openldap/schema/java.schema; fi
 etc/openldap/schema/java.schema.default
-@exec [ ! -f %B/java.schema ] && cp %B/%f %B/java.schema
+@exec [ -f %B/java.schema ] || cp %B/%f %B/java.schema
 @unexec if cmp -s %D/etc/openldap/schema/krb5-kdc.schema %D/etc/openldap/schema/krb5-kdc.schema.default; then rm -f %D/etc/openldap/schema/krb5-kdc.schema; fi
 etc/openldap/schema/krb5-kdc.schema.default
-@exec [ ! -f %B/krb5-kdc.schema ] && cp %B/%f %B/krb5-kdc.schema
+@exec [ -f %B/krb5-kdc.schema ] || cp %B/%f %B/krb5-kdc.schema
 @unexec if cmp -s %D/etc/openldap/schema/misc.schema %D/etc/openldap/schema/misc.schema.default; then rm -f %D/etc/openldap/schema/misc.schema; fi
 etc/openldap/schema/misc.schema.default
-@exec [ ! -f %B/misc.schema ] && cp %B/%f %B/misc.schema
+@exec [ -f %B/misc.schema ] || cp %B/%f %B/misc.schema
 @unexec if cmp -s %D/etc/openldap/schema/nadf.schema %D/etc/openldap/schema/nadf.schema.default; then rm -f %D/etc/openldap/schema/nadf.schema; fi
 etc/openldap/schema/nadf.schema.default
-@exec [ ! -f %B/nadf.schema ] && cp %B/%f %B/nadf.schema
+@exec [ -f %B/nadf.schema ] || cp %B/%f %B/nadf.schema
 @unexec if cmp -s %D/etc/openldap/schema/nis.schema %D/etc/openldap/schema/nis.schema.default; then rm -f %D/etc/openldap/schema/nis.schema; fi
 etc/openldap/schema/nis.schema.default
-@exec [ ! -f %B/nis.schema ] && cp %B/%f %B/nis.schema
+@exec [ -f %B/nis.schema ] || cp %B/%f %B/nis.schema
 @unexec if cmp -s %D/etc/openldap/schema/openldap.schema %D/etc/openldap/schema/openldap.schema.default; then rm -f %D/etc/openldap/schema/openldap.schema; fi
 etc/openldap/schema/openldap.schema.default
-@exec [ ! -f %B/openldap.schema ] && cp %B/%f %B/openldap.schema
-@dirrm etc/openldap/schema
-@dirrm etc/openldap
+@exec [ -f %B/openldap.schema ] || cp %B/%f %B/openldap.schema
+@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
 etc/rc.d/slapd.sh.sample
 include/disptmpl.h
 include/lber.h