ports/173809: [PATCH] audio/libcanberra optionsng

[Chris Petrik]

>Number:         173809
>Category:       ports
>Synopsis:       [PATCH] audio/libcanberra optionsng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 21 23:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Chris Petrik
>Release:        
>Organization:
na
>Environment:
>Description:
Options NG Changes
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: libcanberra/Makefile
===================================================================
--- libcanberra/Makefile        (revision 305743)
+++ libcanberra/Makefile        (working copy)
@@ -14,10 +14,11 @@
 MAINTAINER=    gnome at FreeBSD.org
 COMMENT=       Implementation of the Freedesktop sound theme spec

-LIB_DEPENDS=   vorbisfile.6:${PORTSDIR}/audio/libvorbis
-
 LICENSE=       LGPL21
 LICENSE_FILE=  ${WRKSRC}/LGPL
+
+LIB_DEPENDS=   vorbisfile:${PORTSDIR}/audio/libvorbis
+
 USE_GMAKE=     yes
 USE_GNOME=     gnomeprefix gnomehack gtk20 ltverhack gconf2
 USE_LDCONFIG=  yes
@@ -29,30 +30,30 @@
 .if !defined(SLAVEPORT)
 GCONF_SCHEMAS= libcanberra.schemas

-OPTIONS=       PULSE "Enable Pulse Audio support" off \
-               GSTREAMER "Enable GStreamer audio support" off
+OPTIONS_DEFINE=        PULSEAUDIO GSTREAMER
+
 .endif

 PLIST_SUB=     VERSION=${PORTVERSION}

-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if defined(SLAVEPORT)
 USE_GNOME+=    gtk30
-LIB_DEPENDS+=  canberra.0:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS+=  canberra:${PORTSDIR}/audio/libcanberra
 CONFIGURE_ARGS+=--enable-gtk3
 .else
 CONFIGURE_ARGS+=--disable-gtk3

-.if !defined(WITHOUT_PULSE)
-LIB_DEPENDS+=  pulse.0:${PORTSDIR}/audio/pulseaudio
+.if ${PORT_OPTIONS:MPULSE}
+LIB_DEPENDS+=  pulse:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=    PULSE=""
 .else
 CONFIGURE_ARGS+=--disable-pulse
 PLIST_SUB+=    PULSE="@comment "
 .endif

-.if !defined(WITHOUT_GSTREAMER)
+.if ${PORT_OPTIONS:MGSTREAMER}
 USE_GSTREAMER= yes
 PLIST_SUB+=    GSTREAMER=""
 .else
@@ -66,4 +67,4 @@
        @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
                ${WRKSRC}/configure

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

>Release-Note:
>Audit-Trail:
>Unformatted: