svn commit: r317448 - in head/www: bluefish bluefish-devel

[Jason Helfman]

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 <sylvio at FreeBSD.org>
-#
+# Created by: Sylvio Cesar Teixeira <sylvio at FreeBSD.org>
 # $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 <bsd.port.options.mk>
+
+.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 <bsd.port.pre.mk>
+
+.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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>

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 <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
-.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 <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+USE_GNOME+=	libgnomeui
+.endif
+
 pre-install:
 	@${MKDIR} ${PREFIX}/share/mime