Hopefully finish syncing with bsd.port.mk rev 1.361 - use bsd.port.mk

defined PORTDOCS PLIST_SUB.

Submitted by:	lioux
Closes PR:	24468
PR Submitter:	Mikhail Teterin <mi@aldan.algebra.com>

14 files changed, 146 insertions, 146 deletions

diff --git a/devel/codecrusader/pkg-plist b/devel/codecrusader/pkg-plist
index 9984bce6d67a..c297cd8287b4 100644
--- a/devel/codecrusader/pkg-plist
+++ b/devel/codecrusader/pkg-plist
@@ -1,14 +1,14 @@
 bin/jcc
 bin/dirdiff
-%%PORTDOCS:%%share/doc/%%PORTNAME%%/FAQ
-%%PORTDOCS:%%share/doc/%%PORTNAME%%/LICENSE
-%%PORTDOCS:%%share/doc/%%PORTNAME%%/README.binary
-%%PORTDOCS:%%share/examples/%%PORTNAME%%/desktop/README
-%%PORTDOCS:%%share/examples/%%PORTNAME%%/desktop/fancy.xpm
-%%PORTDOCS:%%share/examples/%%PORTNAME%%/desktop/plain.xpm
-%%PORTDOCS:%%share/examples/%%PORTNAME%%/macros/FORTRAN_indenting
-%%PORTDOCS:%%share/examples/%%PORTNAME%%/macros/Java
-%%PORTDOCS:%%@dirrm share/examples/%%PORTNAME%%/macros
-%%PORTDOCS:%%@dirrm share/examples/%%PORTNAME%%/desktop
-%%PORTDOCS:%%@dirrm share/examples/%%PORTNAME%%
-%%PORTDOCS:%%@dirrm share/doc/%%PORTNAME%%
+%%PORTDOCS%%share/doc/%%PORTNAME%%/FAQ
+%%PORTDOCS%%share/doc/%%PORTNAME%%/LICENSE
+%%PORTDOCS%%share/doc/%%PORTNAME%%/README.binary
+%%PORTDOCS%%share/examples/%%PORTNAME%%/desktop/README
+%%PORTDOCS%%share/examples/%%PORTNAME%%/desktop/fancy.xpm
+%%PORTDOCS%%share/examples/%%PORTNAME%%/desktop/plain.xpm
+%%PORTDOCS%%share/examples/%%PORTNAME%%/macros/FORTRAN_indenting
+%%PORTDOCS%%share/examples/%%PORTNAME%%/macros/Java
+%%PORTDOCS%%@dirrm share/examples/%%PORTNAME%%/macros
+%%PORTDOCS%%@dirrm share/examples/%%PORTNAME%%/desktop
+%%PORTDOCS%%@dirrm share/examples/%%PORTNAME%%
+%%PORTDOCS%%@dirrm share/doc/%%PORTNAME%%
diff --git a/devel/codemedic/pkg-plist b/devel/codemedic/pkg-plist
index 39bb2aa19597..fd8dbfc12918 100644
--- a/devel/codemedic/pkg-plist
+++ b/devel/codemedic/pkg-plist
@@ -1,4 +1,4 @@
 bin/medic
-%%PORTDOCS:%%share/doc/%%PORTNAME%%/LICENSE
-%%PORTDOCS:%%share/doc/%%PORTNAME%%/README.binary
-%%PORTDOCS:%%@dirrm share/doc/%%PORTNAME%%
+%%PORTDOCS%%share/doc/%%PORTNAME%%/LICENSE
+%%PORTDOCS%%share/doc/%%PORTNAME%%/README.binary
+%%PORTDOCS%%@dirrm share/doc/%%PORTNAME%%
diff --git a/emulators/vgb-bin/pkg-plist b/emulators/vgb-bin/pkg-plist
index f8da1cbd619c..ae943a1e8ff5 100644
--- a/emulators/vgb-bin/pkg-plist
+++ b/emulators/vgb-bin/pkg-plist
@@ -1,6 +1,6 @@
 bin/vgb
 bin/vgb-debug
 share/vgb/CART.GB
