Date: Mon, 6 May 2013 15:18:38 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317521 - in head: devel/popt games/enigma games/xblast graphics/geomorph graphics/ocrfeeder irc/smuxi japanese/kasumi korean/ami korean/imhangul korean/libhangul korean/nabi Message-ID: <201305061518.r46FIcFJ041138@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon May 6 15:18:38 2013 New Revision: 317521 URL: http://svnweb.freebsd.org/changeset/ports/317521 Log: Convert from WITHOUT_NLS to PORT_OPTIONS:MNLS Modified: head/devel/popt/Makefile head/games/enigma/Makefile head/games/xblast/Makefile head/graphics/geomorph/Makefile head/graphics/ocrfeeder/Makefile head/irc/smuxi/Makefile head/japanese/kasumi/Makefile head/korean/ami/Makefile head/korean/imhangul/Makefile head/korean/libhangul/Makefile head/korean/nabi/Makefile Modified: head/devel/popt/Makefile ============================================================================== --- head/devel/popt/Makefile Mon May 6 15:09:53 2013 (r317520) +++ head/devel/popt/Makefile Mon May 6 15:18:38 2013 (r317521) @@ -1,9 +1,5 @@ -# New ports collection makefile for: popt -# Date Created: 29 Dec 1999 -# Whom: Yuan-Chen Cheng <ycheng@sinica.edu.tw> -# +# Created by: Yuan-Chen Cheng <ycheng@sinica.edu.tw> # $FreeBSD$ -# PORTNAME= popt PORTVERSION= 1.16 @@ -24,13 +20,15 @@ USE_LDCONFIG= yes MAN3= popt.3 -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+=--enable-nls PLIST_SUB+= NLS="" USES+= gettext +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> Modified: head/games/enigma/Makefile ============================================================================== --- head/games/enigma/Makefile Mon May 6 15:09:53 2013 (r317520) +++ head/games/enigma/Makefile Mon May 6 15:18:38 2013 (r317521) @@ -1,9 +1,5 @@ -# New ports collection makefile for: enigma -# Date created: 25 July 2002 -# Whom: Edwin Groothuis -# +# Created by: Edwin Groothuis # $FreeBSD$ -# PORTNAME= enigma PORTVERSION= 1.01 @@ -39,7 +35,9 @@ SUB_FILES= pkg-message PORTDOCS= * -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} PLIST_SUB+= NLS="" USES+= gettext .else @@ -54,7 +52,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e '/Exec=/s,enigma,${PREFIX}/bin/enigma,g' \ ${WRKSRC}/etc/enigma.desktop -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -E -e '/install-data-am/ s,install-(doc|index)DATA,,g' \ ${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in @${REINPLACE_CMD} -e '/^SUBDIRS/ s|=.*|=|' ${WRKSRC}/doc/Makefile.in Modified: head/games/xblast/Makefile ============================================================================== --- head/games/xblast/Makefile Mon May 6 15:09:53 2013 (r317520) +++ head/games/xblast/Makefile Mon May 6 15:18:38 2013 (r317521) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xblast -# Date created: Sat Nov 08 09:47:12 CET 1997 -# Whom: se -# +# Created by: se # $FreeBSD$ -# PORTNAME= xblast PORTVERSION= 2.10.4 @@ -63,12 +59,13 @@ MODELS_DATE= 2005-01-06 MUSICS_DATE= 2005-01-06 SOUNDS_DATE= 2004-04-29 -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+= --disable-nls +PLIST_SUB+= NLS="@comment " .endif .if defined(WITHOUT_SDL) @@ -111,7 +108,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} xbsndsrv ${PREFIX}/bin/xbsndsrv .endif cd ${WRKSRC} && ${INSTALL_MAN} xblast.man ${MAN6PREFIX}/man/man6/xblast.6 -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} .for lang in de fr @${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES cd ${WRKSRC}/po && ${INSTALL_DATA} ${lang}.gmo \ Modified: head/graphics/geomorph/Makefile ============================================================================== --- head/graphics/geomorph/Makefile Mon May 6 15:09:53 2013 (r317520) +++ head/graphics/geomorph/Makefile Mon May 6 15:18:38 2013 (r317521) @@ -1,9 +1,5 @@ -# ports collection makefile for: geomorph -# Date created: 24 Feb 2006 -# Whom: Dmitry Marakasov <amdmi3@amdmi3.ru> -# +# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru> # $FreeBSD$ -# PORTNAME= geomorph PORTVERSION= 0.50 @@ -25,7 +21,9 @@ CONFIGURE_ARGS= --with-libintl-prefix="$ PLIST_SUB= PORTVERSION=${PORTVERSION} -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else Modified: head/graphics/ocrfeeder/Makefile ============================================================================== --- head/graphics/ocrfeeder/Makefile Mon May 6 15:09:53 2013 (r317520) +++ head/graphics/ocrfeeder/Makefile Mon May 6 15:18:38 2013 (r317521) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ocrfeeder -# Date created: 5 August 2011 -# Whom: buganini@gmail.com -# +# Created by: buganini@gmail.com # $FreeBSD$ -# PORTNAME= ocrfeeder PORTVERSION= 0.7.7 @@ -35,12 +31,14 @@ USE_GNOME= pygtk2 pygnomeextras USES= gettext USE_GHOSTSCRIPT=yes -.if defined(WITHOUT_NLS) -PLIST_SUB+= NLS="@comment " -CONFIGURE_ARGS+= --disable-nls -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" +.else +PLIST_SUB+= NLS="@comment " +CONFIGURE_ARGS+= --disable-nls .endif post-install: Modified: head/irc/smuxi/Makefile ============================================================================== --- head/irc/smuxi/Makefile Mon May 6 15:09:53 2013 (r317520) +++ head/irc/smuxi/Makefile Mon May 6 15:18:38 2013 (r317521) @@ -1,9 +1,5 @@ -# New ports collection makefile for: smuxi -# Date created: 2009-04-27 -# Whom: Romain Tartiere <romain@blogreen.org> -# +# Created by: Romain Tartiere <romain@blogreen.org> # $FreeBSD$ -# PORTNAME= smuxi PORTVERSION= 0.8 @@ -29,7 +25,9 @@ post-patch: 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g ; \ s|@libdir@/locale|@prefix@/share/locale|g' -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else Modified: head/japanese/kasumi/Makefile ============================================================================== --- head/japanese/kasumi/Makefile Mon May 6 15:09:53 2013 (r317520) +++ head/japanese/kasumi/Makefile Mon May 6 15:18:38 2013 (r317521) @@ -1,9 +1,5 @@ -# New ports collection makefile for: kasumi -# Date Created: 10 January 2005 -# Whom: MANTANI Nobutaka <nobutaka@FreeBSD.org> -# +# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org> # $FreeBSD$ -# PORTNAME= kasumi PORTVERSION= 2.5 @@ -26,12 +22,14 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= kasumi.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 PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> Modified: head/korean/ami/Makefile ============================================================================== --- head/korean/ami/Makefile Mon May 6 15:09:53 2013 (r317520) +++ head/korean/ami/Makefile Mon May 6 15:18:38 2013 (r317521) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ami -# Date created: 05 Jun 1999 -# Whom: CHOI Junho <cjh@kr.freebsd.org> -# +# Created by: CHOI Junho <cjh@kr.freebsd.org> # $FreeBSD$ -# PORTNAME= ami PORTVERSION= 1.2.3 @@ -26,7 +22,9 @@ USE_GNOME= gtk12 gdkpixbuf WANT_GNOME= yes GNU_CONFIGURE= yes -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USES+= gettext LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include @@ -46,7 +44,7 @@ post-build: ${CAT} ${DISTDIR}/ami.dic >> ${WRKDIR}/hanja.dic post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${PREFIX}/share/doc/ami ( cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} ) .endif Modified: head/korean/imhangul/Makefile ============================================================================== --- head/korean/imhangul/Makefile Mon May 6 15:09:53 2013 (r317520) +++ head/korean/imhangul/Makefile Mon May 6 15:18:38 2013 (r317521) @@ -1,9 +1,5 @@ -# New ports collection makefile for: imhangul -# Date created: May 26 2003 -# Whom: CHOI Junho <cjh@kr.freebsd.org> -# +# Created by: CHOI Junho <cjh@kr.freebsd.org> # $FreeBSD$ -# PORTNAME= imhangul PORTVERSION= 2.1.0 @@ -24,7 +20,9 @@ USE_GMAKE= yes USE_GNOME= gtk20 GNU_CONFIGURE= yes -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USES+= gettext LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include Modified: head/korean/libhangul/Makefile ============================================================================== --- head/korean/libhangul/Makefile Mon May 6 15:09:53 2013 (r317520) +++ head/korean/libhangul/Makefile Mon May 6 15:18:38 2013 (r317521) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libhangul -# Date created: 31 January 2007 -# Whom: Hyogeol, Lee <hyogeollee@gmail.com> -# +# Created by: Hyogeol, Lee <hyogeollee@gmail.com> # $FreeBSD$ -# PORTNAME= libhangul PORTVERSION= 0.1.0 @@ -19,7 +15,9 @@ USES= iconv USE_LDCONFIG= yes GNU_CONFIGURE= yes -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USES+= gettext LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include Modified: head/korean/nabi/Makefile ============================================================================== --- head/korean/nabi/Makefile Mon May 6 15:09:53 2013 (r317520) +++ head/korean/nabi/Makefile Mon May 6 15:18:38 2013 (r317521) @@ -1,9 +1,5 @@ -# New ports collection makefile for: nabi -# Date created: 5 August 2003 -# Whom: Hye-Shik Chang <perky@FreeBSD.org> -# +# Created by: Hye-Shik Chang <perky@FreeBSD.org> # $FreeBSD$ -# PORTNAME= nabi PORTVERSION= 0.99.11 @@ -22,7 +18,9 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gtk20 GNU_CONFIGURE= yes -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USES+= gettext LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305061518.r46FIcFJ041138>