svn commit: r317474 - in head: editors/ssed editors/zoinks emulators/gxmame emulators/tiemu3

[Baptiste Daroussin]

Author: bapt
Date: Mon May  6 07:01:48 2013
New Revision: 317474
URL: http://svnweb.freebsd.org/changeset/ports/317474

Log:
  Finish converting e* from WITHOUT_NLS to PORT_OPTIONS:MNLS

Modified:
  head/editors/ssed/Makefile
  head/editors/zoinks/Makefile
  head/emulators/gxmame/Makefile
  head/emulators/tiemu3/Makefile

Modified: head/editors/ssed/Makefile
==============================================================================
--- head/editors/ssed/Makefile	Mon May  6 07:00:24 2013	(r317473)
+++ head/editors/ssed/Makefile	Mon May  6 07:01:48 2013	(r317474)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ssed
-# Date created:		28 May 2002
-# Whom:			verm
-#
+# Created by: verm
 # $FreeBSD$
-#
 
 PORTNAME=	sed
 PORTVERSION=	3.62
@@ -20,13 +16,15 @@ CONFIGURE_ARGS=	--program-prefix=s
 
 MAN1=		ssed.1
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
 PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 .include <bsd.port.mk>

Modified: head/editors/zoinks/Makefile
==============================================================================
--- head/editors/zoinks/Makefile	Mon May  6 07:00:24 2013	(r317473)
+++ head/editors/zoinks/Makefile	Mon May  6 07:01:48 2013	(r317474)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	zoinks
-# Date created:				26 July 2003
-# Whom:					Mike Lockwood <mike at mikelockwood.com>
-#
+# Created by: Mike Lockwood <mike at mikelockwood.com>
 # $FreeBSD$
-#
 
 PORTNAME=	zoinks
 PORTVERSION=	0.3.7
@@ -12,7 +8,7 @@ CATEGORIES=	editors
 MASTER_SITES=	http://zoinks.mikelockwood.com/download/
 
 MAINTAINER=	mike at mikelockwood.com
-COMMENT=	An X11 programmer's editor and development environment
+COMMENT=	X11 programmer's editor and development environment
 
 .if defined(WITH_IMLIB)
 USE_GNOME=	imlib
@@ -21,7 +17,12 @@ CONFIGURE_ARGS+=	--enable-imlib
 CONFIGURE_ARGS+=	--disable-imlib
 .endif
 
-.if !defined(WITHOUT_NLS)
+USE_XORG=	xpm
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
@@ -29,9 +30,6 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-USE_XORG=	xpm
-GNU_CONFIGURE=	yes
-
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Zoinks can be built with optional support for calculating image sizes"

Modified: head/emulators/gxmame/Makefile
==============================================================================
--- head/emulators/gxmame/Makefile	Mon May  6 07:00:24 2013	(r317473)
+++ head/emulators/gxmame/Makefile	Mon May  6 07:01:48 2013	(r317474)
@@ -15,7 +15,7 @@ COMMENT=	GXmame is a GTK frontend for xm
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
 
-USES=        pathfix
+USES=		pathfix
 USE_GNOME=	gtk20 intlhack gnomeprefix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -23,11 +23,13 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-xmame-dir=${LOCALBASE}/share/xmame
 
-.if defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+PLIST_SUB+=	NLS=""
+.else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS=""
 .endif
 
 MAN6=		gxmame.6

Modified: head/emulators/tiemu3/Makefile
==============================================================================
--- head/emulators/tiemu3/Makefile	Mon May  6 07:00:24 2013	(r317473)
+++ head/emulators/tiemu3/Makefile	Mon May  6 07:01:48 2013	(r317474)
@@ -27,7 +27,9 @@ CONFIGURE_ARGS=	--disable-gdb
 
 MAN1=		tiemu.1
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB=	NLS=""
 .else