From owner-svn-ports-all@FreeBSD.ORG  Wed Oct 24 18:08:51 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 149EED9;
 Wed, 24 Oct 2012 18:08:51 +0000 (UTC) (envelope-from mva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id D5A998FC0C;
 Wed, 24 Oct 2012 18:08:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9OI8o60068282;
 Wed, 24 Oct 2012 18:08:50 GMT (envelope-from mva@svn.freebsd.org)
Received: (from mva@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9OI8okh068279;
 Wed, 24 Oct 2012 18:08:50 GMT (envelope-from mva@svn.freebsd.org)
Message-Id: <201210241808.q9OI8okh068279@svn.freebsd.org>
From: Marcus von Appen <mva@FreeBSD.org>
Date: Wed, 24 Oct 2012 18:08:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306351 - in head/audio/openal-soft: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Oct 2012 18:08:51 -0000

Author: mva
Date: Wed Oct 24 18:08:50 2012
New Revision: 306351
URL: http://svn.freebsd.org/changeset/ports/306351

Log:
  - Fix OSS device detection
  - Convert to OptionsNG
  - Trim Makefile headers
  
  PR:		ports/173019
  Submitted by:	Sergei <nbspjr@gmail.com>
  Feature safe:	yes

Added:
  head/audio/openal-soft/files/patch-Alc_backends_oss.c   (contents, props changed)
Modified:
  head/audio/openal-soft/Makefile   (contents, props changed)

Modified: head/audio/openal-soft/Makefile
==============================================================================
--- head/audio/openal-soft/Makefile	Wed Oct 24 17:34:54 2012	(r306350)
+++ head/audio/openal-soft/Makefile	Wed Oct 24 18:08:50 2012	(r306351)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	openal-soft
-# Date created:		2009-02-01
-# Whom:			Marcus von Appen <mva@sysfault.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	openal-soft
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 
@@ -21,12 +17,13 @@ USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DALSA:BOOL=OFF -DPORTAUDIO:BOOL=OFF -DSOLARIS:BOOL=OFF \
 		-DDSOUND:BOOL=OFF -DALSOFT_CONFIG:BOOL=ON -DEXAMPLES:BOOL=OFF
 
-OPTIONS=	PULSEAUDIO	"Enable sound streaming using PulseAudio" off
+OPTIONS_DEFINE=		PULSEAUDIO
+PULSEAUDIO_DESC=	Enable sound streaming using PulseAudio
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PULSEAUDIO)
-LIB_DEPENDS+=	pulse-simple.0:${PORTSDIR}/audio/pulseaudio
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+=	pulse-simple:${PORTSDIR}/audio/pulseaudio
 CFLAGS+=	-Iinclude -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS+=	-DPULSEAUDIO:BOOL=ON
@@ -41,4 +38,4 @@ post-patch:
 	@${REINPLACE_CMD} 's|alsoft.conf|alsoft.conf.sample|' \
 		${WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/audio/openal-soft/files/patch-Alc_backends_oss.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/openal-soft/files/patch-Alc_backends_oss.c	Wed Oct 24 18:08:50 2012	(r306351)
@@ -0,0 +1,11 @@
+--- Alc/backends/oss.c.orig	2012-03-28 17:55:17.000000000 +0200
++++ Alc/backends/oss.c	2012-04-22 14:13:19.000000000 +0200
+@@ -511,7 +511,7 @@
+         {
+ #ifdef HAVE_STAT
+             struct stat buf;
+-            if(stat(oss_device, &buf) == 0)
++            if(stat(oss_driver, &buf) == 0)
+ #endif
+                 AppendAllDeviceList(oss_device);
+         }