-%%PORTDOCS:%%share/doc/vgb/VGB.html
-%%PORTDOCS:%%@dirrm share/doc/vgb
+%%PORTDOCS%%share/doc/vgb/VGB.html
+%%PORTDOCS%%@dirrm share/doc/vgb
 @dirrm share/vgb
diff --git a/emulators/vgba-bin/pkg-plist b/emulators/vgba-bin/pkg-plist
index f8da1cbd619c..ae943a1e8ff5 100644
--- a/emulators/vgba-bin/pkg-plist
+++ b/emulators/vgba-bin/pkg-plist
@@ -1,6 +1,6 @@
 bin/vgb
 bin/vgb-debug
 share/vgb/CART.GB
-%%PORTDOCS:%%share/doc/vgb/VGB.html
-%%PORTDOCS:%%@dirrm share/doc/vgb
+%%PORTDOCS%%share/doc/vgb/VGB.html
+%%PORTDOCS%%@dirrm share/doc/vgb
 @dirrm share/vgb
diff --git a/mail/arrow/pkg-plist b/mail/arrow/pkg-plist
index fbe858d6c7e1..69f02d925c86 100644
--- a/mail/arrow/pkg-plist
+++ b/mail/arrow/pkg-plist
@@ -1,4 +1,4 @@
 bin/arrow
-%%PORTDOCS:%%share/doc/%%PORTNAME%%/LICENSE
-%%PORTDOCS:%%share/doc/%%PORTNAME%%/README.binary
-%%PORTDOCS:%%@dirrm share/doc/%%PORTNAME%%
+%%PORTDOCS%%share/doc/%%PORTNAME%%/LICENSE
+%%PORTDOCS%%share/doc/%%PORTNAME%%/README.binary
+%%PORTDOCS%%@dirrm share/doc/%%PORTNAME%%
diff --git a/math/glove/pkg-plist b/math/glove/pkg-plist
index 1c125f649de4..24a9044ba4ae 100644
--- a/math/glove/pkg-plist
+++ b/math/glove/pkg-plist
@@ -1,4 +1,4 @@
 bin/glove
-%%PORTDOCS:%%share/doc/%%PORTNAME%%/LICENSE
-%%PORTDOCS:%%share/doc/%%PORTNAME%%/README.binary
-%%PORTDOCS:%%@dirrm share/doc/%%PORTNAME%%
+%%PORTDOCS%%share/doc/%%PORTNAME%%/LICENSE
+%%PORTDOCS%%share/doc/%%PORTNAME%%/README.binary
+%%PORTDOCS%%@dirrm share/doc/%%PORTNAME%%
diff --git a/math/thx_1138/pkg-plist b/math/thx_1138/pkg-plist
index d632fe9d66e9..edd208503693 100644
--- a/math/thx_1138/pkg-plist
+++ b/math/thx_1138/pkg-plist
@@ -1,4 +1,4 @@
 bin/thx-1138
-%%PORTDOCS:%%share/doc/%%PORTNAME%%/LICENSE
-%%PORTDOCS:%%share/doc/%%PORTNAME%%/README.binary
-%%PORTDOCS:%%@dirrm share/doc/%%PORTNAME%%
+%%PORTDOCS%%share/doc/%%PORTNAME%%/LICENSE
+%%PORTDOCS%%share/doc/%%PORTNAME%%/README.binary
+%%PORTDOCS%%@dirrm share/doc/%%PORTNAME%%
diff --git a/sysutils/clockspeed/pkg-plist b/sysutils/clockspeed/pkg-plist
index 8138dbb05272..00df5283921f 100644
--- a/sysutils/clockspeed/pkg-plist
+++ b/sysutils/clockspeed/pkg-plist
@@ -4,8 +4,8 @@ bin/clockview
 bin/sntpclock
 bin/taiclock
 bin/taiclockd
-%%PORTDOCS:%%share/doc/clockspeed/INSTALL
-%%PORTDOCS:%%@dirrm share/doc/clockspeed
+%%PORTDOCS%%share/doc/clockspeed/INSTALL
+%%PORTDOCS%%@dirrm share/doc/clockspeed
 @mode 0755
 @exec mkdir %D/etc/clockspeed
 @unexec rm %D/etc/clockspeed/atto.tmp 2>/dev/null || true
