Revert last commit. It is not possible (yet) to have the dirrmtry usage

in the post-install target.  Its usage must preceed generate-plist.

This problem needs to be revisited either in a rework of bsd.port.mk or
each of these Makefiles.

Hat:		portmgr
Pointy hat:	edwin`

12 files changed, 15 insertions, 16 deletions

diff --git a/databases/php-sqlrelay/Makefile b/databases/php-sqlrelay/Makefile
index d16cd78cbfbd..ef541abaa9d9 100644
--- a/databases/php-sqlrelay/Makefile
+++ b/databases/php-sqlrelay/Makefile
@@ -50,7 +50,7 @@ pre-install:
 post-install:
 	dir=`php-config --extension-dir | ${SED} 's,^${LOCALBASE}/,,'`; \
 	${ECHO_CMD} "$$dir/sql_relay.so" >> ${TMPPLIST}; \
-	${ECHO_CMD} "@dirrmtry $$dir" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec rmdir %D/$$dir 2>/dev/null || true" >> ${TMPPLIST}
 	@${MKDIR} ${PREFIX}/etc/php
 	@${ECHO_CMD} extension=sql_relay.so \
 		>> ${PREFIX}/etc/php/extensions.ini
@@ -64,7 +64,7 @@ post-install:
 		>> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini" \
 		>> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrmtry etc/php" \
+	@${ECHO_CMD} "@unexec rmdir %D/etc/php 2> /dev/null || true" \
 		>> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index 3e5356a2358b..a2ee5df8f225 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -44,6 +44,6 @@ post-install:
 	  ${TAR} ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} /$$ | \
 	  ${SED} "s,^,@dirrm\ ," >> ${TMPPLIST} ;\
 	  ${ECHO} @dirrm ${DOCSDIR:S,^${PREFIX}/,,}/html >> ${TMPPLIST} ;\
-	  ${ECHO} "@dirrmtry ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
+	  ${ECHO} "@unexec rmdir %D/${DOCSDIR:S,^${PREFIX}/,,} 2> /dev/null || true" >> ${TMPPLIST}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index ae355ef65933..dcbdcf136495 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -81,8 +81,7 @@ do-install:
 
 post-install:
 .if defined(PACKAGE_BUILDING)
-	${ECHO_CMD} "@dirrmtry ${CGIDIR}" >> ${TMPPLIST}
-	${ECHO_CMD} "@dirrmtry ${ICONSDIR}" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec rmdir %D/${CGIDIR} %D/${ICONSDIR} 2>/dev/null || true" >> ${TMPPLIST}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index a09b0a32f144..045388802df3 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -120,9 +120,7 @@ do-install:
 
 post-install:
 .if defined(PACKAGE_BUILDING)
-	${ECHO_CMD} "@dirrmtry ${CGIDIR}" >> ${TMPPLIST}
-	${ECHO_CMD} "@dirrmtry ${ICONSDIR}" >> ${TMPPLIST}
-	${ECHO_CMD} "@dirrmtry ${CSSDIR}" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec rmdir -p %D/${CGIDIR} %D/${ICONSDIR} %D/${CSSDIR} 2>/dev/null || true" >> ${TMPPLIST}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/devel/py-reverse/Makefile b/devel/py-reverse/Makefile
index f6860a3311ce..2b9192a1f60a 100644
--- a/devel/py-reverse/Makefile
+++ b/devel/py-reverse/Makefile
@@ -28,6 +28,6 @@ post-install:
 		${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${PYTHON_SITELIBDIR}/logilab/pyreverse -type d | ${SORT} -r | \
 		${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrmtry %%PYTHSON_SITELIBDIR%%/logilab" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/%%PYTHSON_SITELIBDIR%%/logilab 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index 72c2f7797de1..18751fa28727 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -43,6 +43,6 @@ post-install:
 	@${FIND} ${dir} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 .endfor
-	@${ECHO_CMD} '@dirrmtry lib/security' >> ${TMPPLIST}
+	@${ECHO_CMD} '@unexec rmdir %D/lib/security 2>/dev/null || true' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 7c09edb26679..386a950c2b12 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -134,7 +134,7 @@ post-install:
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \
 		>>${WRKDIR}/PLIST.gcc-lib
-	(${ECHO_CMD} "@dirrmtry lib/gcc-lib/${CONFIGURE_TARGET}" ; ${ECHO_CMD} "@dirrmtry lib/gcc-lib") >> ${WRKDIR}/PLIST.gcc-lib
+	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index f36c936c90f4..40b22f5211c6 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -135,7 +135,7 @@ post-install:
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \
 		>>${WRKDIR}/PLIST.gcc-lib
-	(${ECHO_CMD} "@dirrmtry lib/gcc-lib/${CONFIGURE_TARGET}" ; ${ECHO_CMD} "@dirrmtry lib/gcc-lib") >> ${WRKDIR}/PLIST.gcc-lib
+	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index 9df1f775d55b..b59e7a320d30 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -22,7 +22,7 @@ MAN1=		bbmail.1
 PLIST_FILES=	bin/bbmail share/bbtools/bbmail.bb
 
 post-install:
-	@${ECHO_CMD} "@dirrmtry share/bbtools" \
+	@${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
 		>> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/sysutils/bbapm/Makefile b/sysutils/bbapm/Makefile
index a51575cba33f..108b0cb81a35 100644
--- a/sysutils/bbapm/Makefile
+++ b/sysutils/bbapm/Makefile
@@ -38,6 +38,7 @@ do-install:
 .endfor
 
 post-install:
-	@${ECHO_CMD} "@dirrmtry share/bbtools" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
+		>> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/xaraya/Makefile b/www/xaraya/Makefile
index 85fa9e0605c4..eb4d3ebd1ce6 100644
--- a/www/xaraya/Makefile
+++ b/www/xaraya/Makefile
@@ -56,7 +56,7 @@ post-install:
 		-or -name upgrade.php ')' | ${SED} -e \
 		's,^${PREFIX}/\(.*\),@unexec rm -f %D/\1 >/dev/null 2>\&1 || true,' >> ${TMPPLIST}
 	@${FIND} ${PREFIX}/${XARAYADIR} -type d -and -path "*var*" | \
-		${SED} -e 's,^${PREFIX}/\(.*\),@dirrmtry \1,' | \
+		${SED} -e 's,^${PREFIX}/\(.*\),@unexec rmdir %D/\1 >/dev/null 2>\&1 || true,' | \
 		${SORT} -r >> ${TMPPLIST}
 	@${FIND} ${PREFIX}/${XARAYADIR} -type d -and ! -path "*var*" | \
 		${SED} -e 's,^${PREFIX}/,@dirrm ,' | \
diff --git a/x11-clocks/bbdate/Makefile b/x11-clocks/bbdate/Makefile
index 435757d2e5fc..3400fb5029f3 100644
--- a/x11-clocks/bbdate/Makefile
+++ b/x11-clocks/bbdate/Makefile
@@ -22,6 +22,7 @@ PLIST_FILES=	bin/bbdate share/bbtools/README.bbdate \
 		share/bbtools/bbdate.style share/bbtools/bbtoolsrc.in
 
 post-install:
-	@${ECHO_CMD} "@dirrmtry share/bbtools" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
+		>> ${TMPPLIST}
 
 .include <bsd.port.mk>