Date: Sat, 29 Oct 2011 02:21:06 GMT From: "4720@hushmail.com" <4720@hushmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/162136: [patch] fix incorrect uses of @dirrm %%PORTDOCS%% Message-ID: <201110290221.p9T2L6MB042978@red.freebsd.org> Resent-Message-ID: <201110290230.p9T2UDUP085533@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 162136 >Category: ports >Synopsis: [patch] fix incorrect uses of @dirrm %%PORTDOCS%% >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Oct 29 02:30:13 UTC 2011 >Closed-Date: >Last-Modified: >Originator: 4720@hushmail.com >Release: >Organization: >Environment: >Description: several ports use @dirrm %%PORTDOCS%%files. when NOPORTDOCS is set %%PORTDOCS%% becomes @comment, which has to go at the beginning of the packing list line or it will be treated as a nonexisting file. @dirrm %%PORTDOCS%%%%DOCSDIR%% pkg_delete: file '/usr/local/@comment share/doc/cyberbit-ttfonts' doesn't exist pkg_delete: unable to completely remove directory '/usr/local/@comment share/doc/cyberbit-ttfonts' pkg_delete: couldn't entirely delete package (perhaps the packing list is incorrectly specified?) >How-To-Repeat: >Fix: attached patch replaces @dirrm %%PORTDOCS%%files with %%PORTDOCS%%@dirrm files. Patch attached with submission follows: diff -r -u ports.orig/cad/varkon/pkg-plist ports/cad/varkon/pkg-plist --- ports.orig/cad/varkon/pkg-plist +++ ports/cad/varkon/pkg-plist @@ -907,6 +907,6 @@ %%PORTDOCS%%%%DOCSDIR%%/MBS/images/spline_2.png %%PORTDOCS%%%%DOCSDIR%%/MBS/images/spline_3.png %%PORTDOCS%%%%DOCSDIR%%/MBS/images/splines.png -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%/MBS/images -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%/MBS -@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/MBS/images +%%PORTDOCS%%@dirrm %%DOCSDIR%%/MBS +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff -r -u ports.orig/chinese/phpbb-tw/pkg-plist ports/chinese/phpbb-tw/pkg-plist --- ports.orig/chinese/phpbb-tw/pkg-plist +++ ports/chinese/phpbb-tw/pkg-plist @@ -324,4 +324,4 @@ @dirrm %%PHPBBDIR%% @dirrm %%DATADIR%%/contrib @dirrm %%DATADIR%% -@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff -r -u ports.orig/devel/crossvc/pkg-plist ports/devel/crossvc/pkg-plist --- ports.orig/devel/crossvc/pkg-plist +++ ports/devel/crossvc/pkg-plist @@ -48,8 +48,8 @@ @dirrm %%DATADIR%%/Messages @dirrm %%DATADIR%%/Tools @dirrm %%DATADIR%% -@dirrm %%PORTDOCS%%%%DOCSDIR%%/Translations/de -@dirrm %%PORTDOCS%%%%DOCSDIR%%/Translations/it -@dirrm %%PORTDOCS%%%%DOCSDIR%%/Translations/ru -@dirrm %%PORTDOCS%%%%DOCSDIR%%/Translations +%%PORTDOCS%%@dirrm %%DOCSDIR%%/Translations/de +%%PORTDOCS%%@dirrm %%DOCSDIR%%/Translations/it +%%PORTDOCS%%@dirrm %%DOCSDIR%%/Translations/ru +%%PORTDOCS%%@dirrm %%DOCSDIR%%/Translations %%PORTDOCS%%@dirrm %%DOCSDIR%% diff -r -u ports.orig/devel/libsigc++20/pkg-plist ports/devel/libsigc++20/pkg-plist --- ports.orig/devel/libsigc++20/pkg-plist +++ ports/devel/libsigc++20/pkg-plist @@ -558,12 +558,12 @@ %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html/ch04s02.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html/ch05.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html/index.html -%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html -%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial -%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html -%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference -%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/images -%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%% +%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/tutorial/html +%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/tutorial +%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/reference/html +%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/reference +%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/images +%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%% %%PORTDOCS%%@dirrm share/devhelp/books/libsigc++-%%API_VERSION%% %%PORTDOCS%%@dirrmtry share/devhelp/books %%PORTDOCS%%@dirrmtry share/devhelp diff -r -u ports.orig/devel/ruby-wirble/pkg-plist ports/devel/ruby-wirble/pkg-plist --- ports.orig/devel/ruby-wirble/pkg-plist +++ ports/devel/ruby-wirble/pkg-plist @@ -1,3 +1,3 @@ %%RUBY_SITELIBDIR%%/wirble.rb %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README -@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%% +%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% diff -r -u ports.orig/games/ember/pkg-plist ports/games/ember/pkg-plist --- ports.orig/games/ember/pkg-plist +++ ports/games/ember/pkg-plist @@ -2508,7 +2508,7 @@ @dirrm share/ember @dirrm etc/ember @dirrmtry share/applications -@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm share/icons/worldforge @dirrmtry share/icons diff -r -u ports.orig/games/quake3-rq3/pkg-plist ports/games/quake3-rq3/pkg-plist --- ports.orig/games/quake3-rq3/pkg-plist +++ ports/games/quake3-rq3/pkg-plist @@ -119,12 +119,12 @@ %%PORTDOCS%%%%DOCSDIR%%/mapdocs/vashes.txt %%PORTDOCS%%%%DOCSDIR%%/mapdocs/waterfront.txt @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%/docs/pics/replacement-ui -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%/docs/pics/headers -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%/docs/pics/items -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%/docs/pics/weapons -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%/docs/pics/misc +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/pics/replacement-ui +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/pics/headers +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/pics/items +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/pics/weapons +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/pics/misc %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/pics -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%/docs -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%/mapdocs -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs +%%PORTDOCS%%@dirrm %%DOCSDIR%%/mapdocs +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff -r -u ports.orig/irc/eggdrop/pkg-plist ports/irc/eggdrop/pkg-plist --- ports.orig/irc/eggdrop/pkg-plist +++ ports/irc/eggdrop/pkg-plist @@ -187,7 +187,7 @@ @dirrm %%DATADIR%%/help/msg @dirrm %%DATADIR%%/help @dirrm %%DATADIR%% -@dirrm %%PORTDOCS%%%%DOCSDIR%%/settings -@dirrm %%PORTDOCS%%%%DOCSDIR%%/html -@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/settings +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/eggdrop diff -r -u ports.orig/irc/tr-ircd/pkg-plist ports/irc/tr-ircd/pkg-plist --- ports.orig/irc/tr-ircd/pkg-plist +++ ports/irc/tr-ircd/pkg-plist @@ -406,7 +406,7 @@ %%PORTDOCS%%%%DOCSDIR%%/README.OPM %%PORTDOCS%%%%DOCSDIR%%/RELNOTES %%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/help/en_us @dirrm %%DATADIR%%/help/tr @dirrm %%DATADIR%%/help diff -r -u ports.orig/japanese/ng-devel/pkg-plist ports/japanese/ng-devel/pkg-plist --- ports.orig/japanese/ng-devel/pkg-plist +++ ports/japanese/ng-devel/pkg-plist @@ -8,4 +8,4 @@ %%PORTDOCS%%%%DOCSDIR%%/Ng.tut.euc-jp %%PORTDOCS%%%%DOCSDIR%%/README.Ng.euc-jp %%PORTDOCS%%%%DOCSDIR%%/README.SKG.euc-jp -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff -r -u ports.orig/math/ruby-algebra/pkg-plist ports/math/ruby-algebra/pkg-plist --- ports.orig/math/ruby-algebra/pkg-plist +++ ports/math/ruby-algebra/pkg-plist @@ -213,6 +213,6 @@ %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/todo.rd %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/sample-algebraic-root01.rb.v.rd %%PORTDOCS%%%%RUBY_MODDOCDIR%%/sample-algebraic-root01.rb.v.rd -@dirrm %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%% -@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja -@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%% +%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja +%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% diff -r -u ports.orig/multimedia/mpeg/pkg-plist ports/multimedia/mpeg/pkg-plist --- ports.orig/multimedia/mpeg/pkg-plist +++ ports/multimedia/mpeg/pkg-plist @@ -1,4 +1,4 @@ bin/mpeg %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/doc.ps -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff -r -u ports.orig/multimedia/zoneminder/pkg-plist ports/multimedia/zoneminder/pkg-plist --- ports.orig/multimedia/zoneminder/pkg-plist +++ ports/multimedia/zoneminder/pkg-plist @@ -312,7 +312,7 @@ @dirrm %%WWWDIR_REL%%/data @dirrm %%WWWDIR_REL%%/cgi-bin @dirrm %%WWWDIR_REL%% -@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/mach/auto/ZoneMinder @dirrmtry %%SITE_PERL%%/mach/auto @dirrmtry %%SITE_PERL%%/mach diff -r -u ports.orig/net-im/openfire-devel/pkg-plist ports/net-im/openfire-devel/pkg-plist --- ports.orig/net-im/openfire-devel/pkg-plist +++ ports/net-im/openfire-devel/pkg-plist @@ -432,8 +432,8 @@ @dirrm %%DATADIR%%/plugins/admin/webapp @dirrm %%DATADIR%%/plugins/admin @dirrm share/examples/openfire -@dirrm %%PORTDOCS%%%%DOCSDIR%%/licenses -@dirrm %%PORTDOCS%%%%DOCSDIR%%/images +%%PORTDOCS%%@dirrm %%DOCSDIR%%/licenses +%%PORTDOCS%%@dirrm %%DOCSDIR%%/images @dirrm share/doc/openfire @comment @dirrm %%ETCDIR%%/openfire @unexec rmdir %D/%%DATADIR%%/plugins 2> /dev/null || echo "If permanently deleting this package, %D/%%DATADIR%%/plugins must be removed manually" diff -r -u ports.orig/security/IMHear/pkg-plist ports/security/IMHear/pkg-plist --- ports.orig/security/IMHear/pkg-plist +++ ports/security/IMHear/pkg-plist @@ -1,4 +1,4 @@ bin/hear %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/msn_protocol_10.html -@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff -r -u ports.orig/security/maia/pkg-plist ports/security/maia/pkg-plist --- ports.orig/security/maia/pkg-plist +++ ports/security/maia/pkg-plist @@ -944,4 +944,4 @@ @dirrm %%WWWDIR%%/admin/scripts @dirrm %%WWWDIR%%/admin @dirrmtry %%WWWDIR%% -@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff -r -u ports.orig/textproc/hevea/pkg-plist ports/textproc/hevea/pkg-plist --- ports.orig/textproc/hevea/pkg-plist +++ ports/textproc/hevea/pkg-plist @@ -202,7 +202,7 @@ %%PORTDOCS%%%%DOCSDIR%%/hevea-%%HEVEAVERSION%%-manual/previous_motif.gif %%PORTDOCS%%%%DOCSDIR%%/hevea-%%HEVEAVERSION%%-manual/thaihevea.html %%PORTDOCS%%%%DOCSDIR%%/hevea-%%HEVEAVERSION%%-manual/thaihevea001.gif -%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%/hevea-%%HEVEAVERSION%%-manual +%%PORTDOCS%%@dirrm %%DOCSDIR%%/hevea-%%HEVEAVERSION%%-manual %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/hevea/text @dirrm lib/hevea/mappings diff -r -u ports.orig/x11-fonts/cyberbit-ttfonts/pkg-plist ports/x11-fonts/cyberbit-ttfonts/pkg-plist --- ports.orig/x11-fonts/cyberbit-ttfonts/pkg-plist +++ ports/x11-fonts/cyberbit-ttfonts/pkg-plist @@ -7,4 +7,4 @@ %%PORTDOCS%%%%DOCSDIR%%/CYBERCJK.DOC %%PORTDOCS%%%%DOCSDIR%%/READMEfirst.txt %%PORTDOCS%%%%DOCSDIR%%/ReadMe.htm -@dirrm %%PORTDOCS%%%%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110290221.p9T2L6MB042978>