diff --git a/x11-toolkits/jx/pkg-plist b/x11-toolkits/jx/pkg-plist
index 263723fea1ad..80099c16ee03 100644
--- a/x11-toolkits/jx/pkg-plist
+++ b/x11-toolkits/jx/pkg-plist
@@ -1227,95 +1227,95 @@ lib/libjcore-1_5_3.so.%%LIBJX%%
 lib/libjx-1_5_3.a
 lib/libjx-1_5_3.so
 lib/libjx-1_5_3.so.%%LIBJX%%
-%%PORTDOCS:%%share/doc/jx/ACE_VERSION
-%%PORTDOCS:%%share/doc/jx/CHANGES
-%%PORTDOCS:%%share/doc/jx/FAQ
-%%PORTDOCS:%%share/doc/jx/LICENSE
-%%PORTDOCS:%%share/doc/jx/LICENSE_jxlayout
-%%PORTDOCS:%%share/doc/jx/LICENSE_makemake
-%%PORTDOCS:%%share/doc/jx/Make.files_template
-%%PORTDOCS:%%share/doc/jx/Make.header_template
-%%PORTDOCS:%%share/doc/jx/Makefiles.txt
-%%PORTDOCS:%%share/doc/jx/README
-%%PORTDOCS:%%share/doc/jx/README_ACE
-%%PORTDOCS:%%share/doc/jx/README_jxlayout
-%%PORTDOCS:%%share/doc/jx/README_makemake
-%%PORTDOCS:%%share/doc/jx/jcore_1.0.0.ps.gz
-%%PORTDOCS:%%share/doc/jx/jcore_1.0.0.txt
-%%PORTDOCS:%%share/doc/jx/jx_1.0.0.ps.gz
-%%PORTDOCS:%%share/doc/jx/jx_1.0.0.txt
-%%PORTDOCS:%%share/examples/jx/tutorial/01-HelloWorld/HelloWorldDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/01-HelloWorld/HelloWorldDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/01-HelloWorld/hello_world.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/02-MenuHello/MenuHelloDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/02-MenuHello/MenuHelloDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/02-MenuHello/menu_hello.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/03-DialogHello/DHStringInputDialog.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/03-DialogHello/DHStringInputDialog.h
-%%PORTDOCS:%%share/examples/jx/tutorial/03-DialogHello/DialogHelloDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/03-DialogHello/DialogHelloDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/03-DialogHello/dialog_hello.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/04-Widget/Widget.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/04-Widget/Widget.h
-%%PORTDOCS:%%share/examples/jx/tutorial/04-Widget/WidgetDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/04-Widget/WidgetDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/04-Widget/widget_main.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/05-Scrolling/ScrollingWidget.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/05-Scrolling/ScrollingWidget.h
-%%PORTDOCS:%%share/examples/jx/tutorial/05-Scrolling/ScrollingWidgetDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/05-Scrolling/ScrollingWidgetDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/05-Scrolling/scrolling.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/06-DragPainter/DragWidget.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/06-DragPainter/DragWidget.h
-%%PORTDOCS:%%share/examples/jx/tutorial/06-DragPainter/DragWidgetDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/06-DragPainter/DragWidgetDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/06-DragPainter/drag_painter.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/07-Printing/PrintWidget.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/07-Printing/PrintWidget.h
-%%PORTDOCS:%%share/examples/jx/tutorial/07-Printing/PrintWidgetDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/07-Printing/PrintWidgetDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/07-Printing/printing.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/08-SimpleTable/SimpleTable.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/08-SimpleTable/SimpleTable.h
-%%PORTDOCS:%%share/examples/jx/tutorial/08-SimpleTable/SimpleTableDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/08-SimpleTable/SimpleTableDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/08-SimpleTable/simpletable_main.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/09-DataTable/DataTable.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/09-DataTable/DataTable.h
-%%PORTDOCS:%%share/examples/jx/tutorial/09-DataTable/DataTableDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/09-DataTable/DataTableDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/09-DataTable/datatable_main.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/10-SelectionTable/SelectionTable.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/10-SelectionTable/SelectionTable.h
-%%PORTDOCS:%%share/examples/jx/tutorial/10-SelectionTable/SelectionTableDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/10-SelectionTable/SelectionTableDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/10-SelectionTable/selectiontable_main.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/11-EditTable/EditTable.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/11-EditTable/EditTable.h
-%%PORTDOCS:%%share/examples/jx/tutorial/11-EditTable/EditTableDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/11-EditTable/EditTableDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/11-EditTable/edittable_main.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/12-Clipboard/CBStringInputDialog.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/12-Clipboard/CBStringInputDialog.h
-%%PORTDOCS:%%share/examples/jx/tutorial/12-Clipboard/ClipboardDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/12-Clipboard/ClipboardDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/12-Clipboard/ClipboardWidget.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/12-Clipboard/ClipboardWidget.h
-%%PORTDOCS:%%share/examples/jx/tutorial/12-Clipboard/clipboard.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/13-Undo/JPtrArray-JUndo.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/13-Undo/RedoLine.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/13-Undo/RedoLine.h
-%%PORTDOCS:%%share/examples/jx/tutorial/13-Undo/UndoLine.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/13-Undo/UndoLine.h
-%%PORTDOCS:%%share/examples/jx/tutorial/13-Undo/UndoWidget.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/13-Undo/UndoWidget.h
-%%PORTDOCS:%%share/examples/jx/tutorial/13-Undo/UndoWidgetDir.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/13-Undo/UndoWidgetDir.h
-%%PORTDOCS:%%share/examples/jx/tutorial/13-Undo/undo.cc
-%%PORTDOCS:%%share/examples/jx/tutorial/Make.files
-%%PORTDOCS:%%share/examples/jx/tutorial/Make.header
-%%PORTDOCS:%%share/examples/jx/tutorial/Makefile
-%%PORTDOCS:%%share/examples/jx/tutorial/README
+%%PORTDOCS%%share/doc/jx/ACE_VERSION
+%%PORTDOCS%%share/doc/jx/CHANGES
+%%PORTDOCS%%share/doc/jx/FAQ
+%%PORTDOCS%%share/doc/jx/LICENSE
+%%PORTDOCS%%share/doc/jx/LICENSE_jxlayout
+%%PORTDOCS%%share/doc/jx/LICENSE_makemake
+%%PORTDOCS%%share/doc/jx/Make.files_template
+%%PORTDOCS%%share/doc/jx/Make.header_template
+%%PORTDOCS%%share/doc/jx/Makefiles.txt
+%%PORTDOCS%%share/doc/jx/README
+%%PORTDOCS%%share/doc/jx/README_ACE
+%%PORTDOCS%%share/doc/jx/README_jxlayout
+%%PORTDOCS%%share/doc/jx/README_makemake
+%%PORTDOCS%%share/doc/jx/jcore_1.0.0.ps.gz
+%%PORTDOCS%%share/doc/jx/jcore_1.0.0.txt
+%%PORTDOCS%%share/doc/jx/jx_1.0.0.ps.gz
+%%PORTDOCS%%share/doc/jx/jx_1.0.0.txt
+%%PORTDOCS%%share/examples/jx/tutorial/01-HelloWorld/HelloWorldDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/01-HelloWorld/HelloWorldDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/01-HelloWorld/hello_world.cc
+%%PORTDOCS%%share/examples/jx/tutorial/02-MenuHello/MenuHelloDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/02-MenuHello/MenuHelloDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/02-MenuHello/menu_hello.cc
+%%PORTDOCS%%share/examples/jx/tutorial/03-DialogHello/DHStringInputDialog.cc
+%%PORTDOCS%%share/examples/jx/tutorial/03-DialogHello/DHStringInputDialog.h
+%%PORTDOCS%%share/examples/jx/tutorial/03-DialogHello/DialogHelloDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/03-DialogHello/DialogHelloDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/03-DialogHello/dialog_hello.cc
+%%PORTDOCS%%share/examples/jx/tutorial/04-Widget/Widget.cc
+%%PORTDOCS%%share/examples/jx/tutorial/04-Widget/Widget.h
+%%PORTDOCS%%share/examples/jx/tutorial/04-Widget/WidgetDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/04-Widget/WidgetDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/04-Widget/widget_main.cc
+%%PORTDOCS%%share/examples/jx/tutorial/05-Scrolling/ScrollingWidget.cc
+%%PORTDOCS%%share/examples/jx/tutorial/05-Scrolling/ScrollingWidget.h
+%%PORTDOCS%%share/examples/jx/tutorial/05-Scrolling/ScrollingWidgetDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/05-Scrolling/ScrollingWidgetDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/05-Scrolling/scrolling.cc
+%%PORTDOCS%%share/examples/jx/tutorial/06-DragPainter/DragWidget.cc
+%%PORTDOCS%%share/examples/jx/tutorial/06-DragPainter/DragWidget.h
+%%PORTDOCS%%share/examples/jx/tutorial/06-DragPainter/DragWidgetDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/06-DragPainter/DragWidgetDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/06-DragPainter/drag_painter.cc
+%%PORTDOCS%%share/examples/jx/tutorial/07-Printing/PrintWidget.cc
+%%PORTDOCS%%share/examples/jx/tutorial/07-Printing/PrintWidget.h
+%%PORTDOCS%%share/examples/jx/tutorial/07-Printing/PrintWidgetDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/07-Printing/PrintWidgetDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/07-Printing/printing.cc
+%%PORTDOCS%%share/examples/jx/tutorial/08-SimpleTable/SimpleTable.cc
+%%PORTDOCS%%share/examples/jx/tutorial/08-SimpleTable/SimpleTable.h
+%%PORTDOCS%%share/examples/jx/tutorial/08-SimpleTable/SimpleTableDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/08-SimpleTable/SimpleTableDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/08-SimpleTable/simpletable_main.cc
+%%PORTDOCS%%share/examples/jx/tutorial/09-DataTable/DataTable.cc
+%%PORTDOCS%%share/examples/jx/tutorial/09-DataTable/DataTable.h
+%%PORTDOCS%%share/examples/jx/tutorial/09-DataTable/DataTableDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/09-DataTable/DataTableDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/09-DataTable/datatable_main.cc
+%%PORTDOCS%%share/examples/jx/tutorial/10-SelectionTable/SelectionTable.cc
+%%PORTDOCS%%share/examples/jx/tutorial/10-SelectionTable/SelectionTable.h
+%%PORTDOCS%%share/examples/jx/tutorial/10-SelectionTable/SelectionTableDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/10-SelectionTable/SelectionTableDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/10-SelectionTable/selectiontable_main.cc
+%%PORTDOCS%%share/examples/jx/tutorial/11-EditTable/EditTable.cc
+%%PORTDOCS%%share/examples/jx/tutorial/11-EditTable/EditTable.h
+%%PORTDOCS%%share/examples/jx/tutorial/11-EditTable/EditTableDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/11-EditTable/EditTableDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/11-EditTable/edittable_main.cc
+%%PORTDOCS%%share/examples/jx/tutorial/12-Clipboard/CBStringInputDialog.cc
+%%PORTDOCS%%share/examples/jx/tutorial/12-Clipboard/CBStringInputDialog.h
+%%PORTDOCS%%share/examples/jx/tutorial/12-Clipboard/ClipboardDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/12-Clipboard/ClipboardDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/12-Clipboard/ClipboardWidget.cc
+%%PORTDOCS%%share/examples/jx/tutorial/12-Clipboard/ClipboardWidget.h
+%%PORTDOCS%%share/examples/jx/tutorial/12-Clipboard/clipboard.cc
+%%PORTDOCS%%share/examples/jx/tutorial/13-Undo/JPtrArray-JUndo.cc
+%%PORTDOCS%%share/examples/jx/tutorial/13-Undo/RedoLine.cc
+%%PORTDOCS%%share/examples/jx/tutorial/13-Undo/RedoLine.h
+%%PORTDOCS%%share/examples/jx/tutorial/13-Undo/UndoLine.cc
+%%PORTDOCS%%share/examples/jx/tutorial/13-Undo/UndoLine.h
+%%PORTDOCS%%share/examples/jx/tutorial/13-Undo/UndoWidget.cc
+%%PORTDOCS%%share/examples/jx/tutorial/13-Undo/UndoWidget.h
+%%PORTDOCS%%share/examples/jx/tutorial/13-Undo/UndoWidgetDir.cc
+%%PORTDOCS%%share/examples/jx/tutorial/13-Undo/UndoWidgetDir.h
+%%PORTDOCS%%share/examples/jx/tutorial/13-Undo/undo.cc
+%%PORTDOCS%%share/examples/jx/tutorial/Make.files
+%%PORTDOCS%%share/examples/jx/tutorial/Make.header
+%%PORTDOCS%%share/examples/jx/tutorial/Makefile
+%%PORTDOCS%%share/examples/jx/tutorial/README
 share/jx/blank.xpm
 share/jx/jx_check_spelling.xpm
 share/jx/jx_edit_clean_right_margin.xpm
