From owner-svn-ports-head@FreeBSD.ORG Thu Feb 19 20:12:15 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 179DFF6; Thu, 19 Feb 2015 20:12:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC09BC04; Thu, 19 Feb 2015 20:12:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1JKCEm2072854; Thu, 19 Feb 2015 20:12:14 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1JKCEU9072851; Thu, 19 Feb 2015 20:12:14 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201502192012.t1JKCEU9072851@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Thu, 19 Feb 2015 20:12:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379386 - in head/www/bluefish: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Feb 2015 20:12:15 -0000 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 +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 - -.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 +.include 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 -@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