- Respect NOPORTDOCS

Reported by:	QA Tindie

2 files changed, 57 insertions, 43 deletions

diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 8366e3ce750d..2a24fd8a5576 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -36,9 +36,12 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\(use_gtkhtml=\)yes|\1no|g' ${WRKSRC}/configure
 
 .if !defined(NOPORTDOCS)
+PLIST_SUB+=	NOPORTDOCS="@comment "
 post-extract:
 	@${MV} ${WRKSRC}/docs ${WRKSRC}/docs.old
 	@${CP} -R ${WRKDIR}/${PORTNAME}-help-${DOCVERSION}/docs ${WRKSRC}/docs
+.else
+PLIST_SUB+=	NOPORTDOCS=""
 .endif
 
 .if ${HAVE_GNOME:Mgnomelibs}!=""
diff --git a/editors/gnotepad+/pkg-plist b/editors/gnotepad+/pkg-plist
index 8e6d6daa6304..8f9203de79e8 100644
--- a/editors/gnotepad+/pkg-plist
+++ b/editors/gnotepad+/pkg-plist
@@ -1,51 +1,62 @@
 bin/gnp
 %%GNOME:%%share/gnome/apps/Applications/gnotepad+.desktop
 %%GNOME:%%share/gnome/apps/Applications/gnotepad+.spec
-share/gnome/help/gnotepad+/C/closedialog.png
-share/gnome/help/gnotepad+/C/doclist.png
-share/gnome/help/gnotepad+/C/doctabs.png
-share/gnome/help/gnotepad+/C/editmenu.png
-share/gnome/help/gnotepad+/C/fileinfo1.png
-share/gnome/help/gnotepad+/C/fileinfo2.png
-share/gnome/help/gnotepad+/C/find1.png
-share/gnome/help/gnotepad+/C/find2.png
-share/gnome/help/gnotepad+/C/find3.png
-share/gnome/help/gnotepad+/C/htmldoc.png
-share/gnome/help/gnotepad+/C/htmltag.png
-share/gnome/help/gnotepad+/C/htmltb1.png
-share/gnome/help/gnotepad+/C/htmltb2.png
-share/gnome/help/gnotepad+/C/htmlwin.png
-share/gnome/help/gnotepad+/C/index-1.html
-share/gnome/help/gnotepad+/C/index-2.html
-share/gnome/help/gnotepad+/C/index-3.html
-share/gnome/help/gnotepad+/C/index-4.html
-share/gnome/help/gnotepad+/C/index-5.html
 share/gnome/help/gnotepad+/C/index.html
-share/gnome/help/gnotepad+/C/mainoptions.png
-share/gnome/help/gnotepad+/C/maintb.png
-share/gnome/help/gnotepad+/C/mainwin.png
-share/gnome/help/gnotepad+/C/msgbar.png
-share/gnome/help/gnotepad+/C/msgbox.png
-share/gnome/help/gnotepad+/C/optionsmenu0.png
-share/gnome/help/gnotepad+/C/optionsmenu1.png
-share/gnome/help/gnotepad+/C/optionsmenu2.png
-share/gnome/help/gnotepad+/C/prefs_appearance.png
-share/gnome/help/gnotepad+/C/prefs_document.png
-share/gnome/help/gnotepad+/C/prefs_fonts.png
-share/gnome/help/gnotepad+/C/prefs_fontsel.png
-share/gnome/help/gnotepad+/C/prefs_htmltb.png
-share/gnome/help/gnotepad+/C/prefs_maintb.png
-share/gnome/help/gnotepad+/C/prefs_misc.png
-share/gnome/help/gnotepad+/C/prefs_srcctrl.png
-share/gnome/help/gnotepad+/C/prefs_window.png
-share/gnome/help/gnotepad+/C/printdialog.png
-share/gnome/help/gnotepad+/C/shellcmd.png
-share/gnome/help/gnotepad+/C/splashscreen.png
-share/gnome/help/gnotepad+/C/textarea.png
+share/gnome/help/gnotepad+/C/index-5.html
 share/gnome/help/gnotepad+/C/topic.dat
-share/gnome/help/gnotepad+/C/windowmenu.png
-share/gnome/help/gnotepad+/C/winlist.png
-share/gnome/help/gnotepad+/C/winnew.png
+%%NOPORTDOCS%%share/gnome/help/gnotepad+/C/bugreport.html
+%%NOPORTDOCS%%share/gnome/help/gnotepad+/C/contacting.html
+%%NOPORTDOCS%%share/gnome/help/gnotepad+/C/faq.html
+%%NOPORTDOCS%%share/gnome/help/gnotepad+/C/prefs-0.html
+%%NOPORTDOCS%%share/gnome/help/gnotepad+/C/prefs-1.html
+%%NOPORTDOCS%%share/gnome/help/gnotepad+/C/prefs-2.html
+%%NOPORTDOCS%%share/gnome/help/gnotepad+/C/prefs-3.html
+%%NOPORTDOCS%%share/gnome/help/gnotepad+/C/prefs-4.html
+%%NOPORTDOCS%%share/gnome/help/gnotepad+/C/prefs-5.html
+%%NOPORTDOCS%%share/gnome/help/gnotepad+/C/prefs-6.html
+%%NOPORTDOCS%%share/gnome/help/gnotepad+/C/prefs-7.html
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/closedialog.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/doclist.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/doctabs.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/editmenu.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/fileinfo1.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/fileinfo2.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/find1.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/find2.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/find3.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/htmldoc.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/htmltag.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/htmltb1.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/htmltb2.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/htmlwin.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/index-1.html
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/index-2.html
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/index-3.html
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/index-4.html
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/mainoptions.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/maintb.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/mainwin.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/msgbar.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/msgbox.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/optionsmenu0.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/optionsmenu1.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/optionsmenu2.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/prefs_appearance.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/prefs_document.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/prefs_fonts.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/prefs_fontsel.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/prefs_htmltb.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/prefs_maintb.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/prefs_misc.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/prefs_srcctrl.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/prefs_window.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/printdialog.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/shellcmd.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/splashscreen.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/textarea.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/windowmenu.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/winlist.png
+%%PORTDOCS%%share/gnome/help/gnotepad+/C/winnew.png
 %%DATADIR%%/gnotepad+.glade
 %%DATADIR%%/xpm/colsel.xpm
 %%DATADIR%%/xpm/filesel.xpm