12 files changed, 60 insertions, 79 deletions

diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index b3d49e97ee5c..24b7b3013994 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -6,25 +6,28 @@
 #
 
 PORTNAME=	xgalaga
-PORTVERSION=	2.0.34
-PORTREVISION=	3
+PORTVERSION=	2.1.1.0
 CATEGORIES=	games
-MASTER_SITES=	http://people.FreeBSD.org/~linimon/public_distfiles/
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	turutani@scphys.kyoto-u.ac.jp
 COMMENT=	Galaga resurrected on X
 
+USE_GMAKE=	yes
 USE_XORG=	xpm xmu
 HAS_CONFIGURE=	yes
+MAN6=		xgalaga.6x
+MANCOMPRESSED=	yes
 # xgalaga has a very strange usage of these variables...
 CONFIGURE_ARGS=	--prefix=${LOCALBASE}/lib/X11/xgalaga \
+		--mandir=${LOCALBASE}/man \
 		--exec_prefix=${LOCALBASE}/bin
 
 OPTIONS=	SOUND	"Sound support"	on
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_SOUND) && !defined(NOSOUND)
+.if defined(WITHOUT_SOUND) || defined(NOSOUND)
 CONFIGURE_ARGS+=	--without-sound
 PLIST_SUB=	SOUND="@comment "
 .else
