summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/amule2/pkg-plist12
-rw-r--r--net/apollon/pkg-plist2
-rw-r--r--net/openldap22-server/Makefile4
-rw-r--r--net/openldap22-server/pkg-plist2
-rw-r--r--net/openldap22-server/pkg-plist.client2
-rw-r--r--net/openldap23-server/pkg-plist.client4
-rw-r--r--net/openldap24-server/pkg-plist.client4
-rw-r--r--net/openmpi/Makefile4
-rw-r--r--net/py-bittorrent-devel/pkg-plist2
-rw-r--r--net/py-bittorrent/pkg-plist2
-rw-r--r--net/spread-j/pkg-plist2
-rw-r--r--net/vnc/Makefile6
12 files changed, 23 insertions, 23 deletions
diff --git a/net/amule2/pkg-plist b/net/amule2/pkg-plist
index b579ccf62f0d..6059a3f4976c 100644
--- a/net/amule2/pkg-plist
+++ b/net/amule2/pkg-plist
@@ -57,7 +57,7 @@ share/gnome/doc/aMule-2.1.0/socks4.protocol
@dirrmtry share/gnome/doc
%%PL_CAS%%share/gnome/cas/tmp.html
%%PL_CAS%%share/gnome/cas/stat.png
-%%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true
+%%PL_CAS%%@dirrmtry share/gnome/cas
%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
%%PL_ALC%%share/gnome/pixmaps/alc.xpm
share/gnome/pixmaps/amule.xpm
@@ -225,11 +225,11 @@ share/gnome/applications/amule.desktop
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.html
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/default 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/php-default 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/chicane 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/default
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/php-default
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/chicane
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule
lib/xchat/plugins/xas.pl
@dirrmtry lib/xchat/plugins
@dirrmtry lib/xchat
diff --git a/net/apollon/pkg-plist b/net/apollon/pkg-plist
index f096221ec703..1f9b3faf634b 100644
--- a/net/apollon/pkg-plist
+++ b/net/apollon/pkg-plist
@@ -77,4 +77,4 @@ share/applnk/Applications/Apollon.desktop
@dirrmtry share/icons/crystalsvg/128x128/apps
@dirrmtry share/applnk/Applications
%%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en/apollon
-%%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry share/doc/HTML/en
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
diff --git a/net/openldap23-server/pkg-plist.client b/net/openldap23-server/pkg-plist.client
index 483572128391..0a759e9ef9dd 100644
--- a/net/openldap23-server/pkg-plist.client
+++ b/net/openldap23-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
@@ -40,4 +40,4 @@ lib/libldap_r-2.3.so.1
@comment share/openldap/ucdata/num.dat
@comment @dirrm share/openldap/ucdata
@comment @dirrm share/openldap
-@unexec rmdir %D/libexec/openldap 2>/dev/null || true
+@dirrmtry libexec/openldap
diff --git a/net/openldap24-server/pkg-plist.client b/net/openldap24-server/pkg-plist.client
index 483572128391..0a759e9ef9dd 100644
--- a/net/openldap24-server/pkg-plist.client
+++ b/net/openldap24-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
@@ -40,4 +40,4 @@ lib/libldap_r-2.3.so.1
@comment share/openldap/ucdata/num.dat
@comment @dirrm share/openldap/ucdata
@comment @dirrm share/openldap
-@unexec rmdir %D/libexec/openldap 2>/dev/null || true
+@dirrmtry libexec/openldap
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index 9bf58d24b226..b58aad05dd32 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -67,9 +67,9 @@ build-plist: Makefile
${FIND} ${PREFIX}/${MPIDIR}/* -type d | \
${SED} -e 's|${PREFIX}/${MPIDIR}|@dirrm %%MPIDIR%%|' | \
${SORT} -r >> pkg-plist
- ${ECHO} "@unexec rmdir %D/%%MPIDIR%% 2>/dev/null || true" \
+ ${ECHO} "@dirrmtry %%MPIDIR%%" \
>> pkg-plist
- ${ECHO} "@unexec rmdir %D/%%MPIBASE%% 2>/dev/null || true" \
+ ${ECHO} "@dirrmtry %D/%%MPIBASE%%" \
>> pkg-plist
.include <bsd.port.post.mk>
diff --git a/net/py-bittorrent-devel/pkg-plist b/net/py-bittorrent-devel/pkg-plist
index bcfa49a10b54..f6e9ca29d9cb 100644
--- a/net/py-bittorrent-devel/pkg-plist
+++ b/net/py-bittorrent-devel/pkg-plist
@@ -259,7 +259,7 @@ share/locale/zh_CN/LC_MESSAGES/bittorrent.mo
share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
%%GUI%%@dirrm share/pixmaps/BitTorrent/logo
%%GUI%%@dirrm share/pixmaps/BitTorrent
-%%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+%%GUI%%@dirrmtry share/pixmaps
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_CN/LC_MESSAGES
diff --git a/net/py-bittorrent/pkg-plist b/net/py-bittorrent/pkg-plist
index f480ab4cef60..ae5babc2777a 100644
--- a/net/py-bittorrent/pkg-plist
+++ b/net/py-bittorrent/pkg-plist
@@ -258,7 +258,7 @@ share/locale/zh_CN/LC_MESSAGES/bittorrent.mo
share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
%%GUI%%@dirrm share/pixmaps/BitTorrent/logo
%%GUI%%@dirrm share/pixmaps/BitTorrent
-%%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+%%GUI%%@dirrmtry share/pixmaps
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_CN/LC_MESSAGES
diff --git a/net/spread-j/pkg-plist b/net/spread-j/pkg-plist
index a45877cac486..562d47dc3e4e 100644
--- a/net/spread-j/pkg-plist
+++ b/net/spread-j/pkg-plist
@@ -3,4 +3,4 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/java/recThread.java
%%PORTDOCS%%%%EXAMPLESDIR%%/java/User.java
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/java
-%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 04a713fa9f6d..5974fb544eaf 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -113,9 +113,9 @@ pre-install:
@if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \
${ECHO_CMD} @cwd ${X11BASE} >> ${PLIST} ; \
${ECHO_CMD} lib/modules/extensions/vnc.so >> ${PLIST} ; \
- ${ECHO_CMD} "@unexec rmdir %D/lib/modules/extensions 2>/dev/null || true" >> ${PLIST} ; \
- ${ECHO_CMD} "@unexec rmdir %D/lib/modules 2>/dev/null || true" >> ${PLIST} ; \
- ${ECHO_CMD} "@unexec rmdir %D/lib 2>/dev/null || true" >> ${PLIST} ; \
+ ${ECHO_CMD} "@dirrmtry lib/modules/extensions" >> ${PLIST} ; \
+ ${ECHO_CMD} "@dirrmtry lib/modules" >> ${PLIST} ; \
+ ${ECHO_CMD} "@dirrmtry lib" >> ${PLIST} ; \
fi
.endif