Make @dirrms conditional for %%DOCSDIR%% on NOPORTDOCS

PR:		ports/162136
Submitted by:	4720@hushmail.com
Approved by:	[no rejections from any maintainer within 14 days]
Feature safe:	yes

18 files changed, 40 insertions, 40 deletions

diff --git a/cad/varkon/pkg-plist b/cad/varkon/pkg-plist
index b44bc18f45ab..69038382ade3 100644
--- a/cad/varkon/pkg-plist
+++ b/cad/varkon/pkg-plist
@@ -907,6 +907,6 @@ share/varkon/mdf/swedish/x11.MDF
 %%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 --git a/chinese/phpbb-tw/pkg-plist b/chinese/phpbb-tw/pkg-plist
index 815dc694f2eb..4a8c53221fe8 100644
--- a/chinese/phpbb-tw/pkg-plist
+++ b/chinese/phpbb-tw/pkg-plist
@@ -324,4 +324,4 @@
 @dirrm %%PHPBBDIR%%
 @dirrm %%DATADIR%%/contrib
 @dirrm %%DATADIR%%
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/crossvc/pkg-plist b/devel/crossvc/pkg-plist
index 1739870721fc..29bf4db2af14 100644
--- a/devel/crossvc/pkg-plist
+++ b/devel/crossvc/pkg-plist
@@ -48,8 +48,8 @@ bin/crossvc
 @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 --git a/devel/libsigc++20/pkg-plist b/devel/libsigc++20/pkg-plist
index 16ea0650f273..f8e7e37efcf5 100644
--- a/devel/libsigc++20/pkg-plist
+++ b/devel/libsigc++20/pkg-plist
@@ -558,12 +558,12 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
 %%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 --git a/devel/ruby-wirble/pkg-plist b/devel/ruby-wirble/pkg-plist
index 3d1b7344f9d2..72599f358362 100644
--- a/devel/ruby-wirble/pkg-plist
+++ b/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 --git a/games/ember/pkg-plist b/games/ember/pkg-plist
index 588d76af02e6..9fef98b98f18 100644
--- a/games/ember/pkg-plist
+++ b/games/ember/pkg-plist
@@ -2508,7 +2508,7 @@ share/ember/media/shared/common/3d_objects/creatures/spider/spider.mesh
 @dirrm share/ember
 @dirrm etc/ember
 @dirrmtry share/applications
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/icons/worldforge
 @dirrmtry share/icons
 
diff --git a/games/quake3-rq3/pkg-plist b/games/quake3-rq3/pkg-plist
index fad474d7a842..3ad07ed5e3bc 100644
--- a/games/quake3-rq3/pkg-plist
+++ b/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 --git a/irc/eggdrop/pkg-plist b/irc/eggdrop/pkg-plist
index 617a6b5d054d..70542089929b 100644
--- a/irc/eggdrop/pkg-plist
+++ b/irc/eggdrop/pkg-plist
@@ -187,7 +187,7 @@ lib/eggdrop/wire.so
 @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 --git a/irc/tr-ircd/pkg-plist b/irc/tr-ircd/pkg-plist
index 4656012193a8..4119270794aa 100644
--- a/irc/tr-ircd/pkg-plist
+++ b/irc/tr-ircd/pkg-plist
@@ -406,7 +406,7 @@ lib/tr-ircd/tools/httpd.so
 %%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 --git a/japanese/ng-devel/pkg-plist b/japanese/ng-devel/pkg-plist
index 228c1a0d527b..92f024d5c6c5 100644
--- a/japanese/ng-devel/pkg-plist
+++ b/japanese/ng-devel/pkg-plist
@@ -8,4 +8,4 @@ bin/ng
 %%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 --git a/math/ruby-algebra/pkg-plist b/math/ruby-algebra/pkg-plist
index d0a7cd0e5eb9..f6af053dd89a 100644
--- a/math/ruby-algebra/pkg-plist
+++ b/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 --git a/multimedia/mpeg/pkg-plist b/multimedia/mpeg/pkg-plist
index ea4da7d495c6..32c6c6527f0e 100644
--- a/multimedia/mpeg/pkg-plist
+++ b/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 --git a/multimedia/zoneminder/pkg-plist b/multimedia/zoneminder/pkg-plist
index e9a8dc824b74..ffa702213447 100644
--- a/multimedia/zoneminder/pkg-plist
+++ b/multimedia/zoneminder/pkg-plist
@@ -312,7 +312,7 @@ lib/perl5/%%PERL_VERSION%%/%%PERL_ARCH%%/perllocal.pod
 @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 --git a/net-im/openfire-devel/pkg-plist b/net-im/openfire-devel/pkg-plist
index 0a54f284974a..5caf040f7744 100644
--- a/net-im/openfire-devel/pkg-plist
+++ b/net-im/openfire-devel/pkg-plist
@@ -432,8 +432,8 @@ share/java/classes/slf4j-log4j12.jar
 @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 --git a/security/IMHear/pkg-plist b/security/IMHear/pkg-plist
index 47f41fb8b278..1427ca77aaa0 100644
--- a/security/IMHear/pkg-plist
+++ b/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 --git a/security/maia/pkg-plist b/security/maia/pkg-plist
index 32d7676e70db..ad7a5e447531 100644
--- a/security/maia/pkg-plist
+++ b/security/maia/pkg-plist
@@ -944,4 +944,4 @@ sbin/maiad
 @dirrm %%WWWDIR%%/admin/scripts
 @dirrm %%WWWDIR%%/admin
 @dirrmtry %%WWWDIR%%
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/textproc/hevea/pkg-plist b/textproc/hevea/pkg-plist
index 3ebb58a91e82..04fad1281fff 100644
--- a/textproc/hevea/pkg-plist
+++ b/textproc/hevea/pkg-plist
@@ -202,7 +202,7 @@ lib/hevea/xxdate.exe
 %%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 --git a/x11-fonts/cyberbit-ttfonts/pkg-plist b/x11-fonts/cyberbit-ttfonts/pkg-plist
index 09dcd3f4cdc9..7f67e8a1923f 100644
--- a/x11-fonts/cyberbit-ttfonts/pkg-plist
+++ b/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%%
\ No newline at end of file