diff --git a/games/xgalaga/distinfo b/games/xgalaga/distinfo
index 6c10401a37e7..a1cbcacf338d 100644
--- a/games/xgalaga/distinfo
+++ b/games/xgalaga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xgalaga-2.0.34.tar.gz) = 070ad0bd3c3b2e04723f185d26b1aea4f7564677e74e865628f1933c47f37a00
-SIZE (xgalaga-2.0.34.tar.gz) = 314189
+SHA256 (xgalaga-2.1.1.0.tar.gz) = adcfbfd04876f5197c60b37af0ad89a629e553d6e09314a4b3b5c70f6c634f9b
+SIZE (xgalaga-2.1.1.0.tar.gz) = 331621
diff --git a/games/xgalaga/files/patch-aa b/games/xgalaga/files/patch-aa
index c7571d08e812..2cad8492ec29 100644
--- a/games/xgalaga/files/patch-aa
+++ b/games/xgalaga/files/patch-aa
@@ -1,13 +1,15 @@
---- Makefile.in.orig	Fri Sep 20 03:24:43 2002
-+++ Makefile.in	Fri Sep 20 03:25:29 2002
-@@ -46,7 +46,9 @@
- 	./mkinstalldirs $(bindir)
- 	./mkinstalldirs $(prefix)
- 	$(INSTALL) $(TARGET) $(bindir)/$(TARGET)
--	$(INSTALL) $(SOUNDSRV) $(prefix)/$(SOUNDSRV)
-+	if [ "X$(SOUNDSRV)" != "X" ]; then \
-+		$(INSTALL) $(SOUNDSRV) $(prefix)/$(SOUNDSRV); \
-+	fi
- 	./mkinstalldirs $(prefix)/sounds
- 	./mkinstalldirs $(prefix)/levels
- 	for i in levels/*.xgl; do $(INSTALL) $$i $(prefix)/$$i ; done
+--- Makefile.in.orig	2008-03-06 06:58:16.000000000 +0900
++++ Makefile.in	2012-04-23 23:27:39.000000000 +0900
+@@ -15,9 +15,9 @@
+ bindir = $(exec_prefix)
+ libdir = $(prefix)/lib
+ infodir = $(prefix)/info
+-#mandir = @mandir@
+-mandir = /usr/share/man
+-creditsfile = @CREDITSFILE@
++mandir = @mandir@
++#mandir = /usr/share/man
++creditsfile = $(prefix)/CREDITS
+ distversion = 2.1.1.0
+ 
+ @SET_MAKE@
diff --git a/games/xgalaga/files/patch-ac b/games/xgalaga/files/patch-ac
index 879242d48dbf..ddecdb03b524 100644
--- a/games/xgalaga/files/patch-ac
+++ b/games/xgalaga/files/patch-ac
@@ -1,11 +1,11 @@
---- configure.orig	Thu Apr 30 07:19:38 1998
-+++ configure	Thu May 28 10:23:39 1998
-@@ -1805,7 +1808,7 @@
-   fi
- fi
+--- configure.orig	2008-03-06 06:58:16.000000000 +0900
++++ configure	2012-04-23 14:21:29.000000000 +0900
+@@ -4544,7 +4544,7 @@
  
+ { echo "$as_me:$LINENO: host os is detected as $host_os " >&5
+ echo "$as_me: host os is detected as $host_os " >&6;}
 -if test -n "$sound-type"; then
-+if test "$sound_type" != "no" ; then
-   case $host_alias in
-     *linux*) 
- 	sound_type=native
++if test "$sound-type" != "no" ; then
+   case $host_os in
+     *linux*)
+       sound_type=native
diff --git a/games/xgalaga/files/patch-ae b/games/xgalaga/files/patch-ae
index 5dc74c6d57e0..dea2bd7dd757 100644
--- a/games/xgalaga/files/patch-ae
+++ b/games/xgalaga/files/patch-ae
@@ -1,14 +1,6 @@
---- main.c.orig	Mon May 11 15:52:59 1998
-+++ main.c	Wed Jun 27 02:53:46 2007
-@@ -7,6 +7,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #ifdef HAVE_SYS_TIME_H
- #include <sys/time.h>
- #endif
-@@ -779,6 +780,7 @@
+--- main.c.orig	2008-03-06 06:58:16.000000000 +0900
++++ main.c	2012-04-23 14:26:03.000000000 +0900
+@@ -836,6 +836,7 @@
      if(gameOver) {
          while(W_EventsPending()) {
              W_NextEvent(&wev);
@@ -16,7 +8,7 @@
          
  	    if(gameOver)
  	      mouseControl = 1;
-@@ -826,6 +828,7 @@
+@@ -922,6 +923,7 @@
  
      while(W_EventsPending()) {
          W_NextEvent(&wev);
diff --git a/games/xgalaga/files/patch-config.sub b/games/xgalaga/files/patch-config.sub
new file mode 100644
index 000000000000..5369c8147e6b
--- /dev/null
+++ b/games/xgalaga/files/patch-config.sub
@@ -0,0 +1,11 @@
+--- config.sub.orig	2008-03-05 22:58:16.000000000 +0100
++++ config.sub	2012-05-01 20:43:22.460600001 +0200
+@@ -197,6 +197,8 @@
+ 		basic_machine=a29k-none
+ 		os=-bsd
+ 		;;
++	amd64*)
++		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
diff --git a/games/xgalaga/files/patch-data.h b/games/xgalaga/files/patch-data.h
deleted file mode 100644
index 7a5ec91fb178..000000000000
--- a/games/xgalaga/files/patch-data.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- data.h.orig	Mon May 11 15:37:19 1998
-+++ data.h	Wed Jun 27 02:50:31 2007
-@@ -1,4 +1,5 @@
- #include "Wlib.h"
-+#include "struct.h"
- 
- extern W_Window gal, baseWin;
- 
diff --git a/games/xgalaga/files/patch-libsprite__data.h b/games/xgalaga/files/patch-libsprite__data.h
deleted file mode 100644
index 50a3e7ab8b07..000000000000
--- a/games/xgalaga/files/patch-libsprite__data.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libsprite/data.h.orig	Sun Apr 12 15:03:22 1998
-+++ libsprite/data.h	Wed Jun 27 02:49:24 2007
-@@ -20,6 +20,7 @@
- 
- #include "Wlib.h"
- #include "defs.h"
-+#include "struct.h"
- 
- extern int	nplanes;
- extern int	xpmORplanes ;
diff --git a/games/xgalaga/files/patch-score.c b/games/xgalaga/files/patch-score.c
deleted file mode 100644
index ffe71be86f6b..000000000000
--- a/games/xgalaga/files/patch-score.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- score.c.orig	Thu Apr 30 14:11:58 1998
-+++ score.c	Wed Jun 27 02:55:23 2007
-@@ -4,6 +4,7 @@
- 
- #include <config.h>
- #include <stdio.h>
-+#include <string.h>
- #include "Wlib.h"
- #include "images.h"
- #include "data.h"
diff --git a/games/xgalaga/files/patch-titile.c b/games/xgalaga/files/patch-titile.c
deleted file mode 100644
index 630c9c36df9b..000000000000
--- a/games/xgalaga/files/patch-titile.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- title.c.orig	Mon May 11 15:52:59 1998
-+++ title.c	Wed Jun 27 02:54:45 2007
-@@ -4,6 +4,7 @@
- #include <config.h>
- 
- #include <stdio.h>
-+#include <string.h>
- #include "Wlib.h"
- #include "defs.h"
- #include "images.h"
diff --git a/games/xgalaga/files/patch-title.c b/games/xgalaga/files/patch-title.c
new file mode 100644
index 000000000000..d20c54157fd6
--- /dev/null
+++ b/games/xgalaga/files/patch-title.c
@@ -0,0 +1,10 @@
+--- title.c.orig	2008-03-06 06:58:16.000000000 +0900
++++ title.c	2012-04-23 14:28:39.000000000 +0900
+@@ -5,6 +5,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
diff --git a/games/xgalaga/pkg-plist b/games/xgalaga/pkg-plist
index 69280640658e..3a8c78b4c854 100644
--- a/games/xgalaga/pkg-plist
+++ b/games/xgalaga/pkg-plist
@@ -1,4 +1,5 @@
 bin/xgalaga
+bin/xgalaga-hyperspace
 %%SOUND%%lib/X11/xgalaga/xgal.sndsrv.freebsd
 lib/X11/xgalaga/sounds/ddloo.raw
 lib/X11/xgalaga/sounds/explode.raw
@@ -23,7 +24,7 @@ lib/X11/xgalaga/levels/level12.xgl
 lib/X11/xgalaga/levels/level13.xgl
 lib/X11/xgalaga/levels/level14.xgl
 lib/X11/xgalaga/levels/level15.xgl
-lib/X11/xgalaga/scores
+lib/X11/xgalaga/CREDITS
 @dirrm lib/X11/xgalaga/levels
 @dirrm lib/X11/xgalaga/sounds
 @dirrm lib/X11/xgalaga