@@ -1345,22 +1345,22 @@ share/jx/jx_help_toc.xpm
 share/jx/jx_replace_selection.xpm
 share/jx/jx_run_script.xpm
 @dirrm share/jx
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/13-Undo
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/12-Clipboard
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/11-EditTable
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/10-SelectionTable
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/09-DataTable
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/08-SimpleTable
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/07-Printing
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/06-DragPainter
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/05-Scrolling
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/04-Widget
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/03-DialogHello
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/02-MenuHello
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial/01-HelloWorld
-%%PORTDOCS:%%@dirrm share/examples/jx/tutorial
-%%PORTDOCS:%%@dirrm share/examples/jx
-%%PORTDOCS:%%@dirrm share/doc/jx
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/13-Undo
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/12-Clipboard
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/11-EditTable
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/10-SelectionTable
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/09-DataTable
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/08-SimpleTable
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/07-Printing
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/06-DragPainter
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/05-Scrolling
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/04-Widget
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/03-DialogHello
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/02-MenuHello
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial/01-HelloWorld
+%%PORTDOCS%%@dirrm share/examples/jx/tutorial
+%%PORTDOCS%%@dirrm share/examples/jx
+%%PORTDOCS%%@dirrm share/doc/jx
 @dirrm lib/jx/make/sys
 @dirrm lib/jx/make
 @dirrm lib/jx/lib
