From owner-svn-ports-head@FreeBSD.ORG Wed May 1 18:17:37 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 A989DA58; Wed, 1 May 2013 18:17:37 +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 9BD1D1DC9; Wed, 1 May 2013 18:17:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r41IHbSI053944; Wed, 1 May 2013 18:17:37 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r41IHaop053937; Wed, 1 May 2013 18:17:36 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201305011817.r41IHaop053937@svn.freebsd.org> From: Jason Helfman Date: Wed, 1 May 2013 18:17:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317038 - in head/multimedia: gmencoder imagination vdr vlc 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 18:17:37 -0000 Author: jgh Date: Wed May 1 18:17:36 2013 New Revision: 317038 URL: http://svnweb.freebsd.org/changeset/ports/317038 Log: - adoption of USES Approved by: portmgr (bapt@) Modified: head/multimedia/gmencoder/Makefile head/multimedia/imagination/Makefile head/multimedia/vdr/Makefile.plugins head/multimedia/vlc/Makefile Modified: head/multimedia/gmencoder/Makefile ============================================================================== --- head/multimedia/gmencoder/Makefile Wed May 1 18:15:28 2013 (r317037) +++ head/multimedia/gmencoder/Makefile Wed May 1 18:17:36 2013 (r317038) @@ -1,9 +1,5 @@ -# Ports collection makefile for: gmencoder -# Date created: Wed Feb 25 03:20:50 EST 2004 -# Whom: Michael Johnson -# +# Created by: Michael Johnson # $FreeBSD$ -# PORTNAME= gmencoder PORTVERSION= 0.1.0 @@ -22,13 +18,23 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix libgnomeui +USE_GNOME= gnomeprefix libgnomeui +USES= pathfix MAN1= gmencoder.1 DESKTOP_ENTRIES= "Gmencoder" "Gnome2 front-end to mplayer/mencoder" \ "" "gmencoder" "GNOME;AudioVideo;" false +.include + +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +PLIST_SUB+= NLS="" +.else +PLIST_SUB+= NLS="@comment " +.endif + .include .if defined(WITH_DVD_DEVICE) @@ -44,13 +50,6 @@ pre-everything:: @${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'" .endif -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's|-O4||; s|type -path|which|' \ ${WRKSRC}/configure @@ -61,7 +60,7 @@ post-patch: .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for i in README ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} Modified: head/multimedia/imagination/Makefile ============================================================================== --- head/multimedia/imagination/Makefile Wed May 1 18:15:28 2013 (r317037) +++ head/multimedia/imagination/Makefile Wed May 1 18:17:36 2013 (r317038) @@ -1,9 +1,5 @@ -# New ports collection makefile for: imagination -# Date created: April 22, 2011 -# Whom: Jesse -# +# Created by: Jesse # $FreeBSD$ -# PORTNAME= imagination PORTVERSION= 3.0 @@ -12,7 +8,7 @@ CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ MAINTAINER= jessefrgsmith@yahoo.ca -COMMENT= A DVD slideshow maker +COMMENT= DVD slideshow maker BUILD_DEPENDS= ${LOCALBASE}/lib/gtk-2.0:${PORTSDIR}/x11-toolkits/gtk20 \ ${LOCALBASE}/bin/sox:${PORTSDIR}/audio/sox \ @@ -25,14 +21,14 @@ INSTALLS_ICONS= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -.include +.include -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes +.if ${PORT_OPTIONS:MNLS} +USES+= gettext PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif -.include +.include Modified: head/multimedia/vdr/Makefile.plugins ============================================================================== --- head/multimedia/vdr/Makefile.plugins Wed May 1 18:15:28 2013 (r317037) +++ head/multimedia/vdr/Makefile.plugins Wed May 1 18:17:36 2013 (r317038) @@ -11,7 +11,7 @@ APIVERSION= 1.7.29 DIST_SUBDIR= vdr PATCH_SUBDIR= vdr USE_GMAKE= yes -USE_GETTEXT= yes +USES+= gettext VDRDIR= ${LOCALBASE}/include/vdr VDRINCDIR= ${LOCALBASE}/include USE_CSTD?= gnu89 @@ -31,7 +31,7 @@ PLIST_SUB= VDR_USER=${VDR_USER} PLIST_SUB+= VDR_GROUP=${VDR_GROUP} PLIST_SUB+= APIVERSION=${APIVERSION} -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " @@ -51,6 +51,6 @@ post-patch-plugin: ${WRKSRC}/Makefile ${VDR_PLUGIN_MAKEFILES} post-install-pluginlocales: -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} @(cd ${WRKDIR} && ${COPYTREE_SHARE} locale ${PREFIX}/share/) .endif Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Wed May 1 18:15:28 2013 (r317037) +++ head/multimedia/vlc/Makefile Wed May 1 18:17:36 2013 (r317038) @@ -399,7 +399,7 @@ CONFIGURE_ARGS+=--disable-ncurses .endif .if ${PORT_OPTIONS:MNLS} -USE_GETTEXT= yes +USES+= gettext .else CONFIGURE_ARGS+=--disable-nls .endif