Date: Thu, 13 Nov 2014 14:32:39 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372523 - in head: comms/jerm comms/kb comms/pyla comms/spandsp-devel deskutils/egroupware deskutils/fengoffice deskutils/thinkingrock emulators/bochs emulators/gngeo emulators/mupen64p... Message-ID: <201411131432.sADEWdHB091507@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Thu Nov 13 14:32:39 2014 New Revision: 372523 URL: https://svnweb.freebsd.org/changeset/ports/372523 QAT: https://qat.redports.org/buildarchive/r372523/ Log: Cleanup plist Modified: head/comms/jerm/pkg-plist head/comms/kb/pkg-plist head/comms/pyla/Makefile head/comms/spandsp-devel/pkg-plist head/deskutils/egroupware/Makefile head/deskutils/fengoffice/Makefile head/deskutils/thinkingrock/Makefile head/emulators/bochs/Makefile head/emulators/gngeo/pkg-plist head/emulators/mupen64plus-core/Makefile.common head/emulators/rtc/pkg-plist head/emulators/stonx/pkg-plist head/emulators/tpm-emulator/Makefile head/emulators/tpm-emulator/pkg-plist head/finance/libofx/Makefile head/finance/prestashop/Makefile Modified: head/comms/jerm/pkg-plist ============================================================================== --- head/comms/jerm/pkg-plist Thu Nov 13 14:27:52 2014 (r372522) +++ head/comms/jerm/pkg-plist Thu Nov 13 14:32:39 2014 (r372523) @@ -3,4 +3,3 @@ bin/tiocdtr %%JUPITER%%libexec/jerm/init.sh %%JUPITER%%libexec/jerm/rock.pl man/man1/jerm.1.gz -%%JUPITER%%@dirrm libexec/jerm Modified: head/comms/kb/pkg-plist ============================================================================== --- head/comms/kb/pkg-plist Thu Nov 13 14:27:52 2014 (r372522) +++ head/comms/kb/pkg-plist Thu Nov 13 14:32:39 2014 (r372523) @@ -19,4 +19,3 @@ share/pixmaps/kb/icons/kb-icon.png %%PORTDOCS%%%%DOCSDIR%%/README_KINKS %%PORTDOCS%%%%DOCSDIR%%/README_SRC %%PORTDOCS%%%%DOCSDIR%%/README_TIPS -%%PORTDOCS%%@dirrm %%DOCSDIR%% Modified: head/comms/pyla/Makefile ============================================================================== --- head/comms/pyla/Makefile Thu Nov 13 14:27:52 2014 (r372522) +++ head/comms/pyla/Makefile Thu Nov 13 14:32:39 2014 (r372523) @@ -22,8 +22,6 @@ DATADIR= ${PREFIX}/lib/pyla USES= python PLIST= ${WRKDIR}/pkg-plist -.include <bsd.port.pre.mk> - do-build: @(cd ${FILESDIR} && ${CP} pyla.sh ${WRKDIR}) @(cd ${WRKDIR} && ${REINPLACE_CMD} \ @@ -33,13 +31,12 @@ do-build: @(cd ${WRKSRC} && ${CP} language.en language.db) pre-install: - @${ECHO_CMD} '@exec ${MKDIR} %D/lib/pyla' > ${PLIST} - @${ECHO_CMD} 'bin/pyla' >> ${PLIST} + @${ECHO_CMD} 'bin/pyla' > ${PLIST} @${ECHO_CMD} 'lib/pyla/pyla.pyw' >> ${PLIST} @${FIND} ${WRKSRC}/ -type f | \ ${SED} -e "s:^${WRKSRC}/:lib/pyla/:g" >> ${PLIST} - @${FIND} -d ${WRKSRC} -type d | \ - ${SED} -e "s:^${WRKSRC}:@dirrm lib/pyla:g" >> ${PLIST} + @${FIND} -d ${WRKSRC} -type d -empty | \ + ${SED} -e "s:^${WRKSRC}:@dir lib/pyla:g" >> ${PLIST} do-install: @${MKDIR} ${STAGEDIR}${DATADIR} @@ -47,4 +44,4 @@ do-install: ${TAR} -C ${WRKSRC} --exclude CVS -cf - . | \ ${TAR} -C ${STAGEDIR}${DATADIR} --unlink -xf - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/comms/spandsp-devel/pkg-plist ============================================================================== --- head/comms/spandsp-devel/pkg-plist Thu Nov 13 14:27:52 2014 (r372522) +++ head/comms/spandsp-devel/pkg-plist Thu Nov 13 14:32:39 2014 (r372523) @@ -146,5 +146,3 @@ lib/libspandsp.so lib/libspandsp.so.2 lib/libspandsp.so.2.0.0 libdata/pkgconfig/spandsp.pc -@dirrm include/spandsp/private -@dirrm include/spandsp Modified: head/deskutils/egroupware/Makefile ============================================================================== --- head/deskutils/egroupware/Makefile Thu Nov 13 14:27:52 2014 (r372522) +++ head/deskutils/egroupware/Makefile Thu Nov 13 14:32:39 2014 (r372523) @@ -57,25 +57,21 @@ EG_DATADIR= ${PREFIX}/${EG_DATA} pre-install: @${ECHO_CMD} '@owner ${WWWOWN}' > ${PLIST} @${ECHO_CMD} '@group ${WWWGRP}' >> ${PLIST} + @${ECHO_CMD} '@mode 755' >> ${PLIST} @${FIND} -s -d ${WRKSRC} -type f | ${SED} "s#${WRKSRC}#${EG_DIR}#g" >> ${PLIST} - @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s#${WRKSRC}#@dirrm ${EG_DIR}#g" >> ${PLIST} - @${ECHO} @dirrm ${EG_DATA}/files >> ${PLIST} - @${ECHO} @dirrm ${EG_DATA}/backup >> ${PLIST} - @${ECHO} @dirrm ${EG_DATA} >> ${PLIST} + @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s#${WRKSRC}#@dir ${EG_DIR}#g" >> ${PLIST} + @${ECHO} @dir ${EG_DATA}/files >> ${PLIST} + @${ECHO} @dir ${EG_DATA}/backup >> ${PLIST} + @${ECHO} @dir ${EG_DATA} >> ${PLIST} @${ECHO_CMD} '@group' >> ${PLIST} @${ECHO_CMD} '@owner' >> ${PLIST} + @${ECHO_CMD} '@mode' >> ${PLIST} do-install: @${MKDIR} ${STAGEDIR}${EG_WWWDIR} @${MKDIR} ${STAGEDIR}${EG_DATADIR} @${MKDIR} ${STAGEDIR}${EG_DATADIR}/files @${MKDIR} ${STAGEDIR}${EG_DATADIR}/backup - @${ECHO_CMD} '@owner ${WWWOWN}' >> ${PLIST} - @${ECHO_CMD} '@group ${WWWGRP}' >> ${PLIST} - @${ECHO_CMD} '@mode 755' >> ${PLIST} @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${EG_WWWDIR} - @${ECHO_CMD} '@mode' >> ${PLIST} - @${ECHO_CMD} '@group' >> ${PLIST} - @${ECHO_CMD} '@owner' >> ${PLIST} .include <bsd.port.mk> Modified: head/deskutils/fengoffice/Makefile ============================================================================== --- head/deskutils/fengoffice/Makefile Thu Nov 13 14:27:52 2014 (r372522) +++ head/deskutils/fengoffice/Makefile Thu Nov 13 14:32:39 2014 (r372523) @@ -39,10 +39,9 @@ pre-install: @${ECHO_CMD} -e '@owner ${WWWOWN}\n@group ${WWWGRP}' >> ${PLIST} @cd ${WRKSRC} && \ ${FIND} . -type f | ${SORT} | ${SED} -e 's|^|www/fengoffice/|' -e 's|\./||g' >> ${PLIST} && \ - ${FIND} . -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm www/fengoffice|' -e 's|\.||g' >> ${PLIST} + ${FIND} . -type d | ${SORT} -r | ${SED} -e 's|^|@dir www/fengoffice|' -e 's|\.||g' >> ${PLIST} @${ECHO_CMD} -e '@owner root\n@group wheel' >> ${PLIST} @${ECHO_CMD} "%%PORTDOCS%%%%DOCSDIR%%/README" >> ${PLIST} - @${ECHO_CMD} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST} do-install: @${MKDIR} ${STAGEDIR}${FENGOFFICE_WWWDIR} Modified: head/deskutils/thinkingrock/Makefile ============================================================================== --- head/deskutils/thinkingrock/Makefile Thu Nov 13 14:27:52 2014 (r372522) +++ head/deskutils/thinkingrock/Makefile Thu Nov 13 14:32:39 2014 (r372523) @@ -34,7 +34,6 @@ do-install: @${LN} -sf ${PREFIX}/${PORTNAME}/bin/tr ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${ECHO} bin/${PORTNAME} >> ${TMPPLIST} @(cd ${WRKSRC}; ${FIND} . ! -type d) | ${SORT} | ${SED} "s|^.|${PORTNAME}|" >> ${TMPPLIST} - @(cd ${WRKSRC}; ${FIND} . -type d) | ${SORT} -r | ${SED} "s|^.|@dirrm ${PORTNAME}|" >> ${TMPPLIST} - @(cd ${WRKSRC}; ${FIND} . -type d -empty) | ${SORT} -r | ${SED} "s|^.|@exec mkdir -p ${PORTNAME}|" >> ${TMPPLIST} + @(cd ${WRKSRC}; ${FIND} . -type d -empty) | ${SORT} -r | ${SED} "s|^.|@dir ${PORTNAME}|" >> ${TMPPLIST} .include <bsd.port.mk> Modified: head/emulators/bochs/Makefile ============================================================================== --- head/emulators/bochs/Makefile Thu Nov 13 14:27:52 2014 (r372522) +++ head/emulators/bochs/Makefile Thu Nov 13 14:32:39 2014 (r372523) @@ -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 Modified: head/emulators/gngeo/pkg-plist ============================================================================== --- head/emulators/gngeo/pkg-plist Thu Nov 13 14:27:52 2014 (r372522) +++ head/emulators/gngeo/pkg-plist Thu Nov 13 14:32:39 2014 (r372523) @@ -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%%." Modified: head/emulators/mupen64plus-core/Makefile.common ============================================================================== --- head/emulators/mupen64plus-core/Makefile.common Thu Nov 13 14:27:52 2014 (r372522) +++ head/emulators/mupen64plus-core/Makefile.common Thu Nov 13 14:32:39 2014 (r372523) @@ -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 \ Modified: head/emulators/rtc/pkg-plist ============================================================================== --- head/emulators/rtc/pkg-plist Thu Nov 13 14:27:52 2014 (r372522) +++ head/emulators/rtc/pkg-plist Thu Nov 13 14:32:39 2014 (r372523) @@ -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 Modified: head/emulators/stonx/pkg-plist ============================================================================== --- head/emulators/stonx/pkg-plist Thu Nov 13 14:27:52 2014 (r372522) +++ head/emulators/stonx/pkg-plist Thu Nov 13 14:32:39 2014 (r372523) @@ -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 Modified: head/emulators/tpm-emulator/Makefile ============================================================================== --- head/emulators/tpm-emulator/Makefile Thu Nov 13 14:27:52 2014 (r372522) +++ head/emulators/tpm-emulator/Makefile Thu Nov 13 14:32:39 2014 (r372523) @@ -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> Modified: head/emulators/tpm-emulator/pkg-plist ============================================================================== --- head/emulators/tpm-emulator/pkg-plist Thu Nov 13 14:27:52 2014 (r372522) +++ head/emulators/tpm-emulator/pkg-plist Thu Nov 13 14:32:39 2014 (r372523) @@ -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 Modified: head/finance/libofx/Makefile ============================================================================== --- head/finance/libofx/Makefile Thu Nov 13 14:27:52 2014 (r372522) +++ head/finance/libofx/Makefile Thu Nov 13 14:32:39 2014 (r372523) @@ -35,8 +35,8 @@ post-install: .if ${PORT_OPTIONS:MDOXYGEN} @${FIND} -P ${STAGEDIR}${DOCSDIR}/html -type f 2>/dev/null | \ ${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST} - @${FIND} -P -d ${STAGEDIR}${DOCSDIR}/ -type d 2>/dev/null | \ - ${SED} -ne 's|^${STAGEDIR}${PREFIX}/|@dirrmtry |p' >> ${TMPPLIST} + @${FIND} -P -d ${STAGEDIR}${DOCSDIR}/ -type d -empty 2>/dev/null | \ + ${SED} -ne 's|^${STAGEDIR}${PREFIX}/|@dir |p' >> ${TMPPLIST} .endif .include <bsd.port.mk> Modified: head/finance/prestashop/Makefile ============================================================================== --- head/finance/prestashop/Makefile Thu Nov 13 14:27:52 2014 (r372522) +++ head/finance/prestashop/Makefile Thu Nov 13 14:32:39 2014 (r372523) @@ -21,7 +21,7 @@ SUB_FILES= pkg-message pre-install: @${ECHO_CMD} -e '@owner ${WWWOWN}\n@group ${WWWGRP}' > ${PLIST} @${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${PRESTADIR}?g" >> ${PLIST} - @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s?${WRKSRC}?@dirrm ${PRESTADIR}?g" >> ${PLIST} + @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s?${WRKSRC}?@dir ${PRESTADIR}?g" >> ${PLIST} @${ECHO_CMD} -e '@owner root\n@group wheel' >> ${PLIST} do-install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411131432.sADEWdHB091507>