Add DragonFly support. Install sound server under libexec/, no need

for OS suffix. Bump revision.

5 files changed, 47 insertions, 21 deletions

diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index c7f21cba7e9..26aa9017c7b 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:18 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/13 02:02:50 joerg Exp $
 
 DISTNAME=		xgalaga-2.0.34
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		games x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/games/xgalaga/PLIST b/games/xgalaga/PLIST
index de8d849de66..6573cb93e20 100644
--- a/games/xgalaga/PLIST
+++ b/games/xgalaga/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:41 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/01/13 02:02:50 joerg Exp $
 bin/xgalaga
+libexec/xgalaga.sndsrv
 share/xgalaga/README
 share/xgalaga/sounds/ddloo.raw
 share/xgalaga/sounds/explode.raw
@@ -24,7 +25,6 @@ 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
diff --git a/games/xgalaga/distinfo b/games/xgalaga/distinfo
index 69ca2e60b0e..007f3231475 100644
--- a/games/xgalaga/distinfo
+++ b/games/xgalaga/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2005/06/14 17:56:41 minskim Exp $
+$NetBSD: distinfo,v 1.9 2006/01/13 02:02:50 joerg Exp $
 
 SHA1 (xgalaga-2.0.34.tar.gz) = 82dcb328af0d9e779c566f4225d7f072b1c17b7d
 RMD160 (xgalaga-2.0.34.tar.gz) = bf2cc91820c1cdb8e02bd35347b309cac27b3ba4
 Size (xgalaga-2.0.34.tar.gz) = 314189 bytes
-SHA1 (patch-aa) = 3dede8a392db4f9b36bea84c9402606d14493e33
-SHA1 (patch-ab) = 4131368cb7481ee20a753e0b45bd9560b157cf6f
+SHA1 (patch-aa) = 5857b8641701bc34a97fbca31411478c0c47501a
+SHA1 (patch-ab) = 75c407d95d4ab4b7dad6625050439eda5a012839
 SHA1 (patch-ac) = ca85bafaa637fc03d1c53a527c7804a95c146fe3
 SHA1 (patch-ad) = 22b946b261c4d0969e48bf5de1ba0d55c3649bb8
diff --git a/games/xgalaga/patches/patch-aa b/games/xgalaga/patches/patch-aa
index 4bf08cfb6bc..de93951fff4 100644
--- a/games/xgalaga/patches/patch-aa
+++ b/games/xgalaga/patches/patch-aa
@@ -1,8 +1,14 @@
-$NetBSD: patch-aa,v 1.5 2005/06/14 17:56:41 minskim Exp $
+$NetBSD: patch-aa,v 1.6 2006/01/13 02:02:50 joerg Exp $
 
---- Makefile.in.orig	1998-05-11 01:52:59.000000000 -0500
+--- Makefile.in.orig	1998-05-11 06:52:59.000000000 +0000
 +++ Makefile.in
-@@ -25,7 +25,7 @@ SOUNDDEFS = -DSOUNDSERVER=\"@prefix@/@SO
+@@ -20,12 +20,12 @@ SOUNDSRV = @SOUNDSERVER@
+ SOUNDOBJS = @SOUNDSERVER@.o
+ SOUNDSRCS = @SOUNDSERVER@.c
+ 
+-SOUNDDEFS = -DSOUNDSERVER=\"@prefix@/@SOUNDSERVER@\"
++SOUNDDEFS = -DSOUNDSERVER=\"${PREFIX}/libexec/xgalaga.sndsrv\"
+ 
  RM = rm -f
  CC = @CC@
  CFLAGS = -I. @CFLAGS@ @DEFS@ @X_CFLAGS@ -DXGALAGADIR=\"@prefix@/\" $(SOUNDDEFS)
@@ -11,7 +17,7 @@ $NetBSD: patch-aa,v 1.5 2005/06/14 17:56:41 minskim Exp $
  LIBS = @LIBS@ libsprite/libsprite.a @X_LIBS@
  INSTALL = @INSTALL@
  
-@@ -40,7 +40,7 @@ SUBDIRS = libsprite
+@@ -40,19 +40,22 @@ SUBDIRS = libsprite
  all: $(TARGET) $(SOUNDSRV)
  
  $(SOUNDSRV): $(SOUNDOBJS)
@@ -20,7 +26,12 @@ $NetBSD: patch-aa,v 1.5 2005/06/14 17:56:41 minskim Exp $
  
  install: all
  	./mkinstalldirs $(bindir)
-@@ -52,7 +52,10 @@ install: all
+ 	./mkinstalldirs $(prefix)
+ 	$(INSTALL) $(TARGET) $(bindir)/$(TARGET)
+-	$(INSTALL) $(SOUNDSRV) $(prefix)/$(SOUNDSRV)
++	$(INSTALL) $(SOUNDSRV) ${PREFIX}/libexec/xgalaga.sndsrv
+ 	./mkinstalldirs $(prefix)/sounds
+ 	./mkinstalldirs $(prefix)/levels
  	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
diff --git a/games/xgalaga/patches/patch-ab b/games/xgalaga/patches/patch-ab
index 8fd2a9121f2..501c3bf6ff9 100644
--- a/games/xgalaga/patches/patch-ab
+++ b/games/xgalaga/patches/patch-ab
@@ -1,8 +1,14 @@
-$NetBSD: patch-ab,v 1.1 2001/09/10 01:03:28 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2006/01/13 02:02:50 joerg Exp $
 
---- configure.orig	Mon May 11 09:02:12 1998
+--- configure.orig	1998-05-11 07:02:12.000000000 +0000
 +++ configure
-@@ -1813,6 +1813,9 @@
+@@ -1810,9 +1810,15 @@ if test -n "$sound-type"; then
+     *linux*) 
+ 	sound_type=native
+ 	;;
++    *dragonfly*)
++	sound_type=native
++	;;
      *freebsd*)
          sound_type=native
  	;;
@@ -12,12 +18,19 @@ $NetBSD: patch-ab,v 1.1 2001/09/10 01:03:28 hubertf Exp $
      *sunos*)
          sound_type=native
          ;;
-@@ -1848,6 +1851,16 @@
+@@ -1839,7 +1845,7 @@ EOF
+ EOF
+ 
+ 	;;
+-      *freebsd*)
++      *freebsd* | *dragonfly*)
+         SOUNDSERVER=xgal.sndsrv.freebsd
  	cat >> confdefs.h <<\EOF
- #define SOUND 1
+ #define SOUNDDEV "/dev/dsp"
+@@ -1850,6 +1856,16 @@ EOF
  EOF
-+
-+	;;
+ 
+ 	;;
 +      *netbsd*)
 +	SOUNDSERVER=xgal.sndsrv.linux
 +	cat >> confdefs.h <<\EOF
@@ -26,6 +39,8 @@ $NetBSD: patch-ab,v 1.1 2001/09/10 01:03:28 hubertf Exp $
 +	cat >> confdefs.h <<\EOF
 +#define SOUND 1
 +EOF
- 
- 	;;
++
++	;;
        *sunos*)
+         SOUNDSERVER=xgal.sndsrv.sun.c
+ 	cat >> confdefs.h <<\EOF