svn commit: r367901 - head/editors/gnotepad+

[Adam Weinberger]

Author: adamw
Date: Wed Sep 10 22:23:26 2014
New Revision: 367901
URL: http://svnweb.freebsd.org/changeset/ports/367901
QAT: https://qat.redports.org/buildarchive/r367901/

Log:
  Use OPTIONS_SUB to obtain NO_DOCS, rather than adding NOPORTDOCS to PLIST_SUB.
  
  The presence of NOPORTDOCS would trigger commit hook errors in future
  updates.

Modified:
  head/editors/gnotepad+/Makefile
  head/editors/gnotepad+/pkg-plist

Modified: head/editors/gnotepad+/Makefile
==============================================================================
--- head/editors/gnotepad+/Makefile	Wed Sep 10 22:03:13 2014	(r367900)
+++ head/editors/gnotepad+/Makefile	Wed Sep 10 22:23:26 2014	(r367901)
@@ -28,17 +28,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 DOCVERSION=	1.2.0
 
 OPTIONS_DEFINE=	DOCS
+OPTIONS_SUB=	yes
 
 DOCS_DISTFILES=	${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX}:doc
 
 .include <bsd.port.options.mk>
 
-.if ! ${PORT_OPTIONS:MDOCS}
-PLIST_SUB+=	NOPORTDOCS=""
-.else
-PLIST_SUB+=	NOPORTDOCS="@comment "
-.endif
-
 post-extract:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MV} ${WRKSRC}/docs ${WRKSRC}/docs.old

Modified: head/editors/gnotepad+/pkg-plist
==============================================================================
--- head/editors/gnotepad+/pkg-plist	Wed Sep 10 22:03:13 2014	(r367900)
+++ head/editors/gnotepad+/pkg-plist	Wed Sep 10 22:23:26 2014	(r367901)
@@ -3,17 +3,17 @@ man/man1/gnp.1.gz
 share/gnome/help/gnotepad+/C/index.html
 share/gnome/help/gnotepad+/C/index-5.html
 share/gnome/help/gnotepad+/C/topic.dat
-%%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
+%%NO_DOCS%%share/gnome/help/gnotepad+/C/bugreport.html
+%%NO_DOCS%%share/gnome/help/gnotepad+/C/contacting.html
+%%NO_DOCS%%share/gnome/help/gnotepad+/C/faq.html
+%%NO_DOCS%%share/gnome/help/gnotepad+/C/prefs-0.html
+%%NO_DOCS%%share/gnome/help/gnotepad+/C/prefs-1.html
+%%NO_DOCS%%share/gnome/help/gnotepad+/C/prefs-2.html
+%%NO_DOCS%%share/gnome/help/gnotepad+/C/prefs-3.html
+%%NO_DOCS%%share/gnome/help/gnotepad+/C/prefs-4.html
+%%NO_DOCS%%share/gnome/help/gnotepad+/C/prefs-5.html
+%%NO_DOCS%%share/gnome/help/gnotepad+/C/prefs-6.html
+%%NO_DOCS%%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