From owner-svn-ports-head@FreeBSD.ORG Sun May 5 23:01:50 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3E6682EA; Sun, 5 May 2013 23:01:50 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 30E45142; Sun, 5 May 2013 23:01:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r45N1nKR092804; Sun, 5 May 2013 23:01:49 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r45N1nXQ092801; Sun, 5 May 2013 23:01:49 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201305052301.r45N1nXQ092801@svn.freebsd.org> From: Jason Helfman Date: Sun, 5 May 2013 23:01:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317448 - in head/www: bluefish bluefish-devel 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.14 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: Sun, 05 May 2013 23:01:50 -0000 Author: jgh Date: Sun May 5 23:01:49 2013 New Revision: 317448 URL: http://svnweb.freebsd.org/changeset/ports/317448 Log: - convert to USES=gettext Approved by: portmgr (bapt@) Modified: head/www/bluefish-devel/Makefile head/www/bluefish/Makefile Modified: head/www/bluefish-devel/Makefile ============================================================================== --- head/www/bluefish-devel/Makefile Sun May 5 22:05:55 2013 (r317447) +++ head/www/bluefish-devel/Makefile Sun May 5 23:01:49 2013 (r317448) @@ -1,9 +1,5 @@ -# New ports collection makefile for: bluefish-devel -# Date created: 2009-10-03 -# Whom: Sylvio Cesar Teixeira -# +# Created by: Sylvio Cesar Teixeira # $FreeBSD$ -# PORTNAME= bluefish PORTVERSION= 1.3.7 @@ -25,13 +21,6 @@ INSTALLS_ICONS= yes DATADIR= share/${PORTNAME}-unstable -.if !defined(WITHOUT_WEBLINT) -RUN_DEPENDS+= weblint:${PORTSDIR}/www/weblint -.endif -.if defined(WITH_TIDY) -RUN_DEPENDS+= tidy:${PORTSDIR}/www/tidy -.endif - USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils @@ -45,6 +34,15 @@ CONFIGURE_ARGS= --with-freedesktop_org-m --without-gnome2_4-appreg \ --with-icon-path=${PREFIX}/share/pixmaps +.include + +.if !defined(WITHOUT_WEBLINT) +RUN_DEPENDS+= weblint:${PORTSDIR}/www/weblint +.endif +.if defined(WITH_TIDY) +RUN_DEPENDS+= tidy:${PORTSDIR}/www/tidy +.endif + # Turns debugging output on .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --with-debugging-output @@ -54,8 +52,22 @@ CONFIGURE_ARGS+= --with-debugging-output CONFIGURE_ARGS+= --disable-splash-screen .endif +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+= --disable-nls +PLIST_SUB+= NLS="@comment " +.endif + MAN1= bluefish-unstable.1 +.include + +.if ${HAVE_GNOME:Mlibgnomeui}!="" +USE_GNOME+= libgnomeui +.endif + pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "Bluefish has the following tunable option(s):" @@ -71,18 +83,4 @@ pre-everything:: pre-install: @${MKDIR} ${PREFIX}/share/mime -.include - -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -.endif - -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.else -USE_GETTEXT= yes -PLIST_SUB+= NLS="" -.endif - .include Modified: head/www/bluefish/Makefile ============================================================================== --- head/www/bluefish/Makefile Sun May 5 22:05:55 2013 (r317447) +++ head/www/bluefish/Makefile Sun May 5 23:01:49 2013 (r317448) @@ -40,23 +40,18 @@ WEBLINT_DESC= Include Weblint syntax and OPTIONS_DEFAULT= WEBLINT -.include .include -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -.endif - .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --with-debugging-output .endif -.if defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +PLIST_SUB+= NLS="" +.else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " -.else -USE_GETTEXT= yes -PLIST_SUB+= NLS="" .endif .if ${PORT_OPTIONS:MTIDY} @@ -67,6 +62,12 @@ RUN_DEPENDS+= tidy4:${PORTSDIR}/www/tidy RUN_DEPENDS+= weblint:${PORTSDIR}/www/weblint .endif +.include + +.if ${HAVE_GNOME:Mlibgnomeui}!="" +USE_GNOME+= libgnomeui +.endif + pre-install: @${MKDIR} ${PREFIX}/share/mime