svn commit: r317038 - in head/multimedia: gmencoder imagination vdr vlc

[Jason Helfman]

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 <ahze at ahze.net>
-#
+# Created by: Michael Johnson <ahze at ahze.net>
 # $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 <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .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 <jessefrgsmith at yahoo.ca>
-#
+# Created by: Jesse <jessefrgsmith at yahoo.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	imagination
 PORTVERSION=	3.0
@@ -12,7 +8,7 @@ CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	jessefrgsmith at 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 <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>

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