2 files changed, 76 insertions, 83 deletions

diff --git a/editors/pdfedit/Makefile b/editors/pdfedit/Makefile
index fc592692f8b2..61d3868ceed2 100644
--- a/editors/pdfedit/Makefile
+++ b/editors/pdfedit/Makefile
@@ -28,14 +28,7 @@ CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 MAKE_ENV=	${CONFIGURE_ENV} QTDIR="${LOCALBASE}"
 CFLAGS+=	-I${LOCALBASE}/include
 
-.if !defined(NOPORTDOCS)
 MAN1=		pdfedit.1
-.endif
-
-.if defined(NOPORTDOCS)
-post-patch:
-	@${REINPLACE_CMD} -e 's|doc-dist-install $$||' ${WRKSRC}/Makefile.in
-.endif
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gui/${PORTNAME} ${PREFIX}/bin
diff --git a/editors/pdfedit/pkg-plist b/editors/pdfedit/pkg-plist
index 4d0294a96fbd..2b4a540c51b3 100644
--- a/editors/pdfedit/pkg-plist
+++ b/editors/pdfedit/pkg-plist
@@ -1,74 +1,74 @@
 bin/pdfedit
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/Changelog
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.GPL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README-Tango
-%%PORTDOCS%%%%DOCSDIR%%/README.cygwin
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/command_options_cmdedit.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/options_commandline.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/options_editor.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/options_execute.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/options_lookandfeel.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/options_objecttree.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/options_paths.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/options_toolbars.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/pagespace.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/pdfedit.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_all.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_catalog.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_edit.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_edit_add.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_edit_del.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_edit_ref.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_gfx_selection.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_impor.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_multiselection.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_op_desc.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_op_modes.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_opt_editor.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_opt_objtree.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_outlines.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_pages.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_rclick.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_stream.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/propedit_text_selection.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/theme1.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/images/theme2.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_addFont.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_dashpattern.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_editPageMetrics.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_extractedText.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_findText.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/insert_pages.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_edit.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_file.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_help.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_page.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_tools.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_view.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_draw.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_dynamic.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_main.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_operator.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_page.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_revision.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_selectionmode.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_text.png
-%%PORTDOCS%%%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_treeview.png
-%%PORTDOCS%%%%DOCSDIR%%/images/filedialog.png
-%%PORTDOCS%%%%DOCSDIR%%/images/inputitem.png
-%%PORTDOCS%%%%DOCSDIR%%/images/inputtext.png
-%%PORTDOCS%%%%DOCSDIR%%/images/messageb1.png
-%%PORTDOCS%%%%DOCSDIR%%/images/pdfedit.png
-%%PORTDOCS%%%%DOCSDIR%%/images/qchkbox-w.png
-%%PORTDOCS%%%%DOCSDIR%%/images/qcombo1-w.png
-%%PORTDOCS%%%%DOCSDIR%%/images/qgrpbox-w.png
-%%PORTDOCS%%%%DOCSDIR%%/images/qlined-w.png
-%%PORTDOCS%%%%DOCSDIR%%/images/qradiobt-w.png
-%%PORTDOCS%%%%DOCSDIR%%/images/qsdateed.png
-%%PORTDOCS%%%%DOCSDIR%%/images/qspinbox-w.png
-%%PORTDOCS%%%%DOCSDIR%%/images/qstimeed.png
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/Changelog
+%%DOCSDIR%%/LICENSE.GPL
+%%DOCSDIR%%/README
+%%DOCSDIR%%/README-Tango
+%%DOCSDIR%%/README.cygwin
+%%DOCSDIR%%/gui/images/command_options_cmdedit.png
+%%DOCSDIR%%/gui/images/options_commandline.png
+%%DOCSDIR%%/gui/images/options_editor.png
+%%DOCSDIR%%/gui/images/options_execute.png
+%%DOCSDIR%%/gui/images/options_lookandfeel.png
+%%DOCSDIR%%/gui/images/options_objecttree.png
+%%DOCSDIR%%/gui/images/options_paths.png
+%%DOCSDIR%%/gui/images/options_toolbars.png
+%%DOCSDIR%%/gui/images/pagespace.png
+%%DOCSDIR%%/gui/images/pdfedit.png
+%%DOCSDIR%%/gui/images/propedit_all.png
+%%DOCSDIR%%/gui/images/propedit_catalog.png
+%%DOCSDIR%%/gui/images/propedit_edit.png
+%%DOCSDIR%%/gui/images/propedit_edit_add.png
+%%DOCSDIR%%/gui/images/propedit_edit_del.png
+%%DOCSDIR%%/gui/images/propedit_edit_ref.png
+%%DOCSDIR%%/gui/images/propedit_gfx_selection.png
+%%DOCSDIR%%/gui/images/propedit_impor.png
+%%DOCSDIR%%/gui/images/propedit_multiselection.png
+%%DOCSDIR%%/gui/images/propedit_op_desc.png
+%%DOCSDIR%%/gui/images/propedit_op_modes.png
+%%DOCSDIR%%/gui/images/propedit_opt_editor.png
+%%DOCSDIR%%/gui/images/propedit_opt_objtree.png
+%%DOCSDIR%%/gui/images/propedit_outlines.png
+%%DOCSDIR%%/gui/images/propedit_pages.png
+%%DOCSDIR%%/gui/images/propedit_rclick.png
+%%DOCSDIR%%/gui/images/propedit_stream.png
+%%DOCSDIR%%/gui/images/propedit_text_selection.png
+%%DOCSDIR%%/gui/images/theme1.png
+%%DOCSDIR%%/gui/images/theme2.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_addFont.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_dashpattern.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_editPageMetrics.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_extractedText.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_findText.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/insert_pages.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_edit.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_file.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_help.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_page.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_tools.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_view.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_draw.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_dynamic.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_main.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_operator.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_page.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_revision.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_selectionmode.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_text.png
+%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_treeview.png
+%%DOCSDIR%%/images/filedialog.png
+%%DOCSDIR%%/images/inputitem.png
+%%DOCSDIR%%/images/inputtext.png
+%%DOCSDIR%%/images/messageb1.png
+%%DOCSDIR%%/images/pdfedit.png
+%%DOCSDIR%%/images/qchkbox-w.png
+%%DOCSDIR%%/images/qcombo1-w.png
+%%DOCSDIR%%/images/qgrpbox-w.png
+%%DOCSDIR%%/images/qlined-w.png
+%%DOCSDIR%%/images/qradiobt-w.png
+%%DOCSDIR%%/images/qsdateed.png
+%%DOCSDIR%%/images/qspinbox-w.png
+%%DOCSDIR%%/images/qstimeed.png
 %%DATADIR%%/callback.qs
 %%DATADIR%%/delinearize.qs
 %%DATADIR%%/dialog_lib.qs
@@ -311,9 +311,9 @@ bin/pdfedit
 @dirrm %%DATADIR%%/help/cs
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gui/menuAndToolbarsFun/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gui/menuAndToolbarsFun
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gui/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gui
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DOCSDIR%%/images
+@dirrm %%DOCSDIR%%/gui/menuAndToolbarsFun/images
+@dirrm %%DOCSDIR%%/gui/menuAndToolbarsFun
+@dirrm %%DOCSDIR%%/gui/images
+@dirrm %%DOCSDIR%%/gui
+@dirrm %%DOCSDIR%%