diff options
| author | edwin <edwin@FreeBSD.org> | 2006-01-22 14:28:59 +0800 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2006-01-22 14:28:59 +0800 |
| commit | 1677f97aa26c838254a6818de8cfcfd86c746dfb (patch) | |
| tree | 2c27fc7a03a5b890cdd90d621e595a87209475e6 /net/openldap22-server | |
| parent | 9a0941e0406efa462ec7e72b9a3422d5f60a1506 (diff) | |
| download | freebsd-ports-gnome-1677f97aa26c838254a6818de8cfcfd86c746dfb.tar.gz freebsd-ports-gnome-1677f97aa26c838254a6818de8cfcfd86c746dfb.tar.zst freebsd-ports-gnome-1677f97aa26c838254a6818de8cfcfd86c746dfb.zip | |
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@
PR: ports/88711 (related)
Diffstat (limited to 'net/openldap22-server')
| -rw-r--r-- | net/openldap22-server/Makefile | 4 | ||||
| -rw-r--r-- | net/openldap22-server/pkg-plist | 2 | ||||
| -rw-r--r-- | net/openldap22-server/pkg-plist.client | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile index 1231a39daa64..c09dfa86cb0b 100644 --- a/net/openldap22-server/Makefile +++ b/net/openldap22-server/Makefile @@ -414,8 +414,8 @@ post-install: ${ECHO_CMD} "etc/openldap/schema/$${schema}.schema.default"; \ ${ECHO_CMD} "@exec [ -f %B/$${schema}.schema ] || cp %B/%f %B/$${schema}.schema"; \ done >>${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/etc/openldap/schema 2>/dev/null || true" >>${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/etc/openldap 2>/dev/null || true" >>${TMPPLIST} + @${ECHO_CMD} "@dirrmtry etc/openldap/schema" >>${TMPPLIST} + @${ECHO_CMD} "@dirrmtry %D/etc/openldap" >>${TMPPLIST} @[ "${RC_DIR:S/\/$//}" = "${PREFIX}" ] || ${ECHO_CMD} "@cwd ${RC_DIR}" >>${TMPPLIST} .for script in slapd slurpd @${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${DESTDIR}${RC_DIR:S/\/$//}/etc/rc.d/${script}${RC_SUFX} diff --git a/net/openldap22-server/pkg-plist b/net/openldap22-server/pkg-plist index 193acee2941d..eb0c3d0cbd75 100644 --- a/net/openldap22-server/pkg-plist +++ b/net/openldap22-server/pkg-plist @@ -40,7 +40,7 @@ etc/openldap/slapd.conf.default %%BACK_SQL%%libexec/openldap/back_sql.so %%BACK_SQL%%libexec/openldap/back_sql-2.2.so %%BACK_SQL%%libexec/openldap/back_sql-2.2.so.7 -%%MODULES%%@unexec rmdir %D/libexec/openldap 2>/dev/null || true +%%MODULES%%@dirrmtry libexec/openldap libexec/slapd libexec/slurpd @comment sbin/slapacl diff --git a/net/openldap22-server/pkg-plist.client b/net/openldap22-server/pkg-plist.client index dc0a65c63837..952e599924b9 100644 --- a/net/openldap22-server/pkg-plist.client +++ b/net/openldap22-server/pkg-plist.client @@ -10,7 +10,7 @@ bin/ldapwhoami @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 rmdir %D/etc/openldap 2>/dev/null || true +@dirrmtry etc/openldap include/lber.h include/lber_types.h include/ldap.h |