Add sounds support.

Patches submitted by Rui-Xiang Guo <rxg@ms25.url.com.tw> in PR 13893

4 files changed, 31 insertions, 17 deletions

diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index 658a2f52e5e..4c74a756197 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/06/11 06:34:34 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/08 00:09:10 hubertf Exp $
 #
 
-DISTNAME=		xgalaga-2.0.34
+DISTNAME=		xgalaga-2.0.34nb1
 CATEGORIES=		games x11
 MASTER_SITES=		http://ogresoft.dyn.ml.org/
 
diff --git a/games/xgalaga/distinfo b/games/xgalaga/distinfo
index aeb931c0985..995df7ee0d4 100644
--- a/games/xgalaga/distinfo
+++ b/games/xgalaga/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:39 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/09/08 00:09:10 hubertf Exp $
 
 SHA1 (xgalaga-2.0.34.tar.gz) = 82dcb328af0d9e779c566f4225d7f072b1c17b7d
 Size (xgalaga-2.0.34.tar.gz) = 314189 bytes
-SHA1 (patch-aa) = b7ee31f8358b220cd9cfce1c097a993ae10d1e17
+SHA1 (patch-aa) = 886d7c372e0b477f062402e5e919d32645c7deb2
+SHA1 (patch-ab) = 4131368cb7481ee20a753e0b45bd9560b157cf6f
+SHA1 (patch-ac) = ca85bafaa637fc03d1c53a527c7804a95c146fe3
diff --git a/games/xgalaga/patches/patch-aa b/games/xgalaga/patches/patch-aa
index 6a5a6658141..a910909d7f8 100644
--- a/games/xgalaga/patches/patch-aa
+++ b/games/xgalaga/patches/patch-aa
@@ -1,19 +1,28 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:44 agc Exp $
+$NetBSD: patch-aa,v 1.3 2001/09/08 00:09:10 hubertf Exp $
 
---- Makefile.in.orig	Sun May 10 23:52:59 1998
-+++ Makefile.in	Fri Jul 31 02:26:57 1998
-@@ -27,3 +27,3 @@
+--- Makefile.in.orig	Mon May 11 08:52:59 1998
++++ Makefile.in
+@@ -25,7 +25,7 @@
+ RM = rm -f
+ CC = @CC@
  CFLAGS = -I. @CFLAGS@ @DEFS@ @X_CFLAGS@ -DXGALAGADIR=\"@prefix@/\" $(SOUNDDEFS)
 -LDFLAGS = @LDFLAGS@
-+LDFLAGS = -Wl,-R$(X11BASE)/lib @LDFLAGS@
++
  LIBS = @LIBS@ libsprite/libsprite.a @X_LIBS@
-@@ -47,4 +47,3 @@
- 	./mkinstalldirs $(prefix)
--	$(INSTALL) $(TARGET) $(bindir)/$(TARGET)
--	$(INSTALL) $(SOUNDSRV) $(prefix)/$(SOUNDSRV)
-+	$(INSTALL) $(SOUNDSRV) $(TARGET) $(bindir)/
- 	./mkinstalldirs $(prefix)/sounds
-@@ -54,3 +53,6 @@
+ INSTALL = @INSTALL@
+ 
+@@ -40,7 +40,7 @@
+ all: $(TARGET) $(SOUNDSRV)
+ 
+ $(SOUNDSRV): $(SOUNDOBJS)
+-	$(CC) $(LDFLAGS) -o $(SOUNDSRV) $(SOUNDOBJS) $(SOUNDLIBS)
++	$(CC) $(LDFLAGS) -o $(SOUNDSRV) $(SOUNDOBJS) $(SOUNDLIBS) -lossaudio
+ 
+ install: all
+ 	./mkinstalldirs $(bindir)
+@@ -52,7 +52,10 @@
+ 	for i in levels/*.xgl; do $(INSTALL) $$i $(prefix)/$$i ; done
+ 	for i in sounds/*.raw; do $(INSTALL) $$i $(prefix)/$$i ; done
  	touch $(prefix)/scores
 -	chmod 666 $(prefix)/scores
 +	chown bin:games $(prefix)/scores
@@ -21,3 +30,5 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:44 agc Exp $
 +	chmod 2755 $(bindir)/$(TARGET)
 +	chmod 664 $(prefix)/scores
  
+ subdirs:
+ 	for i in $(SUBDIRS); do cd $$i ; make ; done
diff --git a/games/xgalaga/pkg/PLIST b/games/xgalaga/pkg/PLIST
index 8ab241bf6fa..ad97d9f0b25 100644
--- a/games/xgalaga/pkg/PLIST
+++ b/games/xgalaga/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/08/01 13:25:29 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/09/08 00:09:10 hubertf Exp $
 bin/xgalaga
 share/xgalaga/README
 share/xgalaga/sounds/ddloo.raw
@@ -24,6 +24,7 @@ share/xgalaga/levels/level6.xgl
 share/xgalaga/levels/level7.xgl
 share/xgalaga/levels/level8.xgl
 share/xgalaga/levels/level9.xgl
+share/xgalaga/xgal.sndsrv.linux
 share/xgalaga/scores
 @unexec rm -f %D/share/xgalaga/scores
 @dirrm share/xgalaga/sounds