diff --git a/x11-toolkits/libj2dplot/pkg-plist b/x11-toolkits/libj2dplot/pkg-plist
index fb0a56dbafc2..9ab59c7645a0 100644
--- a/x11-toolkits/libj2dplot/pkg-plist
+++ b/x11-toolkits/libj2dplot/pkg-plist
@@ -23,6 +23,6 @@ lib/jx/make/%%EXTRALIBFILES_MAKE_FILES%%
 lib/%%PORTNAME%%-%%LIBVERSION%%.a
 lib/%%PORTNAME%%-%%LIBVERSION%%.so
 lib/%%PORTNAME%%-%%LIBVERSION%%.so.%%LIBNUMBER%%
-%%PORTDOCS:%%share/doc/jx/LICENSE_%%PORTNAME%%
-%%PORTDOCS:%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
+%%PORTDOCS%%share/doc/jx/LICENSE_%%PORTNAME%%
+%%PORTDOCS%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
 @dirrm include/%%INCLUDEDIR%%
diff --git a/x11-toolkits/libjparser/pkg-plist b/x11-toolkits/libjparser/pkg-plist
index 75a7bce5cd1e..0540421317bf 100644
--- a/x11-toolkits/libjparser/pkg-plist
+++ b/x11-toolkits/libjparser/pkg-plist
@@ -93,7 +93,7 @@ lib/jx/make/%%EXTRALIBFILES_MAKE_FILES%%
 lib/%%PORTNAME%%-%%LIBVERSION%%.a
 lib/%%PORTNAME%%-%%LIBVERSION%%.so
 lib/%%PORTNAME%%-%%LIBVERSION%%.so.%%LIBNUMBER%%
