Massive port framework maintaince/update (long over due too)

Deal with recent USES changes, pet portlint here and there.
Sync with ports, more to come.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18393 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 33 insertions, 39 deletions

diff --git a/audio/rhythmbox3/Makefile b/audio/rhythmbox3/Makefile
index 5d2802388..98b98512c 100644
--- a/audio/rhythmbox3/Makefile
+++ b/audio/rhythmbox3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	rhythmbox
-# Date created:		17 August 2003
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/audio/rhythmbox3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	rhythmbox
 PORTVERSION=	2.90.1.1
@@ -19,24 +15,24 @@ COMMENT=	Audio player for GNOME
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
-		totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		peas-1.0.0:${PORTSDIR}/devel/libpeas \
-		json-glib-1.0.0:${PORTSDIR}/devel/json-glib \
-		soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
-		gnome-media-profiles-3.0.0:${PORTSDIR}/multimedia/libgnome-media-profiles \
-		brasero-media3.3:${PORTSDIR}/sysutils/brasero3
+LIB_DEPENDS=	musicbrainz3:${PORTSDIR}/audio/libmusicbrainz3 \
+		totem-plparser:${PORTSDIR}/multimedia/totem-pl-parser \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		peas-1.0:${PORTSDIR}/devel/libpeas \
+		json-glib-1.0:${PORTSDIR}/devel/json-glib \
+		soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \
+		gnome-media-profiles-3.0:${PORTSDIR}/multimedia/libgnome-media-profiles \
+		brasero-media3:${PORTSDIR}/sysutils/brasero3
 
 CONFLICTS=	rhythmbox-0.[0-9]*
 
 LATEST_LINK=	rhythmbox3
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 INSTALLS_OMF=	yes
 USE_XORG=	ice xproto
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix gtk30
+USE_GNOME=	intlhack gnomeprefix gtk30
 WANT_GNOME=	yes
 USE_GSTREAMER=	flac mp3 jpeg cdparanoia vorbis
 USE_AUTOTOOLS=	libtool
@@ -49,27 +45,24 @@ CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 GLIB_SCHEMAS=	org.gnome.rhythmbox.gschema.xml
 
+OPTIONS_DEFINE=	IPOD FAAD NOTIFY PYTHON LIRC MTP WEBKIT ITMS_PLUGIN
+OPTIONS_DEFAULT=NOTIFY PYTHON 
+IPOD_DESC=	iPod support
+ITMS_PLUGIN_DESC=iTunes browser plugin
+WEBKIT_DESC=	HTML view support
 #OPTIONS=	DAAP "Enable iTunes music sharing" off \
-OPTIONS=	IPOD "Enable iPod support" off \
-		FAAD "Enable FAAD decoder support" off \
-		NOTIFY "Enable libnotify support" on \
-		PYTHON "Enable python based plugins" on \
-		LIRC "Enable Infrared syncing support" off \
-		MTP "Enable MS Media Transfer Protocol support" off \
-		WEBKIT "Enable HTML view" off \
-		ITMS_PLUGIN "Enable iTunes browser plugin" off
 #		VISUAL "Enable clutter visualizer plugin" on \
 
 MAN1=		rhythmbox-client.1 rhythmbox.1
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_FAAD)
+.if ${PORT_OPTIONS:MFAAD}
 USE_GSTREAMER+=	faad
 .endif
 
-.if defined(WITH_LIRC)
-LIB_DEPENDS+=	lirc_client.2:${PORTSDIR}/comms/lirc
+.if ${PORT_OPTIONS:MFAAD}
+LIB_DEPENDS+=	lirc_client:${PORTSDIR}/comms/lirc
 PLIST_SUB+=	LIRC=""
 CONFIGURE_ARGS+=--enable-lirc
 .else
@@ -77,9 +70,9 @@ CONFIGURE_ARGS+=--disable-lirc
 PLIST_SUB+=	LIRC="@comment "
 .endif
 
-.if defined(WITH_MTP)
-LIB_DEPENDS+=	mtp.11:${PORTSDIR}/audio/libmtp \
-		hal.1:${PORTSDIR}/sysutils/hal
+.if ${PORT_OPTIONS:MMTP}
+LIB_DEPENDS+=	mtp:${PORTSDIR}/audio/libmtp \
+		hal:${PORTSDIR}/sysutils/hal
 PLIST_SUB+=	MTP=""
 CONFIGURE_ARGS+=--with-mtp
 .else
@@ -101,15 +94,15 @@ CONFIGURE_ARGS+=--disable-daap
 PLIST_SUB+=	DAAP="@comment "
 #.endif
 
-.if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
+.if ${PORT_OPTIONS:MNOTIFY}
+LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
 PLIST_SUB+=	NOTIFY=""
 .else
 CONFIGURE_ARGS+=--disable-libnotify
 PLIST_SUB+=	NOTIFY="@comment "
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 USE_GSTREAMER+=	python
 CONFIGURE_ARGS+=--enable-python
@@ -119,8 +112,8 @@ CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-.if !defined(WITHOUT_IPOD)
-LIB_DEPENDS+=	gpod.7:${PORTSDIR}/audio/libgpod
+.if ${PORT_OPTIONS:MIPOD}
+LIB_DEPENDS+=	gpod:${PORTSDIR}/audio/libgpod
 CONFIGURE_ARGS+=--with-ipod
 PLIST_SUB+=	IPOD=""
 .else
@@ -128,8 +121,9 @@ CONFIGURE_ARGS+=--without-ipod
 PLIST_SUB+=	IPOD="@comment "
 .endif
 
-.if !defined(WITHOUT_ITMS_PLUGIN)
-USE_WEBPLUGINS=	gecko19 webkit-gtk3
+.if ${PORT_OPTIONS:MITMS_PLUGIN}
+# see if we can run this plugin from mozilla ..
+USE_WEBPLUGINS=	webkit-gtk3
 WEBPLUGINS_FILES=librhythmbox-itms-detection-plugin.so
 .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 
@@ -141,8 +135,8 @@ CONFIGURE_ARGS+=--disable-browser-plugin
 PLIST_SUB+=	ITMS_PLUGIN="@comment "
 .endif
 
-.if defined(WITH_WEBKIT)
-LIB_DEPENDS+=	webkitgtk-3.0.0:${PORTSDIR}/www/webkit-gtk3
+.if ${PORT_OPTIONS:MWEBKIT}
+LIB_DEPENDS+=	webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3
 CONFIGURE_ARGS+=--with-webkit
 PLIST_SUB+=	WEBKIT=""
 .else