diff options
78 files changed, 90 insertions, 137 deletions
diff --git a/audio/alure/Makefile b/audio/alure/Makefile index 29bfb1d98b87..f79cb8959d1e 100644 --- a/audio/alure/Makefile +++ b/audio/alure/Makefile @@ -14,8 +14,7 @@ LICENSE= MIT LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile -USES= cmake pkgconfig -USE_OPENAL= soft +USES= cmake openal:soft pkgconfig USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib diff --git a/audio/fpc-openal/Makefile b/audio/fpc-openal/Makefile index 0853e20bbafb..6ab169e9b364 100644 --- a/audio/fpc-openal/Makefile +++ b/audio/fpc-openal/Makefile @@ -19,4 +19,6 @@ OPTIONS_DEFINE= OPENAL OPENAL_DESC= Install openal library OPTIONS_DEFAULT= OPENAL +OPENAL_USES= openal:soft + .include "${MASTERDIR}/Makefile" diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile index e68e4b58536e..27a3317ebd4c 100644 --- a/audio/freealut/Makefile +++ b/audio/freealut/Makefile @@ -15,8 +15,7 @@ NO_STAGE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake pathfix pkgconfig -USE_OPENAL= al +USES= gmake openal:al pathfix pkgconfig USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile index 7cb9a884ebcc..cc486d4b7393 100644 --- a/audio/hs-ALUT/Makefile +++ b/audio/hs-ALUT/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD USE_CABAL= OpenAL StateVar NO_STAGE= yes -USE_OPENAL= al alut +USES= openal:al,alut INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile index ebb00566eed4..e8ae5d77e543 100644 --- a/audio/hs-OpenAL/Makefile +++ b/audio/hs-OpenAL/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD USE_CABAL= ObjectName StateVar Tensor NO_STAGE= yes -USE_OPENAL= al +USES= openal:al INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) diff --git a/audio/py-al/Makefile b/audio/py-al/Makefile index cf920a8f7323..eba5ea0bc0db 100644 --- a/audio/py-al/Makefile +++ b/audio/py-al/Makefile @@ -10,7 +10,7 @@ DISTNAME= PyAL-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= PyAL is a binding of OpenAL for Python -USE_OPENAL= al +USES= openal:al USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes diff --git a/audio/py-openal/Makefile b/audio/py-openal/Makefile index 1abaf3bb4fec..b47f42657cef 100644 --- a/audio/py-openal/Makefile +++ b/audio/py-openal/Makefile @@ -13,7 +13,7 @@ MAINTAINER= acm@FreeBSD.org COMMENT= PyOpenAL is a binding of OpenAL for Python DIST_SUBDIR= python -USE_OPENAL= al alut +USES= openal:al,alut NO_STAGE= yes USE_PYTHON= yes USE_PYDISTUTILS= yes diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile index 5b55bfe0f3a2..b794d0f1442e 100644 --- a/deskutils/xneur/Makefile +++ b/deskutils/xneur/Makefile @@ -57,7 +57,7 @@ CONFIGURE_ARGS+= --without-x USE_GSTREAMER= yes CONFIGURE_ARGS+= --with-sound=gstreamer .elif ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= al alut +USES+= openal:al,alut CONFIGURE_ARGS+= --with-sound=openal .else CONFIGURE_ARGS+= --with-sound=no diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile index aea19d41bcd5..036222c3fa2b 100644 --- a/devel/allegro-devel/Makefile +++ b/devel/allegro-devel/Makefile @@ -23,9 +23,8 @@ LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack \ libFLAC.so:${PORTSDIR}/audio/flac \ libphysfs.so:${PORTSDIR}/devel/physfs -USES= gmake cmake pkgconfig +USES= gmake cmake openal:soft pkgconfig USE_XORG= x11 xpm xext xcursor xxf86vm xxf86dga -USE_OPENAL= soft USE_GL= gl glu USE_FREETYPE= yes USE_LDCONFIG= yes diff --git a/devel/love/Makefile b/devel/love/Makefile index 2b9ddec36095..136541c33560 100644 --- a/devel/love/Makefile +++ b/devel/love/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= libIL.so:${PORTSDIR}/graphics/devil \ libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs -USES= gmake -USE_OPENAL= yes +USES= gmake openal USE_SDL= sdl mixer USE_GL= gl glu USE_LUA= 5.1+ diff --git a/devel/love07/Makefile b/devel/love07/Makefile index bd37284a32f0..2dcd54ffb45d 100644 --- a/devel/love07/Makefile +++ b/devel/love07/Makefile @@ -23,8 +23,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost PORTSCOUT= limit:^0\.7\. -USES= gmake -USE_OPENAL= yes +USES= gmake openal USE_SDL= sdl mixer USE_GL= gl glu USE_LUA= 5.1+ diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile index 9c3b809fc218..62e6b7f05592 100644 --- a/devel/sfml/Makefile +++ b/devel/sfml/Makefile @@ -16,8 +16,7 @@ LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile \ libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 -USES= gmake pkgconfig -USE_OPENAL= al +USES= gmake openal:al pkgconfig USE_XORG= x11 xrandr USE_GL= gl glu USE_LDCONFIG= yes diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 94c910a943f6..1d5f9befef5f 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -21,9 +21,8 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ USE_BZIP2= yes USE_XORG= ice sm x11 xext xi xt xmu -USE_OPENAL= al alut USE_GL= gl glu glut -USES= cmake +USES= cmake openal:al,alut CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON .include <bsd.port.mk> diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile index bdf067ac1ded..e287290dba4b 100644 --- a/emulators/dolphin-emu/Makefile +++ b/emulators/dolphin-emu/Makefile @@ -22,7 +22,6 @@ LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libpolarssl.so:${PORTSDIR}/security/polarssl USE_SDL= sdl -USE_OPENAL= yes USE_XORG= ice xext x11 xrandr xi USE_WX= 2.9+ WX_UNICODE= yes @@ -30,7 +29,7 @@ USE_GL= gl glew glu USE_GCC= yes -USES= dos2unix cmake pkgconfig iconv +USES= dos2unix cmake iconv openal pkgconfig DOS2UNIX_REGEX= .*\.(h|c|cpp) # Disable ALSA (emulated) and ao (buggy) diff --git a/emulators/higan/Makefile b/emulators/higan/Makefile index 7537be300cec..77c73e06224c 100644 --- a/emulators/higan/Makefile +++ b/emulators/higan/Makefile @@ -84,7 +84,7 @@ VIDEO_DRIVER+= video.sdl .endif .if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL+= al +USES+= openal:al AUDIO_DRIVER+= audio.openal .endif diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index a73f261649e8..8a8171f8576b 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -53,6 +53,9 @@ WINEMAKER_DESC= Fully support winemaker (requires Perl) GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine +# USES needs to be before bsd.port.pre.mk +OPENAL_USES= openal + PORTDATA= l_intl.nls wine.inf .include <bsd.port.pre.mk> @@ -98,7 +101,6 @@ CONFIGURE_ARGS+= --without-xslt .if ${PORT_OPTIONS:MOPENAL} CONFIGURE_ARGS+= --with-openal -USE_OPENAL= yes .else CONFIGURE_ARGS+= --without-openal .endif diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index fe0857f12d58..23399e43d0e7 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -58,6 +58,9 @@ WINEMAKER_DESC= Fully support winemaker (requires Perl) GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine +# USES needs to be before bsd.port.pre.mk +OPENAL_USES= openal + PORTDATA= fonts/ generic.ppd l_intl.nls wine.inf PORTSCOUT= limitw:1,even @@ -105,7 +108,6 @@ CONFIGURE_ARGS+= --without-xslt .if ${PORT_OPTIONS:MOPENAL} CONFIGURE_ARGS+= --with-openal -USE_OPENAL= yes PLIST_SUB+= OPENAL="" .else CONFIGURE_ARGS+= --without-openal diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile index bce7adc1dcd4..fb760a24b785 100644 --- a/emulators/yabause/Makefile +++ b/emulators/yabause/Makefile @@ -14,10 +14,9 @@ LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext USE_AUTOTOOLS= automake:env autoconf:env aclocal:env GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake openal:soft USE_GL= gl glu glut USE_GNOME= # -USE_OPENAL= soft USE_SDL= yes SUB_FILES= pkg-message diff --git a/games/0ad/Makefile b/games/0ad/Makefile index dc1c186c9616..3214677cea5d 100644 --- a/games/0ad/Makefile +++ b/games/0ad/Makefile @@ -24,13 +24,11 @@ LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha BUILD_WRKSRC= ${WRKSRC}/build/workspaces/gcc MAKE_ARGS= config=release -USES= compiler:c++11-lang gmake pkgconfig +USES= compiler:c++11-lang dos2unix gmake openal:al pkgconfig USE_XZ= yes USE_SDL= sdl USE_GNOME= libxml2 gtk20 USE_GL= gl -USE_OPENAL= al -USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.([ch]p{0,2}|make) USE_WX= 2.8 diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile index 7f5a3ea49c81..d020107460e4 100644 --- a/games/alienarena/Makefile +++ b/games/alienarena/Makefile @@ -20,8 +20,7 @@ COMMENT= Alien Arena (native version) RUN_DEPENDS= ${DATADIR}/data1/default.cfg:${PORTSDIR}/games/alienarena-data -USE_DOS2UNIX= yes -USE_GMAKE= yes +USES= dos2unix gmake GNU_CONFIGURE= yes CONFIGURE_WRKSRC=${WRKDIR}/${PORTNAME}-7.66/ CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" @@ -52,14 +51,13 @@ NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCLIENT} -USES+= pkgconfig +USES+= openal:soft,alut pkgconfig LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl \ freetype.9:${PORTSDIR}/print/freetype2 \ jpeg.11:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis USE_GL= yes -USE_OPENAL= soft alut USE_XORG= xxf86dga xxf86vm .endif diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile index 1fc7bcb17bc0..549ab3eca3d2 100644 --- a/games/allacrost/Makefile +++ b/games/allacrost/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ LICENSE= GPLv2 GNU_CONFIGURE= yes -USES= gmake gettext -USE_OPENAL= al +USES= gettext gmake openal:al USE_LUA= 5.1 USE_SDL= sdl ttf net USE_GL= yes diff --git a/games/apricots/Makefile b/games/apricots/Makefile index b50fd63caee7..7b383f1e36e2 100644 --- a/games/apricots/Makefile +++ b/games/apricots/Makefile @@ -33,7 +33,7 @@ OPTIONS_DEFAULT=OPENAL .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= al alut +USES+= openal:al,alut CPPFLAGS+= -DAP_AUDIO_OPENAL LDFLAGS+= -L${LOCALBASE}/lib -lopenal -lalut .endif diff --git a/games/arx-libertatis/Makefile b/games/arx-libertatis/Makefile index d25c42a9116b..aef317c7ae11 100644 --- a/games/arx-libertatis/Makefile +++ b/games/arx-libertatis/Makefile @@ -19,10 +19,9 @@ LIB_DEPENDS= libIL.so:${PORTSDIR}/graphics/devil \ libboost_program_options.so:${PORTSDIR}/devel/boost-libs USE_XZ= yes -USE_OPENAL= yes USE_SDL= sdl USE_GL= gl glu -USES= cmake +USES= cmake openal CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR="man" -DDATA_DIR=arx SUB_FILES= pkg-message diff --git a/games/assaultcube/Makefile b/games/assaultcube/Makefile index 2339b2277c69..53ddec39c115 100644 --- a/games/assaultcube/Makefile +++ b/games/assaultcube/Makefile @@ -23,8 +23,7 @@ LICENSE_FILE_OTHER= ${WRKSRC}/docs/package_copyrights.txt LICENSE_PERMS_OTHER= dist-mirror pkg-mirror auto-accept USE_BZIP2= yes -USE_OPENAL= al -USES= gmake +USES= gmake openal:al GNU_CONFIGURE= yes ALL_TARGET= libenet WRKSRC= ${WRKDIR}/AssaultCube_v${PORTVERSION} diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile index c3e3ac6a2347..84ee1cb441fb 100644 --- a/games/atr3d/Makefile +++ b/games/atr3d/Makefile @@ -34,7 +34,7 @@ NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= alut +USES+= openal:alut CONFIGURE_ARGS+= --enable-sound .else CONFIGURE_ARGS+= --disable-sound diff --git a/games/avp-demo/Makefile b/games/avp-demo/Makefile index 42936926fe7e..fd5f72417654 100644 --- a/games/avp-demo/Makefile +++ b/games/avp-demo/Makefile @@ -12,12 +12,11 @@ MAINTAINER= devel@stasyan.com COMMENT= Aliens versus predator unofficial port from icculus.org USE_SDL= mixer sdl -USE_GMAKE= yes +USES= gmake openal USE_GL= gl WRKSRC= ${WRKDIR} BUILD_WRKSRC= ${WRKDIR}/avp_git -USE_OPENAL= yes NO_STAGE= yes .include <bsd.port.pre.mk> diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile index 6450cff63a5e..f9f8428a5435 100644 --- a/games/battletanks/Makefile +++ b/games/battletanks/Makefile @@ -16,12 +16,11 @@ LIB_DEPENDS= libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \ libvorbisfile.so:${PORTSDIR}/audio/libvorbis \ libsmpeg.so:${PORTSDIR}/multimedia/smpeg -USES= pkgconfig +USES= openal:al pkgconfig USE_BZIP2= yes USE_GCC= yes USE_LDCONFIG= yes USE_LUA= 5.0+ -USE_OPENAL= al USE_SDL= image sdl USE_SCONS= yes USE_PYTHON= yes diff --git a/games/blackshadeselite/Makefile b/games/blackshadeselite/Makefile index 3ae8e3516fbd..7eaf9f56dc94 100644 --- a/games/blackshadeselite/Makefile +++ b/games/blackshadeselite/Makefile @@ -13,11 +13,10 @@ COMMENT= Psychic Bodyguard FPS - protect the VIP LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis -USES= gmake +USES= gmake openal:al,alut USE_BZIP2= yes USE_SDL= sdl USE_GL= yes -USE_OPENAL= al alut MAKE_ARGS= CC=${CC} CXX=${CXX} diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile index 130afca2349c..607aede3f741 100644 --- a/games/chromium-bsu/Makefile +++ b/games/chromium-bsu/Makefile @@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--disable-glut USE_SDL+= mixer CONFIGURE_ARGS+=--disable-openal .else -USE_OPENAL= al alut +USES+= openal:al,alut CONFIGURE_ARGS+=--disable-sdlmixer .endif diff --git a/games/deng/Makefile b/games/deng/Makefile index 98fa76b78e87..48528d06b1dd 100644 --- a/games/deng/Makefile +++ b/games/deng/Makefile @@ -34,7 +34,7 @@ OPENAL_DESC= Build OpenAL sound plugin .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= al +USES+= openal:al CMAKE_ARGS+= -DBUILDOPENAL:BOOL=ON PLIST_SUB= OPENAL="" .else diff --git a/games/el/Makefile b/games/el/Makefile index 304e7ac63636..190e0017d604 100644 --- a/games/el/Makefile +++ b/games/el/Makefile @@ -19,8 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data PROJECTHOST= bsdistfiles USE_BZIP2= yes -USE_GMAKE= yes -USE_OPENAL= al alut +USES= gmake openal:al,alut USE_GNOME= libxml2 USE_SDL= sdl net image USE_GL= yes diff --git a/games/ember/Makefile b/games/ember/Makefile index 8dc0ad2663da..43e371915c95 100644 --- a/games/ember/Makefile +++ b/games/ember/Makefile @@ -35,8 +35,7 @@ GNU_CONFIGURE= YES USE_LDCONFIG= YES USE_LUA= 5.1 LUA_COMPS= toluaxx -USE_OPENAL= al alut -USES= pathfix pkgconfig +USES= openal:al,alut pathfix pkgconfig USE_BZIP2= YES CPPFLAGS+= -DBR_NO_MACROS USE_GCC= 4.7+ diff --git a/games/evq3/Makefile b/games/evq3/Makefile index e20d22192636..381041d34a36 100644 --- a/games/evq3/Makefile +++ b/games/evq3/Makefile @@ -35,6 +35,9 @@ OPENAL_DLOPEN_DESC= Enable dynamic loading of OpenAL SMP_DESC= Build SMP (threaded) client VOIP_DESC= Enable Voice Over IP +# USES must be before bsd.port.pre.mk +OPENAL_USES= openal:al + MAKE_ENV= DEFAULT_BASEDIR="${Q3DIR}" LIBDIR="${LIBDIR}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" @@ -67,7 +70,6 @@ MAKE_ENV+= USE_CURL_DLOPEN=1 . endif # OpenAL . if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 . if ${PORT_OPTIONS:MOPENAL_DLOPEN} MAKE_ENV+= USE_OPENAL_DLOPEN=1 diff --git a/games/excido/Makefile b/games/excido/Makefile index 1d7942b79645..6f07f980e56c 100644 --- a/games/excido/Makefile +++ b/games/excido/Makefile @@ -22,8 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes USE_GL= yes USE_SDL= image sdl ttf -USE_OPENAL= al alut -USES= gmake +USES= gmake openal:al,alut OPTIONS_DEFINE= DOCS diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index 8b1f4f52b138..df1a6fa5e85e 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -30,8 +30,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ USE_BZIP2= yes USE_XORG= ice sm x11 xext xft xi xinerama xt xmu USE_GL= gl glu glut -USE_OPENAL= al alut -USES= cmake +USES= cmake openal:al,alut CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON \ -DENABLE_JS_SERVER:BOOL=ON \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ diff --git a/games/freeminer/Makefile b/games/freeminer/Makefile index 207b4f4c07fc..fa51e87a1039 100644 --- a/games/freeminer/Makefile +++ b/games/freeminer/Makefile @@ -63,7 +63,7 @@ LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND} -USE_OPENAL+= yes +USES+= openal LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis .endif diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile index d673922eae10..e072c1e8dbec 100644 --- a/games/gemrb/Makefile +++ b/games/gemrb/Makefile @@ -15,9 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ libvorbis.so:${PORTSDIR}/audio/libvorbis -USES= cmake +USES= cmake openal:al,alut USE_SDL= sdl mixer ttf -USE_OPENAL= al alut USE_LDCONFIG= yes USE_PYTHON= 2.6+ CFLAGS+= -L${LOCALBASE}/lib -I${LOCALBASE}/include diff --git a/games/glest/Makefile b/games/glest/Makefile index ea332d5e99e3..7ce04cf17c35 100644 --- a/games/glest/Makefile +++ b/games/glest/Makefile @@ -17,11 +17,9 @@ LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \ BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam RUN_DEPENDS= ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data -USES= pkgconfig +USES= dos2unix openal:al,alut pkgconfig USE_AUTOTOOLS= automake:env autoconf:env USE_ZIP= yes -USE_OPENAL= al alut -USE_DOS2UNIX= yes USE_LUA= 5.1 USE_SDL= yes USE_GL= yes diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile index 3acfb56d5400..966836bea13c 100644 --- a/games/ioquake3/Makefile +++ b/games/ioquake3/Makefile @@ -138,7 +138,7 @@ MAKE_ARGS+= USE_CURL=0 .endif .if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= al +USES+= openal:al MAKE_ARGS+= USE_OPENAL=1 USE_OPENAL_DLOPEN=0 .else MAKE_ARGS+= USE_OPENAL=0 diff --git a/games/linwarrior/Makefile b/games/linwarrior/Makefile index 40a906de5f72..e89d6d0a6faa 100644 --- a/games/linwarrior/Makefile +++ b/games/linwarrior/Makefile @@ -12,8 +12,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Navigate a mech through a 3D world and fire at enemies -USES= gmake -USE_OPENAL= al alut +USES= gmake openal:al,alut USE_GL= gl glu USE_SDL= sdl diff --git a/games/lugaru/Makefile b/games/lugaru/Makefile index 758d5a5cec4e..8108eb62c1b8 100644 --- a/games/lugaru/Makefile +++ b/games/lugaru/Makefile @@ -19,9 +19,8 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ libogg.so:${PORTSDIR}/audio/libogg USE_BZIP2= yes -USES= cmake pkgconfig +USES= cmake openal:soft pkgconfig USE_GL= glu -USE_OPENAL= soft USE_SDL= sdl USE_XORG= sm USE_GCC= yes diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile index 3c0b29c11877..ecb39ba352ae 100644 --- a/games/megaglest/Makefile +++ b/games/megaglest/Makefile @@ -23,11 +23,9 @@ RUN_DEPENDS= ${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:${PORTSD SUB_FILES= pkg-message USE_XZ= yes -USES= cmake pkgconfig -USE_DOS2UNIX= yes +USES= cmake dos2unix openal:al,alut pkgconfig USE_GL= glew gl glu USE_LUA= 5.1 -USE_OPENAL= al alut USE_SDL= yes USE_WX= 2.8+ diff --git a/games/minecraft-client/Makefile b/games/minecraft-client/Makefile index 045aa2b5be84..255182888d8d 100644 --- a/games/minecraft-client/Makefile +++ b/games/minecraft-client/Makefile @@ -35,7 +35,7 @@ NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNATIVE_LIBS} -USE_OPENAL= soft +USES+= openal:soft RUN_DEPENDS+= ${JAVALIBDIR}/lwjgl/lwjgl_util.jar:${PORTSDIR}/games/lwjgl JAVA_OS= native JAVA_VENDOR= openjdk diff --git a/games/minetest/Makefile b/games/minetest/Makefile index 0ceff69d4ac4..c10d543b1e91 100644 --- a/games/minetest/Makefile +++ b/games/minetest/Makefile @@ -63,7 +63,7 @@ LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND} -USE_OPENAL+= yes +USES+= openal LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis .endif diff --git a/games/naev/Makefile b/games/naev/Makefile index 0ddbbef41bf9..e73a99c25f38 100644 --- a/games/naev/Makefile +++ b/games/naev/Makefile @@ -41,7 +41,7 @@ NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= yes +USES+= openal CONFIGURE_ARGS+= --with-openal=yes .else CONFIGURE_ARGS+= --with-openal=no diff --git a/games/openastromenace/Makefile b/games/openastromenace/Makefile index f15ae7ea9e14..efdccf32c157 100644 --- a/games/openastromenace/Makefile +++ b/games/openastromenace/Makefile @@ -20,12 +20,10 @@ LIB_DEPENDS+= vorbisfile:${PORTSDIR}/audio/libvorbis \ USE_BZIP2= yes USE_GL= gl glu -USE_OPENAL= al alut WANT_SDL= yes USE_SDL= sdl -USES= cmake +USES= cmake dos2unix openal:al,alut WRKSRC= ${WRKDIR}/OpenAstroMenaceSVN -USE_DOS2UNIX= yes OPTIONS_SINGLE= LANG OPTIONS_SINGLE_LANG= EN DE RU diff --git a/games/openlierox/Makefile b/games/openlierox/Makefile index 34dc0981a9a2..b400ab3bbb8d 100644 --- a/games/openlierox/Makefile +++ b/games/openlierox/Makefile @@ -19,14 +19,13 @@ LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ USE_BZIP2= yes USE_SDL= sdl image USE_GNOME= libxml2 -USE_OPENAL= yes USE_GCC= yes CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USES= cmake pkgconfig +USES= cmake openal pkgconfig CMAKE_ARGS= -DHAWKNL_BUILTIN=YES \ -DLIBZIP_BUILTIN=YES \ -DBREAKPAD=NO \ diff --git a/games/py-fife/Makefile b/games/py-fife/Makefile index 9177752eac52..76690b844c2a 100644 --- a/games/py-fife/Makefile +++ b/games/py-fife/Makefile @@ -25,7 +25,6 @@ LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis \ FETCH_ARGS= -Fpr USE_SDL= sdl ttf image -USE_OPENAL= al USE_SCONS= yes SCONS_ARGS= --prefix=${PREFIX} --python-prefix=${PYTHON_SITELIBDIR} @@ -39,7 +38,7 @@ USE_PYTHON= 2.7 USE_XORG= xcursor USE_GL= gl -USES= pkgconfig +USES= openal:al pkgconfig NO_STAGE= yes post-patch: diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index 1e8f83e79a5b..0b6f5bab2245 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -26,11 +26,10 @@ OPTIONS_DEFINE= MYSQL WRKSRC= ${WRKDIR}/scorched USE_GL= glu -USE_OPENAL= al alut USE_SDL= mixer net sdl USE_WX= 2.4+ WX_CONF_ARGS= absolute -USES= dos2unix iconv perl5 gmake pkgconfig +USES= dos2unix gmake iconv openal:al,alut perl5 pkgconfig USE_AUTOTOOLS= aclocal automake autoconf ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing --copy --force --foreign diff --git a/games/solarus/Makefile b/games/solarus/Makefile index 22fb80cc828e..40d03f310a8c 100644 --- a/games/solarus/Makefile +++ b/games/solarus/Makefile @@ -16,11 +16,10 @@ LIB_DEPENDS= libphysfs.so:${PORTSDIR}/devel/physfs \ libogg.so:${PORTSDIR}/audio/libogg USE_SDL= sdl ttf image -USE_OPENAL= yes PLIST_FILES= bin/solarus WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= cmake +USES= cmake openal .include <bsd.port.mk> diff --git a/games/spring/Makefile b/games/spring/Makefile index a4a00c8ad083..cbef9c7c64c2 100644 --- a/games/spring/Makefile +++ b/games/spring/Makefile @@ -27,13 +27,12 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= relies on x86 floating-point math and amd64 atomic ops USE_SDL= sdl -USE_OPENAL= al USE_GL= gl glu glew USE_XORG= x11 xcursor USE_LDCONFIG= yes -USE_DOS2UNIX= *.h *.hpp *.cpp +DOS2UNIX_GLOB= *.h *.hpp *.cpp -USES= cmake compiler:c++11-lib +USES= cmake compiler:c++11-lib dos2unix openal:al CMAKE_ARGS= -DDATADIR:STRING="share/${PORTNAME}" \ -DAI_TYPES:STRING="NATIVE" \ -DDOCDIR:STRING="share/doc/${PORTNAME}" \ diff --git a/games/springlobby/Makefile b/games/springlobby/Makefile index d9bcf9247810..f9e1b9900a4b 100644 --- a/games/springlobby/Makefile +++ b/games/springlobby/Makefile @@ -39,7 +39,7 @@ NLS_USES= gettext SOUND_CMAKE_ON= -DOPTION_SOUND:BOOL=ON SOUND_CMAKE_OFF= -DOPTION_SOUND:BOOL=OFF SOUND_LIB_DEPENDS= libalure.so:${PORTSDIR}/audio/alure -SOUND_USE= OPENAL=al +SOUND_USES= openal:al NOTIFY_CMAKE_ON= -DOPTION_NOTIFY=ON NOTIFY_CMAKE_OFF= -DOPTION_NOTIFY=OFF diff --git a/games/sumwars/Makefile b/games/sumwars/Makefile index a03c93f898f6..71d83e042306 100644 --- a/games/sumwars/Makefile +++ b/games/sumwars/Makefile @@ -24,12 +24,11 @@ LIB_DEPENDS= CEGUIBase-0.7.9.0:${PORTSDIR}/graphics/cegui \ PocoNet.12:${PORTSDIR}/devel/poco \ physfs.1:${PORTSDIR}/devel/physfs -USES= cmake gettext gmake pkgconfig +USES= cmake gettext gmake openal:al,alut pkgconfig USE_GL= gl glu USE_BZIP2= yes INSTALLS_ICONS= yes USE_LUA= 5.1 -USE_OPENAL= al alut FETCH_ARGS?= -pRr diff --git a/games/supertux-devel/Makefile b/games/supertux-devel/Makefile index 20d5bac54be1..6ad1a8199146 100644 --- a/games/supertux-devel/Makefile +++ b/games/supertux-devel/Makefile @@ -16,9 +16,8 @@ LIB_DEPENDS= libphysfs.so:${PORTSDIR}/devel/physfs \ USE_BZIP2= yes USE_SDL= image -USE_OPENAL= al USE_GL= glew -USES= cmake:outsource iconv +USES= cmake:outsource iconv openal:al LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} post-patch: diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile index f4d6d59ed728..d6986119dfe5 100644 --- a/games/supertuxkart/Makefile +++ b/games/supertuxkart/Makefile @@ -18,10 +18,9 @@ LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis \ USE_BZIP2= yes USE_GL= gl glu glut -USE_OPENAL= al alut -USES= cmake gettext gmake pkgconfig +USES= cmake dos2unix gettext gmake openal:al,alut pkgconfig USE_SDL= sdl -USE_DOS2UNIX= lib/irrlicht/source/Irrlicht/Makefile +DOS2UNIX_FILES= lib/irrlicht/source/Irrlicht/Makefile CMAKE_ARGS= -DUSE_WIIUSE=NO WRKSRC= ${WRKDIR}/SuperTuxKart-${PORTVERSION} diff --git a/games/torcs/Makefile b/games/torcs/Makefile index 522fa21f6cea..1dfe381feed7 100644 --- a/games/torcs/Makefile +++ b/games/torcs/Makefile @@ -18,14 +18,13 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ libvorbis.so:${PORTSDIR}/audio/libvorbis RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -USES= gmake shebangfix +USES= gmake openal:al,alut shebangfix SHEBANG_FILES= src/tools/accc/accc.in src/tools/nfsperf/nfsperf.in \ src/tools/texmapper/texmapper.in src/tools/nfs2ac/nfs2ac.in \ src/tools/trackgen/trackgen.in \ src/modules/telemetry/telemetry.sh robotgen USE_XORG= xrender xmu ice xext x11 xxf86vm xrandr USE_GL= glut -USE_OPENAL= al alut USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile index 82fc9c81d8dc..836254727e98 100644 --- a/games/tremulous/Makefile +++ b/games/tremulous/Makefile @@ -52,7 +52,7 @@ MAKE_ENV+= HAVE_VM_COMPILED=true .if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP_CLIENT} # OpenAL . if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= al +USES+= openal:al MAKE_ENV+= USE_OPENAL=1 . if ${PORT_OPTIONS:MOPENAL_DLOPEN} MAKE_ENV+= USE_OPENAL_DLOPEN=1 diff --git a/games/trigger/Makefile b/games/trigger/Makefile index 8b7eb129f2d9..72d2e9d026a0 100644 --- a/games/trigger/Makefile +++ b/games/trigger/Makefile @@ -15,7 +15,7 @@ COMMENT= Rally car racing game BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam LIB_DEPENDS= libphysfs.so:${PORTSDIR}/devel/physfs -USE_OPENAL= al alut +USES= openal:al,alut USE_SDL= sdl image USE_GL= glu USE_BZIP2= yes diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile index ce3c8926501a..ce0907e100a0 100644 --- a/games/ufoai/Makefile +++ b/games/ufoai/Makefile @@ -26,8 +26,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/base/default.cfg:${PORTSDIR}/games/u USE_BZIP2= yes USE_GL= yes USE_SDL= sdl image mixer ttf -USES= gettext gmake pkgconfig -USE_OPENAL= soft +USES= gettext gmake openal:soft pkgconfig HAS_CONFIGURE= yes CONFIGURE_ARGS+= --enable-release CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile index 47d08935a1d4..0de3d8140258 100644 --- a/games/ultimatestunts/Makefile +++ b/games/ultimatestunts/Makefile @@ -17,8 +17,7 @@ LIB_DEPENDS= vorbisfile.6:${PORTSDIR}/audio/libvorbis OPTIONS_DEFINE= DOCS -USES= pkgconfig gettext -USE_OPENAL= al alut +USES= gettext openal:al,alut pkgconfig USE_GL= gl glu USE_SDL= sdl image GNU_CONFIGURE= yes diff --git a/games/uqm/Makefile b/games/uqm/Makefile index 6c5efc8ba241..da8247d3b80d 100644 --- a/games/uqm/Makefile +++ b/games/uqm/Makefile @@ -37,7 +37,7 @@ OPTIONS_SUB= yes VOICE_DISTFILES= ${PORTNAME}-${DATAVERSION}-voice.uqm MUSIC_DISTFILES= ${PORTNAME}-${DATAVERSION}-3domusic.uqm -OPENAL_USE= OPENAL=al +OPENAL_USES= openal:al .include <bsd.port.options.mk> diff --git a/games/valyriatear/Makefile b/games/valyriatear/Makefile index 3c41b5e8eed5..6440bd4dd955 100644 --- a/games/valyriatear/Makefile +++ b/games/valyriatear/Makefile @@ -22,11 +22,10 @@ GH_ACCOUNT= Bertram25 GH_PROJECT= ValyriaTear GH_COMMIT= a324297 -USES= cmake iconv +USES= cmake iconv openal CMAKE_ARGS= -DUSE_PCH_COMPILATION=OFF USE_SDL= sdl image ttf USE_GL= gl -USE_OPENAL= yes USE_LUA= 5.1 INSTALLS_ICONS= yes LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} -lintl diff --git a/games/vamos/Makefile b/games/vamos/Makefile index b8022346d229..64284eaf6b5f 100644 --- a/games/vamos/Makefile +++ b/games/vamos/Makefile @@ -17,8 +17,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs \ libpng15.so:${PORTSDIR}/graphics/png -USES= pkgconfig -USE_OPENAL= al alut +USES= openal:al,alut pkgconfig USE_XORG= sm ice x11 xi xext xmu USE_GL= glut USE_SDL= sdl diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile index b51ea41fa074..8c2b8a9c0767 100644 --- a/games/vavoom/Makefile +++ b/games/vavoom/Makefile @@ -75,7 +75,7 @@ CMAKE_ARGS+= -DWITH_MIKMOD=N .endif .if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= al +USES+= openal:al CMAKE_ARGS+= -DWITH_OPENAL=Y .else CMAKE_ARGS+= -DWITH_OPENAL=N diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile index 4955a6317169..46af1355ef9e 100644 --- a/games/vegastrike/Makefile +++ b/games/vegastrike/Makefile @@ -15,10 +15,9 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ vorbis.4:${PORTSDIR}/audio/libvorbis \ ogg:${PORTSDIR}/audio/libogg -USE_OPENAL= al USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake openal:al USE_PYTHON= yes USE_SDL= sdl USE_XORG= sm ice xi x11 xext xrender xinerama xi xrandr xcursor \ diff --git a/games/warsow/Makefile b/games/warsow/Makefile index a2f1056be955..5cd0ba21400b 100644 --- a/games/warsow/Makefile +++ b/games/warsow/Makefile @@ -40,6 +40,9 @@ OPENAL_DESC= Build OpenAL sound module IRC_DESC= Build IRC client module TV_SRV_DESC= Build Warsow TV server +# USES needs to be before bsd.port.pre.mk +OPENAL_USES= openal:al + NO_STAGE= yes .include <bsd.port.pre.mk> @@ -63,7 +66,6 @@ PLIST_FILES+= %%DATADIR%%/libs/snd_qf_${ARCH}.so . endif . if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= al ALL_TARGET+= openal PLIST_FILES+= %%DATADIR%%/libs/snd_openal_${ARCH}.so . endif diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index 2e8a40da3a54..d821dcdaef57 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -25,9 +25,8 @@ LIB_DEPENDS= libphysfs.so:${PORTSDIR}/devel/physfs \ RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu USE_XZ= yes -USES= bison gmake pkgconfig compiler:c++11-lang # actually, old gcc fails on unknown -W flag +USES= bison gmake openal:al pkgconfig compiler:c++11-lang # actually, old gcc fails on unknown -W flag GNU_CONFIGURE= yes -USE_OPENAL= al USE_GL= yes USE_SDL= sdl USE_QT4= corelib network script gui moc_build diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile index 0c523b4f917b..4c2d0ce5a949 100644 --- a/games/worldofpadman/Makefile +++ b/games/worldofpadman/Makefile @@ -65,7 +65,7 @@ MAKE_ENV+= USE_CURL_DLOPEN=1 . endif # OpenAL . if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= al +USES+= openal:al MAKE_ENV+= USE_OPENAL=1 . if ${PORT_OPTIONS:MOPENAL_DLOPEN} MAKE_ENV+= USE_OPENAL_DLOPEN=1 diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile index 60f51f32ec04..368960c60c4b 100644 --- a/games/xpilot-ng-server/Makefile +++ b/games/xpilot-ng-server/Makefile @@ -80,7 +80,7 @@ PLIST_SUB+= SDL="@comment " .endif .if ${PORT_OPTIONS:MSOUND} -USE_OPENAL= al alut +USES+= openal:al,alut CONFIGURE_ARGS+=--enable-sound CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile index fade18fd9501..51c1ebbfc8a7 100644 --- a/graphics/Coin/Makefile +++ b/graphics/Coin/Makefile @@ -16,7 +16,7 @@ LICENSE= BSD LIB_DEPENDS= libsimage.so:${PORTSDIR}/graphics/simage USE_GCC= any -USE_OPENAL= al +USES= openal:al USE_GL= yes USE_XORG= xt x11 GNU_CONFIGURE= yes diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index f915a1d9cc87..e6e14b2e2a9b 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -172,7 +172,7 @@ CMAKE_ARGS+= -DWITH_HEADLESS:BOOL=OFF .if ${PORT_OPTIONS:MOPENAL} .if ${PORT_OPTIONS:MSAMPLERATE} -USE_OPENAL= al alut +USES+= openal:al,alut CMAKE_ARGS+= -DWITH_OPENAL:BOOL=ON .else BROKEN= OPENAL requires SAMPLERATE diff --git a/graphics/py-pyglet/Makefile b/graphics/py-pyglet/Makefile index 2f5564f75d16..f1635fa831aa 100644 --- a/graphics/py-pyglet/Makefile +++ b/graphics/py-pyglet/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ USE_PYTHON= yes USE_PYDISTUTILS=yes USE_GL= gl glu -USE_OPENAL= al +USES= openal:al PORTDOCS= * PORTEXAMPLES= * diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile index 825f12f38614..3ca647f75a2c 100644 --- a/graphics/py-soya3d/Makefile +++ b/graphics/py-soya3d/Makefile @@ -25,9 +25,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-edit USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes -USE_OPENAL= al alut +USES= gmake openal:al,alut USE_GL= glew glu -USE_GMAKE= yes USE_SDL= sdl PYDISTUTILS_PKGNAME= Soya diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile index 2753cca66196..dfbea49067c6 100644 --- a/graphics/reallyslick/Makefile +++ b/graphics/reallyslick/Makefile @@ -36,7 +36,7 @@ NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MFREEALUT} -USE_OPENAL= alut +USES+= openal:alut .else CONFIGURE_ARGS+= --disable-sound .endif diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units index 001727c18c0c..d4451d81df00 100644 --- a/lang/fpc/Makefile.units +++ b/lang/fpc/Makefile.units @@ -241,12 +241,6 @@ LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis . endif .endif -.if ${PKGNAMESUFFIX} == "-openal" -. if defined(WITH_OPENAL) -USE_OPENAL= soft -. endif -.endif - .if ${PKGNAMESUFFIX} == "-opengl" . if defined(WITH_OPENGL) USE_GL= glut diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile index 4a85fe21597a..d7c195557ecd 100644 --- a/multimedia/aegisub/Makefile +++ b/multimedia/aegisub/Makefile @@ -91,7 +91,7 @@ CONFIGURE_ARGS+= --without-alsa .endif .if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= yes +USES+= openal .else CONFIGURE_ARGS+= --without-openal .endif diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options index 79226f89f7f9..b1cbf25dbc2c 100644 --- a/multimedia/mplayer/Makefile.options +++ b/multimedia/mplayer/Makefile.options @@ -69,12 +69,6 @@ CATEGORIES+= ipv6 CONFIGURE_ARGS+= --disable-inet6 .endif -.if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= soft -.else -CONFIGURE_ARGS+= --disable-openal -.endif - .if ${PORT_OPTIONS:MRTMP} LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/librtmp CONFIGURE_ARGS+= --enable-librtmp diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars index 93c5bc29e8d4..aba282debfe2 100644 --- a/multimedia/mplayer/Makefile.optvars +++ b/multimedia/mplayer/Makefile.optvars @@ -65,6 +65,9 @@ LZO_CONFIGURE_OFF= --disable-liblzo NAS_LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas NAS_CONFIGURE_OFF= --disable-nas +OPENAL_USES= openal:soft +OPENAL_CONFIGURE_OFF= --disable-openal + OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg OPENJPEG_CONFIGURE_OFF= --disable-libopenjpeg |