Don't use a harcoded -lossaudio in LDFLAGS, use LIBS+= ${LIBOSSAUDIO}

instead.

While I'm here 80 chars per line.

This should fix PR pkg/29429.

4 files changed, 24 insertions, 21 deletions

diff --git a/games/quake/Makefile b/games/quake/Makefile
index 06123d6c416..6c1f80f340c 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/10/03 00:14:46 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/02/17 18:23:24 xtraeme Exp $
 
 DISTNAME=	q1source
 PKGNAME=	quake-2.30
@@ -26,27 +26,30 @@ USE_X11=	yes
 MAKE_ENV+=	MESA_DIR=${BUILDLINK_PREFIX.Mesa}
 MAKE_ENV+=	X11BASE=${X11BASE}
 
+LIBS+=		${LIBOSSAUDIO}
+
 do-configure:
 	cd ${WRKSRC}/qw && ${LN} -fs makefile.linux ${MAKEFILE}
 	cd ${WRKSRC}/winquake && ${LN} -fs makefile.linuxi386 ${MAKEFILE}
 
-#pre-build:
-#	cd ${WRKSRC}/winquake && \
-#		${MV} common.c common.c.orig && \
-#		${SED} "s@GAMENAME, basedir@GAMENAME, \"${PREFIX}/share/quake/\"@" \
-#			< common.c.orig > common.c
-
 do-build:
-	( cd ${WRKSRC}/qw ; ${SETENV} ${MAKE_ENV} ${GMAKE} MAINDIR=`pwd` CFLAGS="${CFLAGS}" all)
-	( cd ${WRKSRC}/winquake ; ${SETENV} ${MAKE_ENV} ${GMAKE} MAINDIR=`pwd` CFLAGS="${CFLAGS}" \
+	( cd ${WRKSRC}/qw ; ${SETENV} ${MAKE_ENV} \
+	    ${GMAKE} MAINDIR=`pwd` CFLAGS="${CFLAGS}" all)
+	( cd ${WRKSRC}/winquake ; ${SETENV} ${MAKE_ENV} \
+	    ${GMAKE} MAINDIR=`pwd` CFLAGS="${CFLAGS}" \
 		WRKSRC="${WRKSRC}" all)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/qwsv ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/qwcl.x11 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/glqwcl.glx ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/winquake/release_version/bin/glquake.glx ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/winquake/release_version/bin/quake.x11 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/qwsv \
+	    ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/qwcl.x11 \
+	    ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/glqwcl.glx \
+	    ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/winquake/release_version/bin/glquake.glx \
+	    ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/winquake/release_version/bin/quake.x11 \
+	    ${PREFIX}/bin
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
diff --git a/games/quake/distinfo b/games/quake/distinfo
index 4a8dbf16bc6..7417620a2b7 100644
--- a/games/quake/distinfo
+++ b/games/quake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/03/09 19:46:53 jschauma Exp $
+$NetBSD: distinfo,v 1.6 2005/02/17 18:23:24 xtraeme Exp $
 
 SHA1 (q1source.zip) = 1f607e549c6aa3921797e51b7d2038e95116c989
 Size (q1source.zip) = 3211531 bytes
@@ -6,11 +6,11 @@ SHA1 (patch-aa) = 99fd7868c2968bb0214282c35a865119cc33721c
 SHA1 (patch-ab) = b459f48703568180445a35e74290bacf87fea170
 SHA1 (patch-ac) = 595e319415fe22e8115170415a6bd69c9da9d1be
 SHA1 (patch-ad) = 84349e4164ee0b2bc4cffd420e9520ce2619495d
-SHA1 (patch-ae) = bd25b97449be7e755cdb307b6204f518e28ba598
+SHA1 (patch-ae) = 6c3863309d22a5295c48635a7841338b041d2817
 SHA1 (patch-af) = ff7a770648efdbf4bf9f91b4502ad5ca93840bbc
 SHA1 (patch-ag) = 56e3b11afe9d2cccf3136b3cd78419d00c8f7487
 SHA1 (patch-ah) = 23501badb57bf8d11bf75105c1dffb7adf19a64d
-SHA1 (patch-ai) = 0f0ba110c3656c68c91d4141607dd0091f5a5956
+SHA1 (patch-ai) = 345747c3dd7ad8442a65c4589e0b89ec9d0f7038
 SHA1 (patch-aj) = 50446164a7ad9085a2e191047f60483885d043c3
 SHA1 (patch-ak) = b7b22a7b01a86522f3dfd510bf31a44c468279b9
 SHA1 (patch-al) = ca76927f36ad4f5f14ec64600bb4d40f0a758b71
diff --git a/games/quake/patches/patch-ae b/games/quake/patches/patch-ae
index 44687a8cca4..749ccf968e7 100644
--- a/games/quake/patches/patch-ae
+++ b/games/quake/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.7 2003/03/09 19:46:53 jschauma Exp $
+$NetBSD: patch-ae,v 1.8 2005/02/17 18:23:24 xtraeme Exp $
 
 --- qw/makefile.linux.orig	Wed Apr 21 20:16:24 1999
 +++ qw/makefile.linux
@@ -42,7 +42,7 @@ $NetBSD: patch-ae,v 1.7 2003/03/09 19:46:53 jschauma Exp $
 +GLCFLAGS=-DGLQUAKE -I${MESA_DIR}/include -I/usr/include/glide
  
 -LDFLAGS=-lm
-+LDFLAGS+=-lm -lossaudio
++LDFLAGS+=-lm
  SVGALDFLAGS=-lvga
 -XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext
 -GL_SVGA_LDFLAGS=-L/usr/X11/lib -L/usr/local/src/Mesa-3.0/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga
diff --git a/games/quake/patches/patch-ai b/games/quake/patches/patch-ai
index 3cfd74b5eba..39657b2b993 100644
--- a/games/quake/patches/patch-ai
+++ b/games/quake/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.6 2003/03/09 19:46:53 jschauma Exp $
+$NetBSD: patch-ai,v 1.7 2005/02/17 18:23:24 xtraeme Exp $
 
 --- winquake/makefile.linuxi386.orig	Tue Apr 27 17:51:18 1999
 +++ winquake/makefile.linuxi386
@@ -30,7 +30,7 @@ $NetBSD: patch-ai,v 1.6 2003/03/09 19:46:53 jschauma Exp $
  	-fomit-frame-pointer -fexpensive-optimizations
  DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 -LDFLAGS=-lm
-+LDFLAGS+=-lm -lossaudio
++LDFLAGS+=-lm
  SVGALDFLAGS=-lvga
 -XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
 -XCFLAGS=-DX11