-%%PORTDOCS:%%share/doc/jx/LICENSE_%%PORTNAME%%
-%%PORTDOCS:%%share/doc/jx/README_%%PORTNAME%%
-%%PORTDOCS:%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
+%%PORTDOCS%%share/doc/jx/LICENSE_%%PORTNAME%%
+%%PORTDOCS%%share/doc/jx/README_%%PORTNAME%%
+%%PORTDOCS%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
 @dirrm include/%%INCLUDEDIR%%
diff --git a/x11-toolkits/libjsearch/pkg-plist b/x11-toolkits/libjsearch/pkg-plist
index b7c0e6990e2d..407e21b5108b 100644
--- a/x11-toolkits/libjsearch/pkg-plist
+++ b/x11-toolkits/libjsearch/pkg-plist
@@ -9,11 +9,11 @@ lib/jx/make/%%EXTRALIBFILES_MAKE_FILES%%
 lib/%%PORTNAME%%-%%LIBVERSION%%.a
 lib/%%PORTNAME%%-%%LIBVERSION%%.so
 lib/%%PORTNAME%%-%%LIBVERSION%%.so.%%LIBNUMBER%%
-%%PORTDOCS:%%share/doc/jx/LICENSE_%%PORTNAME%%
+%%PORTDOCS%%share/doc/jx/LICENSE_%%PORTNAME%%
 share/jx/jsearch/find.xpm
 share/jx/jsearch/findnext.xpm
 share/jx/jsearch/findprev.xpm
 share/jx/jsearch/replace.xpm
 @dirrm share/jx/jsearch
