Index: Mk/bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.631 diff -u -r1.631 bsd.port.mk --- Mk/bsd.port.mk 18 Dec 2009 14:28:46 -0000 1.631 +++ Mk/bsd.port.mk 29 Dec 2009 09:03:37 -0000 @@ -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 +.if defined(USE_OPENAL) +_OPENAL_ALL= al si soft alut +_OPENAL_LIBS= si soft +# Default choie. +_DEFAULT_OPENAL= soft + +_OPENAL_SOFT= openal.1:${PORTSDIR}/audio/openal-soft +_OPENAL_SI= openal.0:${PORTSDIR}/audio/openal +_OPENAL_ALUT= alut.1:${PORTSDIR}/audio/freealut + +.if exists(${LOCALBASE}/lib/libopenal.a) +_HAVE_OPENAL= si +.elif exists(${LOCALBASE}/bin/openal-info) +_HAVE_OPENAL= soft +.endif + +.if ${USE_OPENAL} == "yes" +# Be friendly. +USE_OPENAL= ${_DEFAULT_OPENAL} +.endif + +__USED_OPENAL= +_USE_OPENAL= +.for component in ${USE_OPENAL} +.if ${__USED_OPENAL:M${component}} == "" +__USED_OPENAL+= ${component} + +.if ${_OPENAL_ALL:M${component}} == "" +BROKEN= OPENAL mismatch: unknown component ${component} +.elif ${_OPENAL_ALL:M${component}} == "al" + +# Check if the user wish matches the found OpenAL system. +.if defined(WANT_OPENAL) && defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${WANT_OPENAL} +BROKEN= OPENAL mismatch: ${_HAVE_OPENAL} is installed, but ${WANT_OPENAL} desired +.endif # WANT_OPENAL + +.if defined(_HAVE_OPENAL) +_OPENAL_SYSTEM= ${_HAVE_OPENAL} +.elif defined(WANT_OPENAL) +_OPENAL_SYSTEM= ${WANT_OPENAL} +.else +_OPENAL_SYSTEM= ${_DEFAULT_OPENAL} +.endif # _HAVE_OPENAL + +_USE_OPENAL+= ${_OPENAL_${_OPENAL_SYSTEM:U}} + +.else # ${_OPENAL_ALL:M${component}} == "" + +.if ${_OPENAL_LIBS:M${component}} == ${component} +# Check for the system implementation to use. +.if defined(WANT_OPENAL) && ${WANT_OPENAL} != ${component} +BROKEN= OPENAL mismatch: wants to use ${component}, while you wish to use ${WANT_OPENAL} +.endif +.if defined(_OPENAL_SYSTEM) +BROKEN= OPENAL mismatch: cannot use ${component} and al together. +.endif +.if defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${component} +BROKEN= OPENAL mismatch: wants to use ${component}, but ${_HAVE_OPENAL} is installed +.endif + +_OPENAL_SYSTEM= ${component} + +.endif # ${_OPENAL_LIBS:M${component}} == ${component} + +_USE_OPENAL+= ${_OPENAL_${component:U}} + +.endif # ${_OPENAL_ALL:M${component}} == "" + +.endif # ${__USED_OPENAL:M${component} == "" +.endfor # component in ${USE_OPENAL} + +.for dep in ${_USE_OPENAL} +LIB_DEPENDS+= ${dep} +.endfor + +.endif # USE_OPENAL + .if defined(USE_FAM) DEFAULT_FAM_SYSTEM= gamin # Currently supported FAM systems Index: audio/freealut/Makefile =================================================================== RCS file: /home/pcvs/ports/audio/freealut/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- audio/freealut/Makefile 2 Aug 2009 19:32:14 -0000 1.7 +++ audio/freealut/Makefile 29 Dec 2009 09:03:37 -0000 @@ -7,20 +7,19 @@ PORTNAME= freealut PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://connect.creativelabs.com/openal/Downloads/ALUT/ MAINTAINER= oliver@FreeBSD.org COMMENT= The OpenAL Utility Toolkit -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal - USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack +USE_OPENAL= al USE_LDCONFIG= yes .include Index: audio/py-openal/Makefile =================================================================== RCS file: /home/pcvs/ports/audio/py-openal/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- audio/py-openal/Makefile 15 Jun 2009 16:53:43 -0000 1.11 +++ audio/py-openal/Makefile 29 Dec 2009 09:03:37 -0000 @@ -7,7 +7,7 @@ PORTNAME= openal PORTVERSION= 0.1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio python MASTER_SITES= http://download.gna.org/pyopenal/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,10 +16,8 @@ MAINTAINER= acm@FreeBSD.org COMMENT= PyOpenAL is a binding of OpenAL for Python -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut - DIST_SUBDIR= python +USE_OPENAL= al alut USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= PyOpenAL Index: audio/py-openal/files/patch-setup.py =================================================================== RCS file: /home/pcvs/ports/audio/py-openal/files/patch-setup.py,v retrieving revision 1.4 diff -u -r1.4 patch-setup.py --- audio/py-openal/files/patch-setup.py 15 Jun 2009 16:53:53 -0000 1.4 +++ audio/py-openal/files/patch-setup.py 29 Dec 2009 09:03:38 -0000 @@ -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 @@ -9,7 +9,8 @@ LIBS = ["openal", "alut"] try: - openal_version = os.popen("openal-config --version").read() +- openal_version = os.popen("openal-config --version").read() ++ openal_version = os.popen("pkg-config --modversion openal").read() if openal_version[0] == "0": - LIBDIRS = ["/usr/lib", "/usr/local/lib"] - LIBS = ["openal"] @@ -17,13 +18,17 @@ + LIBS = ["openal","alut"] except: - print "Warning: error while running 'openal-config --version', using default values..." +- print "Warning: error while running 'openal-config --version', using default values..." ++ print "Warning: error while running 'pkg-config --modversion', using default values..." + + + setup( @@ -38,7 +38,7 @@ ext_modules = [Extension("_openal", ["py_openal.c"], - ["/usr/include", "/usr/local/include"], -+ ["/usr/include", "/usr/local/include", "%%LOCALBASE%%/include"], ++ ["/usr/include", "/usr/local/include", "%%LOCALBASE/include"], [("HAVE_CONFIG_H", None)], None, LIBDIRS, Index: deskutils/xneur/Makefile =================================================================== RCS file: /home/pcvs/ports/deskutils/xneur/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- deskutils/xneur/Makefile 28 Jul 2009 16:34:21 -0000 1.13 +++ deskutils/xneur/Makefile 29 Dec 2009 09:03:38 -0000 @@ -7,6 +7,7 @@ PORTNAME= xneur PORTVERSION= 0.9.4 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \ http://mirror.amdmi3.ru/distfiles/ @@ -60,7 +61,7 @@ CONFIGURE_ARGS+= --with-sound=gstreamer .endif .if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al CONFIGURE_ARGS+= --with-sound=openal .endif .if defined(WITHOUT_GSTREAMER) && !defined(WITH_OPENAL) Index: devel/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/Makefile,v retrieving revision 1.3728 diff -u -r1.3728 Makefile --- devel/Makefile 28 Dec 2009 07:15:33 -0000 1.3728 +++ devel/Makefile 29 Dec 2009 09:03:38 -0000 @@ -122,6 +122,7 @@ SUBDIR += boost_build SUBDIR += bouml SUBDIR += bouml-doc + SUBDIR += bsdcflow SUBDIR += bufferpool SUBDIR += bug-buddy SUBDIR += bugzilla Index: devel/allegro-devel/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/allegro-devel/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- devel/allegro-devel/Makefile 19 Nov 2009 22:07:32 -0000 1.38 +++ devel/allegro-devel/Makefile 29 Dec 2009 09:03:38 -0000 @@ -7,7 +7,7 @@ PORTNAME= allegro DISTVERSION= 4.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= SF/alleg/${PORTNAME}-unstable/${PORTVERSION} PKGNAMESUFFIX= -devel @@ -51,7 +51,7 @@ .include .if defined(WITH_AL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al CONFIGURE_ARGS+=--enable-sgialdigi PLIST_SUB+= AL="" .else Index: devel/cflow/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/cflow/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- devel/cflow/Makefile 16 Feb 2008 17:51:40 -0000 1.13 +++ devel/cflow/Makefile 29 Dec 2009 09:03:38 -0000 @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A call graph generator for C code -CONFLICTS= gnucflow-[0-9]* +CONFLICTS= bsdcflow-[0-9]* gnucflow-[0-9]* USE_GMAKE= yes MAN1= cflow.1 Index: devel/gnucflow/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/gnucflow/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- devel/gnucflow/Makefile 13 Jul 2009 14:46:06 -0000 1.3 +++ devel/gnucflow/Makefile 29 Dec 2009 09:03:38 -0000 @@ -15,7 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Tool to chart control flow within the C program -CONFLICTS= cflow-[0-9]* +CONFLICTS= bsdcflow-[0-9]* cflow-[0-9]* USE_BZIP2= yes GNU_CONFIGURE= yes Index: devel/sfml/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/sfml/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- devel/sfml/Makefile 21 Jul 2009 14:33:29 -0000 1.3 +++ devel/sfml/Makefile 29 Dec 2009 09:03:38 -0000 @@ -7,7 +7,7 @@ PORTNAME= sfml PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF DISTNAME= SFML-${PORTVERSION}-sdk-linux-32 @@ -16,12 +16,12 @@ COMMENT= Simple and Fast Multimedia Library LIB_DEPENDS= 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 USE_GMAKE= yes +USE_OPENAL= al USE_XORG= x11 xrandr USE_GL= gl glu USE_LDCONFIG= yes Index: devel/simgear/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/simgear/Makefile,v retrieving revision 1.34 diff -u -r1.34 Makefile --- devel/simgear/Makefile 28 Jul 2009 11:44:53 -0000 1.34 +++ devel/simgear/Makefile 29 Dec 2009 09:03:38 -0000 @@ -7,7 +7,7 @@ PORTNAME= SimGear PORTVERSION= 1.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel games MASTER_SITES= ftp://ftp.de.simgear.org/pub/simgear/Source/ \ ftp://ftp.simgear.org/pub/simgear/Source/ @@ -17,9 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - jpeg.10:${PORTSDIR}/graphics/jpeg \ - alut.1:${PORTSDIR}/audio/freealut \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ boost_thread.4:${PORTSDIR}/devel/boost-libs .if defined(WITH_OSG_DEVEL) @@ -29,6 +27,7 @@ .endif USE_XORG= ice sm x11 xext xi xt xmu +USE_OPENAL= al alut USE_GL= gl glu glut GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include Index: emulators/bsnes/Makefile =================================================================== RCS file: /home/pcvs/ports/emulators/bsnes/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- emulators/bsnes/Makefile 22 Dec 2009 23:37:30 -0000 1.5 +++ emulators/bsnes/Makefile 29 Dec 2009 09:03:38 -0000 @@ -6,6 +6,7 @@ PORTNAME= bsnes PORTVERSION= 0.58 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://byuu.org/files/ \ ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/ @@ -58,7 +59,7 @@ .endif .if defined(WITH_SOUND_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al AUDIO_DRIVER+= audio.openal .endif Index: games/allacrost/Makefile =================================================================== RCS file: /home/pcvs/ports/games/allacrost/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- games/allacrost/Makefile 22 Aug 2009 00:21:58 -0000 1.15 +++ games/allacrost/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= allacrost PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION} DISTNAME= allacrost_demo_source_${PORTVERSION} @@ -18,12 +18,12 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libluabind.a:${PORTSDIR}/devel/luabind LIB_DEPENDS= 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 GNU_CONFIGURE= yes USE_GMAKE= yes +USE_OPENAL= al USE_LUA= 5.0 USE_SDL= sdl ttf net USE_GL= yes Index: games/apricots/Makefile =================================================================== RCS file: /home/pcvs/ports/games/apricots/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- games/apricots/Makefile 11 Sep 2009 21:57:35 -0000 1.8 +++ games/apricots/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= apricots PORTVERSION= 0.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.fishies.org.uk/ \ http://mirror.amdmi3.ru/distfiles/ @@ -37,8 +37,7 @@ .include .if !defined(WITHOUT_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut +USE_OPENAL= al alut .endif post-patch: Index: games/assaultcube/Makefile =================================================================== RCS file: /home/pcvs/ports/games/assaultcube/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- games/assaultcube/Makefile 22 Aug 2009 00:21:59 -0000 1.8 +++ games/assaultcube/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= assaultcube PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/actiongame/AssaultCube/1.0 DISTNAME= AssaultCube_v${PORTVERSION} @@ -15,9 +15,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Total conversion of the FPS game called Cube -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal - USE_BZIP2= yes +USE_OPENAL= al USE_GMAKE= yes GNU_CONFIGURE= yes ALL_TARGET= libenet Index: games/atr3d/Makefile =================================================================== RCS file: /home/pcvs/ports/games/atr3d/Makefile,v retrieving revision 1.33 diff -u -r1.33 Makefile --- games/atr3d/Makefile 23 Jan 2009 16:27:24 -0000 1.33 +++ games/atr3d/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= atr3d PORTVERSION= 0.6 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= ftp://ftp.avoidtheroid.com/pub/${PORTNAME}/ DISTNAME= ${PORTNAME}_source_${PORTVERSION} @@ -39,7 +39,7 @@ .include .if !defined(WITHOUT_SOUND) -LIB_DEPENDS+= alut.1:${PORTSDIR}/audio/freealut +USE_OPENAL= alut CONFIGURE_ARGS+= --enable-sound .else CONFIGURE_ARGS+= --disable-sound Index: games/battletanks/Makefile =================================================================== RCS file: /home/pcvs/ports/games/battletanks/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- games/battletanks/Makefile 22 Aug 2009 00:22:00 -0000 1.9 +++ games/battletanks/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= btanks PORTVERSION= 0.7.5800 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTNAME}-source-${PORTVERSION} @@ -15,12 +15,12 @@ COMMENT= Fast 2D tank arcade game with multiplayer and split-screen modes LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \ - openal.0:${PORTSDIR}/audio/openal \ expat.6:${PORTSDIR}/textproc/expat2 \ vorbisfile.6:${PORTSDIR}/audio/libvorbis USE_BZIP2= yes USE_LDCONFIG= yes +USE_OPENAL= al USE_SCONS= yes USE_SDL= image sdl SCONS_BUILDENV= ${SCONS_ENV} LDFLAGS=${PTHREAD_LIBS} Index: games/blackshadeselite/Makefile =================================================================== RCS file: /home/pcvs/ports/games/blackshadeselite/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- games/blackshadeselite/Makefile 28 Jul 2009 16:34:22 -0000 1.6 +++ games/blackshadeselite/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= blackshadeselite PORTVERSION= 0.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://download.gna.org/blackshadeselite/ \ http://mirror.amdmi3.ru/distfiles/ @@ -15,14 +15,13 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Psychic Bodyguard FPS - protect the VIP -LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ - openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut +LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis USE_BZIP2= yes USE_GMAKE= yes USE_SDL= sdl USE_GL= yes +USE_OPENAL= al alut MAKE_ARGS= CC=${CC} CXX=${CXX} Index: games/chromium-bsu/Makefile =================================================================== RCS file: /home/pcvs/ports/games/chromium-bsu/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- games/chromium-bsu/Makefile 22 Aug 2009 00:22:03 -0000 1.25 +++ games/chromium-bsu/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= chromium-bsu PORTVERSION= 0.9.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Chromium%20B.S.U.%20source%20code/${PORTVERSION} @@ -46,8 +46,7 @@ USE_SDL+= mixer CONFIGURE_ARGS+=--disable-openal .else -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut +USE_OPENAL= al alut CONFIGURE_ARGS+=--disable-sdlmixer .endif Index: games/deng/Makefile =================================================================== RCS file: /home/pcvs/ports/games/deng/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- games/deng/Makefile 22 Aug 2009 00:22:05 -0000 1.25 +++ games/deng/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= deng PORTVERSION= 1.9.0b4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Doomsday%20Engine/1.9.0-beta4 DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/-beta/} @@ -37,8 +37,8 @@ .include .include "${PORTSDIR}/games/doom-data/Makefile.include" -.if defined(WITH_OPENAL) || exists(${LOCALBASE}/lib/libopenal.so.0) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +.if defined(WITH_OPENAL) || exists(${LOCALBASE}/lib/libopenal.so) +USE_OPENAL= al PLIST_SUB= OPENAL="" .else PLIST_SUB= OPENAL="@comment " Index: games/el/Makefile =================================================================== RCS file: /home/pcvs/ports/games/el/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- games/el/Makefile 6 Jul 2009 21:25:45 -0000 1.23 +++ games/el/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= el PORTVERSION= 180 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} @@ -17,15 +17,14 @@ COMMENT= Eternal Lands is a free 3D MMORPG LIB_DEPENDS= 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= ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data PROJECTHOST= bsdistfiles USE_BZIP2= yes USE_GMAKE= yes +USE_OPENAL= al alut USE_GNOME= libxml2 USE_SDL= sdl net image USE_GL= yes Index: games/ember/Makefile =================================================================== RCS file: /home/pcvs/ports/games/ember/Makefile,v retrieving revision 1.49 diff -u -r1.49 Makefile --- games/ember/Makefile 3 Dec 2009 15:05:56 -0000 1.49 +++ games/ember/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,6 +7,7 @@ PORTNAME= ember PORTVERSION= 0.5.7 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= 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 @@ -35,6 +34,7 @@ GNU_CONFIGURE= YES USE_LDCONFIG= YES USE_LUA= 5.1 +USE_OPENAL= al alut USE_GNOME= gnomehack USE_BZIP2= YES CPPFLAGS= -DBR_NO_MACROS Index: games/evq3/Makefile =================================================================== RCS file: /home/pcvs/ports/games/evq3/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- games/evq3/Makefile 28 Jul 2009 21:39:51 -0000 1.16 +++ games/evq3/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= evq3 PORTVERSION= 1.3.20080810 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL:S|$|alepulver/|} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -76,7 +76,7 @@ . endif # OpenAL . if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 . if defined(WITH_OPENAL_DLOPEN) MAKE_ENV+= USE_OPENAL_DLOPEN=1 Index: games/evq3/files/patch-code_client_snd_openal.c =================================================================== RCS file: games/evq3/files/patch-code_client_snd_openal.c diff -N games/evq3/files/patch-code_client_snd_openal.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/evq3/files/patch-code_client_snd_openal.c 29 Dec 2009 09:03:39 -0000 @@ -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/OpenAL" + #else +-#define ALDRIVER_DEFAULT "libopenal.so.0" ++#define ALDRIVER_DEFAULT "libopenal.so" + #endif + + /* Index: games/excido/Makefile =================================================================== RCS file: /home/pcvs/ports/games/excido/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- games/excido/Makefile 31 Jul 2009 13:51:17 -0000 1.10 +++ games/excido/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= excido PORTVERSION= 0.1.5c -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://offload1.icculus.org/excido/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -15,15 +15,14 @@ MAINTAINER= alepulver@FreeBSD.org COMMENT= A portable fast-paced 3d shooter -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - physfs.1:${PORTSDIR}/devel/physfs \ - alut.1:${PORTSDIR}/audio/freealut +LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes USE_GMAKE= yes USE_GL= yes +USE_OPENAL= al alut USE_SDL= image sdl ttf post-install: Index: games/flightgear/Makefile =================================================================== RCS file: /home/pcvs/ports/games/flightgear/Makefile,v retrieving revision 1.63 diff -u -r1.63 Makefile --- games/flightgear/Makefile 1 Oct 2009 13:18:04 -0000 1.63 +++ games/flightgear/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= FlightGear PORTVERSION= 1.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games # see http://www.flightgear.org/templates.js MASTER_SITES= ftp://ftp.de.flightgear.org/pub/fgfs/Source/ \ @@ -22,8 +22,7 @@ MAINTAINER= ganael.laplanche@martymac.com COMMENT= The FlightGear flight simulator -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ @@ -38,6 +37,7 @@ USE_XORG= ice sm x11 xext xi xt xmu USE_GL= gl glu glut +USE_OPENAL= al USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ Index: games/freeorion/Makefile =================================================================== RCS file: /home/pcvs/ports/games/freeorion/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- games/freeorion/Makefile 6 Jul 2009 21:25:46 -0000 1.17 +++ games/freeorion/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= freeorion PORTVERSION= 0.3.12.3007 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= oliver @@ -16,7 +16,6 @@ COMMENT= Open-source, platform independent galactic conquest game LIB_DEPENDS= 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= yes SCONS_ARGS= with_builtin_sdlnet=0 SCONS_BUILDENV= PYTHON_LIB=${PYTHON_VERSION} +USE_OPENAL= alut USE_SDL= sdl net WRKSRC= ${WRKDIR}/${PORTNAME}/FreeOrion Index: games/gemrb/Makefile =================================================================== RCS file: /home/pcvs/ports/games/gemrb/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- games/gemrb/Makefile 22 Aug 2009 00:22:11 -0000 1.8 +++ games/gemrb/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,15 +7,14 @@ PORTNAME= gemrb PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= games emulators MASTER_SITES= SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION}%20Sources MAINTAINER= beyert@cs.ucr.edu COMMENT= GemRB (Game engine made with preRendered Background) -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut \ - png.5:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" @@ -24,6 +23,7 @@ USE_GMAKE= yes USE_SDL= sdl +USE_OPENAL= al alut USE_LDCONFIG= yes USE_PYTHON= 2.4+ Index: games/glest/Makefile =================================================================== RCS file: /home/pcvs/ports/games/glest/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- games/glest/Makefile 22 Aug 2009 00:22:12 -0000 1.24 +++ games/glest/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= glest PORTVERSION= 3.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION} DISTNAME= ${PORTNAME}_source_${PORTVERSION} @@ -17,14 +17,13 @@ COMMENT= Free 3d real-time customizable strategy game LIB_DEPENDS= 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= jam:${PORTSDIR}/devel/jam RUN_DEPENDS= ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data USE_AUTOTOOLS= automake:15:env autoconf:262:env USE_ZIP= yes +USE_OPENAL= al alut USE_DOS2UNIX= yes USE_LUA= 5.1 USE_SDL= yes Index: games/ioquake3/Makefile =================================================================== RCS file: /home/pcvs/ports/games/ioquake3/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- games/ioquake3/Makefile 18 Dec 2009 19:54:07 -0000 1.17 +++ games/ioquake3/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,6 +7,7 @@ PORTNAME?= ioquake3 DISTVERSION?= 1.36 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES?= http://ioquake3.org/files/${DISTVERSION}/ @@ -54,7 +55,7 @@ .if defined(WITH_CLIENT) || defined(WITH_SMP) # OpenAL -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al # SDL USE_SDL= sdl # Vorbis Index: games/ioquake3/files/patch-code-client-snd_openal.c =================================================================== RCS file: games/ioquake3/files/patch-code-client-snd_openal.c diff -N games/ioquake3/files/patch-code-client-snd_openal.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/ioquake3/files/patch-code-client-snd_openal.c 29 Dec 2009 09:03:39 -0000 @@ -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/OpenAL" + #else +-#define ALDRIVER_DEFAULT "libopenal.so.0" ++#define ALDRIVER_DEFAULT "libopenal.so" + #endif + + /* Index: games/iourbanterror/Makefile =================================================================== RCS file: /home/pcvs/ports/games/iourbanterror/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- games/iourbanterror/Makefile 6 Jul 2009 21:25:47 -0000 1.18 +++ games/iourbanterror/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= iourbanterror DISTVERSION= 2007_12_20 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/ DISTNAME= ioUrbanTerrorSource_${DISTVERSION} @@ -78,7 +78,7 @@ . endif # OpenAL . if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 . if defined(WITH_OPENAL_DLOPEN) MAKE_ENV+= USE_OPENAL_DLOPEN=1 Index: games/iourbanterror/files/patch-code_client_snd_openal.c =================================================================== RCS file: games/iourbanterror/files/patch-code_client_snd_openal.c diff -N games/iourbanterror/files/patch-code_client_snd_openal.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/iourbanterror/files/patch-code_client_snd_openal.c 29 Dec 2009 09:03:39 -0000 @@ -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/OpenAL" + #else +-#define ALDRIVER_DEFAULT "libopenal.so.0" ++#define ALDRIVER_DEFAULT "libopenal.so" + #endif + + /* Index: games/kmquake2/Makefile =================================================================== RCS file: /home/pcvs/ports/games/kmquake2/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- games/kmquake2/Makefile 18 Jul 2009 11:10:22 -0000 1.14 +++ games/kmquake2/Makefile 29 Dec 2009 09:03:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= kmquake2 PORTVERSION= 0.19 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/KMQuake2/:src \ http://qexpo2005.quakedev.com/uploaded/54/:data \ @@ -88,9 +88,9 @@ .if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL) LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ - openal.0:${PORTSDIR}/audio/openal \ png.5:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis +USE_OPENAL= al USE_GL= yes .endif Index: games/linwarrior/Makefile =================================================================== RCS file: /home/pcvs/ports/games/linwarrior/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- games/linwarrior/Makefile 1 Dec 2009 22:12:57 -0000 1.7 +++ games/linwarrior/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,6 +7,7 @@ PORTNAME= linwarrior PORTVERSION= 20091108 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.hackcraft.de/games/linwarrior_3d/downloads/ \ http://mirror.amdmi3.ru/distfiles/ @@ -15,10 +16,8 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Navigate a mech through a 3D world and fire at enemies -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut - USE_GMAKE= yes +USE_OPENAL= al alut USE_GL= gl glu USE_SDL= sdl MAKE_JOBS_SAFE= yes Index: games/openarena/Makefile =================================================================== RCS file: /home/pcvs/ports/games/openarena/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- games/openarena/Makefile 6 Jul 2009 21:25:47 -0000 1.7 +++ games/openarena/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= openarena PORTVERSION= 0.7.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= 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+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 . if defined(WITH_OPENAL_DLOPEN) MAKE_ENV+= USE_OPENAL_DLOPEN=1 Index: games/openarena/files/patch-code_client_snd_openal.c =================================================================== RCS file: games/openarena/files/patch-code_client_snd_openal.c diff -N games/openarena/files/patch-code_client_snd_openal.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/openarena/files/patch-code_client_snd_openal.c 29 Dec 2009 09:03:40 -0000 @@ -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/OpenAL" + #else +-#define ALDRIVER_DEFAULT "libopenal.so.0" ++#define ALDRIVER_DEFAULT "libopenal.so" + #endif + + /* Index: games/openastromenace/Makefile =================================================================== RCS file: /home/pcvs/ports/games/openastromenace/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- games/openastromenace/Makefile 18 Jul 2009 11:10:23 -0000 1.7 +++ games/openastromenace/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= openastromenace PORTVERSION= 1.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF DISTFILES= openamenace-src-${PORTVERSION}${EXTRACT_SUFX} \ @@ -18,12 +18,11 @@ COMMENT= Hardcore 3D space shooter with spaceship upgrade possibilities LIB_DEPENDS+= vorbisfile:${PORTSDIR}/audio/libvorbis \ - jpeg:${PORTSDIR}/graphics/jpeg \ - openal:${PORTSDIR}/audio/openal \ - alut:${PORTSDIR}/audio/freealut + jpeg:${PORTSDIR}/graphics/jpeg USE_BZIP2= yes USE_GL= gl glu +USE_OPENAL= al alut WANT_SDL= yes USE_SDL= sdl USE_CMAKE= yes Index: games/rigsofrods/Makefile =================================================================== RCS file: /home/pcvs/ports/games/rigsofrods/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- games/rigsofrods/Makefile 12 Dec 2009 23:50:06 -0000 1.9 +++ games/rigsofrods/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,6 +7,7 @@ PORTNAME= rigsofrods PORTVERSION= 0.36.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \ @@ -16,8 +17,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Truck, car, airplane and boat simulator with advanced physics -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - zzip.13:${PORTSDIR}/devel/zziplib \ +LIB_DEPENDS= 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= does not build USE_ZIP= yes +USE_OPENAL= al USE_XORG= x11 xt xaw sm ice xext WRKSRC= ${WRKDIR}/${PORTNAME}-source-${PORTVERSION}/build USE_WX= 2.6+ Index: games/scorched3d/Makefile =================================================================== RCS file: /home/pcvs/ports/games/scorched3d/Makefile,v retrieving revision 1.44 diff -u -r1.44 Makefile --- games/scorched3d/Makefile 4 Nov 2009 08:08:03 -0000 1.44 +++ games/scorched3d/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,6 +7,7 @@ PORTNAME= scorched3d PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION} +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${SCORCH_VERSION}/ DISTNAME= Scorched3D-${SCORCH_VERSION}-src @@ -14,10 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Scorched is a game based loosely on the classic DOS game -BUILD_DEPENDS= openal-config:${PORTSDIR}/audio/openal -RUN_DEPENDS= openal-config:${PORTSDIR}/audio/openal -LIB_DEPENDS= alut.1:${PORTSDIR}/audio/freealut \ - fftw3f:${PORTSDIR}/math/fftw3-float \ +LIB_DEPENDS= 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= yes .endif +USE_OPENAL= al alut USE_SDL= mixer net sdl GNU_CONFIGURE= yes USE_GL= yes Index: games/scorched3d/files/patch-configure-al.m4 =================================================================== RCS file: games/scorched3d/files/patch-configure-al.m4 diff -N games/scorched3d/files/patch-configure-al.m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/scorched3d/files/patch-configure-al.m4 29 Dec 2009 09:03:40 -0000 @@ -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 program], + , enable_openaltest=yes) + AC_MSG_CHECKING(for OpenAL support) +-AC_PATH_PROG(OPENAL_CONFIG, openal-config, no) +-if test x$OPENAL_CONFIG = xno; then +- echo "*** The openal-config script installed by OpenAL could not be found" +- echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG" +- 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" = x"yes"; then +- AL_LIBS="/usr/local/lib/libopenal.a" +- else +- AL_LIBS="`$OPENAL_CONFIG --libs`" +- fi +- +- AL_CFLAGS="`$OPENAL_CONFIG --cflags`" +- +- AC_MSG_RESULT(yes) +-fi ++AL_LIBS="`pkg-config --libs openal`" ++AL_CFLAGS="`pkg-config --cflags openal`" ++AC_MSG_RESULT(yes) + + AC_MSG_CHECKING(for Freealut support) + AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no) Index: games/spring/Makefile =================================================================== RCS file: /home/pcvs/ports/games/spring/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- games/spring/Makefile 30 Oct 2009 00:47:05 -0000 1.26 +++ games/spring/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,6 +7,7 @@ PORTNAME= spring PORTVERSION= 0.80.5.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/springrts/springrts/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}_src @@ -15,7 +16,6 @@ COMMENT= A project aiming to create a new and versatile RTS Engine LIB_DEPENDS= 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= relies on x86 floating-point math USE_SDL= sdl +USE_OPENAL= al USE_GL= gl glu USE_XORG= x11 xcursor USE_LDCONFIG= yes Index: games/supertuxkart/Makefile =================================================================== RCS file: /home/pcvs/ports/games/supertuxkart/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- games/supertuxkart/Makefile 9 Sep 2009 00:59:03 -0000 1.2 +++ games/supertuxkart/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,6 +7,7 @@ PORTNAME= supertuxkart PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/supertuxkart/SuperTuxKart/${PORTVERSION} EXTRACT_SUFX= -src.tar.bz2 @@ -15,13 +16,12 @@ COMMENT= Free 3D kart racing game BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut \ - vorbisfile.6:${PORTSDIR}/audio/libvorbis \ +LIB_DEPENDS= vorbisfile.6:${PORTSDIR}/audio/libvorbis \ ogg.6:${PORTSDIR}/audio/libogg USE_BZIP2= yes USE_GL= gl glu glut +USE_OPENAL= al alut USE_GMAKE= yes GNU_CONFIGURE= yes USE_SDL= sdl Index: games/tnl/Makefile =================================================================== RCS file: /home/pcvs/ports/games/tnl/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- games/tnl/Makefile 28 Jul 2009 16:34:31 -0000 1.9 +++ games/tnl/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= tnl PORTVERSION= 071111 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://tnlgame.net/downloads/tnl/${PORTVERSION}/ \ http://mirror.amdmi3.ru/distfiles/ @@ -20,9 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libiovmall.so:${PORTSDIR}/lang/io RUN_DEPENDS= ${BUILD_DEPENDS} -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut \ - sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \ +LIB_DEPENDS= 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= sdl USE_GCC= 4.2+ USE_GL= yes +USE_OPENAL= al alut CONFIGURE_ARGS= --with-io-cflags="-I${LOCALBASE}/include/io" \ --with-io-libs="-L${LOCALBASE}/lib -liovmall" Index: games/torcs/Makefile =================================================================== RCS file: /home/pcvs/ports/games/torcs/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- games/torcs/Makefile 22 Nov 2009 19:49:38 -0000 1.38 +++ games/torcs/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= torcs DISTVERSION= 1.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/all-in-one/${PORTVERSION} @@ -15,12 +15,11 @@ COMMENT= The Open Racing Car Simulator BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_XORG= xrender xmu ice xext x11 xxf86vm xrandr +USE_OPENAL= al alut USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes Index: games/toycars/Makefile =================================================================== RCS file: /home/pcvs/ports/games/toycars/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- games/toycars/Makefile 31 Jul 2009 13:51:48 -0000 1.14 +++ games/toycars/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,17 +7,15 @@ PORTNAME= toycars PORTVERSION= 0.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF MAINTAINER= amdmi3@FreeBSD.org COMMENT= Physics-based 2D racing game -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut - USE_SDL= mixer image sdl +USE_OPENAL= al alut USE_GL= yes USE_GMAKE= yes GNU_CONFIGURE= yes Index: games/tremulous/Makefile =================================================================== RCS file: /home/pcvs/ports/games/tremulous/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- games/tremulous/Makefile 22 Aug 2009 02:23:46 -0000 1.14 +++ games/tremulous/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= tremulous PORTVERSION= 1.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= 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+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 . if defined(WITH_OPENAL_DLOPEN) MAKE_ENV+= USE_OPENAL_DLOPEN=1 Index: games/tremulous/files/patch-src_client_snd_openal.c =================================================================== RCS file: games/tremulous/files/patch-src_client_snd_openal.c diff -N games/tremulous/files/patch-src_client_snd_openal.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/tremulous/files/patch-src_client_snd_openal.c 29 Dec 2009 09:03:40 -0000 @@ -0,0 +1,11 @@ +--- ./tremulous-1.1.0-src/src/client/snd_openal.c.orig 2009-12-26 18:56:43.000000000 +0100 ++++ ./tremulous-1.1.0-src/src/client/snd_openal.c 2009-12-26 18:56:49.000000000 +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 + + /* Index: games/trigger/Makefile =================================================================== RCS file: /home/pcvs/ports/games/trigger/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- games/trigger/Makefile 22 Aug 2009 00:22:33 -0000 1.18 +++ games/trigger/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= trigger PORTVERSION= 0.5.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}-rally/${PORTNAME}-rally/${PORTNAME}-${PORTVERSION} DISTFILES= trigger-${PORTVERSION}-src${EXTRACT_SUFX} \ @@ -17,10 +17,9 @@ COMMENT= A rally car racing game BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam -LIB_DEPENDS= openal:${PORTSDIR}/audio/openal \ - physfs.1:${PORTSDIR}/devel/physfs \ - alut.1:${PORTSDIR}/audio/freealut +LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs +USE_OPENAL= al alut USE_SDL= sdl image USE_GL= yes USE_BZIP2= yes Index: games/ultimatestunts/Makefile =================================================================== RCS file: /home/pcvs/ports/games/ultimatestunts/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- games/ultimatestunts/Makefile 22 Nov 2009 19:49:39 -0000 1.10 +++ games/ultimatestunts/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= ultimatestunts PORTVERSION= 0.7.5.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= srcdata- DISTVERSION= ${PORTVERSION:S/.//g} CATEGORIES= games @@ -16,10 +16,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Racing game with elaborate stunts -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut - USE_GETTEXT= yes +USE_OPENAL= al alut USE_GL= gl glu USE_SDL= sdl image GNU_CONFIGURE= yes Index: games/uqm/Makefile =================================================================== RCS file: /home/pcvs/ports/games/uqm/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- games/uqm/Makefile 22 Aug 2009 00:22:35 -0000 1.22 +++ games/uqm/Makefile 29 Dec 2009 09:03:40 -0000 @@ -14,7 +14,7 @@ PORTNAME= uqm PORTVERSION= 0.6.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/sc2/UQM/${PORTVERSION} DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm @@ -52,7 +52,7 @@ .endif .ifdef(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al .endif post-extract: Index: games/vamos/Makefile =================================================================== RCS file: /home/pcvs/ports/games/vamos/Makefile,v retrieving revision 1.52 diff -u -r1.52 Makefile --- games/vamos/Makefile 2 Aug 2009 19:33:55 -0000 1.52 +++ games/vamos/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,16 +7,16 @@ PORTNAME= vamos PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= An automotive simulation framework -LIB_DEPENDS= alut.1:${PORTSDIR}/audio/freealut \ - openal.0:${PORTSDIR}/audio/openal \ - png.5:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png +USE_OPENAL= al alut USE_GL= glut USE_SDL= sdl USE_GMAKE= yes Index: games/vavoom/Makefile =================================================================== RCS file: /home/pcvs/ports/games/vavoom/Makefile,v retrieving revision 1.49 diff -u -r1.49 Makefile --- games/vavoom/Makefile 29 Dec 2009 02:17:40 -0000 1.49 +++ games/vavoom/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,6 +7,7 @@ PORTNAME= vavoom PORTVERSION= 1.30 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Vavoom-source/${PORTVERSION} @@ -87,7 +88,7 @@ .endif .if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al CMAKE_ARGS+= -DWITH_OPENAL=Y .else CMAKE_ARGS+= -DWITH_OPENAL=N Index: games/vegastrike/Makefile =================================================================== RCS file: /home/pcvs/ports/games/vegastrike/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- games/vegastrike/Makefile 3 Dec 2009 15:04:25 -0000 1.12 +++ games/vegastrike/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= vegastrike PORTVERSION= 0.5.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/OldFiles DISTNAME= vegastrike-source-${PORTVERSION} @@ -17,10 +17,10 @@ RUN_DEPENDS= ${DATADIR}/vegastrike.ico:${PORTSDIR}/games/vegastrike-data LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - openal.0:${PORTSDIR}/audio/openal \ vorbis.4:${PORTSDIR}/audio/libvorbis \ ogg.6:${PORTSDIR}/audio/libogg +USE_OPENAL= al USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes Index: games/warsow/Makefile =================================================================== RCS file: /home/pcvs/ports/games/warsow/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- games/warsow/Makefile 5 Dec 2009 15:04:33 -0000 1.17 +++ games/warsow/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,6 +7,7 @@ PORTNAME= warsow PORTVERSION= 0.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://woe.crying-wolves.net/ \ http://www.derchris.eu/warsow/ \ @@ -83,7 +84,7 @@ .endif .if !defined(WITHOUT_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al ALL_TARGET+= openal PLIST_SUB+= OPENAL="" .else Index: games/warsow/files/patch-snd_openal_snd_main.c =================================================================== RCS file: games/warsow/files/patch-snd_openal_snd_main.c diff -N games/warsow/files/patch-snd_openal_snd_main.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/warsow/files/patch-snd_openal_snd_main.c 29 Dec 2009 09:03:40 -0000 @@ -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 + Index: games/warzone2100/Makefile =================================================================== RCS file: /home/pcvs/ports/games/warzone2100/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- games/warzone2100/Makefile 8 Nov 2009 04:05:52 -0000 1.32 +++ games/warzone2100/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,6 +7,7 @@ PORTNAME= warzone2100 PORTVERSION= 2.2.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Warzone%202100%20${PORTVERSION} @@ -19,7 +20,6 @@ LIB_DEPENDS= 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 @@ USE_BISON= build GNU_CONFIGURE= yes +USE_OPENAL= al USE_GL= yes USE_GMAKE= yes USE_SDL= net sdl Index: games/windstille/Makefile =================================================================== RCS file: /home/pcvs/ports/games/windstille/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- games/windstille/Makefile 28 Jul 2009 22:29:54 -0000 1.11 +++ games/windstille/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,15 +7,14 @@ PORTNAME= windstille PORTVERSION= 0.3.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= BERLIOS CENKES MAINTAINER= amdmi3@FreeBSD.org COMMENT= Classic 2D jump-n-shoot game -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - physfs.1:${PORTSDIR}/devel/physfs \ +LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs \ ogg.6:${PORTSDIR}/audio/libogg \ vorbis.4:${PORTSDIR}/audio/libvorbis \ png.5:${PORTSDIR}/graphics/png \ @@ -26,6 +25,7 @@ USE_BZIP2= yes USE_SCONS= yes +USE_OPENAL= al USE_GL= gl USE_SDL= sdl image USE_BISON= build Index: games/worldofpadman/Makefile =================================================================== RCS file: /home/pcvs/ports/games/worldofpadman/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- games/worldofpadman/Makefile 6 Jul 2009 21:25:51 -0000 1.12 +++ games/worldofpadman/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= worldofpadman PORTVERSION= 1.2.20080621 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= 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+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 . if defined(WITH_OPENAL_DLOPEN) MAKE_ENV+= USE_OPENAL_DLOPEN=1 Index: games/worldofpadman/files/patch-code_client_snd_openal.c =================================================================== RCS file: games/worldofpadman/files/patch-code_client_snd_openal.c diff -N games/worldofpadman/files/patch-code_client_snd_openal.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ games/worldofpadman/files/patch-code_client_snd_openal.c 29 Dec 2009 09:03:40 -0000 @@ -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/OpenAL" + #else +-#define ALDRIVER_DEFAULT "libopenal.so.0" ++#define ALDRIVER_DEFAULT "libopenal.so" + #endif + + /* Index: games/xpilot-ng-server/Makefile =================================================================== RCS file: /home/pcvs/ports/games/xpilot-ng-server/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- games/xpilot-ng-server/Makefile 22 Aug 2009 00:22:38 -0000 1.18 +++ games/xpilot-ng-server/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= xpilot-ng PORTVERSION= 4.7.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF/xpilot/xpilot_ng/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX?= -server @@ -74,7 +74,7 @@ .endif .if defined(WITH_SOUND) -LIB_DEPENDS+= openal:${PORTSDIR}/audio/openal +USE_OPENAL= al CONFIGURE_ARGS+=--enable-sound CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} Index: graphics/Coin/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/Coin/Makefile,v retrieving revision 1.33 diff -u -r1.33 Makefile --- graphics/Coin/Makefile 13 Nov 2009 00:14:36 -0000 1.33 +++ graphics/Coin/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,6 +7,7 @@ PORTNAME= Coin PORTVERSION= 3.1.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ \ ftp://ftp.coin3d.org/pub/coin/src/all/ @@ -14,9 +15,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= C++ 3D graphics library based on the Open Inventor 2.1 API -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - simage.26:${PORTSDIR}/graphics/simage +LIB_DEPENDS= simage.26:${PORTSDIR}/graphics/simage +USE_OPENAL= al USE_GL= yes USE_XORG= xt x11 GNU_CONFIGURE= yes Index: graphics/blender/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/blender/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- graphics/blender/Makefile 3 Oct 2009 09:38:13 -0000 1.37 +++ graphics/blender/Makefile 29 Dec 2009 09:03:40 -0000 @@ -6,6 +6,7 @@ PORTNAME= blender PORTVERSION= 2.49b +PORTREVISION= 1 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -147,8 +148,7 @@ .if defined(WITH_OPENAL) MAKE_ENV+= NAN_NO_OPENAL="false" MAKE_ENV+= NAN_OPENAL="${LOCALBASE}/" -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut +USE_OPENAL= al alut .else MAKE_ENV+= NAN_NO_OPENAL="true" .endif Index: graphics/crystalspace/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/crystalspace/Makefile,v retrieving revision 1.40 diff -u -r1.40 Makefile --- graphics/crystalspace/Makefile 22 Aug 2009 00:22:45 -0000 1.40 +++ graphics/crystalspace/Makefile 29 Dec 2009 09:03:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= crystalspace PORTVERSION= 1.0.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= SF/crystal/crystal/${PORTVERSION} DISTNAME= ${PORTNAME:S/$/-src/}-${PORTVERSION} @@ -22,14 +22,13 @@ LIB_DEPENDS= 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 CONFLICTS= crystalspace-devel-[0-9]* USE_BZIP2= yes GNU_CONFIGURE= yes +USE_OPENAL= al alut USE_GL= yes WANT_PERL= yes LDFLAGS+= -L/usr/lib -lc Index: graphics/py-pyglet/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/py-pyglet/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- graphics/py-pyglet/Makefile 31 Oct 2008 12:11:34 -0000 1.1 +++ graphics/py-pyglet/Makefile 29 Dec 2009 09:03:41 -0000 @@ -7,6 +7,7 @@ PORTNAME= pyglet PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= graphics multimedia x11-toolkits python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,12 +16,12 @@ COMMENT= Cross-platform windowing and multimedia library for Python LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ - openal.0:${PORTSDIR}/audio/openal + fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig USE_PYTHON= yes USE_PYDISTUTILS= yes USE_GL= gl glu +USE_OPENAL= al PORTDOCS= * PORTEXAMPLES= * Index: graphics/py-soya3d/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/py-soya3d/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- graphics/py-soya3d/Makefile 31 Jul 2009 13:52:42 -0000 1.32 +++ graphics/py-soya3d/Makefile 29 Dec 2009 09:03:41 -0000 @@ -7,7 +7,7 @@ PORTNAME= soya3d PORTVERSION= 0.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics python MASTER_SITES= http://download.gna.org/soya/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,8 +22,6 @@ ${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging LIB_DEPENDS= 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= ${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-editobj \ ${PYTHON_SITELIBDIR}/tofu/client.py:${PORTSDIR}/net/py-tofu \ @@ -32,6 +30,7 @@ USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +USE_OPENAL= al alut USE_GL= gl USE_GMAKE= yes USE_SDL= sdl Index: graphics/reallyslick/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/reallyslick/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- graphics/reallyslick/Makefile 22 Aug 2009 00:23:08 -0000 1.18 +++ graphics/reallyslick/Makefile 29 Dec 2009 09:03:41 -0000 @@ -7,7 +7,7 @@ PORTNAME= reallyslick PORTVERSION= 0.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/rss-glx/rss-glx/${PORTVERSION} DISTNAME= rss-glx_${PORTVERSION} @@ -39,7 +39,7 @@ .include .if defined(WITH_FREEALUT) -LIB_DEPENDS+= alut.1:${PORTSDIR}/audio/freealut +USE_OPENAL= alut .else CONFIGURE_ARGS+= --disable-sound .endif