From owner-svn-ports-head@FreeBSD.ORG Wed May 1 07:20:27 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 132489B5; Wed, 1 May 2013 07:20:27 +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 DF42A1F69; Wed, 1 May 2013 07:20:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r417KQi2021756; Wed, 1 May 2013 07:20:26 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r417KQuT021754; Wed, 1 May 2013 07:20:26 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201305010720.r417KQuT021754@svn.freebsd.org> From: Jason Helfman Date: Wed, 1 May 2013 07:20:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316994 - in head: x11-fm/thunar-vfs x11-toolkits/Xaw3d 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: Wed, 01 May 2013 07:20:27 -0000 Author: jgh Date: Wed May 1 07:20:26 2013 New Revision: 316994 URL: http://svnweb.freebsd.org/changeset/ports/316994 Log: - conversion to USES framework for gettext Approved by: portmgr (bapt@) Modified: head/x11-fm/thunar-vfs/Makefile head/x11-toolkits/Xaw3d/Makefile Modified: head/x11-fm/thunar-vfs/Makefile ============================================================================== --- head/x11-fm/thunar-vfs/Makefile Wed May 1 07:18:20 2013 (r316993) +++ head/x11-fm/thunar-vfs/Makefile Wed May 1 07:20:26 2013 (r316994) @@ -22,10 +22,10 @@ USE_AUTOTOOLS= libtool USE_PERL5= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack glib20 gtk20 intltool intlhack +USE_GNOME= glib20 gtk20 intltool intlhack USE_XFCE= configenv libutil libexo USE_XORG= x11 -USES= pkgconfig +USES= pkgconfig pathfix CONFIGURE_ARGS= --disable-debug @@ -35,10 +35,10 @@ OPTIONS_DEFAULT= NLS HAL DBUS STARTUP AP APIDOCS_DESC= Install api documentation STARTUP_DESC= Enable startup notification support -.include +.include .if ${PORT_OPTIONS:MNLS} -USE_GETTEXT= yes +USES+= gettext CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" .else @@ -86,4 +86,4 @@ PLIST_SUB+= APIDOCS="@comment " post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure -.include +.include Modified: head/x11-toolkits/Xaw3d/Makefile ============================================================================== --- head/x11-toolkits/Xaw3d/Makefile Wed May 1 07:18:20 2013 (r316993) +++ head/x11-toolkits/Xaw3d/Makefile Wed May 1 07:20:26 2013 (r316994) @@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.visi.com/users/h ftp.slackware.com/pub/slackware/slackware_source/x/xaw3d/ MAINTAINER= ports@FreeBSD.org -COMMENT= A 3-D Athena Widget set that looks like Motif +COMMENT= 3-D Athena Widget set that looks like Motif LICENSE= MIT @@ -23,10 +23,10 @@ SUB_FILES= pkg-message XAWVER= 8 SUB_LIST= XAWVER="${XAWVER}" -.include +.include -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes +.if ${PORT_OPTIONS:MNLS} +USES+= gettext PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " @@ -35,7 +35,7 @@ PLIST_SUB+= NLS="@comment " post-extract: ${MKDIR} ${WRKSRC}/X11/Xaw3d cd ${WRKSRC}/X11/Xaw3d; ${LN} -sf ../../*.h . -.if defined(WITHOUT_NLS) +.if ! ${PORT_OPTIONS:MNLS} ${REINPLACE_CMD} -e '/LINTLIBS =/s/=.*/=/' \ -e '/#ifdef XawI18nDefines/s//#if 0/' \ ${WRKSRC}/Imakefile @@ -49,10 +49,10 @@ post-configure: .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${DOCSDIR}/ .endif @${CAT} ${PKGMESSAGE} -.include +.include