-%%PORTDOCS:%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
+%%PORTDOCS%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
 @dirrm include/%%INCLUDEDIR%%
diff --git a/x11-toolkits/libjtoolbar/pkg-plist b/x11-toolkits/libjtoolbar/pkg-plist
index d80c4813e75a..4eb2d5e4a3ff 100644
--- a/x11-toolkits/libjtoolbar/pkg-plist
+++ b/x11-toolkits/libjtoolbar/pkg-plist
@@ -11,11 +11,11 @@ lib/jx/make/%%EXTRALIBFILES_MAKE_FILES%%
 lib/%%PORTNAME%%-%%LIBVERSION%%.a
 lib/%%PORTNAME%%-%%LIBVERSION%%.so
 lib/%%PORTNAME%%-%%LIBVERSION%%.so.%%LIBNUMBER%%
-%%PORTDOCS:%%share/doc/jx/LICENSE_%%PORTNAME%%
+%%PORTDOCS%%share/doc/jx/LICENSE_%%PORTNAME%%
 share/jx/jtoolbar/itemchecked.xpm
 share/jx/jtoolbar/itemnotchecked.xpm
 share/jx/jtoolbar/menunode.xpm
 share/jx/jtoolbar/todonotdone.xpm
 @dirrm share/jx/jtoolbar
-%%PORTDOCS:%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
+%%PORTDOCS%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
 @dirrm include/%%INCLUDEDIR%%
diff --git a/x11-toolkits/libjtree/pkg-plist b/x11-toolkits/libjtree/pkg-plist
index ea0b0c7bacd4..d7ff4411d2be 100644
--- a/x11-toolkits/libjtree/pkg-plist
+++ b/x11-toolkits/libjtree/pkg-plist
@@ -13,6 +13,6 @@ lib/jx/make/%%EXTRALIBFILES_MAKE_FILES%%
 lib/%%PORTNAME%%-%%LIBVERSION%%.a
 lib/%%PORTNAME%%-%%LIBVERSION%%.so
 lib/%%PORTNAME%%-%%LIBVERSION%%.so.%%LIBNUMBER%%
-%%PORTDOCS:%%share/doc/jx/LICENSE_%%PORTNAME%%
-%%PORTDOCS:%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
+%%PORTDOCS%%share/doc/jx/LICENSE_%%PORTNAME%%
+%%PORTDOCS%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
 @dirrm include/%%INCLUDEDIR%%