aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/HVSC-Update/pkg-plist6
-rw-r--r--audio/Maaate/pkg-plist10
-rw-r--r--audio/abcmidi/pkg-plist10
-rw-r--r--audio/ac3dec/pkg-plist4
-rw-r--r--audio/adpcm/pkg-plist6
-rw-r--r--audio/afsp/pkg-plist50
-rw-r--r--audio/audacity-devel/pkg-plist8
-rw-r--r--audio/audacity/pkg-plist8
-rw-r--r--audio/autools/pkg-plist4
-rw-r--r--audio/btc/pkg-plist4
-rw-r--r--audio/cd2mp3/pkg-plist4
-rw-r--r--audio/chordpack/pkg-plist4
-rw-r--r--audio/cymbaline/pkg-plist4
-rw-r--r--audio/ecawave/pkg-plist6
-rw-r--r--audio/etktab/pkg-plist20
-rw-r--r--audio/fcplay/pkg-plist6
-rw-r--r--audio/flac/pkg-plist464
-rw-r--r--audio/fmio/pkg-plist10
-rw-r--r--audio/funktrackergold/pkg-plist4
-rw-r--r--audio/gkrellmss/pkg-plist8
-rw-r--r--audio/gkrellmss2/pkg-plist8
-rw-r--r--audio/gnupod/pkg-plist16
-rw-r--r--audio/gogo/pkg-plist6
-rw-r--r--audio/gramofile/pkg-plist4
-rw-r--r--audio/gtkpod/pkg-plist4
-rw-r--r--audio/icecast/pkg-plist4
-rw-r--r--audio/ksmp3play/pkg-plist22
-rw-r--r--audio/lame/pkg-plist38
-rw-r--r--audio/liba52-devel/pkg-plist4
-rw-r--r--audio/liba52/pkg-plist4
-rw-r--r--audio/libogg/pkg-plist132
-rw-r--r--audio/libsamplerate/pkg-plist26
-rw-r--r--audio/libshout/pkg-plist50
-rw-r--r--audio/libsndfile/pkg-plist18
-rw-r--r--audio/libvorbis/pkg-plist200
-rw-r--r--audio/maplay/pkg-plist4
-rw-r--r--audio/mp3asm/pkg-plist6
-rw-r--r--audio/mp3butler/pkg-plist12
-rw-r--r--audio/mp3chew/pkg-plist10
-rw-r--r--audio/mp3info/pkg-plist8
-rw-r--r--audio/mpc/pkg-plist8
-rw-r--r--audio/mpt/pkg-plist10
-rw-r--r--audio/mziq/pkg-plist12
-rw-r--r--audio/napster/pkg-plist10
-rw-r--r--audio/opennap/pkg-plist6
-rw-r--r--audio/raproxy/pkg-plist24
-rw-r--r--audio/sbagen/pkg-plist8
-rw-r--r--audio/snowstar/pkg-plist10
-rw-r--r--audio/songprint/pkg-plist10
-rw-r--r--audio/teknap/pkg-plist4
-rw-r--r--audio/timidity++-tcltk/pkg-plist4
-rw-r--r--audio/timidity++-xaw/pkg-plist4
-rw-r--r--audio/timidity++-xskin/pkg-plist4
-rw-r--r--audio/timidity++/pkg-plist6
-rw-r--r--audio/toolame/pkg-plist10
-rw-r--r--audio/tracker/pkg-plist162
-rw-r--r--audio/vsound/pkg-plist4
-rw-r--r--audio/wmmp3/pkg-plist4
-rw-r--r--audio/wmusic/pkg-plist4
-rw-r--r--audio/xhippo/pkg-plist18
-rw-r--r--audio/xmms-crossfade/pkg-plist4
-rw-r--r--audio/xmms-pipe/pkg-plist8
-rw-r--r--audio/xmms-shn/pkg-plist4
-rw-r--r--audio/xsidplay/pkg-plist8
-rw-r--r--audio/xwave/pkg-plist10
-rw-r--r--net-p2p/opennap/pkg-plist6
-rw-r--r--net-p2p/teknap/pkg-plist4
67 files changed, 791 insertions, 791 deletions
diff --git a/audio/HVSC-Update/pkg-plist b/audio/HVSC-Update/pkg-plist
index e0d23880a0ba..e9073f5c9095 100644
--- a/audio/HVSC-Update/pkg-plist
+++ b/audio/HVSC-Update/pkg-plist
@@ -1,4 +1,4 @@
bin/HVSC-Update
-%%PORTDOCS%%share/doc/HVSC-Update/HVSC_Update.txt
-%%PORTDOCS%%share/doc/HVSC-Update/SID_file_format.txt
-%%PORTDOCS%%@dirrm share/doc/HVSC-Update
+%%PORTDOCS%%%%DOCSDIR%%/HVSC_Update.txt
+%%PORTDOCS%%%%DOCSDIR%%/SID_file_format.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/Maaate/pkg-plist b/audio/Maaate/pkg-plist
index 53b1cb0c8db1..329c01d9ae98 100644
--- a/audio/Maaate/pkg-plist
+++ b/audio/Maaate/pkg-plist
@@ -36,10 +36,10 @@ lib/libMaaateMPEG.so.1
lib/libMaaateP.a
lib/libMaaateP.so
lib/libMaaateP.so.1
-%%PORTDOCS%%share/doc/Maaate/API.html
-%%PORTDOCS%%share/doc/Maaate/ChangeLog
-%%PORTDOCS%%share/doc/Maaate/THANKS
-%%PORTDOCS%%share/doc/Maaate/applications.html
-%%PORTDOCS%%@dirrm share/doc/Maaate
+%%PORTDOCS%%%%DOCSDIR%%/API.html
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/applications.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/Maaate
@dirrm include/Maaate
diff --git a/audio/abcmidi/pkg-plist b/audio/abcmidi/pkg-plist
index ed823136ae5e..b6e546e79a34 100644
--- a/audio/abcmidi/pkg-plist
+++ b/audio/abcmidi/pkg-plist
@@ -3,8 +3,8 @@ bin/abc2midi
bin/mftext
bin/midi2abc
bin/yaps
-%%PORTDOCS%%share/doc/abcmidi/abcguide.txt
-%%PORTDOCS%%share/doc/abcmidi/demo.abc
-%%PORTDOCS%%share/doc/abcmidi/readme.txt
-%%PORTDOCS%%share/doc/abcmidi/yaps.txt
-%%PORTDOCS%%@dirrm share/doc/abcmidi
+%%PORTDOCS%%%%DOCSDIR%%/abcguide.txt
+%%PORTDOCS%%%%DOCSDIR%%/demo.abc
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/yaps.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/ac3dec/pkg-plist b/audio/ac3dec/pkg-plist
index 2af09be68fcb..d6b4bf9073a0 100644
--- a/audio/ac3dec/pkg-plist
+++ b/audio/ac3dec/pkg-plist
@@ -1,4 +1,4 @@
bin/ac3dec
bin/extract_ac3
-%%PORTDOCS%%share/doc/ac3dec/README
-%%PORTDOCS%%@dirrm share/doc/ac3dec
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/adpcm/pkg-plist b/audio/adpcm/pkg-plist
index 4be8303f6c9e..657fb7a64b04 100644
--- a/audio/adpcm/pkg-plist
+++ b/audio/adpcm/pkg-plist
@@ -2,6 +2,6 @@ include/adpcm.h
lib/libadpcm.a
lib/libadpcm.so.1
lib/libadpcm.so
-share/doc/adpcm/README
-share/doc/adpcm/hello.adpcm
-@dirrm share/doc/adpcm
+%%DOCSDIR%%/README
+%%DOCSDIR%%/hello.adpcm
+@dirrm %%DOCSDIR%%
diff --git a/audio/afsp/pkg-plist b/audio/afsp/pkg-plist
index 46208ebee2bd..834c3f82920f 100644
--- a/audio/afsp/pkg-plist
+++ b/audio/afsp/pkg-plist
@@ -54,31 +54,31 @@ share/afsp/filters/STL_mIRSS_FIR_16k.cof
share/afsp/filters/STL_mIRSS_FIR_48k.cof
share/afsp/filters/STL_pso_FIR_8k.cof
share/afsp/filters/TIA_IRS_FIR_8k.cof
-share/doc/afsp/audio/AFsp.html
-share/doc/afsp/audio/CompAudio.html
-share/doc/afsp/audio/CopyAudio.html
-share/doc/afsp/audio/FiltAudio.html
-share/doc/afsp/audio/GenNoise.html
-share/doc/afsp/audio/GenTone.html
-share/doc/afsp/audio/InfoAudio.html
-share/doc/afsp/audio/LPanal.html
-share/doc/afsp/audio/LPsyn.html
-share/doc/afsp/audio/ResampAudio.html
-share/doc/afsp/libtsp/AF/AFclose.html
-share/doc/afsp/libtsp/AF/AFdReadData.html
-share/doc/afsp/libtsp/AF/AFdWriteData.html
-share/doc/afsp/libtsp/AF/AFfReadData.html
-share/doc/afsp/libtsp/AF/AFfWriteData.html
-share/doc/afsp/libtsp/AF/AFopnRead.html
-share/doc/afsp/libtsp/AF/AFopnWrite.html
-share/doc/afsp/libtsp/AF/AFsetFileType.html
-share/doc/afsp/libtsp/AF/AFsetHinfo.html
-share/doc/afsp/libtsp/AF/AFsetNHpar.html
-share/doc/afsp/libtsp/AF/AFsetSpeaker.html
+%%DOCSDIR%%/audio/AFsp.html
+%%DOCSDIR%%/audio/CompAudio.html
+%%DOCSDIR%%/audio/CopyAudio.html
+%%DOCSDIR%%/audio/FiltAudio.html
+%%DOCSDIR%%/audio/GenNoise.html
+%%DOCSDIR%%/audio/GenTone.html
+%%DOCSDIR%%/audio/InfoAudio.html
+%%DOCSDIR%%/audio/LPanal.html
+%%DOCSDIR%%/audio/LPsyn.html
+%%DOCSDIR%%/audio/ResampAudio.html
+%%DOCSDIR%%/libtsp/AF/AFclose.html
+%%DOCSDIR%%/libtsp/AF/AFdReadData.html
+%%DOCSDIR%%/libtsp/AF/AFdWriteData.html
+%%DOCSDIR%%/libtsp/AF/AFfReadData.html
+%%DOCSDIR%%/libtsp/AF/AFfWriteData.html
+%%DOCSDIR%%/libtsp/AF/AFopnRead.html
+%%DOCSDIR%%/libtsp/AF/AFopnWrite.html
+%%DOCSDIR%%/libtsp/AF/AFsetFileType.html
+%%DOCSDIR%%/libtsp/AF/AFsetHinfo.html
+%%DOCSDIR%%/libtsp/AF/AFsetNHpar.html
+%%DOCSDIR%%/libtsp/AF/AFsetSpeaker.html
@dirrm include/libtsp
-@dirrm share/doc/afsp/audio
-@dirrm share/doc/afsp/libtsp/AF
-@dirrm share/doc/afsp/libtsp
-@dirrm share/doc/afsp
+@dirrm %%DOCSDIR%%/audio
+@dirrm %%DOCSDIR%%/libtsp/AF
+@dirrm %%DOCSDIR%%/libtsp
+@dirrm %%DOCSDIR%%
@dirrm share/afsp/filters
@dirrm share/afsp
diff --git a/audio/audacity-devel/pkg-plist b/audio/audacity-devel/pkg-plist
index 2d83219f049f..994c949e6419 100644
--- a/audio/audacity-devel/pkg-plist
+++ b/audio/audacity-devel/pkg-plist
@@ -1,5 +1,5 @@
bin/audacity
-%%PORTDOCS%%share/doc/audacity/audacity-help.htb
-%%PORTDOCS%%share/doc/audacity/README.txt
-%%PORTDOCS%%share/doc/audacity/LICENSE.txt
-%%PORTDOCS%%@dirrm share/doc/audacity
+%%PORTDOCS%%%%DOCSDIR%%/audacity-help.htb
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/audacity/pkg-plist b/audio/audacity/pkg-plist
index 2d83219f049f..994c949e6419 100644
--- a/audio/audacity/pkg-plist
+++ b/audio/audacity/pkg-plist
@@ -1,5 +1,5 @@
bin/audacity
-%%PORTDOCS%%share/doc/audacity/audacity-help.htb
-%%PORTDOCS%%share/doc/audacity/README.txt
-%%PORTDOCS%%share/doc/audacity/LICENSE.txt
-%%PORTDOCS%%@dirrm share/doc/audacity
+%%PORTDOCS%%%%DOCSDIR%%/audacity-help.htb
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/autools/pkg-plist b/audio/autools/pkg-plist
index 939ac83d06da..790bde17195d 100644
--- a/audio/autools/pkg-plist
+++ b/audio/autools/pkg-plist
@@ -17,5 +17,5 @@ bin/toc2plax-trk
bin/toc2toc
bin/wav2au
bin/wav2toc
-%%PORTDOCS%%share/doc/autools/README
-%%PORTDOCS%%@dirrm share/doc/autools
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/btc/pkg-plist b/audio/btc/pkg-plist
index 03a9f16e9afe..18008a97a21b 100644
--- a/audio/btc/pkg-plist
+++ b/audio/btc/pkg-plist
@@ -1,3 +1,3 @@
bin/btc
-share/doc/btc/btc.doc
-@dirrm share/doc/btc
+%%DOCSDIR%%/btc.doc
+@dirrm %%DOCSDIR%%
diff --git a/audio/cd2mp3/pkg-plist b/audio/cd2mp3/pkg-plist
index f18415be9440..74281aaeb542 100644
--- a/audio/cd2mp3/pkg-plist
+++ b/audio/cd2mp3/pkg-plist
@@ -1,3 +1,3 @@
bin/cd2mp3
-%%PORTDOCS%%share/doc/cd2mp3/README
-%%PORTDOCS%%@dirrm share/doc/cd2mp3
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/chordpack/pkg-plist b/audio/chordpack/pkg-plist
index afa1beb5eb0e..d71fb641c706 100644
--- a/audio/chordpack/pkg-plist
+++ b/audio/chordpack/pkg-plist
@@ -1,4 +1,4 @@
bin/chordpack
share/emacs/site-lisp/chordpro-mode.el
-%%PORTDOCS%%share/doc/chordpack/chordpack-documentation.html
-%%PORTDOCS%%@dirrm share/doc/chordpack
+%%PORTDOCS%%%%DOCSDIR%%/chordpack-documentation.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/cymbaline/pkg-plist b/audio/cymbaline/pkg-plist
index bb2821e79533..9d2aa7fc835a 100644
--- a/audio/cymbaline/pkg-plist
+++ b/audio/cymbaline/pkg-plist
@@ -2,5 +2,5 @@ bin/cymbaline
lib/%%PYTHON_VERSION%%/site-packages/ID3.py
lib/%%PYTHON_VERSION%%/site-packages/cycolors.py
lib/%%PYTHON_VERSION%%/site-packages/mp3.py
-%%PORTDOCS%%share/doc/cymbaline/README
-%%PORTDOCS%%@dirrm share/doc/cymbaline
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/ecawave/pkg-plist b/audio/ecawave/pkg-plist
index 0e82742d4a9f..dfa136ffb95d 100644
--- a/audio/ecawave/pkg-plist
+++ b/audio/ecawave/pkg-plist
@@ -1,4 +1,4 @@
bin/ecawave
-%%PORTDOCS%%share/doc/ecawave/ecawave_manpage.html
-%%PORTDOCS%%share/doc/ecawave/users_guide.html
-%%PORTDOCS%%@dirrm share/doc/ecawave
+%%PORTDOCS%%%%DOCSDIR%%/ecawave_manpage.html
+%%PORTDOCS%%%%DOCSDIR%%/users_guide.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/etktab/pkg-plist b/audio/etktab/pkg-plist
index 44b7d451149f..c725b22f6441 100644
--- a/audio/etktab/pkg-plist
+++ b/audio/etktab/pkg-plist
@@ -1,11 +1,11 @@
bin/etktab
-%%PORTDOCS%%share/doc/etktab/CHANGES.html
-%%PORTDOCS%%share/doc/etktab/LICENSE.html
-%%PORTDOCS%%share/doc/etktab/README.html
-%%PORTDOCS%%share/doc/etktab/eTktab-small.xpm
-%%PORTDOCS%%share/doc/etktab/eTktab.xpm
-%%PORTDOCS%%share/doc/etktab/canada_multi-3.1.etk
-%%PORTDOCS%%share/doc/etktab/dvorak-3.1.etk
-%%PORTDOCS%%share/doc/etktab/uk-3.1.etk
-%%PORTDOCS%%share/doc/etktab/us-3.1.etk
-@dirrm share/doc/etktab
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.html
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.html
+%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/eTktab-small.xpm
+%%PORTDOCS%%%%DOCSDIR%%/eTktab.xpm
+%%PORTDOCS%%%%DOCSDIR%%/canada_multi-3.1.etk
+%%PORTDOCS%%%%DOCSDIR%%/dvorak-3.1.etk
+%%PORTDOCS%%%%DOCSDIR%%/uk-3.1.etk
+%%PORTDOCS%%%%DOCSDIR%%/us-3.1.etk
+@dirrm %%DOCSDIR%%
diff --git a/audio/fcplay/pkg-plist b/audio/fcplay/pkg-plist
index b477673134b4..35c460328c37 100644
--- a/audio/fcplay/pkg-plist
+++ b/audio/fcplay/pkg-plist
@@ -1,4 +1,4 @@
bin/fcplay
-%%PORTDOCS%%share/doc/fcplay/ABOUT
-%%PORTDOCS%%share/doc/fcplay/POINTER
-%%PORTDOCS%%@dirrm share/doc/fcplay
+%%PORTDOCS%%%%DOCSDIR%%/ABOUT
+%%PORTDOCS%%%%DOCSDIR%%/POINTER
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
index 31befcb5146a..a3e831097453 100644
--- a/audio/flac/pkg-plist
+++ b/audio/flac/pkg-plist
@@ -42,238 +42,238 @@ share/aclocal/libFLAC++.m4
share/aclocal/libFLAC.m4
share/aclocal/libOggFLAC++.m4
share/aclocal/libOggFLAC.m4
-%%PORTDOCS%%share/doc/flac/FLAC.tag
-%%PORTDOCS%%share/doc/flac/html/api/+_2metadata_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/+_2metadata_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2all_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2decoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2decoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2encoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2encoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2export_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC_2all_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC_2export_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC_2stream__decoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC_2stream__decoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC_2stream__encoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/FLAC_2stream__encoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2all_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2decoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2decoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2encoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2encoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2export_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2all_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2export_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2stream__decoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2stream__decoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2stream__encoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2stream__encoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/annotated.html
-%%PORTDOCS%%share/doc/flac/html/api/assert_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1File-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1File.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1SeekableStream.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1Stream.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1File-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1File.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1SeekableStream-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1SeekableStream.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1Stream.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Application-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Application.gif
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Application.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Chain.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet.gif
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Iterator.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Padding.gif
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Padding.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Prototype.gif
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Prototype.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1SeekTable.gif
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo.gif
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Unknown.gif
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Unknown.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment.gif
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
-%%PORTDOCS%%share/doc/flac/html/api/classOggFLAC_1_1Decoder_1_1Stream-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classOggFLAC_1_1Decoder_1_1Stream.html
-%%PORTDOCS%%share/doc/flac/html/api/classOggFLAC_1_1Encoder_1_1Stream-members.html
-%%PORTDOCS%%share/doc/flac/html/api/classOggFLAC_1_1Encoder_1_1Stream.html
-%%PORTDOCS%%share/doc/flac/html/api/classes.html
-%%PORTDOCS%%share/doc/flac/html/api/doxygen.css
-%%PORTDOCS%%share/doc/flac/html/api/doxygen.gif
-%%PORTDOCS%%share/doc/flac/html/api/file__decoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/file__decoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/file__encoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/file__encoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/files.html
-%%PORTDOCS%%share/doc/flac/html/api/format_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/format_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/functions.html
-%%PORTDOCS%%share/doc/flac/html/api/globals.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__file__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__file__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__format.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__metadata.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__metadata__level0.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__metadata__level1.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__metadata__level2.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__metadata__object.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__seekable__stream__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__seekable__stream__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__stream__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flac__stream__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__file__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__file__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__metadata.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__metadata__level0.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__metadata__level1.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__metadata__level2.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__metadata__object.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__seekable__stream__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__seekable__stream__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__stream__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__stream__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__oggflac.html
-%%PORTDOCS%%share/doc/flac/html/api/group__oggflac__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__oggflac__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__oggflac__stream__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__oggflac__stream__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__oggflacpp.html
-%%PORTDOCS%%share/doc/flac/html/api/group__oggflacpp__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__oggflacpp__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__oggflacpp__stream__decoder.html
-%%PORTDOCS%%share/doc/flac/html/api/group__oggflacpp__stream__encoder.html
-%%PORTDOCS%%share/doc/flac/html/api/hierarchy.html
-%%PORTDOCS%%share/doc/flac/html/api/index.html
-%%PORTDOCS%%share/doc/flac/html/api/metadata_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/metadata_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/modules.html
-%%PORTDOCS%%share/doc/flac/html/api/ordinals_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/seekable__stream__decoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/seekable__stream__decoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/seekable__stream__encoder_8h-source.html
-%%PORTDOCS%%share/doc/flac/html/api/seekable__stream__encoder_8h.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FileDecoder-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FileDecoder.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FileEncoder-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FileEncoder.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Frame-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Frame.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FrameFooter-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FrameFooter.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FrameHeader-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FrameHeader.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____SeekableStreamDecoder-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____SeekableStreamDecoder.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____SeekableStreamEncoder-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____SeekableStreamEncoder.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamDecoder-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamDecoder.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamEncoder-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamEncoder.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Application-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Application.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Index.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Padding-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Padding.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__SeekPoint.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__SeekTable-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__SeekTable.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__StreamInfo-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__StreamInfo.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Unknown-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Unknown.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Constant-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Constant.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Fixed-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Fixed.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__LPC-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__LPC.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Verbatim-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Verbatim.html
-%%PORTDOCS%%share/doc/flac/html/api/structOggFLAC____StreamDecoder-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structOggFLAC____StreamDecoder.html
-%%PORTDOCS%%share/doc/flac/html/api/structOggFLAC____StreamEncoder-members.html
-%%PORTDOCS%%share/doc/flac/html/api/structOggFLAC____StreamEncoder.html
-%%PORTDOCS%%share/doc/flac/html/comparison.html
-%%PORTDOCS%%share/doc/flac/html/developers.html
-%%PORTDOCS%%share/doc/flac/html/documentation.html
-%%PORTDOCS%%share/doc/flac/html/download.html
-%%PORTDOCS%%share/doc/flac/html/features.html
-%%PORTDOCS%%share/doc/flac/html/format.html
-%%PORTDOCS%%share/doc/flac/html/goals.html
-%%PORTDOCS%%share/doc/flac/html/id.html
-%%PORTDOCS%%share/doc/flac/html/images/1x1.gif
-%%PORTDOCS%%share/doc/flac/html/images/cafebug.gif
-%%PORTDOCS%%share/doc/flac/html/images/logo.jpg
-%%PORTDOCS%%share/doc/flac/html/index.html
-%%PORTDOCS%%share/doc/flac/html/news.html
-%%PORTDOCS%%share/doc/flac/html/ru/authors.html
-%%PORTDOCS%%share/doc/flac/html/ru/comparison.html
-%%PORTDOCS%%share/doc/flac/html/ru/developers.html
-%%PORTDOCS%%share/doc/flac/html/ru/documentation.html
-%%PORTDOCS%%share/doc/flac/html/ru/download.html
-%%PORTDOCS%%share/doc/flac/html/ru/features.html
-%%PORTDOCS%%share/doc/flac/html/ru/format.html
-%%PORTDOCS%%share/doc/flac/html/ru/goals.html
-%%PORTDOCS%%share/doc/flac/html/ru/id.html
-%%PORTDOCS%%share/doc/flac/html/ru/index.html
-%%PORTDOCS%%share/doc/flac/html/ru/links.html
-%%PORTDOCS%%share/doc/flac/html/ru/news.html
-%%PORTDOCS%%@dirrm share/doc/flac/html/ru
-%%PORTDOCS%%@dirrm share/doc/flac/html/images
-%%PORTDOCS%%@dirrm share/doc/flac/html/api
-%%PORTDOCS%%@dirrm share/doc/flac/html
-%%PORTDOCS%%@dirrm share/doc/flac
+%%PORTDOCS%%%%DOCSDIR%%/FLAC.tag
+%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2all_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2decoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2decoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2encoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2export_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2all_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2export_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__decoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__decoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__encoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2all_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2decoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2decoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2encoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2export_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2all_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2export_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__decoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__decoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__encoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/assert_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1SeekableStream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1SeekableStream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1SeekableStream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1Stream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1Stream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1Stream-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1Stream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/file__decoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/file__decoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/file__encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/file__encoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/files.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__file__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__file__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__format.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level0.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__object.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__seekable__stream__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__seekable__stream__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__file__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__file__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level0.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__object.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__seekable__stream__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__seekable__stream__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__stream__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__stream__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__stream__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__stream__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__stream__decoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__stream__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/hierarchy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/ordinals_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__decoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__decoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__encoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileDecoder-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileDecoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileEncoder-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileEncoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamDecoder-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamDecoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamEncoder-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamEncoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamEncoder-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamEncoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Application-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Application.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekTable-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekTable.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__StreamInfo-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__StreamInfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Unknown-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Unknown.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Constant-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Constant.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Fixed-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Fixed.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamDecoder-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamDecoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamEncoder-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamEncoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison.html
+%%PORTDOCS%%%%DOCSDIR%%/html/developers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/download.html
+%%PORTDOCS%%%%DOCSDIR%%/html/features.html
+%%PORTDOCS%%%%DOCSDIR%%/html/format.html
+%%PORTDOCS%%%%DOCSDIR%%/html/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/id.html
+%%PORTDOCS%%%%DOCSDIR%%/html/images/1x1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/cafebug.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/logo.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/news.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/authors.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/comparison.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/developers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/documentation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/download.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/features.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/format.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/id.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/links.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ru/news.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ru
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/api
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/OggFLAC++
@dirrm include/OggFLAC
@dirrm include/FLAC++
diff --git a/audio/fmio/pkg-plist b/audio/fmio/pkg-plist
index 888bf9e8052e..0736a9c8d6e5 100644
--- a/audio/fmio/pkg-plist
+++ b/audio/fmio/pkg-plist
@@ -1,7 +1,7 @@
bin/fmio
etc/rc.d/bktrctl.sh
-share/doc/fmio/Changelog
-share/doc/fmio/FAQ
-share/doc/fmio/FAQ.ru
-share/doc/fmio/README
-@dirrm share/doc/fmio
+%%DOCSDIR%%/Changelog
+%%DOCSDIR%%/FAQ
+%%DOCSDIR%%/FAQ.ru
+%%DOCSDIR%%/README
+@dirrm %%DOCSDIR%%
diff --git a/audio/funktrackergold/pkg-plist b/audio/funktrackergold/pkg-plist
index f52b1cca9a4b..fe217073201a 100644
--- a/audio/funktrackergold/pkg-plist
+++ b/audio/funktrackergold/pkg-plist
@@ -1,3 +1,3 @@
bin/funkgold
-%%PORTDOCS%%share/doc/funktrackergold/README
-%%PORTDOCS%%@dirrm share/doc/funktrackergold
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/gkrellmss/pkg-plist b/audio/gkrellmss/pkg-plist
index c7e11918233f..53b6033e322c 100644
--- a/audio/gkrellmss/pkg-plist
+++ b/audio/gkrellmss/pkg-plist
@@ -1,6 +1,6 @@
@comment $FreeBSD$
libexec/gkrellm/plugins/gkrellmss.so
-%%PORTDOCS%%share/doc/gkrellmss/Changelog
-%%PORTDOCS%%share/doc/gkrellmss/README
-%%PORTDOCS%%share/doc/gkrellmss/Themes
-%%PORTDOCS%%@dirrm share/doc/gkrellmss
+%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/Themes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/gkrellmss2/pkg-plist b/audio/gkrellmss2/pkg-plist
index f14ae04e7114..6ae27dad9902 100644
--- a/audio/gkrellmss2/pkg-plist
+++ b/audio/gkrellmss2/pkg-plist
@@ -1,5 +1,5 @@
libexec/gkrellm2/plugins/gkrellmss.so
-%%PORTDOCS%%share/doc/gkrellmss/Changelog
-%%PORTDOCS%%share/doc/gkrellmss/README
-%%PORTDOCS%%share/doc/gkrellmss/Themes
-%%PORTDOCS%%@dirrm share/doc/gkrellmss
+%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/Themes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/gnupod/pkg-plist b/audio/gnupod/pkg-plist
index b40b45119d43..3dcfe0487582 100644
--- a/audio/gnupod/pkg-plist
+++ b/audio/gnupod/pkg-plist
@@ -9,11 +9,11 @@ bin/gnupod_search.pl
bin/mktunes.pl
bin/tunes2pod.pl
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/iPod.pm
-%%PORTDOCS%%share/doc/gnupod/CHANGES
-%%PORTDOCS%%share/doc/gnupod/gnutunesdb.example
-%%PORTDOCS%%share/doc/gnupod/gnupod.html
-%%PORTDOCS%%share/doc/gnupod/gnupod.texi
-%%PORTDOCS%%share/doc/gnupod/fdl.texi
-%%PORTDOCS%%share/doc/gnupod/version.texi
-%%PORTDOCS%%share/doc/gnupod/ipod.svg
-%%PORTDOCS%%@dirrm share/doc/gnupod
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/gnutunesdb.example
+%%PORTDOCS%%%%DOCSDIR%%/gnupod.html
+%%PORTDOCS%%%%DOCSDIR%%/gnupod.texi
+%%PORTDOCS%%%%DOCSDIR%%/fdl.texi
+%%PORTDOCS%%%%DOCSDIR%%/version.texi
+%%PORTDOCS%%%%DOCSDIR%%/ipod.svg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/gogo/pkg-plist b/audio/gogo/pkg-plist
index 163763deabb2..8c181a48659d 100644
--- a/audio/gogo/pkg-plist
+++ b/audio/gogo/pkg-plist
@@ -1,5 +1,5 @@
bin/cdda2mp3.gogo
bin/gogo
-%%PORTDOCS%%share/doc/gogo/cdda2mp3.gogo.en
-%%PORTDOCS%%share/doc/gogo/cdda2mp3.gogo.ja
-%%PORTDOCS%%@dirrm share/doc/gogo
+%%PORTDOCS%%%%DOCSDIR%%/cdda2mp3.gogo.en
+%%PORTDOCS%%%%DOCSDIR%%/cdda2mp3.gogo.ja
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/gramofile/pkg-plist b/audio/gramofile/pkg-plist
index 54a458ab6d47..d9428bdc731c 100644
--- a/audio/gramofile/pkg-plist
+++ b/audio/gramofile/pkg-plist
@@ -1,5 +1,5 @@
bin/gramofile
bin/bplay_gramo
bin/brec_gramo
-share/doc/gramofile/README
-@dirrm share/doc/gramofile
+%%DOCSDIR%%/README
+@dirrm %%DOCSDIR%%
diff --git a/audio/gtkpod/pkg-plist b/audio/gtkpod/pkg-plist
index 9d70849871e4..357dc9cfa855 100644
--- a/audio/gtkpod/pkg-plist
+++ b/audio/gtkpod/pkg-plist
@@ -3,5 +3,5 @@ share/locale/de/LC_MESSAGES/gtkpod.mo
share/locale/fr/LC_MESSAGES/gtkpod.mo
share/locale/it/LC_MESSAGES/gtkpod.mo
share/locale/ja/LC_MESSAGES/gtkpod.mo
-%%PORTDOCS%%share/doc/gtkpod/README
-%%PORTDOCS%%@dirrm share/doc/gtkpod
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/icecast/pkg-plist b/audio/icecast/pkg-plist
index 5ed338f1a9f0..78d6b10be701 100644
--- a/audio/icecast/pkg-plist
+++ b/audio/icecast/pkg-plist
@@ -21,8 +21,8 @@ etc/icecast/templates/manual.html
etc/icecast/templates/mountlist.html
etc/icecast/templates/statistics.html
sbin/icecast
-share/doc/icecast/manual.html
+%%DOCSDIR%%/manual.html
@dirrm etc/icecast/conf
@dirrm etc/icecast/templates
@dirrm etc/icecast
-@dirrm share/doc/icecast
+@dirrm %%DOCSDIR%%
diff --git a/audio/ksmp3play/pkg-plist b/audio/ksmp3play/pkg-plist
index 4da10bc5dd47..0d73991fe11c 100644
--- a/audio/ksmp3play/pkg-plist
+++ b/audio/ksmp3play/pkg-plist
@@ -1,12 +1,12 @@
bin/ksmp3play
-%%PORTDOCS%%share/doc/ksmp3play/ksmp3play.html/ch-usage.html
-%%PORTDOCS%%share/doc/ksmp3play/ksmp3play.html/footnotes.html
-%%PORTDOCS%%share/doc/ksmp3play/ksmp3play.html/ch-intro.html
-%%PORTDOCS%%share/doc/ksmp3play/ksmp3play.html/index.html
-%%PORTDOCS%%share/doc/ksmp3play/ksmp3play.html/ch-install.html
-%%PORTDOCS%%share/doc/ksmp3play/ksmp3play.html/ch-qa.html
-%%PORTDOCS%%share/doc/ksmp3play/ksmp3play.pdf
-%%PORTDOCS%%share/doc/ksmp3play/ksmp3play.sgml
-%%PORTDOCS%%share/doc/ksmp3play/ksmp3play.txt
-%%PORTDOCS%%@dirrm share/doc/ksmp3play/ksmp3play.html
-%%PORTDOCS%%@dirrm share/doc/ksmp3play
+%%PORTDOCS%%%%DOCSDIR%%/ksmp3play.html/ch-usage.html
+%%PORTDOCS%%%%DOCSDIR%%/ksmp3play.html/footnotes.html
+%%PORTDOCS%%%%DOCSDIR%%/ksmp3play.html/ch-intro.html
+%%PORTDOCS%%%%DOCSDIR%%/ksmp3play.html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ksmp3play.html/ch-install.html
+%%PORTDOCS%%%%DOCSDIR%%/ksmp3play.html/ch-qa.html
+%%PORTDOCS%%%%DOCSDIR%%/ksmp3play.pdf
+%%PORTDOCS%%%%DOCSDIR%%/ksmp3play.sgml
+%%PORTDOCS%%%%DOCSDIR%%/ksmp3play.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ksmp3play.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/lame/pkg-plist b/audio/lame/pkg-plist
index 53fd5a844f3a..8c7d9676bd53 100644
--- a/audio/lame/pkg-plist
+++ b/audio/lame/pkg-plist
@@ -5,23 +5,23 @@ lib/libmp3lame.a
lib/libmp3lame.so.0
@exec ln -fs %F %B/libmp3lame.so
@unexec rm -f %B/libmp3lame.so
-%%PORTDOCS%%share/doc/lame/API
-%%PORTDOCS%%share/doc/lame/LICENSE
-%%PORTDOCS%%share/doc/lame/PRESETS.draft
-%%PORTDOCS%%share/doc/lame/README
-%%PORTDOCS%%share/doc/lame/TODO
-%%PORTDOCS%%share/doc/lame/USAGE
-%%PORTDOCS%%share/doc/lame/html/basic.html
-%%PORTDOCS%%share/doc/lame/html/contributors.html
-%%PORTDOCS%%share/doc/lame/html/examples.html
-%%PORTDOCS%%share/doc/lame/html/history.html
-%%PORTDOCS%%share/doc/lame/html/id3.html
-%%PORTDOCS%%share/doc/lame/html/index.html
-%%PORTDOCS%%share/doc/lame/html/lame.css
-%%PORTDOCS%%share/doc/lame/html/modes.html
-%%PORTDOCS%%share/doc/lame/html/node6.html
-%%PORTDOCS%%share/doc/lame/html/presets.html
-%%PORTDOCS%%share/doc/lame/html/switchs.html
-%%PORTDOCS%%@dirrm share/doc/lame/html
-%%PORTDOCS%%@dirrm share/doc/lame
+%%PORTDOCS%%%%DOCSDIR%%/API
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/PRESETS.draft
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/USAGE
+%%PORTDOCS%%%%DOCSDIR%%/html/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/html/contributors.html
+%%PORTDOCS%%%%DOCSDIR%%/html/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/html/history.html
+%%PORTDOCS%%%%DOCSDIR%%/html/id3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lame.css
+%%PORTDOCS%%%%DOCSDIR%%/html/modes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/node6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/presets.html
+%%PORTDOCS%%%%DOCSDIR%%/html/switchs.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/lame
diff --git a/audio/liba52-devel/pkg-plist b/audio/liba52-devel/pkg-plist
index bf290b1b0928..c03996cc1c6f 100644
--- a/audio/liba52-devel/pkg-plist
+++ b/audio/liba52-devel/pkg-plist
@@ -9,6 +9,6 @@ lib/liba52.so.0
lib/liba52.so
lib/liba52.la
lib/liba52.a
-%%PORTDOCS%%share/doc/liba52/liba52.txt
-%%PORTDOCS%%@dirrm share/doc/liba52
+%%PORTDOCS%%%%DOCSDIR%%/liba52.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/a52dec
diff --git a/audio/liba52/pkg-plist b/audio/liba52/pkg-plist
index bf290b1b0928..c03996cc1c6f 100644
--- a/audio/liba52/pkg-plist
+++ b/audio/liba52/pkg-plist
@@ -9,6 +9,6 @@ lib/liba52.so.0
lib/liba52.so
lib/liba52.la
lib/liba52.a
-%%PORTDOCS%%share/doc/liba52/liba52.txt
-%%PORTDOCS%%@dirrm share/doc/liba52
+%%PORTDOCS%%%%DOCSDIR%%/liba52.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/a52dec
diff --git a/audio/libogg/pkg-plist b/audio/libogg/pkg-plist
index b14a48fcc760..a922d0f5a7ee 100644
--- a/audio/libogg/pkg-plist
+++ b/audio/libogg/pkg-plist
@@ -6,70 +6,70 @@ lib/libogg.a
lib/libogg.so
lib/libogg.so.4
share/aclocal/ogg.m4
-%%PORTDOCS%%share/doc/libogg/framing.html
-%%PORTDOCS%%share/doc/libogg/index.html
-%%PORTDOCS%%share/doc/libogg/ogg/bitpacking.html
-%%PORTDOCS%%share/doc/libogg/ogg/datastructures.html
-%%PORTDOCS%%share/doc/libogg/ogg/decoding.html
-%%PORTDOCS%%share/doc/libogg/ogg/encoding.html
-%%PORTDOCS%%share/doc/libogg/ogg/general.html
-%%PORTDOCS%%share/doc/libogg/ogg/index.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_packet.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_packet_clear.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_page.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_page_bos.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_page_checksum_set.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_page_continued.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_page_eos.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_page_granulepos.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_page_packets.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_page_pageno.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_page_serialno.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_page_version.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_stream_clear.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_stream_destroy.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_stream_eos.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_stream_flush.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_stream_init.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_stream_packetin.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_stream_packetout.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_stream_pagein.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_stream_pageout.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_stream_reset.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_stream_state.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_sync_buffer.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_sync_clear.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_sync_destroy.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_sync_init.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_sync_pageout.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_sync_pageseek.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_sync_reset.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_sync_state.html
-%%PORTDOCS%%share/doc/libogg/ogg/ogg_sync_wrote.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_adv.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_adv1.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_bits.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_buffer.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_bytes.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_get_buffer.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_look.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_look1.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_read.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_read1.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_readinit.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_reset.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_write.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_writeclear.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_writeinit.html
-%%PORTDOCS%%share/doc/libogg/ogg/overview.html
-%%PORTDOCS%%share/doc/libogg/ogg/reference.html
-%%PORTDOCS%%share/doc/libogg/ogg/style.css
-%%PORTDOCS%%share/doc/libogg/ogg/vorbis_comment.html
-%%PORTDOCS%%share/doc/libogg/ogg/vorbis_info.html
-%%PORTDOCS%%share/doc/libogg/oggstream.html
-%%PORTDOCS%%share/doc/libogg/stream.png
-%%PORTDOCS%%share/doc/libogg/white-ogg.png
-%%PORTDOCS%%share/doc/libogg/white-xifish.png
+%%PORTDOCS%%%%DOCSDIR%%/framing.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/bitpacking.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/datastructures.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/decoding.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/encoding.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/general.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_packet.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_packet_clear.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_bos.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_checksum_set.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_continued.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_eos.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_granulepos.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_packets.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_pageno.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_serialno.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_version.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_clear.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_destroy.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_eos.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_flush.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_init.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_packetin.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_packetout.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_pagein.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_pageout.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_reset.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_state.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_clear.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_destroy.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_init.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_pageout.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_pageseek.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_reset.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_state.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_wrote.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_adv.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_adv1.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_bits.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_bytes.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_get_buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_look.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_look1.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_read.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_read1.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_readinit.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_reset.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_write.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_writeclear.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_writeinit.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/style.css
+%%PORTDOCS%%%%DOCSDIR%%/ogg/vorbis_comment.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg/vorbis_info.html
+%%PORTDOCS%%%%DOCSDIR%%/oggstream.html
+%%PORTDOCS%%%%DOCSDIR%%/stream.png
+%%PORTDOCS%%%%DOCSDIR%%/white-ogg.png
+%%PORTDOCS%%%%DOCSDIR%%/white-xifish.png
@dirrm include/ogg
-%%PORTDOCS%%@dirrm share/doc/libogg/ogg
-%%PORTDOCS%%@dirrm share/doc/libogg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ogg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/libsamplerate/pkg-plist b/audio/libsamplerate/pkg-plist
index 3fe98f53de4d..2e471274cc63 100644
--- a/audio/libsamplerate/pkg-plist
+++ b/audio/libsamplerate/pkg-plist
@@ -4,16 +4,16 @@ lib/libsamplerate.a
lib/libsamplerate.so
lib/libsamplerate.so.0
libdata/pkgconfig/samplerate.pc
-%%PORTDOCS%%share/doc/libsamplerate/SRC.css
-%%PORTDOCS%%share/doc/libsamplerate/SRC.png
-%%PORTDOCS%%share/doc/libsamplerate/api.html
-%%PORTDOCS%%share/doc/libsamplerate/api_full.html
-%%PORTDOCS%%share/doc/libsamplerate/api_misc.html
-%%PORTDOCS%%share/doc/libsamplerate/api_simple.html
-%%PORTDOCS%%share/doc/libsamplerate/download.html
-%%PORTDOCS%%share/doc/libsamplerate/history.html
-%%PORTDOCS%%share/doc/libsamplerate/index.html
-%%PORTDOCS%%share/doc/libsamplerate/license.html
-%%PORTDOCS%%share/doc/libsamplerate/lists.html
-%%PORTDOCS%%share/doc/libsamplerate/quality.html
-%%PORTDOCS%%share/doc/libsamplerate/win32.html
+%%PORTDOCS%%%%DOCSDIR%%/SRC.css
+%%PORTDOCS%%%%DOCSDIR%%/SRC.png
+%%PORTDOCS%%%%DOCSDIR%%/api.html
+%%PORTDOCS%%%%DOCSDIR%%/api_full.html
+%%PORTDOCS%%%%DOCSDIR%%/api_misc.html
+%%PORTDOCS%%%%DOCSDIR%%/api_simple.html
+%%PORTDOCS%%%%DOCSDIR%%/download.html
+%%PORTDOCS%%%%DOCSDIR%%/history.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/lists.html
+%%PORTDOCS%%%%DOCSDIR%%/quality.html
+%%PORTDOCS%%%%DOCSDIR%%/win32.html
diff --git a/audio/libshout/pkg-plist b/audio/libshout/pkg-plist
index 4b771016fcc8..79fb2776eac0 100644
--- a/audio/libshout/pkg-plist
+++ b/audio/libshout/pkg-plist
@@ -3,32 +3,32 @@ lib/libshout.so.2
lib/libshout.so
lib/libshout.la
lib/libshout.a
-share/doc/libshout-%%PORTVERSION%%/index.html
-share/doc/libshout-%%PORTVERSION%%/overview.html
-share/doc/libshout-%%PORTVERSION%%/initialization.html
-share/doc/libshout-%%PORTVERSION%%/connection.html
-share/doc/libshout-%%PORTVERSION%%/datastreaming.html
-share/doc/libshout-%%PORTVERSION%%/metadata.html
-share/doc/libshout-%%PORTVERSION%%/datastructures.html
-share/doc/libshout-%%PORTVERSION%%/shout_conn_t.html
-share/doc/libshout-%%PORTVERSION%%/shout_connect.html
-share/doc/libshout-%%PORTVERSION%%/shout_disconnect.html
-share/doc/libshout-%%PORTVERSION%%/shout_sleep.html
-share/doc/libshout-%%PORTVERSION%%/shout_init_connection.html
-share/doc/libshout-%%PORTVERSION%%/shout_send_data.html
-share/doc/libshout-%%PORTVERSION%%/shout_update_metadata.html
-share/doc/libshout-%%PORTVERSION%%/style.css
-share/doc/libshout-%%PORTVERSION%%/example.html
-share/doc/libshout-%%PORTVERSION%%/example_c.html
-share/doc/libshout-%%PORTVERSION%%/reference.html
-share/doc/libshout-%%PORTVERSION%%/errorhandling.html
-share/doc/libshout-%%PORTVERSION%%/shout_strerror.html
-share/doc/libshout-%%PORTVERSION%%/README
-share/doc/libshout-%%PORTVERSION%%/AUTHORS
-share/doc/libshout-%%PORTVERSION%%/COPYING
-share/doc/libshout-%%PORTVERSION%%/CHANGES
+%%DOCSDIR%%-%%PORTVERSION%%/index.html
+%%DOCSDIR%%-%%PORTVERSION%%/overview.html
+%%DOCSDIR%%-%%PORTVERSION%%/initialization.html
+%%DOCSDIR%%-%%PORTVERSION%%/connection.html
+%%DOCSDIR%%-%%PORTVERSION%%/datastreaming.html
+%%DOCSDIR%%-%%PORTVERSION%%/metadata.html
+%%DOCSDIR%%-%%PORTVERSION%%/datastructures.html
+%%DOCSDIR%%-%%PORTVERSION%%/shout_conn_t.html
+%%DOCSDIR%%-%%PORTVERSION%%/shout_connect.html
+%%DOCSDIR%%-%%PORTVERSION%%/shout_disconnect.html
+%%DOCSDIR%%-%%PORTVERSION%%/shout_sleep.html
+%%DOCSDIR%%-%%PORTVERSION%%/shout_init_connection.html
+%%DOCSDIR%%-%%PORTVERSION%%/shout_send_data.html
+%%DOCSDIR%%-%%PORTVERSION%%/shout_update_metadata.html
+%%DOCSDIR%%-%%PORTVERSION%%/style.css
+%%DOCSDIR%%-%%PORTVERSION%%/example.html
+%%DOCSDIR%%-%%PORTVERSION%%/example_c.html
+%%DOCSDIR%%-%%PORTVERSION%%/reference.html
+%%DOCSDIR%%-%%PORTVERSION%%/errorhandling.html
+%%DOCSDIR%%-%%PORTVERSION%%/shout_strerror.html
+%%DOCSDIR%%-%%PORTVERSION%%/README
+%%DOCSDIR%%-%%PORTVERSION%%/AUTHORS
+%%DOCSDIR%%-%%PORTVERSION%%/COPYING
+%%DOCSDIR%%-%%PORTVERSION%%/CHANGES
share/examples/libshout-%%PORTVERSION%%/Makefile
share/examples/libshout-%%PORTVERSION%%/example.c
@dirrm include/shout
-@dirrm share/doc/libshout-%%PORTVERSION%%
+@dirrm %%DOCSDIR%%-%%PORTVERSION%%
@dirrm share/examples/libshout-%%PORTVERSION%%
diff --git a/audio/libsndfile/pkg-plist b/audio/libsndfile/pkg-plist
index 56ff01ee0044..d9278a1035d2 100644
--- a/audio/libsndfile/pkg-plist
+++ b/audio/libsndfile/pkg-plist
@@ -6,18 +6,18 @@ lib/libsndfile.a
lib/libsndfile.so
lib/libsndfile.so.1
libdata/pkgconfig/sndfile.pc
-%%PORTDOCS%%share/doc/libsndfile/ChangeLog
-%%PORTDOCS%%share/doc/libsndfile/NEWS
-%%PORTDOCS%%share/doc/libsndfile/api.html
-%%PORTDOCS%%share/doc/libsndfile/bugs.html
-%%PORTDOCS%%share/doc/libsndfile/index.html
-%%PORTDOCS%%share/doc/libsndfile/libsndfile.jpg
-%%PORTDOCS%%share/doc/libsndfile/new_file_type.HOWTO
-%%PORTDOCS%%share/doc/libsndfile/sndfile_info.html
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/api.html
+%%PORTDOCS%%%%DOCSDIR%%/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/libsndfile.jpg
+%%PORTDOCS%%%%DOCSDIR%%/new_file_type.HOWTO
+%%PORTDOCS%%%%DOCSDIR%%/sndfile_info.html
share/octave/site/m/sndfile_load.m
share/octave/site/m/sndfile_play.m
share/octave/site/m/sndfile_save.m
@unexec rmdir %D/share/octave/site/m 2>/dev/null || true
@unexec rmdir %D/share/octave/site 2>/dev/null || true
@unexec rmdir %D/share/octave 2>/dev/null || true
-%%PORTDOCS%%@dirrm share/doc/libsndfile
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist
index fdeb223fe3ac..3eb1d3d537c5 100644
--- a/audio/libvorbis/pkg-plist
+++ b/audio/libvorbis/pkg-plist
@@ -12,104 +12,104 @@ lib/libvorbisfile.a
lib/libvorbisfile.so
lib/libvorbisfile.so.3
share/aclocal/vorbis.m4
-%%PORTDOCS%%share/doc/libvorbis/components.png
-%%PORTDOCS%%share/doc/libvorbis/draft-moffitt-vorbis-rtp-00.txt
-%%PORTDOCS%%share/doc/libvorbis/eightphase.png
-%%PORTDOCS%%share/doc/libvorbis/evenlsp.png
-%%PORTDOCS%%share/doc/libvorbis/floor1-1.png
-%%PORTDOCS%%share/doc/libvorbis/floor1-2.png
-%%PORTDOCS%%share/doc/libvorbis/floor1-3.png
-%%PORTDOCS%%share/doc/libvorbis/floor1-4.png
-%%PORTDOCS%%share/doc/libvorbis/floor1_inverse_dB_table.html
-%%PORTDOCS%%share/doc/libvorbis/floorval.png
-%%PORTDOCS%%share/doc/libvorbis/fourphase.png
-%%PORTDOCS%%share/doc/libvorbis/framing.html
-%%PORTDOCS%%share/doc/libvorbis/helper.html
-%%PORTDOCS%%share/doc/libvorbis/hufftree-under.png
-%%PORTDOCS%%share/doc/libvorbis/hufftree.png
-%%PORTDOCS%%share/doc/libvorbis/index.html
-%%PORTDOCS%%share/doc/libvorbis/lspmap.png
-%%PORTDOCS%%share/doc/libvorbis/oddlsp.png
-%%PORTDOCS%%share/doc/libvorbis/oggstream.html
-%%PORTDOCS%%share/doc/libvorbis/programming.html
-%%PORTDOCS%%share/doc/libvorbis/residue-pack.png
-%%PORTDOCS%%share/doc/libvorbis/residue2.png
-%%PORTDOCS%%share/doc/libvorbis/squarepolar.png
-%%PORTDOCS%%share/doc/libvorbis/stereo.html
-%%PORTDOCS%%share/doc/libvorbis/stream.png
-%%PORTDOCS%%share/doc/libvorbis/v-comment.html
-%%PORTDOCS%%share/doc/libvorbis/vorbis-clip.txt
-%%PORTDOCS%%share/doc/libvorbis/vorbis-errors.txt
-%%PORTDOCS%%share/doc/libvorbis/vorbis-fidelity.html
-%%PORTDOCS%%share/doc/libvorbis/vorbis-ogg.html
-%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-bitpack.html
-%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-codebook.html
-%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-floor0.html
-%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-floor1.html
-%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-intro.html
-%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-ref.html
-%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-res.html
-%%PORTDOCS%%share/doc/libvorbis/vorbis.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisenc/index.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisenc/overview.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisenc/reference.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisenc/style.css
-%%PORTDOCS%%share/doc/libvorbis/vorbisenc/vorbis_encode_ctl.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisenc/vorbis_encode_init.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisenc/vorbis_encode_init_vbr.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisenc/vorbis_info.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/OggVorbis_File.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/chaining_example_c.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/chainingexample.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/datastructures.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/decoding.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/example.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/exampleindex.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/fileinfo.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/index.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/initialization.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_bitrate.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_bitrate_instant.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_callbacks.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_clear.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_comment.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_info.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_open.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_open_callbacks.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_pcm_seek.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_pcm_tell.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_pcm_total.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_raw_seek.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_raw_tell.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_raw_total.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_read.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_read_float.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_seekable.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_serialnumber.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_streams.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_test.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_test_callbacks.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_test_open.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_time_seek.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_time_tell.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_time_total.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/overview.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/reference.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seekexample.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seeking.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seeking_test_c.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/style.css
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seekingexample.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/vorbis_comment.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/vorbis_info.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisfile/vorbisfile_example_c.html
-%%PORTDOCS%%share/doc/libvorbis/vorbisword2.png
-%%PORTDOCS%%share/doc/libvorbis/wait.png
-%%PORTDOCS%%share/doc/libvorbis/white-ogg.png
-%%PORTDOCS%%share/doc/libvorbis/white-xifish.png
-%%PORTDOCS%%share/doc/libvorbis/window1.png
-%%PORTDOCS%%share/doc/libvorbis/window2.png
+%%PORTDOCS%%%%DOCSDIR%%/components.png
+%%PORTDOCS%%%%DOCSDIR%%/draft-moffitt-vorbis-rtp-00.txt
+%%PORTDOCS%%%%DOCSDIR%%/eightphase.png
+%%PORTDOCS%%%%DOCSDIR%%/evenlsp.png
+%%PORTDOCS%%%%DOCSDIR%%/floor1-1.png
+%%PORTDOCS%%%%DOCSDIR%%/floor1-2.png
+%%PORTDOCS%%%%DOCSDIR%%/floor1-3.png
+%%PORTDOCS%%%%DOCSDIR%%/floor1-4.png
+%%PORTDOCS%%%%DOCSDIR%%/floor1_inverse_dB_table.html
+%%PORTDOCS%%%%DOCSDIR%%/floorval.png
+%%PORTDOCS%%%%DOCSDIR%%/fourphase.png
+%%PORTDOCS%%%%DOCSDIR%%/framing.html
+%%PORTDOCS%%%%DOCSDIR%%/helper.html
+%%PORTDOCS%%%%DOCSDIR%%/hufftree-under.png
+%%PORTDOCS%%%%DOCSDIR%%/hufftree.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lspmap.png
+%%PORTDOCS%%%%DOCSDIR%%/oddlsp.png
+%%PORTDOCS%%%%DOCSDIR%%/oggstream.html
+%%PORTDOCS%%%%DOCSDIR%%/programming.html
+%%PORTDOCS%%%%DOCSDIR%%/residue-pack.png
+%%PORTDOCS%%%%DOCSDIR%%/residue2.png
+%%PORTDOCS%%%%DOCSDIR%%/squarepolar.png
+%%PORTDOCS%%%%DOCSDIR%%/stereo.html
+%%PORTDOCS%%%%DOCSDIR%%/stream.png
+%%PORTDOCS%%%%DOCSDIR%%/v-comment.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbis-clip.txt
+%%PORTDOCS%%%%DOCSDIR%%/vorbis-errors.txt
+%%PORTDOCS%%%%DOCSDIR%%/vorbis-fidelity.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbis-ogg.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-bitpack.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-codebook.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-floor0.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-floor1.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-intro.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-ref.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-res.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbis.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisenc/index.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisenc/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisenc/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisenc/style.css
+%%PORTDOCS%%%%DOCSDIR%%/vorbisenc/vorbis_encode_ctl.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisenc/vorbis_encode_init.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisenc/vorbis_encode_init_vbr.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisenc/vorbis_info.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/OggVorbis_File.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/chaining_example_c.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/chainingexample.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/datastructures.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/decoding.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/example.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/exampleindex.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/fileinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/index.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/initialization.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_bitrate.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_bitrate_instant.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_callbacks.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_clear.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_comment.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_info.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_open.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_open_callbacks.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_pcm_seek.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_pcm_tell.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_pcm_total.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_raw_seek.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_raw_tell.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_raw_total.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_read.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_read_float.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_seekable.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_serialnumber.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_streams.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_test.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_test_callbacks.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_test_open.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_time_seek.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_time_tell.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_time_total.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/seekexample.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/seeking.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/seeking_test_c.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/style.css
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/seekingexample.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/vorbis_comment.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/vorbis_info.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/vorbisfile_example_c.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisword2.png
+%%PORTDOCS%%%%DOCSDIR%%/wait.png
+%%PORTDOCS%%%%DOCSDIR%%/white-ogg.png
+%%PORTDOCS%%%%DOCSDIR%%/white-xifish.png
+%%PORTDOCS%%%%DOCSDIR%%/window1.png
+%%PORTDOCS%%%%DOCSDIR%%/window2.png
@dirrm include/vorbis
-%%PORTDOCS%%@dirrm share/doc/libvorbis/vorbisenc
-%%PORTDOCS%%@dirrm share/doc/libvorbis/vorbisfile
-%%PORTDOCS%%@dirrm share/doc/libvorbis
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/vorbisenc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/vorbisfile
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/maplay/pkg-plist b/audio/maplay/pkg-plist
index 7d3a3daa4937..5a817e007ff2 100644
--- a/audio/maplay/pkg-plist
+++ b/audio/maplay/pkg-plist
@@ -1,3 +1,3 @@
bin/maplay
-%%PORTDOCS%%share/doc/maplay/README
-%%PORTDOCS%%@dirrm share/doc/maplay
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/mp3asm/pkg-plist b/audio/mp3asm/pkg-plist
index b89aa5cc1e0a..7c8461876703 100644
--- a/audio/mp3asm/pkg-plist
+++ b/audio/mp3asm/pkg-plist
@@ -1,4 +1,4 @@
bin/mp3asm
-%%PORTDOCS%%share/doc/mp3asm/Changelog
-%%PORTDOCS%%share/doc/mp3asm/README
-%%PORTDOCS%%@dirrm share/doc/mp3asm
+%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/mp3butler/pkg-plist b/audio/mp3butler/pkg-plist
index a80bf3ac3f98..2a9350b8829f 100644
--- a/audio/mp3butler/pkg-plist
+++ b/audio/mp3butler/pkg-plist
@@ -1,7 +1,7 @@
bin/mp3butler
-%%PORTDOCS%%share/doc/mp3butler/COPYING
-%%PORTDOCS%%share/doc/mp3butler/ChangeLog
-%%PORTDOCS%%share/doc/mp3butler/INSTALL
-%%PORTDOCS%%share/doc/mp3butler/RANT
-%%PORTDOCS%%share/doc/mp3butler/README
-%%PORTDOCS%%@dirrm share/doc/mp3butler
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/RANT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/mp3chew/pkg-plist b/audio/mp3chew/pkg-plist
index 5c7113b9eaeb..4cd561321368 100644
--- a/audio/mp3chew/pkg-plist
+++ b/audio/mp3chew/pkg-plist
@@ -1,6 +1,6 @@
bin/mp3chew
-%%PORTDOCS%%share/doc/mp3chew/CHANGELOG
-%%PORTDOCS%%share/doc/mp3chew/INSTALL
-%%PORTDOCS%%share/doc/mp3chew/README
-%%PORTDOCS%%share/doc/mp3chew/TODO
-%%PORTDOCS%%@dirrm share/doc/mp3chew
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/mp3info/pkg-plist b/audio/mp3info/pkg-plist
index 0f92b1e7637f..c513e3fa1d6a 100644
--- a/audio/mp3info/pkg-plist
+++ b/audio/mp3info/pkg-plist
@@ -1,6 +1,6 @@
bin/mp3info
%%WITH_GTK%%bin/gmp3info
-%%PORTDOCS%%share/doc/mp3info/ChangeLog
-%%PORTDOCS%%share/doc/mp3info/README
-%%PORTDOCS%%share/doc/mp3info/mp3info.txt
-%%PORTDOCS%%@dirrm share/doc/mp3info
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/mp3info.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/mpc/pkg-plist b/audio/mpc/pkg-plist
index d83569cf5e98..78368e88cf91 100644
--- a/audio/mpc/pkg-plist
+++ b/audio/mpc/pkg-plist
@@ -1,6 +1,6 @@
bin/mpc
man/man1/mpc.1
-share/doc/mpc/AUTHORS
-share/doc/mpc/README
-share/doc/mpc/mpc-bashrc
-@dirrm share/doc/mpc
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/mpc-bashrc
+@dirrm %%DOCSDIR%%
diff --git a/audio/mpt/pkg-plist b/audio/mpt/pkg-plist
index e799ea84c50d..d4fd1314f65f 100644
--- a/audio/mpt/pkg-plist
+++ b/audio/mpt/pkg-plist
@@ -1,6 +1,6 @@
bin/mpt
-%%PORTDOCS%%share/doc/mpt/AUTHORS
-%%PORTDOCS%%share/doc/mpt/COPYING
-%%PORTDOCS%%share/doc/mpt/README
-%%PORTDOCS%%share/doc/mpt/config.txt
-%%PORTDOCS%%@dirrm share/doc/mpt
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/config.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/mziq/pkg-plist b/audio/mziq/pkg-plist
index 12349e3c56ba..f7fb61bd2d4b 100644
--- a/audio/mziq/pkg-plist
+++ b/audio/mziq/pkg-plist
@@ -1,9 +1,9 @@
bin/gmziq
bin/jukebox
bin/mziq
-%%PORTDOCS%%share/doc/mziq/README
-%%PORTDOCS%%share/doc/mziq/TODO
-%%PORTDOCS%%share/doc/mziq/default.mz
-%%PORTDOCS%%share/doc/mziq/example.mz
-%%PORTDOCS%%share/doc/mziq/rcfile
-%%PORTDOCS%%@dirrm share/doc/mziq
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/default.mz
+%%PORTDOCS%%%%DOCSDIR%%/example.mz
+%%PORTDOCS%%%%DOCSDIR%%/rcfile
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/napster/pkg-plist b/audio/napster/pkg-plist
index 9f401851fb16..23a31348eeae 100644
--- a/audio/napster/pkg-plist
+++ b/audio/napster/pkg-plist
@@ -1,7 +1,7 @@
bin/nap
bin/napping
-%%PORTDOCS%%share/doc/nap/NEWS
-%%PORTDOCS%%share/doc/nap/README
-%%PORTDOCS%%share/doc/nap/napster.txt
-%%PORTDOCS%%share/doc/nap/userguide.html
-%%PORTDOCS%%@dirrm share/doc/nap
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/napster.txt
+%%PORTDOCS%%%%DOCSDIR%%/userguide.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/opennap/pkg-plist b/audio/opennap/pkg-plist
index fcf846cbea0e..36a5302a893b 100644
--- a/audio/opennap/pkg-plist
+++ b/audio/opennap/pkg-plist
@@ -9,9 +9,9 @@ share/opennap/examples/sample.filter
share/opennap/examples/sample.motd
share/opennap/examples/sample.servers
share/opennap/examples/sample.users
-%%PORTDOCS%%share/doc/opennap/README
-%%PORTDOCS%%share/doc/opennap/napster.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/napster.txt
@dirrm share/opennap/examples
@dirrm share/opennap
-%%PORTDOCS%%@dirrm share/doc/opennap
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
etc/rc.d/opennap.sh
diff --git a/audio/raproxy/pkg-plist b/audio/raproxy/pkg-plist
index fec93e2b5cdd..58f9459f6a86 100644
--- a/audio/raproxy/pkg-plist
+++ b/audio/raproxy/pkg-plist
@@ -1,13 +1,13 @@
libexec/raproxy
-%%PORTDOCS%%share/doc/raproxy/about.html
-%%PORTDOCS%%share/doc/raproxy/advanced.html
-%%PORTDOCS%%share/doc/raproxy/contents.html
-%%PORTDOCS%%share/doc/raproxy/generic.html
-%%PORTDOCS%%share/doc/raproxy/index.html
-%%PORTDOCS%%share/doc/raproxy/moreinfo.html
-%%PORTDOCS%%share/doc/raproxy/player.html
-%%PORTDOCS%%share/doc/raproxy/raproxy.pdf
-%%PORTDOCS%%share/doc/raproxy/thrdprty.html
-%%PORTDOCS%%share/doc/raproxy/tproxy.pdf
-%%PORTDOCS%%share/doc/raproxy/usekit.html
-%%PORTDOCS%%@dirrm share/doc/raproxy
+%%PORTDOCS%%%%DOCSDIR%%/about.html
+%%PORTDOCS%%%%DOCSDIR%%/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/contents.html
+%%PORTDOCS%%%%DOCSDIR%%/generic.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/moreinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/player.html
+%%PORTDOCS%%%%DOCSDIR%%/raproxy.pdf
+%%PORTDOCS%%%%DOCSDIR%%/thrdprty.html
+%%PORTDOCS%%%%DOCSDIR%%/tproxy.pdf
+%%PORTDOCS%%%%DOCSDIR%%/usekit.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/sbagen/pkg-plist b/audio/sbagen/pkg-plist
index 19e24a1ff460..dcef18923d59 100644
--- a/audio/sbagen/pkg-plist
+++ b/audio/sbagen/pkg-plist
@@ -1,7 +1,7 @@
bin/sbagen
-%%PORTDOCS%%share/doc/sbagen/sbagen.txt
-%%PORTDOCS%%share/doc/sbagen/theory.txt
-%%PORTDOCS%%share/doc/sbagen/theory2.txt
+%%PORTDOCS%%%%DOCSDIR%%/sbagen.txt
+%%PORTDOCS%%%%DOCSDIR%%/theory.txt
+%%PORTDOCS%%%%DOCSDIR%%/theory2.txt
share/sbagen/prog-990102
share/sbagen/prog-990103
share/sbagen/prog-990104
@@ -39,4 +39,4 @@ share/sbagen/t-truth-other
share/sbagen/t-wave-1
share/sbagen/t-wave-2
@dirrm share/sbagen
-%%PORTDOCS%%@dirrm share/doc/sbagen
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/snowstar/pkg-plist b/audio/snowstar/pkg-plist
index c80eee7db41a..f76b2f1bc590 100644
--- a/audio/snowstar/pkg-plist
+++ b/audio/snowstar/pkg-plist
@@ -1,6 +1,6 @@
bin/snowstar
-%%PORTDOCS%%share/doc/snowstar/README_Snowstar
-%%PORTDOCS%%share/doc/snowstar/TODO
-%%PORTDOCS%%share/doc/snowstar/LICENSE
-%%PORTDOCS%%share/doc/snowstar/CHANGES
-%%PORTDOCS%%@dirrm share/doc/snowstar
+%%PORTDOCS%%%%DOCSDIR%%/README_Snowstar
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/songprint/pkg-plist b/audio/songprint/pkg-plist
index d116235989ce..c1161af2fddc 100644
--- a/audio/songprint/pkg-plist
+++ b/audio/songprint/pkg-plist
@@ -8,8 +8,8 @@ lib/libsongprintfile.a
lib/libsongprintfile.la
lib/libsongprintfile.so
lib/libsongprintfile.so.0
-%%PORTDOCS%%share/doc/songprint/AUTHORS
-%%PORTDOCS%%share/doc/songprint/COPYING
-%%PORTDOCS%%share/doc/songprint/NEWS
-%%PORTDOCS%%share/doc/songprint/README
-%%PORTDOCS%%@dirrm share/doc/songprint
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/teknap/pkg-plist b/audio/teknap/pkg-plist
index 6151a4d7d476..b3ef5646bb64 100644
--- a/audio/teknap/pkg-plist
+++ b/audio/teknap/pkg-plist
@@ -642,8 +642,8 @@ share/TekNap/help/7_Docs/Signals
share/TekNap/help/7_Docs/Special_Vars
share/TekNap/help/7_Docs/Status_Line
share/TekNap/help/7_Docs/Text_Highlight
-share/doc/TekNap/README
-@dirrm share/doc/TekNap
+%%DOCSDIR%%/README
+@dirrm %%DOCSDIR%%
@dirrm share/TekNap/help/7_Docs
@dirrm share/TekNap/help/6_Functions
@dirrm share/TekNap/help/5_Programming/on
diff --git a/audio/timidity++-tcltk/pkg-plist b/audio/timidity++-tcltk/pkg-plist
index eb813568ed40..3d68041ead8f 100644
--- a/audio/timidity++-tcltk/pkg-plist
+++ b/audio/timidity++-tcltk/pkg-plist
@@ -16,6 +16,6 @@ lib/timidity/misc.tcl
lib/timidity/tclIndex
lib/timidity/tkmidity.tcl
lib/timidity/tkpanel.tcl
-%%PORTDOCS%%share/doc/timidity++/README.tk
-%%PORTDOCS%%share/doc/ja/timidity++/README.tk
+%%PORTDOCS%%%%DOCSDIR%%timidity++/README.tk
+%%PORTDOCS%%%%DOCSDIR%%ja/timidity++/README.tk
@dirrm lib/timidity/bitmaps
diff --git a/audio/timidity++-xaw/pkg-plist b/audio/timidity++-xaw/pkg-plist
index 5fc3610d5a1a..e33bcc6f912c 100644
--- a/audio/timidity++-xaw/pkg-plist
+++ b/audio/timidity++-xaw/pkg-plist
@@ -15,8 +15,8 @@ lib/timidity/bitmaps/repeat.xbm
lib/timidity/bitmaps/stop.xbm
lib/timidity/bitmaps/timidity.xbm
lib/timidity/interface_a.so
-%%PORTDOCS%%share/doc/timidity++/README.xaw
-%%PORTDOCS%%share/doc/ja/timidity++/README.xaw
+%%PORTDOCS%%%%DOCSDIR%%timidity++/README.xaw
+%%PORTDOCS%%%%DOCSDIR%%ja/timidity++/README.xaw
@dirrm lib/timidity/bitmaps
@cwd /usr/X11R6
@unexec rmdir %D/lib/X11/%%EUCJP_LOCALE%%/app-defaults 2>/dev/null || true
diff --git a/audio/timidity++-xskin/pkg-plist b/audio/timidity++-xskin/pkg-plist
index 7a618b3ee12a..9c37f7abfc81 100644
--- a/audio/timidity++-xskin/pkg-plist
+++ b/audio/timidity++-xskin/pkg-plist
@@ -1,4 +1,4 @@
bin/xskinmidi
lib/timidity/interface_i.so
-%%PORTDOCS%%share/doc/timidity++/README.xskin
-%%PORTDOCS%%share/doc/ja/timidity++/README.xskin
+%%PORTDOCS%%%%DOCSDIR%%timidity++/README.xskin
+%%PORTDOCS%%%%DOCSDIR%%ja/timidity++/README.xskin
diff --git a/audio/timidity++/pkg-plist b/audio/timidity++/pkg-plist
index b484bf0f8ef1..a3922979fbd6 100644
--- a/audio/timidity++/pkg-plist
+++ b/audio/timidity++/pkg-plist
@@ -1,8 +1,8 @@
bin/timidity
-%%PORTDOCS%%share/doc/timidity++/README.dl
-%%PORTDOCS%%share/doc/timidity++/README.sf
+%%PORTDOCS%%%%DOCSDIR%%/README.dl
+%%PORTDOCS%%%%DOCSDIR%%/README.sf
%%PORTDOCS%%share/doc/ja/timidity++/README.dl
%%PORTDOCS%%share/doc/ja/timidity++/README.sf
@dirrm lib/timidity
%%PORTDOCS%%@dirrm share/doc/ja/timidity++
-%%PORTDOCS%%@dirrm share/doc/timidity++
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/toolame/pkg-plist b/audio/toolame/pkg-plist
index 501eb7b49a5b..ae7e0cf5dce9 100644
--- a/audio/toolame/pkg-plist
+++ b/audio/toolame/pkg-plist
@@ -1,6 +1,6 @@
bin/toolame
-%%PORTDOCS%%share/doc/toolame/FUTURE
-%%PORTDOCS%%share/doc/toolame/HISTORY
-%%PORTDOCS%%share/doc/toolame/LGPL.txt
-%%PORTDOCS%%share/doc/toolame/README
-%%PORTDOCS%%@dirrm share/doc/toolame
+%%PORTDOCS%%%%DOCSDIR%%/FUTURE
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/LGPL.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/tracker/pkg-plist b/audio/tracker/pkg-plist
index 950d21d7f01e..a8f4c3ae97b8 100644
--- a/audio/tracker/pkg-plist
+++ b/audio/tracker/pkg-plist
@@ -1,84 +1,84 @@
bin/randomize
bin/tracker
etc/compression_methods
-%%PORTDOCS%%share/doc/tracker/FAQ
-%%PORTDOCS%%share/doc/tracker/html/Accessing_Aminet_on_the_Internet.html
-%%PORTDOCS%%share/doc/tracker/html/Accessing_Aminet_without_Internet.html
-%%PORTDOCS%%share/doc/tracker/html/Aix.html
-%%PORTDOCS%%share/doc/tracker/html/Amiga.html
-%%PORTDOCS%%share/doc/tracker/html/Amiga_audio_hardware.html
-%%PORTDOCS%%share/doc/tracker/html/Amiga_implementation.html
-%%PORTDOCS%%share/doc/tracker/html/Architecture_dependent_problems.html
-%%PORTDOCS%%share/doc/tracker/html/Arpeggio.html
-%%PORTDOCS%%share/doc/tracker/html/Availability.html
-%%PORTDOCS%%share/doc/tracker/html/Background_information.html
-%%PORTDOCS%%share/doc/tracker/html/Base_effects.html
-%%PORTDOCS%%share/doc/tracker/html/Concept_Index.html
-%%PORTDOCS%%share/doc/tracker/html/Configure_tracker.html
-%%PORTDOCS%%share/doc/tracker/html/Copyright_status_and_disclaimer.html
-%%PORTDOCS%%share/doc/tracker/html/Credits.html
-%%PORTDOCS%%share/doc/tracker/html/Cut_note.html
-%%PORTDOCS%%share/doc/tracker/html/DECstation.html
-%%PORTDOCS%%share/doc/tracker/html/Decoding_pattern_information.html
-%%PORTDOCS%%share/doc/tracker/html/Delay_note.html
-%%PORTDOCS%%share/doc/tracker/html/Delay_pattern.html
-%%PORTDOCS%%share/doc/tracker/html/Far_jump.html
-%%PORTDOCS%%share/doc/tracker/html/Finding_a_specific_file.html
-%%PORTDOCS%%share/doc/tracker/html/Fine_portamento_down.html
-%%PORTDOCS%%share/doc/tracker/html/Fine_portamento_up.html
-%%PORTDOCS%%share/doc/tracker/html/Fine_volume_slide_down.html
-%%PORTDOCS%%share/doc/tracker/html/Fine_volume_slide_up.html
-%%PORTDOCS%%share/doc/tracker/html/Generic_problems.html
-%%PORTDOCS%%share/doc/tracker/html/Glissando_control.html
-%%PORTDOCS%%share/doc/tracker/html/HP$2fUX.html
-%%PORTDOCS%%share/doc/tracker/html/History.html
-%%PORTDOCS%%share/doc/tracker/html/Installation.html
-%%PORTDOCS%%share/doc/tracker/html/Introduction.html
-%%PORTDOCS%%share/doc/tracker/html/Invert_loop.html
-%%PORTDOCS%%share/doc/tracker/html/Linux$2fFreeBSD.html
-%%PORTDOCS%%share/doc/tracker/html/Loop_pattern.html
-%%PORTDOCS%%share/doc/tracker/html/MM1$2fOS9.html
-%%PORTDOCS%%share/doc/tracker/html/Mirror_sites_of_Aminet.html
-%%PORTDOCS%%share/doc/tracker/html/NAS.html
-%%PORTDOCS%%share/doc/tracker/html/NeXtStep.html
-%%PORTDOCS%%share/doc/tracker/html/NextStep.html
-%%PORTDOCS%%share/doc/tracker/html/OS$2f2.html
-%%PORTDOCS%%share/doc/tracker/html/Pattern_break.html
-%%PORTDOCS%%share/doc/tracker/html/Performance_issues.html
-%%PORTDOCS%%share/doc/tracker/html/Portamento_down.html
-%%PORTDOCS%%share/doc/tracker/html/Portamento_up.html
-%%PORTDOCS%%share/doc/tracker/html/Porting_tracker.html
-%%PORTDOCS%%share/doc/tracker/html/Protracker_extended_effects.html
-%%PORTDOCS%%share/doc/tracker/html/Protracker_finetunes.html
-%%PORTDOCS%%share/doc/tracker/html/Registration.html
-%%PORTDOCS%%share/doc/tracker/html/Reporting_bugs.html
-%%PORTDOCS%%share/doc/tracker/html/Resampling_details.html
-%%PORTDOCS%%share/doc/tracker/html/Retrig_note.html
-%%PORTDOCS%%share/doc/tracker/html/Sample_numbers_and_note_periods.html
-%%PORTDOCS%%share/doc/tracker/html/Set_filter.html
-%%PORTDOCS%%share/doc/tracker/html/Set_finetune.html
-%%PORTDOCS%%share/doc/tracker/html/Set_sample_offset.html
-%%PORTDOCS%%share/doc/tracker/html/Set_tempo.html
-%%PORTDOCS%%share/doc/tracker/html/Set_tremolo_waveform.html
-%%PORTDOCS%%share/doc/tracker/html/Set_vibrato_waveform.html
-%%PORTDOCS%%share/doc/tracker/html/Set_volume.html
-%%PORTDOCS%%share/doc/tracker/html/Silicon_Graphics.html
-%%PORTDOCS%%share/doc/tracker/html/Slide_volume.html
-%%PORTDOCS%%share/doc/tracker/html/Soundtracker_and_Protracker_tempo.html
-%%PORTDOCS%%share/doc/tracker/html/Sparc.html
-%%PORTDOCS%%share/doc/tracker/html/Technical_Information.html
-%%PORTDOCS%%share/doc/tracker/html/The_Protracker_file_format.html
-%%PORTDOCS%%share/doc/tracker/html/The_Protracker_format.html
-%%PORTDOCS%%share/doc/tracker/html/Tone_portamento.html
-%%PORTDOCS%%share/doc/tracker/html/Tone_portamento_$2b_Volume_slide.html
-%%PORTDOCS%%share/doc/tracker/html/Top.html
-%%PORTDOCS%%share/doc/tracker/html/Tracker_memory_consumption.html
-%%PORTDOCS%%share/doc/tracker/html/Tremolo.html
-%%PORTDOCS%%share/doc/tracker/html/Usage.html
-%%PORTDOCS%%share/doc/tracker/html/Vibrato.html
-%%PORTDOCS%%share/doc/tracker/html/Vibrato_$2b_Volume_slide.html
-%%PORTDOCS%%share/doc/tracker/html/aminet.html
-%%PORTDOCS%%share/doc/tracker/readme
-%%PORTDOCS%%share/doc/tracker/tracker.doc
-%%PORTDOCS%%@dirrm share/doc/tracker/html
-%%PORTDOCS%%@dirrm share/doc/tracker
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/html/Accessing_Aminet_on_the_Internet.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Accessing_Aminet_without_Internet.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Aix.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Amiga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Amiga_audio_hardware.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Amiga_implementation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Architecture_dependent_problems.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Arpeggio.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Availability.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Background_information.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Base_effects.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Concept_Index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Configure_tracker.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Copyright_status_and_disclaimer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Credits.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Cut_note.html
+%%PORTDOCS%%%%DOCSDIR%%/html/DECstation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Decoding_pattern_information.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Delay_note.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Delay_pattern.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Far_jump.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Finding_a_specific_file.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Fine_portamento_down.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Fine_portamento_up.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Fine_volume_slide_down.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Fine_volume_slide_up.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Generic_problems.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Glissando_control.html
+%%PORTDOCS%%%%DOCSDIR%%/html/HP$2fUX.html
+%%PORTDOCS%%%%DOCSDIR%%/html/History.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Installation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Invert_loop.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Linux$2fFreeBSD.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Loop_pattern.html
+%%PORTDOCS%%%%DOCSDIR%%/html/MM1$2fOS9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Mirror_sites_of_Aminet.html
+%%PORTDOCS%%%%DOCSDIR%%/html/NAS.html
+%%PORTDOCS%%%%DOCSDIR%%/html/NeXtStep.html
+%%PORTDOCS%%%%DOCSDIR%%/html/NextStep.html
+%%PORTDOCS%%%%DOCSDIR%%/html/OS$2f2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Pattern_break.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Performance_issues.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Portamento_down.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Portamento_up.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Porting_tracker.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Protracker_extended_effects.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Protracker_finetunes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Registration.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Reporting_bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Resampling_details.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Retrig_note.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Sample_numbers_and_note_periods.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Set_filter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Set_finetune.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Set_sample_offset.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Set_tempo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Set_tremolo_waveform.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Set_vibrato_waveform.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Set_volume.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Silicon_Graphics.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Slide_volume.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Soundtracker_and_Protracker_tempo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Sparc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Technical_Information.html
+%%PORTDOCS%%%%DOCSDIR%%/html/The_Protracker_file_format.html
+%%PORTDOCS%%%%DOCSDIR%%/html/The_Protracker_format.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Tone_portamento.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Tone_portamento_$2b_Volume_slide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Top.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Tracker_memory_consumption.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Tremolo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Usage.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Vibrato.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Vibrato_$2b_Volume_slide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/aminet.html
+%%PORTDOCS%%%%DOCSDIR%%/readme
+%%PORTDOCS%%%%DOCSDIR%%/tracker.doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/vsound/pkg-plist b/audio/vsound/pkg-plist
index 787e119c438a..5fd935da469f 100644
--- a/audio/vsound/pkg-plist
+++ b/audio/vsound/pkg-plist
@@ -1,5 +1,5 @@
bin/vsound
lib/vsound/libvsound.so
@dirrm lib/vsound
-%%PORTDOCS%%share/doc/vsound/README
-%%PORTDOCS%%@dirrm share/doc/vsound
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/wmmp3/pkg-plist b/audio/wmmp3/pkg-plist
index 2629dff017c1..3095443f768f 100644
--- a/audio/wmmp3/pkg-plist
+++ b/audio/wmmp3/pkg-plist
@@ -1,5 +1,5 @@
bin/wmmp3
share/examples/wmmp3/sample.wmmp3
-%%PORTDOCS%%share/doc/wmmp3/README
+%%PORTDOCS%%%%DOCSDIR%%/README
@dirrm share/examples/wmmp3
-%%PORTDOCS%%@dirrm share/doc/wmmp3
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/wmusic/pkg-plist b/audio/wmusic/pkg-plist
index a6df3a8ba535..57c80d967373 100644
--- a/audio/wmusic/pkg-plist
+++ b/audio/wmusic/pkg-plist
@@ -1,3 +1,3 @@
bin/wmusic
-%%PORTDOCS%%share/doc/wmusic/README
-%%PORTDOCS%%@dirrm share/doc/wmusic
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/xhippo/pkg-plist b/audio/xhippo/pkg-plist
index 6effb3632d2b..27399ab1d766 100644
--- a/audio/xhippo/pkg-plist
+++ b/audio/xhippo/pkg-plist
@@ -2,13 +2,13 @@ bin/xhippo
@unexec if cmp -s %D/etc/xhippo.config %D/etc/xhippo.config.default; then rm -f %D/etc/xhippo.config; fi
etc/xhippo.config.default
@exec test -f %B/xhippo.config || cp %B/%f %B/xhippo.config
-%%PORTDOCS%%share/doc/xhippo/ChangeLog
-%%PORTDOCS%%share/doc/xhippo/gnu-xhippo.html
-%%PORTDOCS%%share/doc/xhippo/screenshot.jpeg
-%%PORTDOCS%%share/doc/xhippo/xhippo.html.gz
-%%PORTDOCS%%share/doc/xhippo/xhippo.info.gz
-%%PORTDOCS%%share/doc/xhippo/xhippo.ps.gz
-%%PORTDOCS%%share/doc/xhippo/xhippo.sgml
-%%PORTDOCS%%share/doc/xhippo/xhippo.txt.gz
-%%PORTDOCS%%@dirrm share/doc/xhippo
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/gnu-xhippo.html
+%%PORTDOCS%%%%DOCSDIR%%/screenshot.jpeg
+%%PORTDOCS%%%%DOCSDIR%%/xhippo.html.gz
+%%PORTDOCS%%%%DOCSDIR%%/xhippo.info.gz
+%%PORTDOCS%%%%DOCSDIR%%/xhippo.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/xhippo.sgml
+%%PORTDOCS%%%%DOCSDIR%%/xhippo.txt.gz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
share/locale/de/LC_MESSAGES/xhippo.mo
diff --git a/audio/xmms-crossfade/pkg-plist b/audio/xmms-crossfade/pkg-plist
index ef1db67d84ab..cf950f0e4a5e 100644
--- a/audio/xmms-crossfade/pkg-plist
+++ b/audio/xmms-crossfade/pkg-plist
@@ -1,3 +1,3 @@
lib/xmms/Output/libcrossfade.so
-%%PORTDOCS%%share/doc/xmms-crossfade/README
-%%PORTDOCS%%@dirrm share/doc/xmms-crossfade
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/xmms-pipe/pkg-plist b/audio/xmms-pipe/pkg-plist
index f88a50ae5563..5e859fbcea85 100644
--- a/audio/xmms-pipe/pkg-plist
+++ b/audio/xmms-pipe/pkg-plist
@@ -1,5 +1,5 @@
-%%PORTDOCS%%share/doc/xmms-pipe/HISTORY
-%%PORTDOCS%%share/doc/xmms-pipe/LICENSE
-%%PORTDOCS%%share/doc/xmms-pipe/README
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
lib/xmms/Effect/xmmspipe.so
-%%PORTDOCS%%@dirrm share/doc/xmms-pipe
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/xmms-shn/pkg-plist b/audio/xmms-shn/pkg-plist
index afaec6043a4f..d6b78c7026ea 100644
--- a/audio/xmms-shn/pkg-plist
+++ b/audio/xmms-shn/pkg-plist
@@ -1,4 +1,4 @@
@comment $FreeBSD$
lib/xmms/Input/libshn.so
-%%PORTDOCS%%share/doc/xmms-shn/README
-%%PORTDOCS%%@dirrm share/doc/xmms-shn
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/audio/xsidplay/pkg-plist b/audio/xsidplay/pkg-plist
index 43636577f832..e8d1286387a0 100644
--- a/audio/xsidplay/pkg-plist
+++ b/audio/xsidplay/pkg-plist
@@ -1,7 +1,7 @@
bin/xsidplay
share/pixmaps/xsidplay.xpm
-%%PORTDOCS%%share/doc/xsidplay/README
-%%PORTDOCS%%share/doc/xsidplay/STIL.faq
-%%PORTDOCS%%share/doc/xsidplay/hv_sids.faq
-%%PORTDOCS%%@dirrm share/doc/xsidplay
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/STIL.faq
+%%PORTDOCS%%%%DOCSDIR%%/hv_sids.faq
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@unexec rmdir %D/share/pixmaps 2>/dev/null || true
diff --git a/audio/xwave/pkg-plist b/audio/xwave/pkg-plist
index fba822a2e24a..9cc902346e1e 100644
--- a/audio/xwave/pkg-plist
+++ b/audio/xwave/pkg-plist
@@ -1,7 +1,7 @@
bin/xwave
lib/X11/app-defaults/XWave
-%%PORTDOCS%%share/doc/xwave/README
-%%PORTDOCS%%share/doc/xwave/README-XWAVE2
-%%PORTDOCS%%share/doc/xwave/README.v06
-%%PORTDOCS%%share/doc/xwave/INSTALL
-%%PORTDOCS%%@dirrm share/doc/xwave
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-XWAVE2
+%%PORTDOCS%%%%DOCSDIR%%/README.v06
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-p2p/opennap/pkg-plist b/net-p2p/opennap/pkg-plist
index fcf846cbea0e..36a5302a893b 100644
--- a/net-p2p/opennap/pkg-plist
+++ b/net-p2p/opennap/pkg-plist
@@ -9,9 +9,9 @@ share/opennap/examples/sample.filter
share/opennap/examples/sample.motd
share/opennap/examples/sample.servers
share/opennap/examples/sample.users
-%%PORTDOCS%%share/doc/opennap/README
-%%PORTDOCS%%share/doc/opennap/napster.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/napster.txt
@dirrm share/opennap/examples
@dirrm share/opennap
-%%PORTDOCS%%@dirrm share/doc/opennap
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
etc/rc.d/opennap.sh
diff --git a/net-p2p/teknap/pkg-plist b/net-p2p/teknap/pkg-plist
index 6151a4d7d476..b3ef5646bb64 100644
--- a/net-p2p/teknap/pkg-plist
+++ b/net-p2p/teknap/pkg-plist
@@ -642,8 +642,8 @@ share/TekNap/help/7_Docs/Signals
share/TekNap/help/7_Docs/Special_Vars
share/TekNap/help/7_Docs/Status_Line
share/TekNap/help/7_Docs/Text_Highlight
-share/doc/TekNap/README
-@dirrm share/doc/TekNap
+%%DOCSDIR%%/README
+@dirrm %%DOCSDIR%%
@dirrm share/TekNap/help/7_Docs
@dirrm share/TekNap/help/6_Functions
@dirrm share/TekNap/help/5_Programming/on