From owner-svn-ports-head@FreeBSD.ORG Mon Apr 29 22:27:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 01978FD8; Mon, 29 Apr 2013 22:27:13 +0000 (UTC) (envelope-from bapt@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 E52231B48; Mon, 29 Apr 2013 22:27:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3TMRC7l019768; Mon, 29 Apr 2013 22:27:12 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3TMR6gB019724; Mon, 29 Apr 2013 22:27:06 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201304292227.r3TMR6gB019724@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 29 Apr 2013 22:27:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316850 - in head: accessibility/yasr archivers/lha-ac audio/wxguitar benchmarks/gtkperf cad/geda-gattrib cad/geda-gschem cad/kicad cad/libgeda cad/repsnapper chinese/opencc comms/gpred... 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: Mon, 29 Apr 2013 22:27:13 -0000 Author: bapt Date: Mon Apr 29 22:27:05 2013 New Revision: 316850 URL: http://svnweb.freebsd.org/changeset/ports/316850 Log: Convert a bunch of ports from WITHOUT_NLS -> ${PORT_OPTIONS:MNLS} While here: - trim headers - convert to new options framework Modified: head/accessibility/yasr/Makefile head/archivers/lha-ac/Makefile head/audio/wxguitar/Makefile head/benchmarks/gtkperf/Makefile head/cad/geda-gattrib/Makefile head/cad/geda-gschem/Makefile head/cad/kicad/Makefile head/cad/libgeda/Makefile head/cad/repsnapper/Makefile head/chinese/opencc/Makefile head/comms/gpredict/Makefile head/comms/gsmlib/Makefile head/comms/xlog/Makefile head/deskutils/bmp-docklet/Makefile head/deskutils/genius/Makefile head/deskutils/gimmie/Makefile head/deskutils/gxmessage/Makefile head/deskutils/kompose/Makefile head/deskutils/tpb/Makefile head/deskutils/vym/Makefile head/deskutils/x-tile/Makefile head/devel/gmake/Makefile head/devel/gnucflow/Makefile head/devel/idutils/Makefile head/devel/m17n-db/Makefile head/devel/motor/Makefile head/devel/obby/Makefile head/devel/quilt/Makefile head/devel/thunar-vcs-plugin/Makefile head/dns/libidn/Makefile head/dns/mydns/Makefile head/finance/gnofin/Makefile head/finance/grisbi/Makefile head/games/fgrun/Makefile head/games/ggz-client-libs/Makefile head/games/ggz-gtk-client/Makefile head/games/ggz-gtk-games/Makefile head/games/ggz-txt-client/Makefile head/games/glchess/Makefile head/games/lincity/Makefile head/games/lpairs/Makefile head/games/neverball/Makefile head/games/springlobby/Makefile head/games/typespeed/Makefile head/games/zaz/Makefile head/graphics/albumshaper/Makefile head/graphics/exif/Makefile head/graphics/gimp-focusblur-plugin/Makefile head/graphics/gpicview/Makefile head/graphics/gqview/Makefile head/graphics/gscan2pdf/Makefile head/graphics/gtkdps/Makefile head/graphics/libgphoto2/Makefile head/graphics/pornview/Makefile Modified: head/accessibility/yasr/Makefile ============================================================================== --- head/accessibility/yasr/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/accessibility/yasr/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -19,7 +19,9 @@ PORTDOCS= AUTHORS BUGS CREDITS ChangeLog README-br README-de README-es README-fr README-ru SUB_FILES= pkg-message -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" USES+= gettext @@ -44,7 +46,7 @@ post-patch: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/csh|' ${WRKSRC}/yasr.conf post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} Modified: head/archivers/lha-ac/Makefile ============================================================================== --- head/archivers/lha-ac/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/archivers/lha-ac/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -23,7 +23,9 @@ GNU_CONFIGURE= yes RESTRICTED= no permission to redistribute -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+= --disable-multibyte-filename .else CONFIGURE_ARGS+= --enable-multibyte-filename=auto Modified: head/audio/wxguitar/Makefile ============================================================================== --- head/audio/wxguitar/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/audio/wxguitar/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: wxguitar -# Date created: 19 Aug 2009 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= wxguitar PORTVERSION= 1.01 @@ -27,7 +23,9 @@ MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/wxGuitar -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else Modified: head/benchmarks/gtkperf/Makefile ============================================================================== --- head/benchmarks/gtkperf/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/benchmarks/gtkperf/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# Ports collection makefile for: gtkperf -# Date created: 2006-04-22 -# Whom: Andreas Kohn -# +# Created by: Andreas Kohn # $FreeBSD$ -# PORTNAME= gtkperf PORTVERSION= 0.40 @@ -20,7 +16,9 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gtk20 gnomeprefix -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext iconv CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/cad/geda-gattrib/Makefile ============================================================================== --- head/cad/geda-gattrib/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/cad/geda-gattrib/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: geda-gattrib -# Date created: 26 June 2006 -# Whom: Stanislav Sedov -# +# Created by: Stanislav Sedov # $FreeBSD$ -# PORTNAME= gattrib PORTVERSION= 1.4.3 @@ -33,7 +29,9 @@ CONFIGURE_ARGS= --with-docdir="${DOCSDIR CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else Modified: head/cad/geda-gschem/Makefile ============================================================================== --- head/cad/geda-gschem/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/cad/geda-gschem/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: geda -# Date created: 4 April 2001 -# Whom: bruno schwander -# +# Created by: bruno schwander # $FreeBSD$ -# PORTNAME= gschem PORTVERSION= 1.4.3 @@ -36,7 +32,9 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= gschem.1 -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else Modified: head/cad/kicad/Makefile ============================================================================== --- head/cad/kicad/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/cad/kicad/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -38,11 +38,13 @@ WRKSRC= ${WRKDIR}/${SFNAME} PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||} -.if defined(WITHOUT_NLS) -PLIST_SUB+= NLS="@comment " -.else +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" +.else +PLIST_SUB+= NLS="@comment " .endif SFNAME= ${PORTNAME}-sources-${DISTVERSION} @@ -59,7 +61,7 @@ RUN_DEPENDS+= konqueror:${PORTSDIR}/x11/ RUN_DEPENDS+= xpdf:${PORTSDIR}/graphics/xpdf .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-extract: cd ${WRKSRC} && ${TAR} -xf ${DISTDIR}/${DFNAME}.tgz .endif @@ -72,14 +74,14 @@ pre-configure: ${WRKSRC}/common/gestfich.cpp post-install: -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} ${MKDIR} ${DATADIR}/internat (cd ${WRKSRC}/internat && \ ${COPYTREE_SHARE} \* ${DATADIR}/internat) ${RM} ${DATADIR}/internat/CMakeLists.txt ${FIND} ${DATADIR}/internat -name kicad.po -delete .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}) .endif @${ECHO_MSG} Modified: head/cad/libgeda/Makefile ============================================================================== --- head/cad/libgeda/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/cad/libgeda/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -25,7 +25,9 @@ CONFIGURE_ARGS= --disable-update-mime-da CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else Modified: head/cad/repsnapper/Makefile ============================================================================== --- head/cad/repsnapper/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/cad/repsnapper/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -45,7 +45,9 @@ USE_GMAKE= yes USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xmu xrandr xrender xt xxf86vm -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else @@ -75,10 +77,4 @@ post-install: ${PREFIX}/etc/xdg/repsnapper/repsnapper.conf ; \ fi -.include - -.if ${OSVERSION} < 800000 -IGNORE= needs acosl(3) function to compile -.endif - -.include +.include Modified: head/chinese/opencc/Makefile ============================================================================== --- head/chinese/opencc/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/chinese/opencc/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: opencc -# Date created: 28 Nov 2011 -# Whom: Zhihao Yuan -# +# Created by: Zhihao Yuan # $FreeBSD$ -# PORTNAME= opencc PORTVERSION= 0.3.0 @@ -20,7 +16,9 @@ MAN1= opencc.1 opencc_dict.1 USES= cmake USE_LDCONFIG= yes -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext CMAKE_ARGS+= -DENABLE_GETTEXT=On PLIST_SUB+= NLS="" Modified: head/comms/gpredict/Makefile ============================================================================== --- head/comms/gpredict/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/comms/gpredict/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,7 +1,4 @@ -# New ports collection makefile for: gpredict -# Date created: 2004-01-22 -# Whom: Matt Dawson -# +# Created by: Matt Dawson # $FreeBSD$ PORTNAME= gpredict @@ -27,12 +24,14 @@ MAN1= gpredict.1 LICENSE= GPLv2 -.if defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +PLIST_SUB+= NLS="" +.else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " -.else -USES= gettext -PLIST_SUB+= NLS="" .endif DESKTOP_ENTRIES="GPREDICT" \ Modified: head/comms/gsmlib/Makefile ============================================================================== --- head/comms/gsmlib/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/comms/gsmlib/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: gsmlib -# Date created: Apr 24, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= gsmlib PORTVERSION= 1.10 @@ -31,12 +26,14 @@ CPPFLAGS+= -I${LOCALBASE}/include -DBROK ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -.if defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +PLIST_SUB+= NLS="" +.else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " -.else -USES= gettext -PLIST_SUB+= NLS="" .endif post-patch: Modified: head/comms/xlog/Makefile ============================================================================== --- head/comms/xlog/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/comms/xlog/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xlog -# Date created: 2002-11-05 -# Whom: Patrick Gardella -# +# Created by: Patrick Gardella # $FreeBSD$ -# PORTNAME= xlog PORTVERSION= 2.0.5 @@ -28,17 +24,19 @@ LIB_DEPENDS+= hamlib:${PORTSDIR}/comms/h MAN1= xlog.1 LICENSE= GPLv3 -.if defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} +PLIST_SUB+= NLS="" +.else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " -.else -PLIST_SUB+= NLS="" .endif post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|-D.*_DISABLE_DEPRECATED||g' -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|desktop doc dxcc|desktop dxcc|g' \ ${WRKSRC}/data/Makefile.in @${REINPLACE_CMD} -e \ Modified: head/deskutils/bmp-docklet/Makefile ============================================================================== --- head/deskutils/bmp-docklet/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/deskutils/bmp-docklet/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: bmp-docklet -# Date created: 10 April, 2005 -# Whom: Adam Weinberger -# +# Created by: Adam Weinberger # $FreeBSD$ -# PORTNAME= bmp-docklet PORTVERSION= 1.3 @@ -27,12 +23,14 @@ USE_GNOME= gnomehack intlhack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +PLIST_SUB+= NLS="" +.else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment" -.else -USES= gettext -PLIST_SUB+= NLS="" .endif .include Modified: head/deskutils/genius/Makefile ============================================================================== --- head/deskutils/genius/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/deskutils/genius/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: genius -# Date created: 1 May 1999 -# Whom: Andrey Zakhvatov -# +# Created by: Andrey Zakhvatov # $FreeBSD$ -# PORTNAME= genius PORTVERSION= 1.0.12 @@ -33,13 +29,15 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes INSTALLS_OMF= yes -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.else -USES= gettext +.include + +.if ${PORT_OPTIONS:MNLS} +USES+= gettext CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+= --disable-nls +PLIST_SUB+= NLS="@comment " .endif .include Modified: head/deskutils/gimmie/Makefile ============================================================================== --- head/deskutils/gimmie/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/deskutils/gimmie/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gimmie -# Date created: 28 06 2006 -# Whom: pneumann@gmail.com -# +# Created by: pneumann@gmail.com # $FreeBSD$ -# PORTNAME= gimmie PORTVERSION= 0.2.7 @@ -30,7 +26,9 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else Modified: head/deskutils/gxmessage/Makefile ============================================================================== --- head/deskutils/gxmessage/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/deskutils/gxmessage/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gxmessage -# Date created: 9 March 2005 -# Whom: Andriy Gapon -# +# Created by: Andriy Gapon # $FreeBSD$ -# PORTNAME= gxmessage PORTVERSION= 2.12.4 @@ -22,7 +18,9 @@ INSTALLS_ICONS= yes MAKE_ARGS+= INSTALL="${INSTALL_PROGRAM}" -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" Modified: head/deskutils/kompose/Makefile ============================================================================== --- head/deskutils/kompose/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/deskutils/kompose/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: kompose -# Date created: 31 Aug 2004 -# Whom: Lauri Watts -# +# Created by: Lauri Watts # $FreeBSD$ -# PORTNAME= kompose PORTVERSION= 0.5.3 @@ -28,12 +24,14 @@ INSTALLS_ICONS= yes DOCSDIR= share/doc/HTML/en/${PORTNAME} -.if defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +PLIST_SUB+= NLS="" +.else CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " -.else -USES= gettext -PLIST_SUB+= NLS="" .endif post-patch: Modified: head/deskutils/tpb/Makefile ============================================================================== --- head/deskutils/tpb/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/deskutils/tpb/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -23,7 +23,9 @@ CONFIGURE_ARGS= --with-libiconv-prefix=$ MAN1= tpb.1 -.ifndef(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else @@ -39,7 +41,7 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/doc/tpbrc ${PREFIX}/etc/tpbrc.default -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_SCRIPT} ${WRKSRC}/doc/callback_example.sh ${DOCSDIR} .endif Modified: head/deskutils/vym/Makefile ============================================================================== --- head/deskutils/vym/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/deskutils/vym/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -28,7 +28,9 @@ DESKTOP_ENTRIES= "VYM" \ "" \ false -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USE_QT4+= linguist_build PLIST_SUB+= NLS="" .else @@ -36,12 +38,12 @@ PLIST_SUB+= NLS="@comment " .endif post-patch: -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e '/INSTALLS += doc/d' ${WRKSRC}/vym.pro .endif do-configure: -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} cd ${WRKSRC} && ${QT_LRELEASE} vym.pro .endif @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} \ @@ -49,7 +51,7 @@ do-configure: post-install: ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} ${MKDIR} ${DATADIR}/lang ${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/ .endif Modified: head/deskutils/x-tile/Makefile ============================================================================== --- head/deskutils/x-tile/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/deskutils/x-tile/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: x-tile -# Date created: 2010-09-17 -# Whom: Pedro Garcia Freitas -# +# Created by: Pedro Garcia Freitas # $FreeBSD$ -# PORTNAME= x-tile PORTVERSION= 2.2.1 @@ -21,12 +17,9 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= X_Tile -post-patch: - @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \ - ${WRKSRC}/x-tile ${WRKSRC}/linux/x-tile.desktop \ - ${WRKSRC}/modules/cons.py +.include -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else @@ -35,4 +28,9 @@ PYDISTUTILS_INSTALL_TARGET= --without-ge PLIST_SUB+= NLS="@comment " .endif +post-patch: + @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \ + ${WRKSRC}/x-tile ${WRKSRC}/linux/x-tile.desktop \ + ${WRKSRC}/modules/cons.py + .include Modified: head/devel/gmake/Makefile ============================================================================== --- head/devel/gmake/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/devel/gmake/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: GNU make -# Date created: 11 September 1994 -# Whom: jkh -# +# Created by: jkh # $FreeBSD$ -# PORTNAME= gmake PORTVERSION= 3.82 @@ -22,7 +18,10 @@ COMMENT= GNU version of 'make' utility USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--program-prefix=g -.if !defined(WITHOUT_NLS) + +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} Modified: head/devel/gnucflow/Makefile ============================================================================== --- head/devel/gnucflow/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/devel/gnucflow/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gnucflow -# Date created: 07 Feb 2008 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= gnucflow PORTVERSION= 1.4 @@ -26,8 +22,9 @@ INFO= cflow PLIST_FILES= bin/cflow +.include -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USES+= gettext CONFIGURE_ARGS+=--with-libintl-prefix="${LOCALBASE}" PLIST_FILES+= share/locale/da/LC_MESSAGES/cflow.mo \ Modified: head/devel/idutils/Makefile ============================================================================== --- head/devel/idutils/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/devel/idutils/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: id-utils -# Date created: 22 Aug 1996 -# Whom: pst@freebsd.org -# +# Created by: pst@freebsd.org # $FreeBSD$ -# PORTNAME= idutils PORTVERSION= 4.6 @@ -24,12 +20,14 @@ LDFLAGS+= -L${LOCALBASE}/lib INFO= idutils MAN1= aid.1 defid.1 eid.1 fid.1 fnid.1 gid.1 lid.1 mkid.1 xtokid.1 -.if defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +PLIST_SUB+= NLS="" +.else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " -.else -USES= gettext -PLIST_SUB+= NLS="" .endif # Port configure script will auto-install the .elc file if [x]emacs is found Modified: head/devel/m17n-db/Makefile ============================================================================== --- head/devel/m17n-db/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/devel/m17n-db/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: m17n-db -# Date created: 29 May 2004 -# Whom: Kimura Fuyuki -# +# Created by: Kimura Fuyuki # $FreeBSD$ -# PORTNAME= m17n-db PORTVERSION= 1.6.3 @@ -24,7 +20,9 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-charmaps=${CHARMAPSDIR} -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else Modified: head/devel/motor/Makefile ============================================================================== --- head/devel/motor/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/devel/motor/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: motor -# Date created: 20 February 2001 -# Whom: Maxim Sobolev -# +# Created by: Maxim Sobolev # $FreeBSD$ -# PORTNAME= motor PORTVERSION= 3.4.0 @@ -19,7 +15,10 @@ USE_GMAKE= yes USES= iconv GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} -.if !defined(WITHOUT_NLS) + +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext CONFIGURE_ARGS+=--with-libintl-prefix=${LOCALBASE} PLIST_SUB= NLS="" @@ -35,7 +34,7 @@ post-patch: @${REINPLACE_CMD} -e 's|strndup|my_strndup|' ${WRKSRC}/parser/src/parser.c \ ${WRKSRC}/parser/src/strfn.c ${WRKSRC}/parser/include/strfn.h -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: @${MKDIR} ${DOCSDIR} @(cd ${WRKSRC} ; ${INSTALL_DATA} FAQ README ${DOCSDIR}) Modified: head/devel/obby/Makefile ============================================================================== --- head/devel/obby/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/devel/obby/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -19,7 +19,9 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USES+= gettext Modified: head/devel/quilt/Makefile ============================================================================== --- head/devel/quilt/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/devel/quilt/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quilt -# Date created: 20 Oct 2006 -# Whom: Dirk Jagdmann -# +# Created by: Dirk Jagdmann # $FreeBSD$ -# PORTNAME= quilt PORTVERSION= 0.60 @@ -28,7 +24,8 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ USE_GMAKE= yes USE_PERL5= yes -OPTIONS= RPMBUILD "rpmbuild support" off +OPTIONS_DEFINE= RPMBUILD DOCS NLS +RPMBUILD_DESC= rpmbuild support GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sed=${LOCALBASE}/bin/gsed \ @@ -40,7 +37,7 @@ PORTDOCS= README README.MAIL quilt.pdf .include -.if defined(WITH_RPMBUILD) +.if ${PORT_OPTIONS:MRPMBUILD} BUILD_DEPENDS+= rpm:${PORTSDIR}/archivers/rpm RUN_DEPENDS+= rpm:${PORTSDIR}/archivers/rpm PLIST_SUB+= RPMBUILD="" @@ -49,7 +46,7 @@ CONFIGURE_ARGS+=--without-rpmbuild PLIST_SUB+= RPMBUILD="@comment " .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} PLIST_SUB+= NLS="" USES+= gettext .else @@ -63,7 +60,7 @@ PLIST_SUB+= SENDMAIL="" PLIST_SUB+= SENDMAIL="@comment " .endif -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Makefile.in .endif Modified: head/devel/thunar-vcs-plugin/Makefile ============================================================================== --- head/devel/thunar-vcs-plugin/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/devel/thunar-vcs-plugin/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -23,14 +23,14 @@ USES= pkgconfig LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= NLS "Enable Native Language Support" on \ - GIT "Enable Git support" off \ - SVN "Enable Subversion support" on +OPTIONS_DEFINE= NLS GIT SVN +OPTIONS_DEFAULT= SVN +GIT_DESC= Git support -.include +.include -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes +.if ${PORT_OPTIONS:MNLS} +USES+= gettext CONFIGURE_ARGS+=--enable-nls PLIST_SUB+= NLS="" .else @@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif -.if defined(WITH_GIT) +.if ${PORT_OPTIONS:MGIT} RUN_DEPENDS+= git:${PORTSDIR}/devel/git CONFIGURE_ARGS+=--enable-git PLIST_SUB+= GIT="" @@ -47,7 +47,7 @@ CONFIGURE_ARGS+=--disable-git PLIST_SUB+= GIT="@comment " .endif -.if !defined(WITHOUT_SVN) +.if ${PORT_OPTIONS:MSVN} LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion CONFIGURE_ARGS+=--enable-subversion PLIST_SUB+= SVN="" @@ -59,4 +59,4 @@ PLIST_SUB+= SVN="@comment " post-install: @-update-desktop-database -.include +.include Modified: head/dns/libidn/Makefile ============================================================================== --- head/dns/libidn/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/dns/libidn/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -20,7 +20,9 @@ CPPFLAGS+= -I${LOCALBASE}/include INFO= libidn -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else @@ -34,13 +36,13 @@ post-patch: @${REINPLACE_CMD} -e 's|$$(AUTOMAKE)|${TRUE}|' \ -e 's|imagesdir = $$(infodir)|imagesdir = $$(docdir)|' \ ${WRKSRC}/doc/Makefile.in -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|install-data-am: install-imagesDATA install-info-am install-man|install-data-am: install-info-am install-man|' \ ${WRKSRC}/doc/Makefile.in .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for i in FAQ NEWS README ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} Modified: head/dns/mydns/Makefile ============================================================================== --- head/dns/mydns/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/dns/mydns/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mydns -# Date created: 23 July 2002 -# Whom: Simon Dick -# +# Created by: Simon Dick # $FreeBSD$ -# PORTNAME= mydns PORTVERSION= 1.1.0 @@ -30,18 +26,18 @@ MAN8= mydns.8 mydnscheck.8 mydnsexport. DOCS= AUTHORS COPYING ChangeLog NEWS QUICKSTART.mysql QUICKSTART.postgres README TODO -.if defined(WITH_ALIAS) +.if ${PORT_OPTIONS:MALIAS} CONFIGURE_ARGS+=--enable-alias .endif -.if defined(WITH_OPENSSL) +.if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-openssl \ --with-openssl-include=${OPENSSLINC} \ --with-openssl-lib=${OPENSSLLIB} .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+=--without-mysql \ --with-pgsql-include=${LOCALBASE}/include \ @@ -55,7 +51,7 @@ PKGNAMESUFFIX= -mysql USE_MYSQL= yes .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else @@ -73,7 +69,7 @@ pre-fetch: @${ECHO} "" post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR}/contrib .for f in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ Modified: head/finance/gnofin/Makefile ============================================================================== --- head/finance/gnofin/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/finance/gnofin/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gnofin -# Date created: Sun Jul 18 1999 -# Whom: domi@saargate.de -# +# Created by: domi@saargate.de # $FreeBSD$ -# PORTNAME= gnofin PORTVERSION= 0.8.4 @@ -22,7 +18,9 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB= NLS="" .else Modified: head/finance/grisbi/Makefile ============================================================================== --- head/finance/grisbi/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/finance/grisbi/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: grisbi -# Date created: 19 November 2002 -# Whom: Thierry Thomas -# +# Created by: Thierry Thomas # $FreeBSD$ -# PORTNAME= grisbi PORTVERSION= 0.8.9 @@ -32,18 +28,20 @@ MAN1= grisbi.1 CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif pre-configure: ${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ ${WRKSRC}/${CONFIGURE_SCRIPT} -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e "s|pixmaps help|pixmaps|" ${WRKSRC}/Makefile.in .endif Modified: head/games/fgrun/Makefile ============================================================================== --- head/games/fgrun/Makefile Mon Apr 29 22:07:27 2013 (r316849) +++ head/games/fgrun/Makefile Mon Apr 29 22:27:05 2013 (r316850) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fgrun -# Date created: 18 Oct 2008 -# Whom: buganini@gmail.com -# +# Created by: buganini@gmail.com # $FreeBSD$ -# PORTNAME= fgrun PORTVERSION= 1.6.0 @@ -26,16 +22,18 @@ CONFIGURE_ARGS= --with-boost="${LOCALBAS USE_GMAKE= yes USE_GL= gl -.if defined(WITHOUT_NLS) -PLIST_SUB+= NLS="@comment " -CONFIGURE_ARGS+= --disable-nls -.else +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***