summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2014-09-10 22:23:26 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2014-09-10 22:23:26 +0000
commitc50469eb322eba6571a21cf4c3d2a82808c33ab0 (patch)
tree6c6165602d155f33f7c7891346353936af156062 /editors
parentFix build by forcing -lpopt. (diff)
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.
Notes
Notes: svn path=/head/; revision=367901
Diffstat (limited to 'editors')
-rw-r--r--editors/gnotepad+/Makefile7
-rw-r--r--editors/gnotepad+/pkg-plist22
2 files changed, 12 insertions, 17 deletions
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 476010737c66..a5ba899da275 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -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
diff --git a/editors/gnotepad+/pkg-plist b/editors/gnotepad+/pkg-plist
index e107fbf23dc1..a101c593c5fa 100644
--- a/editors/gnotepad+/pkg-plist
+++ b/editors/gnotepad+/pkg-plist
@@ -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