Cleanup plist

7 files changed, 7 insertions, 17 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index b7de3ca8a70..9084a840f5c 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -268,8 +268,8 @@ post-install:
 .if ${PORT_OPTIONS:MPLUGINS}
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/bochs ! -type d | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${STAGEDIR}${PREFIX}/lib/bochs -type d | ${SORT} -r | \
-		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${PREFIX}/lib/bochs -type d -empty | ${SORT} -r | \
+		${SED} 's,^${STAGEDIR}${PREFIX}/,@dir ,' >> ${TMPPLIST}
 .endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in CHANGES README TODO bochsrc-sample.txt
diff --git a/emulators/gngeo/pkg-plist b/emulators/gngeo/pkg-plist
index e1e0e341eb0..b5c06bbea1d 100644
--- a/emulators/gngeo/pkg-plist
+++ b/emulators/gngeo/pkg-plist
@@ -2,5 +2,4 @@ bin/gngeo
 man/man1/gngeo.1.gz
 %%DATADIR%%/gngeo_data.zip
 %%EXAMPLESDIR%%/gngeorc
-@dirrm %%EXAMPLESDIR%%
 @unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove the Neo-Geo BIOS files left in %D/%%DATADIR%%."
diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common
index c4a19963956..9ade5635797 100644
--- a/emulators/mupen64plus-core/Makefile.common
+++ b/emulators/mupen64plus-core/Makefile.common
@@ -64,11 +64,10 @@ pre-install:
 
 .	if ${PKGNAMESUFFIX} != "-ui-console"
 		@${ECHO_CMD} "lib/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}.so" >> ${PLIST}
-		@${ECHO_CMD} "@dirrmtry lib/${PORTNAME}" >> ${PLIST}
 .	else
 		@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
 .	endif
-	@${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST}
+	@${ECHO_CMD} "@dir %%DATADIR%%" >> ${PLIST}
 .else
 post-patch:
 	@cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e \
diff --git a/emulators/rtc/pkg-plist b/emulators/rtc/pkg-plist
index 26d45c9fd62..36213f9d5bc 100644
--- a/emulators/rtc/pkg-plist
+++ b/emulators/rtc/pkg-plist
@@ -3,5 +3,4 @@ include/rtc.h
 modules/rtc.ko
 %%EXAMPLESDIR%%/test.c
 @exec rm -f %%DEVDIR%%/rtc
-@dirrm %%EXAMPLESDIR%%
 @unexec rm -f /dev/rtc
diff --git a/emulators/stonx/pkg-plist b/emulators/stonx/pkg-plist
index a096832e0bf..240094f6946 100644
--- a/emulators/stonx/pkg-plist
+++ b/emulators/stonx/pkg-plist
@@ -22,14 +22,8 @@ lib/X11/fonts/misc/System2.pcf.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/TOS-VERSIONS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench1.pas
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench1.prg
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%/gemdos_c/mint
-@dirrm %%DATADIR%%/gemdos_c
-@dirrm %%DATADIR%%
-@dirrmtry %%ETCDIR%%
 @exec mkfontdir %D/lib/X11/fonts/misc
 @exec xset fp+ %D/lib/X11/fonts/misc
 @exec xset fp rehash
diff --git a/emulators/tpm-emulator/Makefile b/emulators/tpm-emulator/Makefile
index 18b8d2982fb..e58345e54bd 100644
--- a/emulators/tpm-emulator/Makefile
+++ b/emulators/tpm-emulator/Makefile
@@ -25,14 +25,12 @@ USE_LDCONFIG=	yes
 USERS=		_tss
 GROUPS=		_tss
 SUB_LIST=	USERS="${USERS}" GROUPS="${GROUPS}"
+PLIST_SUB=	USERS="${USERS}" GROUPS="${GROUPS}"
 
 BROKEN_powerpc=		Does not compile on powerpc
 
 post-install:
-	@${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 /var/run/tpm" >> ${TMPPLIST}
 	@${MKDIR} ${STAGEDIR}/var/run/tpm
-	@${ECHO_CMD} "@dirrmtry /var/run/tpm" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 %D/var/db/tpm" >> ${TMPPLIST}
-	@${MKDIR} ${STAGEDIR}/${PREFIX}/var/db/tpm
+	@${MKDIR} ${STAGEDIR}${PREFIX}/var/db/tpm
 
 .include <bsd.port.mk>
diff --git a/emulators/tpm-emulator/pkg-plist b/emulators/tpm-emulator/pkg-plist
index 7e5fd71c387..e2c62b60549 100644
--- a/emulators/tpm-emulator/pkg-plist
+++ b/emulators/tpm-emulator/pkg-plist
@@ -4,4 +4,5 @@ lib/libtddl.a
 lib/libtddl.so
 lib/libtddl.so.1
 lib/libtddl.so.1.2.0.7
-@dir var
+@dir(%%USERS%%,%%GROUPS%%,0700) var/db/tpm
+@dir(%%USERS%%,%%GROUPS%%,0700) /var/run/tpm