Update to 2.2.7, and use OPTIONS helpers.

Instead of patching the Makefile to only install a file if DOCS is enabled,
install it unconditionally and let pkg(8) sort it out. Also, the file in
question is an example file, not a documentation file, so control it with
EXAMPLES, not DOCS.

4 files changed, 18 insertions, 92 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index c4ce1caba89b..2f238242c9d1 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bluefish
-PORTVERSION=	2.2.6
-PORTREVISION=	1
+PORTVERSION=	2.2.7
 CATEGORIES=	www editors
 MASTER_SITES=	http://www.bennewitz.com/bluefish/stable/source/ \
 		http://bluefish.mrball.net/stable/source/ \
@@ -31,53 +30,31 @@ CONFIGURE_ARGS=	--with-gtk2 \
 		--with-freedesktop_org-menu=${PREFIX}/share/applications \
 		--with-freedesktop_org-mime=${PREFIX}/share/mime \
 		--with-icon-path=${PREFIX}/share/pixmaps
+INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	DEBUG NLS TIDY WEBLINT DOCS
+OPTIONS_DEFINE=	DEBUG NLS TIDY WEBLINT EXAMPLES
 
 DEBUG_DESC=	Enable debugging output
 TIDY_DESC=	Include Tidy HTML cleanup program
 WEBLINT_DESC=	Include Weblint syntax and style checker
 
-OPTIONS_DEFAULT=	WEBLINT
+OPTIONS_DEFAULT=WEBLINT
 
-.include <bsd.port.options.mk>
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--with-debugging-output
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_OFF=	--disable-nls
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=			gettext
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
+DEBUG_CONFIGURE_ON=	--with-debugging-output
+LIBGNOME_USE=		GNOME=libgnomeui
+TIDY_RUN_DEPENDS=	tidy4:${PORTSDIR}/www/tidy
+WEBLINT_RUN_DEPENDS=	weblint:${PORTSDIR}/www/weblint
 
-.if ${PORT_OPTIONS:MTIDY}
-RUN_DEPENDS+=	tidy4:${PORTSDIR}/www/tidy
-.endif
-
-.if ${PORT_OPTIONS:MWEBLINT}
-RUN_DEPENDS+=	weblint:${PORTSDIR}/www/weblint
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+=	libgnomeui
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e '/^bflangsampledir = /s|$$(docdir)/bflang|${EXAMPLESDIR}|' \
+		${WRKSRC}/data/bflang/Makefile.in
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mime
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/bflang
-	${INSTALL_DATA} ${WRKSRC}/data/bflang/sample.bflang2 \
-		${STAGEDIR}${DOCSDIR}/bflang
-.endif
-	(cd ${STAGEDIR}${PREFIX}/lib/bluefish/ && \
-		${STRIP_CMD} *.so)
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/bluefish/distinfo b/www/bluefish/distinfo
index 23dd30782a9c..4cc27a73810e 100644
--- a/www/bluefish/distinfo
+++ b/www/bluefish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bluefish-2.2.6.tar.bz2) = 54c2892c317eb2287c9fb0a3e29c3f19bef51d9ab0353bfb158e52a1cdae4216
-SIZE (bluefish-2.2.6.tar.bz2) = 3793018
+SHA256 (bluefish-2.2.7.tar.bz2) = 23534b73b929754e15b86d12904ca3ffc1b069da5dcd4f34a67e842fe9e858df
+SIZE (bluefish-2.2.7.tar.bz2) = 3836580
diff --git a/www/bluefish/files/patch-data_bflang-Makefile.in b/www/bluefish/files/patch-data_bflang-Makefile.in
deleted file mode 100644
index a3bd3ab60fb7..000000000000
--- a/www/bluefish/files/patch-data_bflang-Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- data/bflang/Makefile.in.orig	2014-09-02 16:47:12 UTC
-+++ data/bflang/Makefile.in
-@@ -405,24 +405,6 @@
- 	@list='$(bflangrng_DATA)'; test -n "$(bflangrngdir)" || list=; \
- 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- 	dir='$(DESTDIR)$(bflangrngdir)'; $(am__uninstall_files_from_dir)
--install-bflangsampleDATA: $(bflangsample_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(bflangsampledir)" || $(MKDIR_P) "$(DESTDIR)$(bflangsampledir)"
--	@list='$(bflangsample_DATA)'; test -n "$(bflangsampledir)" || list=; \
--	for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bflangsampledir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(bflangsampledir)" || exit $$?; \
--	done
--
--uninstall-bflangsampleDATA:
--	@$(NORMAL_UNINSTALL)
--	@list='$(bflangsample_DATA)'; test -n "$(bflangsampledir)" || list=; \
--	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	dir='$(DESTDIR)$(bflangsampledir)'; $(am__uninstall_files_from_dir)
- install-bflangxmlDATA: $(bflangxml_DATA)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bflangxmldir)" || $(MKDIR_P) "$(DESTDIR)$(bflangxmldir)"
diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist
index 88e5ffcae5e1..096fb44ea080 100644
--- a/www/bluefish/pkg-plist
+++ b/www/bluefish/pkg-plist
@@ -131,7 +131,7 @@ share/applications/bluefish.desktop
 %%DATADIR%%/templates/PHP
 %%DATADIR%%/templates/XHTML_1.0
 %%DATADIR%%/ui/bluefish_menu_ui.xml
-%%PORTDOCS%%%%DOCSDIR%%/bflang/sample.bflang2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.bflang2
 share/icons/hicolor/128x128/apps/bluefish.png
 share/icons/hicolor/128x128/mimetypes/application-x-bluefish-project.png
 share/icons/hicolor/16x16/apps/bluefish.png
@@ -425,27 +425,3 @@ share/pixmaps/application-x-bluefish-project.png
 share/pixmaps/bluefish.png
 share/xml/bluefish/2.0/bflang2.rng
 share/xml/bluefish/catalog.xml
-@dirrm lib/bluefish
-@dirrm %%DATADIR%%/bflang
-@dirrm %%DATADIR%%/bflib
-@dirrm %%DATADIR%%/jsbeautifier
-@dirrm %%DATADIR%%/jsbeautifier/unpackers
-@dirrm %%DATADIR%%/lipsum/data
-@dirrm %%DATADIR%%/lipsum
-@dirrm %%DATADIR%%/plugins/htmlbar/ui
-@dirrm %%DATADIR%%/plugins/htmlbar
-@dirrm %%DATADIR%%/plugins/zencoding/actions
-@dirrm %%DATADIR%%/plugins/zencoding/filters
-@dirrm %%DATADIR%%/plugins/zencoding/interface
-@dirrm %%DATADIR%%/plugins/zencoding/parser
-@dirrm %%DATADIR%%/plugins/zencoding
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/bflang
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/appdata
-@dirrmtry share/mime/application
-@dirrm share/xml/bluefish/2.0
-@dirrm share/xml/bluefish