Sync with ports, mostly OptionsNG conversion and some diff reductions.

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

2 files changed, 22 insertions, 17 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index ef119da14..0f02063ed 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -43,10 +43,12 @@ MAN1=		totem.1 totem-video-thumbnailer.1
 GCONF_SCHEMAS=	totem-handlers.schemas totem-video-thumbnail.schemas \
 		totem.schemas
 
-OPTIONS=	LIRC "Enable lirc support" off \
-		GALAGO "Enable Galago support" off \
-		BROWSER_PLUGINS "Enable install plugins for gecko browser" on \
-#		TRACKER "Enable tracker local search plugin" off
+OPTIONS_DEFINE=	LIRC GALAGO BROWSER_PLUGINS
+GALAGO_DESC=	Galago support
+BROWSER_PLUGINS_DESC=	Plugins for gecko browser
+#TRACKER_DESC=	Tracker local search plugin
+
+OPTIONS_DEFAULT=       BROWSER_PLUGINS
 
 # check configure script for allowed_plugins="..." for new plugins
 TOTEM_PLUGINS=	thumbnail screensaver ontop gromit media-player-keys \
@@ -56,7 +58,7 @@ TOTEM_PLUGINS=	thumbnail screensaver ontop gromit media-player-keys \
 # Not using:
 # TOTEM_PLUGINS= mythtv bemused jamendo
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 #.if defined(WITH_TRACKER)
 #LIB_DEPENDS+=	tracker-gtk.0:${PORTSDIR}/sysutils/tracker-libtrackergtk
@@ -66,7 +68,7 @@ TOTEM_PLUGINS=	thumbnail screensaver ontop gromit media-player-keys \
 PLIST_SUB+=	TRACKER="@comment "
 #.endif
 
-.if defined(WITH_LIRC)
+.if ${PORT_OPTIONS:MLIRC}
 LIB_DEPENDS+=	lirc_client.2:${PORTSDIR}/comms/lirc
 PLIST_SUB+=	LIRC=""
 TOTEM_PLUGINS:=	${TOTEM_PLUGINS} lirc
@@ -74,7 +76,7 @@ TOTEM_PLUGINS:=	${TOTEM_PLUGINS} lirc
 PLIST_SUB+=	LIRC="@comment "
 .endif
 
-.if defined(WITH_GALAGO)
+.if ${PORT_OPTIONS:MGALAGO}
 LIB_DEPENDS+=	galago.3:${PORTSDIR}/devel/libgalago
 PLIST_SUB+=	GALAGO=""
 TOTEM_PLUGINS:=	${TOTEM_PLUGINS} galago
@@ -82,7 +84,7 @@ TOTEM_PLUGINS:=	${TOTEM_PLUGINS} galago
 PLIST_SUB+=	GALAGO="@comment "
 .endif
 
-.if !defined(WITHOUT_BROWSER_PLUGINS)
+.if  ${PORT_OPTIONS:MBROWSER_PLUGINS}
 CONFIGURE_ARGS+=--enable-browser-plugins \
 		--enable-gmp-plugin \
 		--enable-narrowspace-plugin
@@ -104,7 +106,7 @@ PLIST_SUB+=	BROWSER_PLUGINS="@comment "
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
-DEFAULT_DVD_DEVICE=/dev/acd0
+DEFAULT_DVD_DEVICE=/dev/cd0
 .endif
 
 pre-everything::
@@ -123,4 +125,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.deps ${PREFIX}/share/vala/vapi
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/totem3/Makefile b/multimedia/totem3/Makefile
index 6b861128c..6833e0f07 100644
--- a/multimedia/totem3/Makefile
+++ b/multimedia/totem3/Makefile
@@ -51,10 +51,13 @@ GLIB_SCHEMAS=	org.gnome.totem.enums.xml \
 		org.gnome.totem.gschema.xml \
 		org.gnome.totem.plugins.opensubtitles.gschema.xml
 
-OPTIONS=	LIRC "Enable lirc support" off \
-		BROWSER_PLUGINS "Build plugins for a webkit-gtk3 browser" on \
-		PUBLISH "Enable Publish (network playlist) plugin" off
-#		TRACKER "Enable tracker local search plugin" off
+
+OPTIONS_DEFINE=	LIRC BROWSER_PLUGINS PUBLISH
+BROWSER_PLUGINS_DESC=	Plugins for gecko browser
+PUBLISH_DESC=	Publish (network playlist) plugin
+TRACKER_DESC=	Tracker local search plugin
+
+OPTIONS_DEFAULT=BROWSER_PLUGINS
 
 # check configure script for allowed_plugins="..." for new plugins
 TOTEM_PLUGINS=	brasero-disc-recorder chapters dbusservice im-status gromit \
@@ -68,7 +71,7 @@ TOTEM_PLUGINS=	brasero-disc-recorder chapters dbusservice im-status gromit \
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PUBLISH)
+.if ${PORT_OPTIONS:MPUBLISH}
 LIB_DEPENDS+=	epc-1.0:${PORTSDIR}/www/libepc
 PLIST_SUB+=	PUBLISH=""
 TOTEM_PLUGINS:=	${TOTEM_PLUGINS} publish
@@ -88,7 +91,7 @@ PLIST_SUB+=	PUBLISH="@comment "
 PLIST_SUB+=	TRACKER="@comment "
 #.endif
 
-.if defined(WITH_LIRC)
+.if ${PORT_OPTIONS:MLIRC}
 LIB_DEPENDS+=	lirc_client:${PORTSDIR}/comms/lirc
 PLIST_SUB+=	LIRC=""
 TOTEM_PLUGINS:=	${TOTEM_PLUGINS} lirc
@@ -96,7 +99,7 @@ TOTEM_PLUGINS:=	${TOTEM_PLUGINS} lirc
 PLIST_SUB+=	LIRC="@comment "
 .endif
 
-.if !defined(WITHOUT_BROWSER_PLUGINS)
+.if ${PORT_OPTIONS:MBROWSER_PLUGINS}
 CONFIGURE_ARGS+=--enable-browser-plugins \
 		--enable-gmp-plugin \
 		--enable-narrowspace-plugin