From 1e57a4ad575c979c5366f3fb460f2c52d470ecf0 Mon Sep 17 00:00:00 2001 From: naddy Date: Wed, 16 Dec 2009 21:13:24 +0000 Subject: [PATCH] openal now pulls in libsndio rather than libossaudio --- games/warzone2100/Makefile | 10 +++++----- games/warzone2100/patches/patch-configure | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index bd2a0ec4e1f..3e049f77492 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2009/08/10 06:31:43 kili Exp $ +# $OpenBSD: Makefile,v 1.4 2009/12/16 21:13:24 naddy Exp $ COMMENT= 3d realtime strategy on a future earth DISTNAME= warzone2100-2.0.7 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= games EXTRACT_SUFX= .tar.bz2 @@ -16,8 +16,8 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= GL GLU SDL X11 Xext c m ogg ossaudio pthread pthread-stubs \ - usbhid xcb z +WANTLIB= GL GLU SDL X11 Xext c m ogg pthread pthread-stubs \ + sndio usbhid xcb z MASTER_SITES= http://download.gna.org/warzone/releases/2.0/ @@ -42,7 +42,7 @@ CONFIGURE_ARGS+=${CONFIGURE_SHARED} CONFIGURE_ENV+= CPPFLAGS='-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng \ -I${X11BASE}/include' \ LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib' \ - LIBS='-pthread -lossaudio' \ + LIBS='-pthread' \ YACC='bison -y' .include diff --git a/games/warzone2100/patches/patch-configure b/games/warzone2100/patches/patch-configure index 2f86a4f0e75..9548cd21ecb 100644 --- a/games/warzone2100/patches/patch-configure +++ b/games/warzone2100/patches/patch-configure @@ -1,4 +1,4 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2007/07/22 14:57:52 simon Exp $ +$OpenBSD: patch-configure,v 1.2 2009/12/16 21:13:24 naddy Exp $ --- configure.orig Sat Jun 23 11:20:09 2007 +++ configure Sat Jul 21 21:20:43 2007 @@ -6485,7 +6485,7 @@ if test "${ac_cv_lib_GLU_main+set}" = set; then @@ -15,7 +15,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2007/07/22 14:57:52 simon Exp $ else ac_check_lib_save_LIBS=$LIBS -LIBS="-lopenal $LIBS" -+LIBS="-lopenal -lossaudio $LIBS" ++LIBS="-lopenal -lsndio $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF