diff options
| author | olgeni <olgeni@FreeBSD.org> | 2001-05-13 04:14:35 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2001-05-13 04:14:35 +0800 |
| commit | 2f367f4dfe66ce5b4aeb8cf3b6e6cb5fa35eb591 (patch) | |
| tree | 9003f9676d84e04668523b74ff89d3434d34979c | |
| parent | 83572ed5102a5859ae867ca69cc40662c6690f94 (diff) | |
| download | freebsd-ports-gnome-2f367f4dfe66ce5b4aeb8cf3b6e6cb5fa35eb591.tar.gz freebsd-ports-gnome-2f367f4dfe66ce5b4aeb8cf3b6e6cb5fa35eb591.tar.zst freebsd-ports-gnome-2f367f4dfe66ce5b4aeb8cf3b6e6cb5fa35eb591.zip | |
Update port to version 2.0.8.
* Rewrite lines like:
@exec [ CONDITION ] && ACTION
as:
@exec [ ! CONDITION ] || ACTION
In the first version, the @executed command returns false if CONDITION
is false and ACTION is not performed: pkg_add would then complain about the
whole command's exit code.
The second version returns either true or the actual ACTION exit code.
* Do not echo some Makefile commands.
27 files changed, 216 insertions, 243 deletions
diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile index bb2b25ab301a..0dde938e88ef 100644 --- a/net/openldap2/Makefile +++ b/net/openldap2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openldap -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \ @@ -78,19 +77,19 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-configure: - cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff pre-build: - cd ${WRKSRC} ; ${MAKE} depend + @cd ${WRKSRC} ; ${MAKE} depend post-build: - ${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh + @${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh post-install: .for f in ${BINS} - strip ${PREFIX}/${f} + @strip ${PREFIX}/${f} .endfor - ${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample + @${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net/openldap2/distinfo b/net/openldap2/distinfo index a617d2b16a0c..5556ab6d68e0 100644 --- a/net/openldap2/distinfo +++ b/net/openldap2/distinfo @@ -1 +1 @@ -MD5 (openldap-2.0.7.tgz) = e772449b0fcc64dc4e7bf20c2853dd10 +MD5 (openldap-2.0.8.tgz) = 4e6603c732011f01d7fc0120685b6f31 diff --git a/net/openldap2/pkg-plist b/net/openldap2/pkg-plist index 01b9157e87f0..35e14c96310e 100644 --- a/net/openldap2/pkg-plist +++ b/net/openldap2/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 diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile index bb2b25ab301a..0dde938e88ef 100644 --- a/net/openldap20-server/Makefile +++ b/net/openldap20-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openldap -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \ @@ -78,19 +77,19 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-configure: - cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff pre-build: - cd ${WRKSRC} ; ${MAKE} depend + @cd ${WRKSRC} ; ${MAKE} depend post-build: - ${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh + @${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh post-install: .for f in ${BINS} - strip ${PREFIX}/${f} + @strip ${PREFIX}/${f} .endfor - ${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample + @${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net/openldap20-server/distinfo b/net/openldap20-server/distinfo index a617d2b16a0c..5556ab6d68e0 100644 --- a/net/openldap20-server/distinfo +++ b/net/openldap20-server/distinfo @@ -1 +1 @@ -MD5 (openldap-2.0.7.tgz) = e772449b0fcc64dc4e7bf20c2853dd10 +MD5 (openldap-2.0.8.tgz) = 4e6603c732011f01d7fc0120685b6f31 diff --git a/net/openldap20-server/pkg-plist b/net/openldap20-server/pkg-plist index 01b9157e87f0..35e14c96310e 100644 --- a/net/openldap20-server/pkg-plist +++ b/net/openldap20-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 diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile index bb2b25ab301a..0dde938e88ef 100644 --- a/net/openldap20/Makefile +++ b/net/openldap20/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openldap -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \ @@ -78,19 +77,19 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-configure: - cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff pre-build: - cd ${WRKSRC} ; ${MAKE} depend + @cd ${WRKSRC} ; ${MAKE} depend post-build: - ${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh + @${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh post-install: .for f in ${BINS} - strip ${PREFIX}/${f} + @strip ${PREFIX}/${f} .endfor - ${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample + @${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net/openldap20/distinfo b/net/openldap20/distinfo index a617d2b16a0c..5556ab6d68e0 100644 --- a/net/openldap20/distinfo +++ b/net/openldap20/distinfo @@ -1 +1 @@ -MD5 (openldap-2.0.7.tgz) = e772449b0fcc64dc4e7bf20c2853dd10 +MD5 (openldap-2.0.8.tgz) = 4e6603c732011f01d7fc0120685b6f31 diff --git a/net/openldap20/pkg-plist b/net/openldap20/pkg-plist index 01b9157e87f0..35e14c96310e 100644 --- a/net/openldap20/pkg-plist +++ b/net/openldap20/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 diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile index bb2b25ab301a..0dde938e88ef 100644 --- a/net/openldap21-server/Makefile +++ b/net/openldap21-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openldap -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \ @@ -78,19 +77,19 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-configure: - cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff pre-build: - cd ${WRKSRC} ; ${MAKE} depend + @cd ${WRKSRC} ; ${MAKE} depend post-build: - ${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh + @${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh post-install: .for f in ${BINS} - strip ${PREFIX}/${f} + @strip ${PREFIX}/${f} .endfor - ${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample + @${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net/openldap21-server/distinfo b/net/openldap21-server/distinfo index a617d2b16a0c..5556ab6d68e0 100644 --- a/net/openldap21-server/distinfo +++ b/net/openldap21-server/distinfo @@ -1 +1 @@ -MD5 (openldap-2.0.7.tgz) = e772449b0fcc64dc4e7bf20c2853dd10 +MD5 (openldap-2.0.8.tgz) = 4e6603c732011f01d7fc0120685b6f31 diff --git a/net/openldap21-server/pkg-plist b/net/openldap21-server/pkg-plist index 01b9157e87f0..35e14c96310e 100644 --- a/net/openldap21-server/pkg-plist +++ b/net/openldap21-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 diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile index bb2b25ab301a..0dde938e88ef 100644 --- a/net/openldap21/Makefile +++ b/net/openldap21/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openldap -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \ @@ -78,19 +77,19 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-configure: - cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff pre-build: - cd ${WRKSRC} ; ${MAKE} depend + @cd ${WRKSRC} ; ${MAKE} depend post-build: - ${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh + @${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh post-install: .for f in ${BINS} - strip ${PREFIX}/${f} + @strip ${PREFIX}/${f} .endfor - ${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample + @${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net/openldap21/distinfo b/net/openldap21/distinfo index a617d2b16a0c..5556ab6d68e0 100644 --- a/net/openldap21/distinfo +++ b/net/openldap21/distinfo @@ -1 +1 @@ -MD5 (openldap-2.0.7.tgz) = e772449b0fcc64dc4e7bf20c2853dd10 +MD5 (openldap-2.0.8.tgz) = 4e6603c732011f01d7fc0120685b6f31 diff --git a/net/openldap21/pkg-plist b/net/openldap21/pkg-plist index 01b9157e87f0..35e14c96310e 100644 --- a/net/openldap21/pkg-plist +++ b/net/openldap21/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 diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile index bb2b25ab301a..0dde938e88ef 100644 --- a/net/openldap22-server/Makefile +++ b/net/openldap22-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openldap -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \ @@ -78,19 +77,19 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-configure: - cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff pre-build: - cd ${WRKSRC} ; ${MAKE} depend + @cd ${WRKSRC} ; ${MAKE} depend post-build: - ${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh + @${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh post-install: .for f in ${BINS} - strip ${PREFIX}/${f} + @strip ${PREFIX}/${f} .endfor - ${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample + @${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net/openldap22-server/distinfo b/net/openldap22-server/distinfo index a617d2b16a0c..5556ab6d68e0 100644 --- a/net/openldap22-server/distinfo +++ b/net/openldap22-server/distinfo @@ -1 +1 @@ -MD5 (openldap-2.0.7.tgz) = e772449b0fcc64dc4e7bf20c2853dd10 +MD5 (openldap-2.0.8.tgz) = 4e6603c732011f01d7fc0120685b6f31 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 diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile index bb2b25ab301a..0dde938e88ef 100644 --- a/net/openldap22/Makefile +++ b/net/openldap22/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openldap -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \ @@ -78,19 +77,19 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-configure: - cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff pre-build: - cd ${WRKSRC} ; ${MAKE} depend + @cd ${WRKSRC} ; ${MAKE} depend post-build: - ${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh + @${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh post-install: .for f in ${BINS} - strip ${PREFIX}/${f} + @strip ${PREFIX}/${f} .endfor - ${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample + @${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net/openldap22/distinfo b/net/openldap22/distinfo index a617d2b16a0c..5556ab6d68e0 100644 --- a/net/openldap22/distinfo +++ b/net/openldap22/distinfo @@ -1 +1 @@ -MD5 (openldap-2.0.7.tgz) = e772449b0fcc64dc4e7bf20c2853dd10 +MD5 (openldap-2.0.8.tgz) = 4e6603c732011f01d7fc0120685b6f31 diff --git a/net/openldap22/pkg-plist b/net/openldap22/pkg-plist index 01b9157e87f0..35e14c96310e 100644 --- a/net/openldap22/pkg-plist +++ b/net/openldap22/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 diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile index bb2b25ab301a..0dde938e88ef 100644 --- a/net/openldap23-server/Makefile +++ b/net/openldap23-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openldap -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \ @@ -78,19 +77,19 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-configure: - cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff pre-build: - cd ${WRKSRC} ; ${MAKE} depend + @cd ${WRKSRC} ; ${MAKE} depend post-build: - ${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh + @${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh post-install: .for f in ${BINS} - strip ${PREFIX}/${f} + @strip ${PREFIX}/${f} .endfor - ${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample + @${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net/openldap23-server/distinfo b/net/openldap23-server/distinfo index a617d2b16a0c..5556ab6d68e0 100644 --- a/net/openldap23-server/distinfo +++ b/net/openldap23-server/distinfo @@ -1 +1 @@ -MD5 (openldap-2.0.7.tgz) = e772449b0fcc64dc4e7bf20c2853dd10 +MD5 (openldap-2.0.8.tgz) = 4e6603c732011f01d7fc0120685b6f31 diff --git a/net/openldap23-server/pkg-plist b/net/openldap23-server/pkg-plist index 01b9157e87f0..35e14c96310e 100644 --- a/net/openldap23-server/pkg-plist +++ b/net/openldap23-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 diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index bb2b25ab301a..0dde938e88ef 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openldap -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \ @@ -78,19 +77,19 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-configure: - cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff pre-build: - cd ${WRKSRC} ; ${MAKE} depend + @cd ${WRKSRC} ; ${MAKE} depend post-build: - ${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh + @${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh post-install: .for f in ${BINS} - strip ${PREFIX}/${f} + @strip ${PREFIX}/${f} .endfor - ${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample + @${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo index a617d2b16a0c..5556ab6d68e0 100644 --- a/net/openldap24-server/distinfo +++ b/net/openldap24-server/distinfo @@ -1 +1 @@ -MD5 (openldap-2.0.7.tgz) = e772449b0fcc64dc4e7bf20c2853dd10 +MD5 (openldap-2.0.8.tgz) = 4e6603c732011f01d7fc0120685b6f31 diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist index 01b9157e87f0..35e14c96310e 100644 --- a/net/openldap24-server/pkg-plist +++ b/net/openldap24-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 |