From nobody@FreeBSD.org  Wed Nov 21 22:53:53 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6924BF57
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 Nov 2012 22:53:53 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 37E798FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 Nov 2012 22:53:53 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qALMrrp6028768
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 Nov 2012 22:53:53 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qALMrrwL028767;
	Wed, 21 Nov 2012 22:53:53 GMT
	(envelope-from nobody)
Message-Id: <201211212253.qALMrrwL028767@red.freebsd.org>
Date: Wed, 21 Nov 2012 22:53:53 GMT
From: Chris Petrik <c.petrik.sosa@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] audio/libcanberra optionsng
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         173809
>Category:       ports
>Synopsis:       [PATCH] audio/libcanberra optionsng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 21 23:00:00 UTC 2012
>Closed-Date:    Sat Dec 29 20:59:02 UTC 2012
>Last-Modified:  Sat Dec 29 20:59:02 UTC 2012
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Nov 21 23:00:13 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173809 
State-Changed-From-To: open->closed 
State-Changed-By: mezz 
State-Changed-When: Sat Dec 29 20:58:21 UTC 2012 
State-Changed-Why:  
Committed, thanks! ${PORT_OPTIONS:MPULSE} -> ${PORT_OPTIONS:MPULSEAUDIO} 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173809 
>Unformatted:
