From b9864fe38d6c25e4f65f96b07d0be6080b8a437b Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Wed, 12 Nov 2014 14:56:34 +0000 Subject: [PATCH] Cleanup plist --- russian/artwiz-ru/pkg-plist | 1 - russian/bugzilla44/Makefile | 2 +- russian/bugzilla44/pkg-plist | 43 ----------------------- russian/calligra-l10n/pkg-plist | 2 -- russian/fortune-bashorgru/pkg-plist | 5 --- russian/fortuneru/pkg-plist | 3 -- russian/ircd-hybrid/pkg-plist | 15 +------- russian/mueller-dic/pkg-plist | 2 -- russian/stardict-bars/pkg-plist | 2 -- russian/stardict-computer/pkg-plist | 2 -- russian/stardict-dal/pkg-plist | 2 -- russian/stardict-engcom/pkg-plist | 2 -- russian/stardict-mueller7/pkg-plist | 2 -- russian/stardict-mueller7accent/pkg-plist | 2 -- russian/stardict-pc/pkg-plist | 2 -- russian/wordpress/Makefile | 2 +- russian/xruskb/pkg-plist | 1 - ukrainian/calligra-l10n/pkg-plist | 4 --- ukrainian/monacofonts/pkg-plist | 1 - 19 files changed, 3 insertions(+), 92 deletions(-) diff --git a/russian/artwiz-ru/pkg-plist b/russian/artwiz-ru/pkg-plist index aec4388a590c..fecb59cd862a 100644 --- a/russian/artwiz-ru/pkg-plist +++ b/russian/artwiz-ru/pkg-plist @@ -19,4 +19,3 @@ lib/X11/fonts/artwiz-ru/nu.pcf lib/X11/fonts/artwiz-ru/snap-koi8-r.pcf lib/X11/fonts/artwiz-ru/snap-microsoft-cp1251.pcf lib/X11/fonts/artwiz-ru/snap.pcf -@dirrm lib/X11/fonts/artwiz-ru diff --git a/russian/bugzilla44/Makefile b/russian/bugzilla44/Makefile index 37f9a2429ff2..dd84096f9868 100644 --- a/russian/bugzilla44/Makefile +++ b/russian/bugzilla44/Makefile @@ -23,7 +23,7 @@ do-install: # Maintainer plist: patch @( cd ${WRKSRC}/ && ${FIND} * -type f | ${AWK} '{print "%%WWWDIR%%/"$$1}' | ${SORT} > ${PLIST}.new ) - @( cd ${WRKSRC}/ && ${FIND} * -type d | ${AWK} '{print "@dirrmtry %%WWWDIR%%/"$$1}' | ${SORT} -r >> ${PLIST}.new ) + @( cd ${WRKSRC}/ && ${FIND} * -type d -empty | ${AWK} '{print "@dir %%WWWDIR%%/"$$1}' | ${SORT} -r >> ${PLIST}.new ) @if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \ ${ECHO_MSG} no pkg-plist changes; \ ${RM} ${PLIST}.new ; \ diff --git a/russian/bugzilla44/pkg-plist b/russian/bugzilla44/pkg-plist index c2019c32b4b3..0942502c932d 100644 --- a/russian/bugzilla44/pkg-plist +++ b/russian/bugzilla44/pkg-plist @@ -245,46 +245,3 @@ %%WWWDIR%%/template/ru-RU/default/whine/mail.txt.tmpl %%WWWDIR%%/template/ru-RU/default/whine/multipart-mime.txt.tmpl %%WWWDIR%%/template/ru-RU/default/whine/schedule.html.tmpl -@dirrmtry %%WWWDIR%%/template/ru-RU/default/whine -@dirrmtry %%WWWDIR%%/template/ru-RU/default/setup -@dirrmtry %%WWWDIR%%/template/ru-RU/default/search -@dirrmtry %%WWWDIR%%/template/ru-RU/default/request -@dirrmtry %%WWWDIR%%/template/ru-RU/default/reports -@dirrmtry %%WWWDIR%%/template/ru-RU/default/pages -@dirrmtry %%WWWDIR%%/template/ru-RU/default/list -@dirrmtry %%WWWDIR%%/template/ru-RU/default/global -@dirrmtry %%WWWDIR%%/template/ru-RU/default/flag -@dirrmtry %%WWWDIR%%/template/ru-RU/default/extensions -@dirrmtry %%WWWDIR%%/template/ru-RU/default/email -@dirrmtry %%WWWDIR%%/template/ru-RU/default/bug/process -@dirrmtry %%WWWDIR%%/template/ru-RU/default/bug/create -@dirrmtry %%WWWDIR%%/template/ru-RU/default/bug/activity -@dirrmtry %%WWWDIR%%/template/ru-RU/default/bug -@dirrmtry %%WWWDIR%%/template/ru-RU/default/attachment -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/workflow -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/versions -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/users -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/settings -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/sanitycheck -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/products/groupcontrol -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/products -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/params -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/milestones -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/keywords -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/groups -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/flag-type -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/fieldvalues -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/custom_fields -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/components -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin/classifications -@dirrmtry %%WWWDIR%%/template/ru-RU/default/admin -@dirrmtry %%WWWDIR%%/template/ru-RU/default/account/prefs -@dirrmtry %%WWWDIR%%/template/ru-RU/default/account/password -@dirrmtry %%WWWDIR%%/template/ru-RU/default/account/email -@dirrmtry %%WWWDIR%%/template/ru-RU/default/account/auth -@dirrmtry %%WWWDIR%%/template/ru-RU/default/account -@dirrmtry %%WWWDIR%%/template/ru-RU/default -@dirrmtry %%WWWDIR%%/template/ru-RU -@dirrmtry %%WWWDIR%%/template -@dirrmtry %%WWWDIR%%/help/ru -@dirrmtry %%WWWDIR%%/help diff --git a/russian/calligra-l10n/pkg-plist b/russian/calligra-l10n/pkg-plist index 71d6e9f26372..3ec95bd1a5cd 100644 --- a/russian/calligra-l10n/pkg-plist +++ b/russian/calligra-l10n/pkg-plist @@ -67,5 +67,3 @@ share/locale/ru/LC_MESSAGES/sheetssolver.mo share/locale/ru/LC_MESSAGES/stage.mo share/locale/ru/LC_MESSAGES/thesaurus_tool.mo share/locale/ru/LC_MESSAGES/words.mo -@dirrm share/doc/HTML/ru/sheets -@dirrm share/doc/HTML/ru/calligra diff --git a/russian/fortune-bashorgru/pkg-plist b/russian/fortune-bashorgru/pkg-plist index e44db875de12..56a43cd374a1 100644 --- a/russian/fortune-bashorgru/pkg-plist +++ b/russian/fortune-bashorgru/pkg-plist @@ -7,8 +7,3 @@ share/games/fortune/ru_RU.UTF-8/fortune-bashorgru share/games/fortune/ru_RU.UTF-8/fortune-bashorgru-freebsd share/games/fortune/ru_RU.UTF-8/fortune-bashorgru-freebsd.dat share/games/fortune/ru_RU.UTF-8/fortune-bashorgru.dat -@dirrmtry share/games/fortune/ru_RU.UTF-8 -@dirrmtry share/games/fortune/ru_RU.KOI8-R -@dirrmtry share/games/fortune -@dirrmtry share/games -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% diff --git a/russian/fortuneru/pkg-plist b/russian/fortuneru/pkg-plist index f0989865dec9..626e82ca9ef5 100644 --- a/russian/fortuneru/pkg-plist +++ b/russian/fortuneru/pkg-plist @@ -82,6 +82,3 @@ share/games/fortune/rus/matilda share/games/fortune/rus/matilda.dat share/games/fortune/rus/house-md share/games/fortune/rus/house-md.dat -@dirrm share/games/fortune/rus -@dirrmtry share/games/fortune -@dirrmtry share/games diff --git a/russian/ircd-hybrid/pkg-plist b/russian/ircd-hybrid/pkg-plist index eca72c8ff734..980d4f931d27 100644 --- a/russian/ircd-hybrid/pkg-plist +++ b/russian/ircd-hybrid/pkg-plist @@ -398,17 +398,4 @@ man/man8/ircd.8.gz %%DOCSDIR%%/server-version-info %%DOCSDIR%%/serverhide.txt %%DOCSDIR%%/whats-new.txt -@dirrm share/doc/ircd -@dirrm lib/ircd-hybrid-ru-modules/autoload -@dirrm lib/ircd-hybrid-ru-modules -@dirrm help/users -@dirrm help/opers -@dirrm help -@dirrm etc/ircd-hybrid-ru/codepages -@dirrm etc/ircd-hybrid-ru -@owner %%USR%% -@group %%GRP%% -@exec install -d -m 755 -o %%USR%% -g %%GRP%% /var/log/ircd-hybrid-ru -@dirrmtry /var/log/ircd-hybrid-ru -@owner root -@group wheel +@dir(%%USR%%,%%GRP%%,0755) /var/log/ircd-hybrid-ru diff --git a/russian/mueller-dic/pkg-plist b/russian/mueller-dic/pkg-plist index 57e7d189b93e..c76a79cb98a4 100644 --- a/russian/mueller-dic/pkg-plist +++ b/russian/mueller-dic/pkg-plist @@ -7,5 +7,3 @@ bin/muellerfind %%DATADIR%%/Mueller7accentGPL.ru_RU.KOI8-R.h %%DATADIR%%/Mueller7accentGPL.ru_RU.UTF-8 %%DATADIR%%/Mueller7accentGPL.ru_RU.UTF-8.h -@dirrmtry %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/russian/stardict-bars/pkg-plist b/russian/stardict-bars/pkg-plist index 892abb20d43b..3d78a6309c4b 100644 --- a/russian/stardict-bars/pkg-plist +++ b/russian/stardict-bars/pkg-plist @@ -1,5 +1,3 @@ share/stardict/dic/en-ru-bars.dict.dz share/stardict/dic/en-ru-bars.idx share/stardict/dic/en-ru-bars.ifo -@dirrmtry share/stardict/dic -@dirrmtry share/stardict diff --git a/russian/stardict-computer/pkg-plist b/russian/stardict-computer/pkg-plist index 4634fdbcff27..219ad36f2951 100644 --- a/russian/stardict-computer/pkg-plist +++ b/russian/stardict-computer/pkg-plist @@ -1,5 +1,3 @@ share/stardict/dic/computer-ru.dict.dz share/stardict/dic/computer-ru.idx share/stardict/dic/computer-ru.ifo -@dirrmtry share/stardict/dic -@dirrmtry share/stardict diff --git a/russian/stardict-dal/pkg-plist b/russian/stardict-dal/pkg-plist index 092f7a4161a4..73e9cade4b65 100644 --- a/russian/stardict-dal/pkg-plist +++ b/russian/stardict-dal/pkg-plist @@ -1,5 +1,3 @@ share/stardict/dic/dal-ru.dict.dz share/stardict/dic/dal-ru.idx share/stardict/dic/dal-ru.ifo -@dirrmtry share/stardict/dic -@dirrmtry share/stardict diff --git a/russian/stardict-engcom/pkg-plist b/russian/stardict-engcom/pkg-plist index d02c813c6419..aad1ca7c1cff 100644 --- a/russian/stardict-engcom/pkg-plist +++ b/russian/stardict-engcom/pkg-plist @@ -1,5 +1,3 @@ share/stardict/dic/engcom.dict.dz share/stardict/dic/engcom.idx share/stardict/dic/engcom.ifo -@dirrmtry share/stardict/dic -@dirrmtry share/stardict diff --git a/russian/stardict-mueller7/pkg-plist b/russian/stardict-mueller7/pkg-plist index 7a2cb4c45b35..0a7f1ca42654 100644 --- a/russian/stardict-mueller7/pkg-plist +++ b/russian/stardict-mueller7/pkg-plist @@ -1,5 +1,3 @@ share/stardict/dic/Mueller7GPL.dict.dz share/stardict/dic/Mueller7GPL.idx share/stardict/dic/Mueller7GPL.ifo -@dirrmtry share/stardict/dic -@dirrmtry share/stardict diff --git a/russian/stardict-mueller7accent/pkg-plist b/russian/stardict-mueller7accent/pkg-plist index 68b967e80218..10b5924e2cf7 100644 --- a/russian/stardict-mueller7accent/pkg-plist +++ b/russian/stardict-mueller7accent/pkg-plist @@ -1,5 +1,3 @@ share/stardict/dic/Mueller7accentGPL.dict.dz share/stardict/dic/Mueller7accentGPL.idx share/stardict/dic/Mueller7accentGPL.ifo -@dirrmtry share/stardict/dic -@dirrmtry share/stardict diff --git a/russian/stardict-pc/pkg-plist b/russian/stardict-pc/pkg-plist index eb7299cfb000..eb094f606a80 100644 --- a/russian/stardict-pc/pkg-plist +++ b/russian/stardict-pc/pkg-plist @@ -1,5 +1,3 @@ share/stardict/dic/pc-user-ru.dict.dz share/stardict/dic/pc-user-ru.idx share/stardict/dic/pc-user-ru.ifo -@dirrmtry share/stardict/dic -@dirrmtry share/stardict diff --git a/russian/wordpress/Makefile b/russian/wordpress/Makefile index b42bab5fa85d..d3ed0d9a796f 100644 --- a/russian/wordpress/Makefile +++ b/russian/wordpress/Makefile @@ -41,7 +41,7 @@ pre-install: ${ECHO_CMD} '@owner www' > ${PLIST} ${ECHO_CMD} '@group www' >> ${PLIST} cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST} - cd ${WRKSRC}/ && ${FIND} -d . -type d | ${SED} -e 's|^\.|@dirrm %%WWWDIR%%|' >> ${PLIST} + cd ${WRKSRC}/ && ${FIND} -d . -type d | ${SED} -e 's|^\.|@dir %%WWWDIR%%|' >> ${PLIST} ${ECHO_CMD} '@owner' >> ${PLIST} ${ECHO_CMD} '@group' >> ${PLIST} if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \ diff --git a/russian/xruskb/pkg-plist b/russian/xruskb/pkg-plist index 36ada3bcf9c8..4d096439ad2a 100644 --- a/russian/xruskb/pkg-plist +++ b/russian/xruskb/pkg-plist @@ -9,4 +9,3 @@ man/man1/xrus.1.gz %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/xrus.doc-english %%PORTDOCS%%%%DOCSDIR%%/xrus.doc-koi8 -%%PORTDOCS%%@dirrmtry %%DOCSDIR%% diff --git a/ukrainian/calligra-l10n/pkg-plist b/ukrainian/calligra-l10n/pkg-plist index 442c85ac1238..b22a4a0b2996 100644 --- a/ukrainian/calligra-l10n/pkg-plist +++ b/ukrainian/calligra-l10n/pkg-plist @@ -145,7 +145,3 @@ share/locale/uk/LC_MESSAGES/sheetssolver.mo share/locale/uk/LC_MESSAGES/stage.mo share/locale/uk/LC_MESSAGES/thesaurus_tool.mo share/locale/uk/LC_MESSAGES/words.mo -@dirrm share/doc/HTML/uk/stage -@dirrm share/doc/HTML/uk/sheets -@dirrm share/doc/HTML/uk/kexi -@dirrm share/doc/HTML/uk/calligra diff --git a/ukrainian/monacofonts/pkg-plist b/ukrainian/monacofonts/pkg-plist index a7d8ca024a10..f4070ed308e0 100644 --- a/ukrainian/monacofonts/pkg-plist +++ b/ukrainian/monacofonts/pkg-plist @@ -5,4 +5,3 @@ lib/X11/fonts/koi8u-monaco/roman10.pcf.gz lib/X11/fonts/koi8u-monaco/roman12.pcf.gz lib/X11/fonts/koi8u-monaco/fonts.dir lib/X11/fonts/koi8u-monaco/fonts.alias -@dirrm lib/X11/fonts/koi8u-monaco