svn commit: r379386 - in head/www/bluefish: . files

[Adam Weinberger]

Author: adamw
Date: Thu Feb 19 20:12:13 2015
New Revision: 379386
URL: https://svnweb.freebsd.org/changeset/ports/379386
QAT: https://qat.redports.org/buildarchive/r379386/

Log:
  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.

Deleted:
  head/www/bluefish/files/
Modified:
  head/www/bluefish/Makefile
  head/www/bluefish/distinfo
  head/www/bluefish/pkg-plist

Modified: head/www/bluefish/Makefile
==============================================================================
--- head/www/bluefish/Makefile	Thu Feb 19 20:07:32 2015	(r379385)
+++ head/www/bluefish/Makefile	Thu Feb 19 20:12:13 2015	(r379386)
@@ -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
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=			gettext
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
-
-.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
+NLS_USES=		gettext
+NLS_CONFIGURE_OFF=	--disable-nls
+
+DEBUG_CONFIGURE_ON=	--with-debugging-output
+LIBGNOME_USE=		GNOME=libgnomeui
+TIDY_RUN_DEPENDS=	tidy4:${PORTSDIR}/www/tidy
+WEBLINT_RUN_DEPENDS=	weblint:${PORTSDIR}/www/weblint
+
+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>

Modified: head/www/bluefish/distinfo
==============================================================================
--- head/www/bluefish/distinfo	Thu Feb 19 20:07:32 2015	(r379385)
+++ head/www/bluefish/distinfo	Thu Feb 19 20:12:13 2015	(r379386)
@@ -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

Modified: head/www/bluefish/pkg-plist
==============================================================================
--- head/www/bluefish/pkg-plist	Thu Feb 19 20:07:32 2015	(r379385)
+++ head/www/bluefish/pkg-plist	Thu Feb 19 20:12:13 2015	(r379386)
@@ -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-pro
 share/pixmaps/bluefish.png
 share/xml/bluefish/2.0/bflang2.rng
 share/xml/bluefish/catalog.xml
- at dirrm lib/bluefish
- at dirrm %%DATADIR%%/bflang
- at dirrm %%DATADIR%%/bflib
- at dirrm %%DATADIR%%/jsbeautifier
- at dirrm %%DATADIR%%/jsbeautifier/unpackers
- at dirrm %%DATADIR%%/lipsum/data
- at dirrm %%DATADIR%%/lipsum
- at dirrm %%DATADIR%%/plugins/htmlbar/ui
- at dirrm %%DATADIR%%/plugins/htmlbar
- at dirrm %%DATADIR%%/plugins/zencoding/actions
- at dirrm %%DATADIR%%/plugins/zencoding/filters
- at dirrm %%DATADIR%%/plugins/zencoding/interface
- at dirrm %%DATADIR%%/plugins/zencoding/parser
- at dirrm %%DATADIR%%/plugins/zencoding
- at dirrm %%DATADIR%%/plugins
- at dirrm %%DATADIR%%/templates
- at dirrm %%DATADIR%%/ui
- at dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/bflang
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrmtry share/appdata
- at dirrmtry share/mime/application
- at dirrm share/xml/bluefish/2.0
- at dirrm share/xml/bluefish