Date: Sat, 26 Dec 2009 23:42:43 +0100 From: Marcus von Appen <mva@FreeBSD.org> To: freebsd-ports@freebsd.org Subject: [HEADS UP] openal -> openal-soft switch Message-ID: <20091226224243.GB1409@medusa.sysfault.org>
next in thread | raw e-mail | index | archive | help
--GZVR6ND4mMseVXL/
Content-Type: multipart/mixed; boundary="uZ3hkaAS1mZxFaxD"
Content-Disposition: inline
--uZ3hkaAS1mZxFaxD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi,
the reference implementation of OpenAL, audio/openal, will be replaced
with audio/openal-soft as default dependency for ports.
While audio/openal is widely used, several sounds cards can only produce
crackling sound effects and have limited support for the feature range
of OpenAL. Furthermore, its development is stalled, leaving minor bugs
within the implementation around, without the hope of fixes.
audio/openal-soft is an actively developed, stable and fully
software-driven OpenAL implementation, circumventing most, if not all,
limitations of audio/openal.
Attached you will find a patch set, which adds and changes the
following within the current ports infrastructure.
New port knobs are:
WANT_OPENAL= si|soft
User switch for using either audio/openal (si) or audio/openal-soft
(soft) as default OpenAL library.
USE_OPENAL= al|si|soft|alut
This replaces the previous LIB_DEPENDS+= openal.0|openal.1|alut.1 lines
for audio/openal, audio/openal-soft and audio/freealut.
The 'al' setting is used for the user switch setting - or - if
WANT_OPENAL is not set by the user - the default OpenAL library
specified in bsd.port.mk, which will be audio/openal-soft.
The 'si' and 'soft' settings are used for ports, which explicitly
require the one or other OpenAL library. They should be avoided,
whenever possible, though.
'alut' will include audio/freealut in the LIB_DEPENDS.
Technical differences for maintainers:
Do not rely on the openal-config script anymore. It is only provided by
audio/openal and thus only valid in conjunction with
USE_OPENAL=si. Whenever possible, refer to pkg-config instead (and patch
accordingly).
To apply the patch and test the changes, do the following:
# cd /usr/ports
# patch -p2 < /your/patch/location/openal_2009-12-26.diff
# pkg_delete -f openal\*
# pkg_delete -f freealut\*
# portmaster -a <or> portupgrade -a
If there are no votes against this switch, I'll go ahead and schedule an
-exp run for the changes later on.
Regards
Marcus
--uZ3hkaAS1mZxFaxD
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="openal_2009-12-26.diff"
Content-Transfer-Encoding: quoted-printable
diff -Nur FreeBSD.2009-12-26/ports/Mk/bsd.port.mk FreeBSD/ports/Mk/bsd.port=
=2Emk
--- FreeBSD.2009-12-26/ports/Mk/bsd.port.mk 2009-12-26 16:03:03.000000000 +=
0100
+++ FreeBSD/ports/Mk/bsd.port.mk 2009-12-26 22:12:01.000000000 +0100
@@ -395,6 +395,12 @@
# USE_SDL - If set, this port uses the sdl libraries.
# See bsd.sdl.mk for more information.
##
+# USE_OPENAL - If set, this port relies on the OpenAL package.
+# Legal values are: al, soft, si, alut.
+# If set to an unknown value, the port is marked broken.
+# WANT_OPENAL - User-specific OpenAL wishes.
+# Legal values are: soft, si. The default is soft.
+##
# USE_OPENSSL - If set, this port relies on the OpenSSL package.
##
# USE_OPENLDAP - If set, this port uses the OpenLDAP libraries.
@@ -1744,6 +1750,83 @@
.include "${PORTSDIR}/Mk/bsd.ldap.mk"
.endif
=20
+.if defined(USE_OPENAL)
+_OPENAL_ALL=3D al si soft alut
+_OPENAL_LIBS=3D si soft
+# Default choie.
+_DEFAULT_OPENAL=3D soft
+
+_OPENAL_SOFT=3D openal.1:${PORTSDIR}/audio/openal-soft
+_OPENAL_SI=3D openal.0:${PORTSDIR}/audio/openal
+_OPENAL_ALUT=3D alut.1:${PORTSDIR}/audio/freealut
+
+.if exists(${LOCALBASE}/lib/libopenal.a)
+_HAVE_OPENAL=3D si
+.elif exists(${LOCALBASE}/bin/openal-info)
+_HAVE_OPENAL=3D soft
+.endif
+
+.if ${USE_OPENAL} =3D=3D "yes"
+# Be friendly.
+USE_OPENAL=3D ${_DEFAULT_OPENAL}
+.endif
+
+__USED_OPENAL=3D
+_USE_OPENAL=3D
+.for component in ${USE_OPENAL}
+.if ${__USED_OPENAL:M${component}} =3D=3D ""
+__USED_OPENAL+=3D ${component}
+
+.if ${_OPENAL_ALL:M${component}} =3D=3D ""
+BROKEN=3D OPENAL mismatch: unknown component ${component}
+.elif ${_OPENAL_ALL:M${component}} =3D=3D "al"
+
+# Check if the user wish matches the found OpenAL system.
+.if defined(WANT_OPENAL) && defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} !=3D =
${WANT_OPENAL}
+BROKEN=3D OPENAL mismatch: ${_HAVE_OPENAL} is installed, but ${WANT_OPENAL=
} desired
+.endif # WANT_OPENAL
+
+.if defined(_HAVE_OPENAL)
+_OPENAL_SYSTEM=3D ${_HAVE_OPENAL}
+.elif defined(WANT_OPENAL)
+_OPENAL_SYSTEM=3D ${WANT_OPENAL}
+.else
+_OPENAL_SYSTEM=3D ${_DEFAULT_OPENAL}
+.endif # _HAVE_OPENAL
+
+_USE_OPENAL+=3D ${_OPENAL_${_OPENAL_SYSTEM:U}}
+
+.else # ${_OPENAL_ALL:M${component}} =3D=3D ""
+
+.if ${_OPENAL_LIBS:M${component}} =3D=3D ${component}
+# Check for the system implementation to use.
+.if defined(WANT_OPENAL) && ${WANT_OPENAL} !=3D ${component}
+BROKEN=3D OPENAL mismatch: wants to use ${component}, while you wish to us=
e ${WANT_OPENAL}
+.endif
+.if defined(_OPENAL_SYSTEM)
+BROKEN=3D OPENAL mismatch: cannot use ${component} and al together.
+.endif
+.if defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} !=3D ${component}
+BROKEN=3D OPENAL mismatch: wants to use ${component}, but ${_HAVE_OPENAL} =
is installed
+.endif
+
+_OPENAL_SYSTEM=3D ${component}
+
+.endif # ${_OPENAL_LIBS:M${component}} =3D=3D ${component}
+
+_USE_OPENAL+=3D ${_OPENAL_${component:U}}
+
+.endif # ${_OPENAL_ALL:M${component}} =3D=3D ""
+
+.endif # ${__USED_OPENAL:M${component} =3D=3D ""
+.endfor # component in ${USE_OPENAL}
+
+.for dep in ${_USE_OPENAL}
+LIB_DEPENDS+=3D ${dep}
+.endfor
+
+.endif # USE_OPENAL
+
.if defined(USE_FAM)
DEFAULT_FAM_SYSTEM=3D gamin
# Currently supported FAM systems
diff -Nur FreeBSD.2009-12-26/ports/audio/freealut/Makefile FreeBSD/ports/au=
dio/freealut/Makefile
--- FreeBSD.2009-12-26/ports/audio/freealut/Makefile 2009-12-26 16:01:31.00=
0000000 +0100
+++ FreeBSD/ports/audio/freealut/Makefile 2009-12-26 17:46:38.000000000 +01=
00
@@ -7,20 +7,19 @@
=20
PORTNAME=3D freealut
PORTVERSION=3D 1.1.0
-PORTREVISION=3D 1
+PORTREVISION=3D 2
CATEGORIES=3D audio
MASTER_SITES=3D http://connect.creativelabs.com/openal/Downloads/ALUT/
=20
MAINTAINER=3D oliver@FreeBSD.org
COMMENT=3D The OpenAL Utility Toolkit
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal
-
USE_AUTOTOOLS=3D libtool:22
GNU_CONFIGURE=3D yes
CONFIGURE_ENV=3D CPPFLAGS=3D"-I${LOCALBASE}/include" LDFLAGS=3D"-L${LOCALB=
ASE}/lib"
USE_GMAKE=3D yes
USE_GNOME=3D pkgconfig gnomehack
+USE_OPENAL=3D al
USE_LDCONFIG=3D yes
=20
.include <bsd.port.pre.mk>
diff -Nur FreeBSD.2009-12-26/ports/audio/py-openal/Makefile FreeBSD/ports/a=
udio/py-openal/Makefile
--- FreeBSD.2009-12-26/ports/audio/py-openal/Makefile 2009-12-26 16:01:41.0=
00000000 +0100
+++ FreeBSD/ports/audio/py-openal/Makefile 2009-12-26 17:47:50.000000000 +0=
100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D openal
PORTVERSION=3D 0.1.6
-PORTREVISION=3D 2
+PORTREVISION=3D 3
CATEGORIES=3D audio python
MASTER_SITES=3D http://download.gna.org/pyopenal/
PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX}
@@ -16,10 +16,8 @@
MAINTAINER=3D acm@FreeBSD.org
COMMENT=3D PyOpenAL is a binding of OpenAL for Python
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut
-
DIST_SUBDIR=3D python
+USE_OPENAL=3D al alut
USE_PYTHON=3D yes
USE_PYDISTUTILS=3D yes
PYDISTUTILS_PKGNAME=3D PyOpenAL
diff -Nur FreeBSD.2009-12-26/ports/audio/py-openal/files/patch-setup.py Fre=
eBSD/ports/audio/py-openal/files/patch-setup.py
--- FreeBSD.2009-12-26/ports/audio/py-openal/files/patch-setup.py 2009-12-2=
6 16:01:41.000000000 +0100
+++ FreeBSD/ports/audio/py-openal/files/patch-setup.py 2009-12-26 17:51:59.=
000000000 +0100
@@ -1,6 +1,6 @@
---- setup.py Sun Apr 30 10:23:44 2006
-+++ setup.py Mon Aug 21 00:25:58 2006
-@@ -1,14 +1,14 @@
+--- setup.py.orig 2006-04-30 17:23:44.000000000 +0200
++++ setup.py 2009-12-26 17:50:57.000000000 +0100
+@@ -1,17 +1,17 @@
import os
from distutils.core import setup, Extension
=20
@@ -9,7 +9,8 @@
LIBS =3D ["openal", "alut"]
=20
try:
- openal_version =3D os.popen("openal-config --version").read()
+- openal_version =3D os.popen("openal-config --version").read()
++ openal_version =3D os.popen("pkg-config --modversion openal").read()
if openal_version[0] =3D=3D "0":
- LIBDIRS =3D ["/usr/lib", "/usr/local/lib"]
- LIBS =3D ["openal"]
@@ -17,13 +18,17 @@
+ LIBS =3D ["openal","alut"]
=20
except:
- print "Warning: error while running 'openal-config --version', using de=
fault values..."
+- print "Warning: error while running 'openal-config --version', using de=
fault values..."
++ print "Warning: error while running 'pkg-config --modversion', using de=
fault values..."
+=20
+=20
+ setup(
@@ -38,7 +38,7 @@
=20
ext_modules =3D [Extension("_openal",
["py_openal.c"],
- ["/usr/include", "/usr/local/include"],
-+ ["/usr/include", "/usr/local/include", "%%LOC=
ALBASE%%/include"],
++ ["/usr/include", "/usr/local/include", "%%LOC=
ALBASE/include"],
[("HAVE_CONFIG_H", None)],
None,
LIBDIRS,
diff -Nur FreeBSD.2009-12-26/ports/deskutils/xneur/Makefile FreeBSD/ports/d=
eskutils/xneur/Makefile
--- FreeBSD.2009-12-26/ports/deskutils/xneur/Makefile 2009-12-26 16:02:12.0=
00000000 +0100
+++ FreeBSD/ports/deskutils/xneur/Makefile 2009-12-26 17:53:40.000000000 +0=
100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D xneur
PORTVERSION=3D 0.9.4
+PORTREVISION=3D 1
CATEGORIES=3D deskutils
MASTER_SITES=3D http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
http://mirror.amdmi3.ru/distfiles/
@@ -60,7 +61,7 @@
CONFIGURE_ARGS+=3D --with-sound=3Dgstreamer
.endif
.if defined(WITH_OPENAL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
CONFIGURE_ARGS+=3D --with-sound=3Dopenal
.endif
.if defined(WITHOUT_GSTREAMER) && !defined(WITH_OPENAL)
diff -Nur FreeBSD.2009-12-26/ports/devel/allegro-devel/Makefile FreeBSD/por=
ts/devel/allegro-devel/Makefile
--- FreeBSD.2009-12-26/ports/devel/allegro-devel/Makefile 2009-12-26 16:02:=
13.000000000 +0100
+++ FreeBSD/ports/devel/allegro-devel/Makefile 2009-12-26 17:54:29.00000000=
0 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D allegro
DISTVERSION=3D 4.3.1
-PORTREVISION=3D 3
+PORTREVISION=3D 4
CATEGORIES=3D devel
MASTER_SITES=3D SF/alleg/${PORTNAME}-unstable/${PORTVERSION}
PKGNAMESUFFIX=3D -devel
@@ -51,7 +51,7 @@
.include <bsd.port.pre.mk>
=20
.if defined(WITH_AL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
CONFIGURE_ARGS+=3D--enable-sgialdigi
PLIST_SUB+=3D AL=3D""
.else
diff -Nur FreeBSD.2009-12-26/ports/devel/sfml/Makefile FreeBSD/ports/devel/=
sfml/Makefile
--- FreeBSD.2009-12-26/ports/devel/sfml/Makefile 2009-12-26 16:02:31.000000=
000 +0100
+++ FreeBSD/ports/devel/sfml/Makefile 2009-12-26 17:54:49.000000000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D sfml
PORTVERSION=3D 1.5
-PORTREVISION=3D 1
+PORTREVISION=3D 2
CATEGORIES=3D devel
MASTER_SITES=3D SF
DISTNAME=3D SFML-${PORTVERSION}-sdk-linux-32
@@ -16,12 +16,12 @@
COMMENT=3D Simple and Fast Multimedia Library
=20
LIB_DEPENDS=3D sndfile.1:${PORTSDIR}/audio/libsndfile \
- openal.0:${PORTSDIR}/audio/openal \
jpeg.10:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
=20
USE_GMAKE=3D yes
+USE_OPENAL=3D al
USE_XORG=3D x11 xrandr
USE_GL=3D gl glu
USE_LDCONFIG=3D yes
diff -Nur FreeBSD.2009-12-26/ports/devel/simgear/Makefile FreeBSD/ports/dev=
el/simgear/Makefile
--- FreeBSD.2009-12-26/ports/devel/simgear/Makefile 2009-12-26 16:02:31.000=
000000 +0100
+++ FreeBSD/ports/devel/simgear/Makefile 2009-12-26 17:55:20.000000000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D SimGear
PORTVERSION=3D 1.9.1
-PORTREVISION=3D 3
+PORTREVISION=3D 4
CATEGORIES=3D devel games
MASTER_SITES=3D ftp://ftp.de.simgear.org/pub/simgear/Source/ \
ftp://ftp.simgear.org/pub/simgear/Source/
@@ -17,9 +17,7 @@
=20
BUILD_DEPENDS=3D ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
RUN_DEPENDS=3D ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- jpeg.10:${PORTSDIR}/graphics/jpeg \
- alut.1:${PORTSDIR}/audio/freealut \
+LIB_DEPENDS=3D jpeg.10:${PORTSDIR}/graphics/jpeg \
boost_thread.4:${PORTSDIR}/devel/boost-libs
=20
.if defined(WITH_OSG_DEVEL)
@@ -29,6 +27,7 @@
.endif
=20
USE_XORG=3D ice sm x11 xext xi xt xmu
+USE_OPENAL=3D al alut
USE_GL=3D gl glu glut
GNU_CONFIGURE=3D yes
CPPFLAGS+=3D -I${LOCALBASE}/include
diff -Nur FreeBSD.2009-12-26/ports/emulators/bsnes/Makefile FreeBSD/ports/e=
mulators/bsnes/Makefile
--- FreeBSD.2009-12-26/ports/emulators/bsnes/Makefile 2009-12-26 16:02:41.0=
00000000 +0100
+++ FreeBSD/ports/emulators/bsnes/Makefile 2009-12-26 17:56:03.000000000 +0=
100
@@ -6,6 +6,7 @@
=20
PORTNAME=3D bsnes
PORTVERSION=3D 0.58
+PORTREVISION=3D 1
CATEGORIES=3D emulators
MASTER_SITES=3D http://byuu.org/files/ \
ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
@@ -58,7 +59,7 @@
.endif
=20
.if defined(WITH_SOUND_OPENAL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
AUDIO_DRIVER+=3D audio.openal
.endif
=20
diff -Nur FreeBSD.2009-12-26/ports/games/allacrost/Makefile FreeBSD/ports/g=
ames/allacrost/Makefile
--- FreeBSD.2009-12-26/ports/games/allacrost/Makefile 2009-12-26 16:02:47.0=
00000000 +0100
+++ FreeBSD/ports/games/allacrost/Makefile 2009-12-26 17:56:59.000000000 +0=
100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D allacrost
PORTVERSION=3D 0.2.2
-PORTREVISION=3D 2
+PORTREVISION=3D 3
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION}
DISTNAME=3D allacrost_demo_source_${PORTVERSION}
@@ -18,12 +18,12 @@
BUILD_DEPENDS=3D ${LOCALBASE}/lib/libluabind.a:${PORTSDIR}/devel/luabind
LIB_DEPENDS=3D jpeg.10:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
- openal.0:${PORTSDIR}/audio/openal \
ogg.6:${PORTSDIR}/audio/libogg \
vorbis.4:${PORTSDIR}/audio/libvorbis
=20
GNU_CONFIGURE=3D yes
USE_GMAKE=3D yes
+USE_OPENAL=3D al
USE_LUA=3D 5.0
USE_SDL=3D sdl ttf net
USE_GL=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/apricots/Makefile FreeBSD/ports/ga=
mes/apricots/Makefile
--- FreeBSD.2009-12-26/ports/games/apricots/Makefile 2009-12-26 16:02:47.00=
0000000 +0100
+++ FreeBSD/ports/games/apricots/Makefile 2009-12-26 17:57:45.000000000 +01=
00
@@ -7,7 +7,7 @@
=20
PORTNAME=3D apricots
PORTVERSION=3D 0.2.6
-PORTREVISION=3D 1
+PORTREVISION=3D 2
CATEGORIES=3D games
MASTER_SITES=3D http://www.fishies.org.uk/ \
http://mirror.amdmi3.ru/distfiles/
@@ -37,8 +37,7 @@
.include <bsd.port.pre.mk>
=20
.if !defined(WITHOUT_OPENAL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut
+USE_OPENAL=3D al alut
.endif
=20
post-patch:
diff -Nur FreeBSD.2009-12-26/ports/games/assaultcube/Makefile FreeBSD/ports=
/games/assaultcube/Makefile
--- FreeBSD.2009-12-26/ports/games/assaultcube/Makefile 2009-12-26 16:02:47=
=2E000000000 +0100
+++ FreeBSD/ports/games/assaultcube/Makefile 2009-12-26 17:58:42.000000000 =
+0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D assaultcube
PORTVERSION=3D 1.0.2
-PORTREVISION=3D 1
+PORTREVISION=3D 2
CATEGORIES=3D games
MASTER_SITES=3D SF/actiongame/AssaultCube/1.0
DISTNAME=3D AssaultCube_v${PORTVERSION}
@@ -15,9 +15,8 @@
MAINTAINER=3D ports@FreeBSD.org
COMMENT=3D Total conversion of the FPS game called Cube
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal
-
USE_BZIP2=3D yes
+USE_OPENAL=3D al
USE_GMAKE=3D yes
GNU_CONFIGURE=3D yes
ALL_TARGET=3D libenet
diff -Nur FreeBSD.2009-12-26/ports/games/atr3d/Makefile FreeBSD/ports/games=
/atr3d/Makefile
--- FreeBSD.2009-12-26/ports/games/atr3d/Makefile 2009-12-26 16:02:47.00000=
0000 +0100
+++ FreeBSD/ports/games/atr3d/Makefile 2009-12-26 17:59:21.000000000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D atr3d
PORTVERSION=3D 0.6
-PORTREVISION=3D 11
+PORTREVISION=3D 12
CATEGORIES=3D games
MASTER_SITES=3D ftp://ftp.avoidtheroid.com/pub/${PORTNAME}/
DISTNAME=3D ${PORTNAME}_source_${PORTVERSION}
@@ -39,7 +39,7 @@
.include <bsd.port.pre.mk>
=20
.if !defined(WITHOUT_SOUND)
-LIB_DEPENDS+=3D alut.1:${PORTSDIR}/audio/freealut
+USE_OPENAL=3D alut
CONFIGURE_ARGS+=3D --enable-sound
.else
CONFIGURE_ARGS+=3D --disable-sound
diff -Nur FreeBSD.2009-12-26/ports/games/battletanks/Makefile FreeBSD/ports=
/games/battletanks/Makefile
--- FreeBSD.2009-12-26/ports/games/battletanks/Makefile 2009-12-26 16:02:48=
=2E000000000 +0100
+++ FreeBSD/ports/games/battletanks/Makefile 2009-12-26 18:00:42.000000000 =
+0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D btanks
PORTVERSION=3D 0.7.5800
-PORTREVISION=3D 1
+PORTREVISION=3D 2
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}-source/${PORTNAME}-source-${POR=
TVERSION}
=20
@@ -15,12 +15,12 @@
COMMENT=3D Fast 2D tank arcade game with multiplayer and split-screen modes
=20
LIB_DEPENDS=3D sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
- openal.0:${PORTSDIR}/audio/openal \
expat.6:${PORTSDIR}/textproc/expat2 \
vorbisfile.6:${PORTSDIR}/audio/libvorbis
=20
USE_BZIP2=3D yes
USE_LDCONFIG=3D yes
+USE_OPENAL=3D al
USE_SCONS=3D yes
USE_SDL=3D image sdl
SCONS_BUILDENV=3D ${SCONS_ENV} LDFLAGS=3D${PTHREAD_LIBS}
diff -Nur FreeBSD.2009-12-26/ports/games/blackshadeselite/Makefile FreeBSD/=
ports/games/blackshadeselite/Makefile
--- FreeBSD.2009-12-26/ports/games/blackshadeselite/Makefile 2009-12-26 16:=
02:48.000000000 +0100
+++ FreeBSD/ports/games/blackshadeselite/Makefile 2009-12-26 18:01:16.00000=
0000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D blackshadeselite
PORTVERSION=3D 0.0.1
-PORTREVISION=3D 2
+PORTREVISION=3D 3
CATEGORIES=3D games
MASTER_SITES=3D http://download.gna.org/blackshadeselite/ \
http://mirror.amdmi3.ru/distfiles/
@@ -15,14 +15,13 @@
MAINTAINER=3D amdmi3@FreeBSD.org
COMMENT=3D Psychic Bodyguard FPS - protect the VIP
=20
-LIB_DEPENDS=3D vorbis.4:${PORTSDIR}/audio/libvorbis \
- openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut
+LIB_DEPENDS=3D vorbis.4:${PORTSDIR}/audio/libvorbis
=20
USE_BZIP2=3D yes
USE_GMAKE=3D yes
USE_SDL=3D sdl
USE_GL=3D yes
+USE_OPENAL=3D al alut
=20
MAKE_ARGS=3D CC=3D${CC} CXX=3D${CXX}
=20
diff -Nur FreeBSD.2009-12-26/ports/games/chromium-bsu/Makefile FreeBSD/port=
s/games/chromium-bsu/Makefile
--- FreeBSD.2009-12-26/ports/games/chromium-bsu/Makefile 2009-12-26 16:02:4=
8.000000000 +0100
+++ FreeBSD/ports/games/chromium-bsu/Makefile 2009-12-26 18:01:50.000000000=
+0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D chromium-bsu
PORTVERSION=3D 0.9.14
-PORTREVISION=3D 1
+PORTREVISION=3D 2
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}/Chromium%20B.S.U.%20source%20code/${PORTVER=
SION}
=20
@@ -46,8 +46,7 @@
USE_SDL+=3D mixer
CONFIGURE_ARGS+=3D--disable-openal
.else
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut
+USE_OPENAL=3D al alut
CONFIGURE_ARGS+=3D--disable-sdlmixer
.endif
=20
diff -Nur FreeBSD.2009-12-26/ports/games/deng/Makefile FreeBSD/ports/games/=
deng/Makefile
--- FreeBSD.2009-12-26/ports/games/deng/Makefile 2009-12-26 16:02:48.000000=
000 +0100
+++ FreeBSD/ports/games/deng/Makefile 2009-12-26 18:02:50.000000000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D deng
PORTVERSION=3D 1.9.0b4
-PORTREVISION=3D 3
+PORTREVISION=3D 4
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}/Doomsday%20Engine/1.9.0-beta4
DISTNAME=3D ${PORTNAME}-${PORTVERSION:S/b/-beta/}
@@ -37,8 +37,8 @@
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/games/doom-data/Makefile.include"
=20
-.if defined(WITH_OPENAL) || exists(${LOCALBASE}/lib/libopenal.so.0)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+.if defined(WITH_OPENAL) || exists(${LOCALBASE}/lib/libopenal.so)
+USE_OPENAL=3D al
PLIST_SUB=3D OPENAL=3D""
.else
PLIST_SUB=3D OPENAL=3D"@comment "
diff -Nur FreeBSD.2009-12-26/ports/games/el/Makefile FreeBSD/ports/games/el=
/Makefile
--- FreeBSD.2009-12-26/ports/games/el/Makefile 2009-12-26 16:02:48.00000000=
0 +0100
+++ FreeBSD/ports/games/el/Makefile 2009-12-26 18:03:21.000000000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D el
PORTVERSION=3D 180
-PORTREVISION=3D 1
+PORTREVISION=3D 2
CATEGORIES=3D games
MASTER_SITES=3D ${MASTER_SITE_GOOGLE_CODE} \
${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
@@ -17,15 +17,14 @@
COMMENT=3D Eternal Lands is a free 3D MMORPG
=20
LIB_DEPENDS=3D png.5:${PORTSDIR}/graphics/png \
- openal.0:${PORTSDIR}/audio/openal \
vorbis.4:${PORTSDIR}/audio/libvorbis \
- cal3d.12:${PORTSDIR}/graphics/cal3d \
- alut.1:${PORTSDIR}/audio/freealut
+ cal3d.12:${PORTSDIR}/graphics/cal3d
RUN_DEPENDS=3D ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-=
data
=20
PROJECTHOST=3D bsdistfiles
USE_BZIP2=3D yes
USE_GMAKE=3D yes
+USE_OPENAL=3D al alut
USE_GNOME=3D libxml2
USE_SDL=3D sdl net image
USE_GL=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/ember/Makefile FreeBSD/ports/games=
/ember/Makefile
--- FreeBSD.2009-12-26/ports/games/ember/Makefile 2009-12-26 16:02:48.00000=
0000 +0100
+++ FreeBSD/ports/games/ember/Makefile 2009-12-26 18:03:53.000000000 +0100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D ember
PORTVERSION=3D 0.5.7
+PORTREVISION=3D 1
CATEGORIES=3D games
MASTER_SITES=3D SF/worldforge/Ember%20%28OGRE%20client%29/${PORTVERSION} \
http://amber.worldforge.org/ember/releases/stable/
@@ -23,8 +24,6 @@
eris-1.3:${PORTSDIR}/devel/eris \
varconf-1.0.6:${PORTSDIR}/devel/varconf \
mercator-0.2.6:${PORTSDIR}/devel/mercator \
- openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut \
wfut-0.2:${PORTSDIR}/devel/libwfut \
boost_thread.4:${PORTSDIR}/devel/boost-libs
=20
@@ -35,6 +34,7 @@
GNU_CONFIGURE=3D YES
USE_LDCONFIG=3D YES
USE_LUA=3D 5.1
+USE_OPENAL=3D al alut
USE_GNOME=3D gnomehack
USE_BZIP2=3D YES
CPPFLAGS=3D -DBR_NO_MACROS
diff -Nur FreeBSD.2009-12-26/ports/games/evq3/Makefile FreeBSD/ports/games/=
evq3/Makefile
--- FreeBSD.2009-12-26/ports/games/evq3/Makefile 2009-12-26 16:02:48.000000=
000 +0100
+++ FreeBSD/ports/games/evq3/Makefile 2009-12-26 18:04:39.000000000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D evq3
PORTVERSION=3D 1.3.20080810
-PORTREVISION=3D 2
+PORTREVISION=3D 3
CATEGORIES=3D games
MASTER_SITES=3D ${MASTER_SITE_LOCAL:S|$|alepulver/|}
DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX} \
@@ -76,7 +76,7 @@
. endif
# OpenAL
. if defined(WITH_OPENAL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
MAKE_ENV+=3D USE_OPENAL=3D1
. if defined(WITH_OPENAL_DLOPEN)
MAKE_ENV+=3D USE_OPENAL_DLOPEN=3D1
diff -Nur FreeBSD.2009-12-26/ports/games/evq3/files/patch-code_client_snd_o=
penal.c FreeBSD/ports/games/evq3/files/patch-code_client_snd_openal.c
--- FreeBSD.2009-12-26/ports/games/evq3/files/patch-code_client_snd_openal.=
c 1970-01-01 01:00:00.000000000 +0100
+++ FreeBSD/ports/games/evq3/files/patch-code_client_snd_openal.c 2009-12-2=
6 18:06:52.000000000 +0100
@@ -0,0 +1,11 @@
+--- code/client/snd_openal.c.orig 2009-12-26 18:05:56.000000000 +0100
++++ code/client/snd_openal.c 2009-12-26 18:06:06.000000000 +0100
+@@ -1707,7 +1707,7 @@
+ #elif defined(MACOS_X)
+ #define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/Ope=
nAL"
+ #else
+-#define ALDRIVER_DEFAULT "libopenal.so.0"
++#define ALDRIVER_DEFAULT "libopenal.so"
+ #endif
+=20
+ /*
diff -Nur FreeBSD.2009-12-26/ports/games/excido/Makefile FreeBSD/ports/game=
s/excido/Makefile
--- FreeBSD.2009-12-26/ports/games/excido/Makefile 2009-12-26 16:02:48.0000=
00000 +0100
+++ FreeBSD/ports/games/excido/Makefile 2009-12-26 18:07:27.000000000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D excido
PORTVERSION=3D 0.1.5c
-PORTREVISION=3D 6
+PORTREVISION=3D 7
CATEGORIES=3D games
MASTER_SITES=3D http://offload1.icculus.org/excido/
DISTNAME=3D ${PORTNAME}-${PORTVERSION}-src
@@ -15,15 +15,14 @@
MAINTAINER=3D alepulver@FreeBSD.org
COMMENT=3D A portable fast-paced 3d shooter
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- physfs.1:${PORTSDIR}/devel/physfs \
- alut.1:${PORTSDIR}/audio/freealut
+LIB_DEPENDS=3D physfs.1:${PORTSDIR}/devel/physfs
=20
WRKSRC=3D ${WRKDIR}/${PORTNAME}-${PORTVERSION}
=20
USE_BZIP2=3D yes
USE_GMAKE=3D yes
USE_GL=3D yes
+USE_OPENAL=3D al alut
USE_SDL=3D image sdl ttf
=20
post-install:
diff -Nur FreeBSD.2009-12-26/ports/games/flightgear/Makefile FreeBSD/ports/=
games/flightgear/Makefile
--- FreeBSD.2009-12-26/ports/games/flightgear/Makefile 2009-12-26 16:02:50.=
000000000 +0100
+++ FreeBSD/ports/games/flightgear/Makefile 2009-12-26 18:07:59.000000000 +=
0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D FlightGear
PORTVERSION=3D 1.9.1
-PORTREVISION=3D 3
+PORTREVISION=3D 4
CATEGORIES=3D games
# see http://www.flightgear.org/templates.js
MASTER_SITES=3D ftp://ftp.de.flightgear.org/pub/fgfs/Source/ \
@@ -22,8 +22,7 @@
MAINTAINER=3D ganael.laplanche@martymac.com
COMMENT=3D The FlightGear flight simulator
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- boost_thread.4:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=3D boost_thread.4:${PORTSDIR}/devel/boost-libs
BUILD_DEPENDS=3D ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/pli=
b \
${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
RUN_DEPENDS=3D ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
@@ -38,6 +37,7 @@
=20
USE_XORG=3D ice sm x11 xext xi xt xmu
USE_GL=3D gl glu glut
+USE_OPENAL=3D al
USE_GMAKE=3D yes
GNU_CONFIGURE=3D yes
CONFIGURE_ENV=3D CPPFLAGS=3D"-I${LOCALBASE}/include" \
diff -Nur FreeBSD.2009-12-26/ports/games/freeorion/Makefile FreeBSD/ports/g=
ames/freeorion/Makefile
--- FreeBSD.2009-12-26/ports/games/freeorion/Makefile 2009-12-26 16:02:50.0=
00000000 +0100
+++ FreeBSD/ports/games/freeorion/Makefile 2009-12-26 19:21:26.000000000 +0=
100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D freeorion
PORTVERSION=3D 0.3.12.3007
-PORTREVISION=3D 1
+PORTREVISION=3D 2
CATEGORIES=3D games
MASTER_SITES=3D ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=3D oliver
@@ -16,7 +16,6 @@
COMMENT=3D Open-source, platform independent galactic conquest game
=20
LIB_DEPENDS=3D GiGi.0:${PORTSDIR}/x11-toolkits/gigi \
- alut.1:${PORTSDIR}/audio/freealut \
graph:${PORTSDIR}/graphics/graphviz \
log4cpp.4:${PORTSDIR}/devel/log4cpp \
vorbisfile.6:${PORTSDIR}/audio/libvorbis
@@ -29,6 +28,7 @@
USE_SCONS=3D yes
SCONS_ARGS=3D with_builtin_sdlnet=3D0
SCONS_BUILDENV=3D PYTHON_LIB=3D${PYTHON_VERSION}
+USE_OPENAL=3D alut
USE_SDL=3D sdl net
WRKSRC=3D ${WRKDIR}/${PORTNAME}/FreeOrion
=20
diff -Nur FreeBSD.2009-12-26/ports/games/gemrb/Makefile FreeBSD/ports/games=
/gemrb/Makefile
--- FreeBSD.2009-12-26/ports/games/gemrb/Makefile 2009-12-26 16:02:50.00000=
0000 +0100
+++ FreeBSD/ports/games/gemrb/Makefile 2009-12-26 18:08:25.000000000 +0100
@@ -7,15 +7,14 @@
=20
PORTNAME=3D gemrb
PORTVERSION=3D 0.5.0
+PORTREVISION=3D 1
CATEGORIES=3D games emulators
MASTER_SITES=3D SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION}%20So=
urces
=20
MAINTAINER=3D beyert@cs.ucr.edu
COMMENT=3D GemRB (Game engine made with preRendered Background)
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut \
- png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=3D png.5:${PORTSDIR}/graphics/png
=20
GNU_CONFIGURE=3D yes
CONFIGURE_ENV=3D LDFLAGS=3D"-L${LOCALBASE}/lib"
@@ -24,6 +23,7 @@
=20
USE_GMAKE=3D yes
USE_SDL=3D sdl
+USE_OPENAL=3D al alut
USE_LDCONFIG=3D yes
USE_PYTHON=3D 2.4+
=20
diff -Nur FreeBSD.2009-12-26/ports/games/glest/Makefile FreeBSD/ports/games=
/glest/Makefile
--- FreeBSD.2009-12-26/ports/games/glest/Makefile 2009-12-26 16:02:50.00000=
0000 +0100
+++ FreeBSD/ports/games/glest/Makefile 2009-12-26 18:09:13.000000000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D glest
PORTVERSION=3D 3.2.2
-PORTREVISION=3D 1
+PORTREVISION=3D 2
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION}
DISTNAME=3D ${PORTNAME}_source_${PORTVERSION}
@@ -17,14 +17,13 @@
COMMENT=3D Free 3d real-time customizable strategy game
=20
LIB_DEPENDS=3D xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
- vorbis.4:${PORTSDIR}/audio/libvorbis \
- openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut
+ vorbis.4:${PORTSDIR}/audio/libvorbis
BUILD_DEPENDS=3D jam:${PORTSDIR}/devel/jam
RUN_DEPENDS=3D ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data
=20
USE_AUTOTOOLS=3D automake:15:env autoconf:262:env
USE_ZIP=3D yes
+USE_OPENAL=3D al alut
USE_DOS2UNIX=3D yes
USE_LUA=3D 5.1
USE_SDL=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/ioquake3/Makefile FreeBSD/ports/ga=
mes/ioquake3/Makefile
--- FreeBSD.2009-12-26/ports/games/ioquake3/Makefile 2009-12-26 16:02:50.00=
0000000 +0100
+++ FreeBSD/ports/games/ioquake3/Makefile 2009-12-26 18:10:13.000000000 +01=
00
@@ -7,6 +7,7 @@
=20
PORTNAME?=3D ioquake3
DISTVERSION?=3D 1.36
+PORTREVISION=3D 1
CATEGORIES=3D games
MASTER_SITES?=3D http://ioquake3.org/files/${DISTVERSION}/
=20
@@ -54,7 +55,7 @@
=20
.if defined(WITH_CLIENT) || defined(WITH_SMP)
# OpenAL
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
# SDL
USE_SDL=3D sdl
# Vorbis
diff -Nur FreeBSD.2009-12-26/ports/games/ioquake3/files/patch-code-client-s=
nd_openal.c FreeBSD/ports/games/ioquake3/files/patch-code-client-snd_openal=
=2Ec
--- FreeBSD.2009-12-26/ports/games/ioquake3/files/patch-code-client-snd_ope=
nal.c 1970-01-01 01:00:00.000000000 +0100
+++ FreeBSD/ports/games/ioquake3/files/patch-code-client-snd_openal.c 2009-=
12-26 18:11:32.000000000 +0100
@@ -0,0 +1,11 @@
+--- code/client/snd_openal.c.orig 2009-12-26 18:10:44.000000000 +0100
++++ code/client/snd_openal.c 2009-12-26 18:11:00.000000000 +0100
+@@ -1719,7 +1719,7 @@
+ #elif defined(MACOS_X)
+ #define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/Ope=
nAL"
+ #else
+-#define ALDRIVER_DEFAULT "libopenal.so.0"
++#define ALDRIVER_DEFAULT "libopenal.so"
+ #endif
+=20
+ /*
diff -Nur FreeBSD.2009-12-26/ports/games/iourbanterror/Makefile FreeBSD/por=
ts/games/iourbanterror/Makefile
--- FreeBSD.2009-12-26/ports/games/iourbanterror/Makefile 2009-12-26 16:02:=
50.000000000 +0100
+++ FreeBSD/ports/games/iourbanterror/Makefile 2009-12-26 18:12:19.00000000=
0 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D iourbanterror
DISTVERSION=3D 2007_12_20
-PORTREVISION=3D 5
+PORTREVISION=3D 6
CATEGORIES=3D games
MASTER_SITES=3D http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanter=
ror/source/complete/
DISTNAME=3D ioUrbanTerrorSource_${DISTVERSION}
@@ -78,7 +78,7 @@
. endif
# OpenAL
. if defined(WITH_OPENAL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
MAKE_ENV+=3D USE_OPENAL=3D1
. if defined(WITH_OPENAL_DLOPEN)
MAKE_ENV+=3D USE_OPENAL_DLOPEN=3D1
diff -Nur FreeBSD.2009-12-26/ports/games/iourbanterror/files/patch-code_cli=
ent_snd_openal.c FreeBSD/ports/games/iourbanterror/files/patch-code_client_=
snd_openal.c
--- FreeBSD.2009-12-26/ports/games/iourbanterror/files/patch-code_client_sn=
d_openal.c 1970-01-01 01:00:00.000000000 +0100
+++ FreeBSD/ports/games/iourbanterror/files/patch-code_client_snd_openal.c =
2009-12-26 18:13:20.000000000 +0100
@@ -0,0 +1,11 @@
+--- code/client/snd_openal.c.orig 2009-12-26 18:12:52.000000000 +0100
++++ code/client/snd_openal.c 2009-12-26 18:13:00.000000000 +0100
+@@ -1676,7 +1676,7 @@
+ #elif defined(MACOS_X)
+ #define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/Ope=
nAL"
+ #else
+-#define ALDRIVER_DEFAULT "libopenal.so.0"
++#define ALDRIVER_DEFAULT "libopenal.so"
+ #endif
+=20
+ /*
diff -Nur FreeBSD.2009-12-26/ports/games/kmquake2/Makefile FreeBSD/ports/ga=
mes/kmquake2/Makefile
--- FreeBSD.2009-12-26/ports/games/kmquake2/Makefile 2009-12-26 16:02:51.00=
0000000 +0100
+++ FreeBSD/ports/games/kmquake2/Makefile 2009-12-26 18:15:33.000000000 +01=
00
@@ -7,7 +7,7 @@
=20
PORTNAME=3D kmquake2
PORTVERSION=3D 0.19
-PORTREVISION=3D 9
+PORTREVISION=3D 10
CATEGORIES=3D games
MASTER_SITES=3D http://qudos.quakedev.com/linux/quake2/engines/KMQuake2/:s=
rc \
http://qexpo2005.quakedev.com/uploaded/54/:data \
@@ -88,9 +88,9 @@
=20
.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL)
LIB_DEPENDS+=3D jpeg.10:${PORTSDIR}/graphics/jpeg \
- openal.0:${PORTSDIR}/audio/openal \
png.5:${PORTSDIR}/graphics/png \
vorbis.4:${PORTSDIR}/audio/libvorbis
+USE_OPENAL=3D al
USE_GL=3D yes
.endif
=20
diff -Nur FreeBSD.2009-12-26/ports/games/linwarrior/Makefile FreeBSD/ports/=
games/linwarrior/Makefile
--- FreeBSD.2009-12-26/ports/games/linwarrior/Makefile 2009-12-26 16:02:51.=
000000000 +0100
+++ FreeBSD/ports/games/linwarrior/Makefile 2009-12-26 18:18:48.000000000 +=
0100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D linwarrior
PORTVERSION=3D 20091108
+PORTREVISION=3D 1
CATEGORIES=3D games
MASTER_SITES=3D http://www.hackcraft.de/games/linwarrior_3d/downloads/ \
http://mirror.amdmi3.ru/distfiles/
@@ -15,10 +16,8 @@
MAINTAINER=3D amdmi3@FreeBSD.org
COMMENT=3D Navigate a mech through a 3D world and fire at enemies
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut
-
USE_GMAKE=3D yes
+USE_OPENAL=3D al alut
USE_GL=3D gl glu
USE_SDL=3D sdl
MAKE_JOBS_SAFE=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/openarena/Makefile FreeBSD/ports/g=
ames/openarena/Makefile
--- FreeBSD.2009-12-26/ports/games/openarena/Makefile 2009-12-26 16:02:52.0=
00000000 +0100
+++ FreeBSD/ports/games/openarena/Makefile 2009-12-26 18:23:22.000000000 +0=
100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D openarena
PORTVERSION=3D 0.7.1
-PORTREVISION=3D 4
+PORTREVISION=3D 5
CATEGORIES=3D games
MASTER_SITES=3D http://openarena.ws/rel/070/:src \
http://download.tuxfamily.net/cooker/openarena/rel070/:data \
@@ -66,7 +66,7 @@
.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP)
# OpenAL
. if defined(WITH_OPENAL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
MAKE_ENV+=3D USE_OPENAL=3D1
. if defined(WITH_OPENAL_DLOPEN)
MAKE_ENV+=3D USE_OPENAL_DLOPEN=3D1
diff -Nur FreeBSD.2009-12-26/ports/games/openarena/files/patch-code_client_=
snd_openal.c FreeBSD/ports/games/openarena/files/patch-code_client_snd_open=
al.c
--- FreeBSD.2009-12-26/ports/games/openarena/files/patch-code_client_snd_op=
enal.c 1970-01-01 01:00:00.000000000 +0100
+++ FreeBSD/ports/games/openarena/files/patch-code_client_snd_openal.c 2009=
-12-26 18:22:41.000000000 +0100
@@ -0,0 +1,11 @@
+--- code/client/snd_openal.c.orig 2009-12-26 18:20:08.000000000 +0100
++++ code/client/snd_openal.c 2009-12-26 18:20:27.000000000 +0100
+@@ -1676,7 +1676,7 @@
+ #elif defined(MACOS_X)
+ #define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/Ope=
nAL"
+ #else
+-#define ALDRIVER_DEFAULT "libopenal.so.0"
++#define ALDRIVER_DEFAULT "libopenal.so"
+ #endif
+=20
+ /*
diff -Nur FreeBSD.2009-12-26/ports/games/openastromenace/Makefile FreeBSD/p=
orts/games/openastromenace/Makefile
--- FreeBSD.2009-12-26/ports/games/openastromenace/Makefile 2009-12-26 16:0=
2:52.000000000 +0100
+++ FreeBSD/ports/games/openastromenace/Makefile 2009-12-26 18:24:16.000000=
000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D openastromenace
PORTVERSION=3D 1.2.0
-PORTREVISION=3D 6
+PORTREVISION=3D 7
CATEGORIES=3D games
MASTER_SITES=3D SF
DISTFILES=3D openamenace-src-${PORTVERSION}${EXTRACT_SUFX} \
@@ -18,12 +18,11 @@
COMMENT=3D Hardcore 3D space shooter with spaceship upgrade possibilities
=20
LIB_DEPENDS+=3D vorbisfile:${PORTSDIR}/audio/libvorbis \
- jpeg:${PORTSDIR}/graphics/jpeg \
- openal:${PORTSDIR}/audio/openal \
- alut:${PORTSDIR}/audio/freealut
+ jpeg:${PORTSDIR}/graphics/jpeg
=20
USE_BZIP2=3D yes
USE_GL=3D gl glu
+USE_OPENAL=3D al alut
WANT_SDL=3D yes
USE_SDL=3D sdl
USE_CMAKE=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/rigsofrods/Makefile FreeBSD/ports/=
games/rigsofrods/Makefile
--- FreeBSD.2009-12-26/ports/games/rigsofrods/Makefile 2009-12-26 16:02:53.=
000000000 +0100
+++ FreeBSD/ports/games/rigsofrods/Makefile 2009-12-26 18:31:52.000000000 +=
0100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D rigsofrods
PORTVERSION=3D 0.36.2
+PORTREVISION=3D 1
CATEGORIES=3D games
MASTER_SITES=3D SF
DISTFILES=3D ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
@@ -16,8 +17,7 @@
MAINTAINER=3D amdmi3@FreeBSD.org
COMMENT=3D Truck, car, airplane and boat simulator with advanced physics
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- zzip.13:${PORTSDIR}/devel/zziplib \
+LIB_DEPENDS=3D zzip.13:${PORTSDIR}/devel/zziplib \
freetype.9:${PORTSDIR}/print/freetype2 \
CEGUIBase.3:${PORTSDIR}/graphics/cegui \
freeimage.3:${PORTSDIR}/graphics/freeimage
@@ -29,6 +29,7 @@
BROKEN=3D does not build
=20
USE_ZIP=3D yes
+USE_OPENAL=3D al
USE_XORG=3D x11 xt xaw sm ice xext
WRKSRC=3D ${WRKDIR}/${PORTNAME}-source-${PORTVERSION}/build
USE_WX=3D 2.6+
diff -Nur FreeBSD.2009-12-26/ports/games/scorched3d/Makefile FreeBSD/ports/=
games/scorched3d/Makefile
--- FreeBSD.2009-12-26/ports/games/scorched3d/Makefile 2009-12-26 16:02:53.=
000000000 +0100
+++ FreeBSD/ports/games/scorched3d/Makefile 2009-12-26 18:33:23.000000000 +=
0100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D scorched3d
PORTVERSION=3D 0.${SCORCH_VERSION}${SCORCH_REVISION}
+PORTREVISION=3D 1
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}/Version%20${SCORCH_VERSION}/
DISTNAME=3D Scorched3D-${SCORCH_VERSION}-src
@@ -14,10 +15,7 @@
MAINTAINER=3D ports@FreeBSD.org
COMMENT=3D Scorched is a game based loosely on the classic DOS game
=20
-BUILD_DEPENDS=3D openal-config:${PORTSDIR}/audio/openal
-RUN_DEPENDS=3D openal-config:${PORTSDIR}/audio/openal
-LIB_DEPENDS=3D alut.1:${PORTSDIR}/audio/freealut \
- fftw3f:${PORTSDIR}/math/fftw3-float \
+LIB_DEPENDS=3D fftw3f:${PORTSDIR}/math/fftw3-float \
fftw3:${PORTSDIR}/math/fftw3 \
jpeg:${PORTSDIR}/graphics/jpeg \
png:${PORTSDIR}/graphics/png
@@ -27,6 +25,7 @@
.if defined(WITH_MYSQL)
USE_MYSQL=3D yes
.endif
+USE_OPENAL=3D al alut
USE_SDL=3D mixer net sdl
GNU_CONFIGURE=3D yes
USE_GL=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/scorched3d/files/patch-configure-a=
l.m4 FreeBSD/ports/games/scorched3d/files/patch-configure-al.m4
--- FreeBSD.2009-12-26/ports/games/scorched3d/files/patch-configure-al.m4 1=
970-01-01 01:00:00.000000000 +0100
+++ FreeBSD/ports/games/scorched3d/files/patch-configure-al.m4 2009-12-26 1=
8:51:29.000000000 +0100
@@ -0,0 +1,31 @@
+--- configure-al.m4.orig 2009-12-26 18:48:59.000000000 +0100
++++ configure-al.m4 2009-12-26 18:50:56.000000000 +0100
+@@ -7,25 +7,9 @@
+ [ --disable-openaltest Do not try to compile and run a test OpenAL p=
rogram],
+ , enable_openaltest=3Dyes)
+ AC_MSG_CHECKING(for OpenAL support)
+-AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
+-if test x$OPENAL_CONFIG =3D xno; then
+- echo "*** The openal-config script installed by OpenAL could not be foun=
d"
+- echo "*** Make sure openal-config is in your path, or set the OPENAL_CON=
FIG"
+- echo "*** environment variable to the full path to openal-config."
+-
+- AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.=
org/])
+-else
+-
+- if test x"$use_static_openal" =3D x"yes"; then
+- AL_LIBS=3D"/usr/local/lib/libopenal.a"
+- else
+- AL_LIBS=3D"`$OPENAL_CONFIG --libs`"
+- fi
+-=09
+- AL_CFLAGS=3D"`$OPENAL_CONFIG --cflags`"
+-
+- AC_MSG_RESULT(yes)
+-fi
++AL_LIBS=3D"`pkg-config --libs openal`"
++AL_CFLAGS=3D"`pkg-config --cflags openal`"
++AC_MSG_RESULT(yes)
+=20
+ AC_MSG_CHECKING(for Freealut support)
+ AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
diff -Nur FreeBSD.2009-12-26/ports/games/spring/Makefile FreeBSD/ports/game=
s/spring/Makefile
--- FreeBSD.2009-12-26/ports/games/spring/Makefile 2009-12-26 16:02:53.0000=
00000 +0100
+++ FreeBSD/ports/games/spring/Makefile 2009-12-26 18:53:01.000000000 +0100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D spring
PORTVERSION=3D 0.80.5.1
+PORTREVISION=3D 1
CATEGORIES=3D games
MASTER_SITES=3D SF/springrts/springrts/${PORTNAME}-${PORTVERSION}
DISTNAME=3D ${PORTNAME}_${PORTVERSION}_src
@@ -15,7 +16,6 @@
COMMENT=3D A project aiming to create a new and versatile RTS Engine
=20
LIB_DEPENDS=3D freetype.9:${PORTSDIR}/print/freetype2 \
- openal.0:${PORTSDIR}/audio/openal \
GLEW.1:${PORTSDIR}/graphics/glew \
boost_thread.4:${PORTSDIR}/devel/boost-libs \
IL.2:${PORTSDIR}/graphics/devil \
@@ -28,6 +28,7 @@
ONLY_FOR_ARCHS_REASON=3D relies on x86 floating-point math
=20
USE_SDL=3D sdl
+USE_OPENAL=3D al
USE_GL=3D gl glu
USE_XORG=3D x11 xcursor
USE_LDCONFIG=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/supertuxkart/Makefile FreeBSD/port=
s/games/supertuxkart/Makefile
--- FreeBSD.2009-12-26/ports/games/supertuxkart/Makefile 2009-12-26 16:02:5=
4.000000000 +0100
+++ FreeBSD/ports/games/supertuxkart/Makefile 2009-12-26 18:53:41.000000000=
+0100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D supertuxkart
PORTVERSION=3D 0.6.2
+PORTREVISION=3D 1
CATEGORIES=3D games
MASTER_SITES=3D SF/supertuxkart/SuperTuxKart/${PORTVERSION}
EXTRACT_SUFX=3D -src.tar.bz2
@@ -15,13 +16,12 @@
COMMENT=3D Free 3D kart racing game
=20
BUILD_DEPENDS=3D ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut \
- vorbisfile.6:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=3D vorbisfile.6:${PORTSDIR}/audio/libvorbis \
ogg.6:${PORTSDIR}/audio/libogg
=20
USE_BZIP2=3D yes
USE_GL=3D gl glu glut
+USE_OPENAL=3D al alut
USE_GMAKE=3D yes
GNU_CONFIGURE=3D yes
USE_SDL=3D sdl
diff -Nur FreeBSD.2009-12-26/ports/games/tnl/Makefile FreeBSD/ports/games/t=
nl/Makefile
--- FreeBSD.2009-12-26/ports/games/tnl/Makefile 2009-12-26 16:02:54.0000000=
00 +0100
+++ FreeBSD/ports/games/tnl/Makefile 2009-12-26 18:54:07.000000000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D tnl
PORTVERSION=3D 071111
-PORTREVISION=3D 4
+PORTREVISION=3D 5
CATEGORIES=3D games
MASTER_SITES=3D http://tnlgame.net/downloads/tnl/${PORTVERSION}/ \
http://mirror.amdmi3.ru/distfiles/
@@ -20,9 +20,7 @@
=20
BUILD_DEPENDS=3D ${LOCALBASE}/lib/libiovmall.so:${PORTSDIR}/lang/io
RUN_DEPENDS=3D ${BUILD_DEPENDS}
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut \
- sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
+LIB_DEPENDS=3D sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
CEGUIBase.3:${PORTSDIR}/graphics/cegui \
png.5:${PORTSDIR}/graphics/png \
GLEW.1:${PORTSDIR}/graphics/glew
@@ -33,6 +31,7 @@
USE_SDL=3D sdl
USE_GCC=3D 4.2+
USE_GL=3D yes
+USE_OPENAL=3D al alut
=20
CONFIGURE_ARGS=3D --with-io-cflags=3D"-I${LOCALBASE}/include/io" \
--with-io-libs=3D"-L${LOCALBASE}/lib -liovmall"
diff -Nur FreeBSD.2009-12-26/ports/games/torcs/Makefile FreeBSD/ports/games=
/torcs/Makefile
--- FreeBSD.2009-12-26/ports/games/torcs/Makefile 2009-12-26 16:02:54.00000=
0000 +0100
+++ FreeBSD/ports/games/torcs/Makefile 2009-12-26 18:55:09.000000000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D torcs
DISTVERSION=3D 1.3.1
-PORTREVISION=3D 1
+PORTREVISION=3D 2
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}/all-in-one/${PORTVERSION}
=20
@@ -15,12 +15,11 @@
COMMENT=3D The Open Racing Car Simulator
=20
BUILD_DEPENDS=3D ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=3D png.5:${PORTSDIR}/graphics/png \
- openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut
+LIB_DEPENDS=3D png.5:${PORTSDIR}/graphics/png
RUN_DEPENDS=3D bash:${PORTSDIR}/shells/bash
=20
USE_XORG=3D xrender xmu ice xext x11 xxf86vm xrandr
+USE_OPENAL=3D al alut
USE_BZIP2=3D yes
GNU_CONFIGURE=3D yes
USE_GMAKE=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/toycars/Makefile FreeBSD/ports/gam=
es/toycars/Makefile
--- FreeBSD.2009-12-26/ports/games/toycars/Makefile 2009-12-26 16:02:54.000=
000000 +0100
+++ FreeBSD/ports/games/toycars/Makefile 2009-12-26 18:55:30.000000000 +0100
@@ -7,17 +7,15 @@
=20
PORTNAME=3D toycars
PORTVERSION=3D 0.3.3
-PORTREVISION=3D 2
+PORTREVISION=3D 3
CATEGORIES=3D games
MASTER_SITES=3D SF
=20
MAINTAINER=3D amdmi3@FreeBSD.org
COMMENT=3D Physics-based 2D racing game
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut
-
USE_SDL=3D mixer image sdl
+USE_OPENAL=3D al alut
USE_GL=3D yes
USE_GMAKE=3D yes
GNU_CONFIGURE=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/tremulous/Makefile FreeBSD/ports/g=
ames/tremulous/Makefile
--- FreeBSD.2009-12-26/ports/games/tremulous/Makefile 2009-12-26 16:02:54.0=
00000000 +0100
+++ FreeBSD/ports/games/tremulous/Makefile 2009-12-26 18:55:58.000000000 +0=
100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D tremulous
PORTVERSION=3D 1.1.0
-PORTREVISION=3D 6
+PORTREVISION=3D 7
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}/1.1 \
http://0day.icculus.org/mirrors/tremulous/ \
@@ -59,7 +59,7 @@
.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP)
# OpenAL
. if defined(WITH_OPENAL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
MAKE_ENV+=3D USE_OPENAL=3D1
. if defined(WITH_OPENAL_DLOPEN)
MAKE_ENV+=3D USE_OPENAL_DLOPEN=3D1
diff -Nur FreeBSD.2009-12-26/ports/games/tremulous/files/patch-src_client_s=
nd_openal.c FreeBSD/ports/games/tremulous/files/patch-src_client_snd_openal=
=2Ec
--- FreeBSD.2009-12-26/ports/games/tremulous/files/patch-src_client_snd_ope=
nal.c 1970-01-01 01:00:00.000000000 +0100
+++ FreeBSD/ports/games/tremulous/files/patch-src_client_snd_openal.c 2009-=
12-26 18:58:19.000000000 +0100
@@ -0,0 +1,11 @@
+--- ./tremulous-1.1.0-src/src/client/snd_openal.c.orig 2009-12-26 18:56:43=
=2E000000000 +0100
++++ ./tremulous-1.1.0-src/src/client/snd_openal.c 2009-12-26 18:56:49.0000=
00000 +0100
+@@ -1526,7 +1526,7 @@
+ #ifdef _WIN32
+ #define ALDRIVER_DEFAULT "OpenAL32.dll"
+ #else
+-#define ALDRIVER_DEFAULT "libopenal.so.0"
++#define ALDRIVER_DEFAULT "libopenal.so"
+ #endif
+=20
+ /*
diff -Nur FreeBSD.2009-12-26/ports/games/trigger/Makefile FreeBSD/ports/gam=
es/trigger/Makefile
--- FreeBSD.2009-12-26/ports/games/trigger/Makefile 2009-12-26 16:02:54.000=
000000 +0100
+++ FreeBSD/ports/games/trigger/Makefile 2009-12-26 18:59:28.000000000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D trigger
PORTVERSION=3D 0.5.2.1
-PORTREVISION=3D 5
+PORTREVISION=3D 6
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}-rally/${PORTNAME}-rally/${PORTNAME}-${PORTV=
ERSION}
DISTFILES=3D trigger-${PORTVERSION}-src${EXTRACT_SUFX} \
@@ -17,10 +17,9 @@
COMMENT=3D A rally car racing game
=20
BUILD_DEPENDS=3D jam:${PORTSDIR}/devel/jam
-LIB_DEPENDS=3D openal:${PORTSDIR}/audio/openal \
- physfs.1:${PORTSDIR}/devel/physfs \
- alut.1:${PORTSDIR}/audio/freealut
+LIB_DEPENDS=3D physfs.1:${PORTSDIR}/devel/physfs
=20
+USE_OPENAL=3D al alut
USE_SDL=3D sdl image
USE_GL=3D yes
USE_BZIP2=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/ultimatestunts/Makefile FreeBSD/po=
rts/games/ultimatestunts/Makefile
--- FreeBSD.2009-12-26/ports/games/ultimatestunts/Makefile 2009-12-26 16:02=
:55.000000000 +0100
+++ FreeBSD/ports/games/ultimatestunts/Makefile 2009-12-26 19:00:30.0000000=
00 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D ultimatestunts
PORTVERSION=3D 0.7.5.1
-PORTREVISION=3D 1
+PORTREVISION=3D 2
DISTVERSIONPREFIX=3D srcdata-
DISTVERSION=3D ${PORTVERSION:S/.//g}
CATEGORIES=3D games
@@ -16,10 +16,8 @@
MAINTAINER=3D ports@FreeBSD.org
COMMENT=3D Racing game with elaborate stunts
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut
-
USE_GETTEXT=3D yes
+USE_OPENAL=3D al alut
USE_GL=3D gl glu
USE_SDL=3D sdl image
GNU_CONFIGURE=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/uqm/Makefile FreeBSD/ports/games/u=
qm/Makefile
--- FreeBSD.2009-12-26/ports/games/uqm/Makefile 2009-12-26 16:02:55.0000000=
00 +0100
+++ FreeBSD/ports/games/uqm/Makefile 2009-12-26 19:01:07.000000000 +0100
@@ -14,7 +14,7 @@
=20
PORTNAME=3D uqm
PORTVERSION=3D 0.6.2
-PORTREVISION=3D 5
+PORTREVISION=3D 6
CATEGORIES=3D games
MASTER_SITES=3D SF/sc2/UQM/${PORTVERSION}
DISTFILES=3D ${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSI=
ON}-content.uqm
@@ -52,7 +52,7 @@
.endif
=20
.ifdef(WITH_OPENAL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
.endif
=20
post-extract:
diff -Nur FreeBSD.2009-12-26/ports/games/vamos/Makefile FreeBSD/ports/games=
/vamos/Makefile
--- FreeBSD.2009-12-26/ports/games/vamos/Makefile 2009-12-26 16:02:55.00000=
0000 +0100
+++ FreeBSD/ports/games/vamos/Makefile 2009-12-26 19:01:37.000000000 +0100
@@ -7,16 +7,16 @@
=20
PORTNAME=3D vamos
PORTVERSION=3D 0.6.2
+PORTREVISION=3D 1
CATEGORIES=3D games
MASTER_SITES=3D SF
=20
MAINTAINER=3D ports@FreeBSD.org
COMMENT=3D An automotive simulation framework
=20
-LIB_DEPENDS=3D alut.1:${PORTSDIR}/audio/freealut \
- openal.0:${PORTSDIR}/audio/openal \
- png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=3D png.5:${PORTSDIR}/graphics/png
=20
+USE_OPENAL=3D al alut
USE_GL=3D glut
USE_SDL=3D sdl
USE_GMAKE=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/vavoom/Makefile FreeBSD/ports/game=
s/vavoom/Makefile
--- FreeBSD.2009-12-26/ports/games/vavoom/Makefile 2009-12-26 16:02:55.0000=
00000 +0100
+++ FreeBSD/ports/games/vavoom/Makefile 2009-12-26 19:02:12.000000000 +0100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D vavoom
PORTVERSION=3D 1.30
+PORTREVISION=3D 1
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}/Vavoom-source/${PORTVERSION}
=20
@@ -89,7 +90,7 @@
.endif
=20
.if defined(WITH_OPENAL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
CMAKE_ARGS+=3D -DWITH_OPENAL=3DY
.else
CMAKE_ARGS+=3D -DWITH_OPENAL=3DN
diff -Nur FreeBSD.2009-12-26/ports/games/vegastrike/Makefile FreeBSD/ports/=
games/vegastrike/Makefile
--- FreeBSD.2009-12-26/ports/games/vegastrike/Makefile 2009-12-26 16:02:55.=
000000000 +0100
+++ FreeBSD/ports/games/vegastrike/Makefile 2009-12-26 19:02:55.000000000 +=
0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D vegastrike
PORTVERSION=3D 0.5.0
-PORTREVISION=3D 7
+PORTREVISION=3D 8
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}/OldFiles
DISTNAME=3D vegastrike-source-${PORTVERSION}
@@ -17,10 +17,10 @@
=20
RUN_DEPENDS=3D ${DATADIR}/vegastrike.ico:${PORTSDIR}/games/vegastrike-data
LIB_DEPENDS=3D expat.6:${PORTSDIR}/textproc/expat2 \
- openal.0:${PORTSDIR}/audio/openal \
vorbis.4:${PORTSDIR}/audio/libvorbis \
ogg.6:${PORTSDIR}/audio/libogg
=20
+USE_OPENAL=3D al
USE_BZIP2=3D yes
GNU_CONFIGURE=3D yes
USE_GMAKE=3D yes
diff -Nur FreeBSD.2009-12-26/ports/games/warsow/Makefile FreeBSD/ports/game=
s/warsow/Makefile
--- FreeBSD.2009-12-26/ports/games/warsow/Makefile 2009-12-26 16:02:55.0000=
00000 +0100
+++ FreeBSD/ports/games/warsow/Makefile 2009-12-26 19:03:29.000000000 +0100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D warsow
PORTVERSION=3D 0.5
+PORTREVISION=3D 1
CATEGORIES=3D games
MASTER_SITES=3D http://woe.crying-wolves.net/ \
http://www.derchris.eu/warsow/ \
@@ -83,7 +84,7 @@
.endif
=20
.if !defined(WITHOUT_OPENAL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
ALL_TARGET+=3D openal
PLIST_SUB+=3D OPENAL=3D""
.else
diff -Nur FreeBSD.2009-12-26/ports/games/warsow/files/patch-snd_openal_snd_=
main.c FreeBSD/ports/games/warsow/files/patch-snd_openal_snd_main.c
--- FreeBSD.2009-12-26/ports/games/warsow/files/patch-snd_openal_snd_main.c=
1970-01-01 01:00:00.000000000 +0100
+++ FreeBSD/ports/games/warsow/files/patch-snd_openal_snd_main.c 2009-12-26=
19:08:06.000000000 +0100
@@ -0,0 +1,11 @@
+--- ./snd_openal/snd_main.c.orig 2009-12-26 19:07:05.000000000 +0100
++++ ./snd_openal/snd_main.c 2009-12-26 19:07:13.000000000 +0100
+@@ -231,7 +231,7 @@
+ #define ALDRIVER "/System/Library/Frameworks/OpenAL.framework/OpenAL"
+ #define ALDEVICE_DEFAULT NULL
+ #else
+-#define ALDRIVER "libopenal.so.0"
++#define ALDRIVER "libopenal.so"
+ #define ALDEVICE_DEFAULT NULL
+ #endif
+=20
diff -Nur FreeBSD.2009-12-26/ports/games/warzone2100/Makefile FreeBSD/ports=
/games/warzone2100/Makefile
--- FreeBSD.2009-12-26/ports/games/warzone2100/Makefile 2009-12-26 16:02:55=
=2E000000000 +0100
+++ FreeBSD/ports/games/warzone2100/Makefile 2009-12-26 19:09:01.000000000 =
+0100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D warzone2100
PORTVERSION=3D 2.2.4
+PORTREVISION=3D 1
CATEGORIES=3D games
MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}/Warzone%202100%20${PORTVERSION}
=20
@@ -19,7 +20,6 @@
LIB_DEPENDS=3D jpeg.10:${PORTSDIR}/graphics/jpeg \
mad.2:${PORTSDIR}/audio/libmad \
ogg.6:${PORTSDIR}/audio/libogg \
- openal.0:${PORTSDIR}/audio/openal \
physfs.1:${PORTSDIR}/devel/physfs \
png.5:${PORTSDIR}/graphics/png \
vorbis.4:${PORTSDIR}/audio/libvorbis \
@@ -30,6 +30,7 @@
=20
USE_BISON=3D build
GNU_CONFIGURE=3D yes
+USE_OPENAL=3D al
USE_GL=3D yes
USE_GMAKE=3D yes
USE_SDL=3D net sdl
diff -Nur FreeBSD.2009-12-26/ports/games/windstille/Makefile FreeBSD/ports/=
games/windstille/Makefile
--- FreeBSD.2009-12-26/ports/games/windstille/Makefile 2009-12-26 16:02:55.=
000000000 +0100
+++ FreeBSD/ports/games/windstille/Makefile 2009-12-26 19:09:31.000000000 +=
0100
@@ -7,15 +7,14 @@
=20
PORTNAME=3D windstille
PORTVERSION=3D 0.3.0
-PORTREVISION=3D 7
+PORTREVISION=3D 8
CATEGORIES=3D games
MASTER_SITES=3D BERLIOS CENKES
=20
MAINTAINER=3D amdmi3@FreeBSD.org
COMMENT=3D Classic 2D jump-n-shoot game
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- physfs.1:${PORTSDIR}/devel/physfs \
+LIB_DEPENDS=3D physfs.1:${PORTSDIR}/devel/physfs \
ogg.6:${PORTSDIR}/audio/libogg \
vorbis.4:${PORTSDIR}/audio/libvorbis \
png.5:${PORTSDIR}/graphics/png \
@@ -26,6 +25,7 @@
=20
USE_BZIP2=3D yes
USE_SCONS=3D yes
+USE_OPENAL=3D al
USE_GL=3D gl
USE_SDL=3D sdl image
USE_BISON=3D build
diff -Nur FreeBSD.2009-12-26/ports/games/worldofpadman/Makefile FreeBSD/por=
ts/games/worldofpadman/Makefile
--- FreeBSD.2009-12-26/ports/games/worldofpadman/Makefile 2009-12-26 16:02:=
55.000000000 +0100
+++ FreeBSD/ports/games/worldofpadman/Makefile 2009-12-26 19:12:22.00000000=
0 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D worldofpadman
PORTVERSION=3D 1.2.20080621
-PORTREVISION=3D 3
+PORTREVISION=3D 4
CATEGORIES=3D games
MASTER_SITES=3D http://thilo.kickchat.com/download/:full \
http://btc3x6.che.uni-bayreuth.de/~tl/wop_final/:full \
@@ -74,7 +74,7 @@
. endif
# OpenAL
. if defined(WITH_OPENAL)
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
MAKE_ENV+=3D USE_OPENAL=3D1
. if defined(WITH_OPENAL_DLOPEN)
MAKE_ENV+=3D USE_OPENAL_DLOPEN=3D1
diff -Nur FreeBSD.2009-12-26/ports/games/worldofpadman/files/patch-code_cli=
ent_snd_openal.c FreeBSD/ports/games/worldofpadman/files/patch-code_client_=
snd_openal.c
--- FreeBSD.2009-12-26/ports/games/worldofpadman/files/patch-code_client_sn=
d_openal.c 1970-01-01 01:00:00.000000000 +0100
+++ FreeBSD/ports/games/worldofpadman/files/patch-code_client_snd_openal.c =
2009-12-26 20:08:35.000000000 +0100
@@ -0,0 +1,11 @@
+--- ./code/client/snd_openal.c.orig 2009-12-26 20:07:28.000000000 +0100
++++ ./code/client/snd_openal.c 2009-12-26 20:07:36.000000000 +0100
+@@ -1686,7 +1686,7 @@
+ #elif defined(MACOS_X)
+ #define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/Ope=
nAL"
+ #else
+-#define ALDRIVER_DEFAULT "libopenal.so.0"
++#define ALDRIVER_DEFAULT "libopenal.so"
+ #endif
+=20
+ /*
diff -Nur FreeBSD.2009-12-26/ports/games/xpilot-ng-server/Makefile FreeBSD/=
ports/games/xpilot-ng-server/Makefile
--- FreeBSD.2009-12-26/ports/games/xpilot-ng-server/Makefile 2009-12-26 16:=
02:55.000000000 +0100
+++ FreeBSD/ports/games/xpilot-ng-server/Makefile 2009-12-26 19:13:52.00000=
0000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D xpilot-ng
PORTVERSION=3D 4.7.2
-PORTREVISION=3D 4
+PORTREVISION=3D 5
CATEGORIES=3D games
MASTER_SITES=3D SF/xpilot/xpilot_ng/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX?=3D -server
@@ -74,7 +74,7 @@
.endif
=20
.if defined(WITH_SOUND)
-LIB_DEPENDS+=3D openal:${PORTSDIR}/audio/openal
+USE_OPENAL=3D al
CONFIGURE_ARGS+=3D--enable-sound
CPPFLAGS+=3D ${PTHREAD_CFLAGS}
LDFLAGS+=3D ${PTHREAD_LIBS}
diff -Nur FreeBSD.2009-12-26/ports/graphics/Coin/Makefile FreeBSD/ports/gra=
phics/Coin/Makefile
--- FreeBSD.2009-12-26/ports/graphics/Coin/Makefile 2009-12-26 16:02:58.000=
000000 +0100
+++ FreeBSD/ports/graphics/Coin/Makefile 2009-12-26 19:14:59.000000000 +0100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D Coin
PORTVERSION=3D 3.1.2
+PORTREVISION=3D 1
CATEGORIES=3D graphics
MASTER_SITES=3D http://ftp.coin3d.org/coin/src/all/ \
ftp://ftp.coin3d.org/pub/coin/src/all/
@@ -14,9 +15,9 @@
MAINTAINER=3D ports@FreeBSD.org
COMMENT=3D C++ 3D graphics library based on the Open Inventor 2.1 API
=20
-LIB_DEPENDS=3D openal.0:${PORTSDIR}/audio/openal \
- simage.26:${PORTSDIR}/graphics/simage
+LIB_DEPENDS=3D simage.26:${PORTSDIR}/graphics/simage
=20
+USE_OPENAL=3D al
USE_GL=3D yes
USE_XORG=3D xt x11
GNU_CONFIGURE=3D yes
diff -Nur FreeBSD.2009-12-26/ports/graphics/blender/Makefile FreeBSD/ports/=
graphics/blender/Makefile
--- FreeBSD.2009-12-26/ports/graphics/blender/Makefile 2009-12-26 16:02:58.=
000000000 +0100
+++ FreeBSD/ports/graphics/blender/Makefile 2009-12-26 19:15:43.000000000 +=
0100
@@ -6,6 +6,7 @@
=20
PORTNAME=3D blender
PORTVERSION=3D 2.49b
+PORTREVISION=3D 1
CATEGORIES=3D graphics games
MASTER_SITES=3D http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
@@ -147,8 +148,7 @@
.if defined(WITH_OPENAL)
MAKE_ENV+=3D NAN_NO_OPENAL=3D"false"
MAKE_ENV+=3D NAN_OPENAL=3D"${LOCALBASE}/"
-LIB_DEPENDS+=3D openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut
+USE_OPENAL=3D al alut
.else
MAKE_ENV+=3D NAN_NO_OPENAL=3D"true"
.endif
diff -Nur FreeBSD.2009-12-26/ports/graphics/crystalspace/Makefile FreeBSD/p=
orts/graphics/crystalspace/Makefile
--- FreeBSD.2009-12-26/ports/graphics/crystalspace/Makefile 2009-12-26 16:0=
2:58.000000000 +0100
+++ FreeBSD/ports/graphics/crystalspace/Makefile 2009-12-26 19:16:12.000000=
000 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D crystalspace
PORTVERSION=3D 1.0.2
-PORTREVISION=3D 9
+PORTREVISION=3D 10
CATEGORIES=3D graphics
MASTER_SITES=3D SF/crystal/crystal/${PORTVERSION}
DISTNAME=3D ${PORTNAME:S/$/-src/}-${PORTVERSION}
@@ -22,14 +22,13 @@
LIB_DEPENDS=3D png.5:${PORTSDIR}/graphics/png \
jpeg.10:${PORTSDIR}/graphics/jpeg \
aa.1:${PORTSDIR}/graphics/aalib \
- openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut \
CEGUIBase.3:${PORTSDIR}/graphics/cegui
=20
CONFLICTS=3D crystalspace-devel-[0-9]*
=20
USE_BZIP2=3D yes
GNU_CONFIGURE=3D yes
+USE_OPENAL=3D al alut
USE_GL=3D yes
WANT_PERL=3D yes
LDFLAGS+=3D -L/usr/lib -lc
diff -Nur FreeBSD.2009-12-26/ports/graphics/py-pyglet/Makefile FreeBSD/port=
s/graphics/py-pyglet/Makefile
--- FreeBSD.2009-12-26/ports/graphics/py-pyglet/Makefile 2009-12-26 16:03:0=
1.000000000 +0100
+++ FreeBSD/ports/graphics/py-pyglet/Makefile 2009-12-26 19:16:36.000000000=
+0100
@@ -7,6 +7,7 @@
=20
PORTNAME=3D pyglet
PORTVERSION=3D 1.1.2
+PORTREVISION=3D 1
CATEGORIES=3D graphics multimedia x11-toolkits python
MASTER_SITES=3D ${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX}
@@ -15,12 +16,12 @@
COMMENT=3D Cross-platform windowing and multimedia library for Python
=20
LIB_DEPENDS=3D freetype.9:${PORTSDIR}/print/freetype2 \
- fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
- openal.0:${PORTSDIR}/audio/openal
+ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
=20
USE_PYTHON=3D yes
USE_PYDISTUTILS=3D yes
USE_GL=3D gl glu
+USE_OPENAL=3D al
=20
PORTDOCS=3D *
PORTEXAMPLES=3D *
diff -Nur FreeBSD.2009-12-26/ports/graphics/py-soya3d/Makefile FreeBSD/port=
s/graphics/py-soya3d/Makefile
--- FreeBSD.2009-12-26/ports/graphics/py-soya3d/Makefile 2009-12-26 16:03:0=
1.000000000 +0100
+++ FreeBSD/ports/graphics/py-soya3d/Makefile 2009-12-26 19:17:12.000000000=
+0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D soya3d
PORTVERSION=3D 0.14
-PORTREVISION=3D 3
+PORTREVISION=3D 4
CATEGORIES=3D graphics python
MASTER_SITES=3D http://download.gna.org/soya/
PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX}
@@ -22,8 +22,6 @@
${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
LIB_DEPENDS=3D cal3d.12:${PORTSDIR}/graphics/cal3d \
GLEW.1:${PORTSDIR}/graphics/glew \
- openal.0:${PORTSDIR}/audio/openal \
- alut.1:${PORTSDIR}/audio/freealut \
freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS=3D ${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics=
/py-editobj \
${PYTHON_SITELIBDIR}/tofu/client.py:${PORTSDIR}/net/py-tofu \
@@ -32,6 +30,7 @@
USE_BZIP2=3D yes
USE_PYTHON=3D yes
USE_PYDISTUTILS=3D yes
+USE_OPENAL=3D al alut
USE_GL=3D gl
USE_GMAKE=3D yes
USE_SDL=3D sdl
diff -Nur FreeBSD.2009-12-26/ports/graphics/reallyslick/Makefile FreeBSD/po=
rts/graphics/reallyslick/Makefile
--- FreeBSD.2009-12-26/ports/graphics/reallyslick/Makefile 2009-12-26 16:03=
:01.000000000 +0100
+++ FreeBSD/ports/graphics/reallyslick/Makefile 2009-12-26 19:22:13.0000000=
00 +0100
@@ -7,7 +7,7 @@
=20
PORTNAME=3D reallyslick
PORTVERSION=3D 0.9.0
-PORTREVISION=3D 1
+PORTREVISION=3D 2
CATEGORIES=3D graphics
MASTER_SITES=3D SF/rss-glx/rss-glx/${PORTVERSION}
DISTNAME=3D rss-glx_${PORTVERSION}
@@ -39,7 +39,7 @@
.include <bsd.port.pre.mk>
=20
.if defined(WITH_FREEALUT)
-LIB_DEPENDS+=3D alut.1:${PORTSDIR}/audio/freealut
+USE_OPENAL=3D alut
.else
CONFIGURE_ARGS+=3D --disable-sound
.endif
--uZ3hkaAS1mZxFaxD--
--GZVR6ND4mMseVXL/
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (FreeBSD)
iEYEARECAAYFAks2kWMACgkQi68/ErJnpkfcEgCgwAejmspi/C8LgW3cmS1kLVKS
u1wAnR737H8FUZRKTTSVgjWDp9hvnpf2
=/8WC
-----END PGP SIGNATURE-----
--GZVR6ND4mMseVXL/--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091226224243.GB1409>