Date: Mon, 23 Apr 2012 23:45:45 +0900 (JST) From: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org Cc: turutani@scphys.kyoto-u.ac.jp Subject: ports/167227: update games/xgalaga Message-ID: <201204231445.q3NEjjEY026304@h120.65.226.10.32118.vlan.kuins.net> Resent-Message-ID: <201204231510.q3NFA835075754@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 167227 >Category: ports >Synopsis: update games/xgalaga >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 23 15:10:08 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Tsurutani Naoki >Release: FreeBSD 8.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD h120.65.226.10.32118.vlan.kuins.net 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #25: Mon Jan 24 10:37:18 JST 2011 turutani@h120.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386 >Description: xgalaga-2.1.1.0 is available. >How-To-Repeat: >Fix: diff -urN xgalaga.orig/Makefile xgalaga/Makefile --- xgalaga.orig/Makefile 2011-10-07 06:40:34.000000000 +0900 +++ xgalaga/Makefile 2012-04-23 23:28:54.000000000 +0900 @@ -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= http://downloads.sourceforge.net/project/xgalaga/${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 -urN xgalaga.orig/distinfo xgalaga/distinfo --- xgalaga.orig/distinfo 2011-07-07 06:53:40.000000000 +0900 +++ xgalaga/distinfo 2012-04-23 13:41:47.000000000 +0900 @@ -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 -urN xgalaga.orig/files/patch-aa xgalaga/files/patch-aa --- xgalaga.orig/files/patch-aa 2002-09-20 04:53:36.000000000 +0900 +++ xgalaga/files/patch-aa 2012-04-23 23:29:42.000000000 +0900 @@ -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 -urN xgalaga.orig/files/patch-ac xgalaga/files/patch-ac --- xgalaga.orig/files/patch-ac 1998-05-28 17:24:37.000000000 +0900 +++ xgalaga/files/patch-ac 2012-04-23 14:33:59.000000000 +0900 @@ -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 -urN xgalaga.orig/files/patch-ad xgalaga/files/patch-ad --- xgalaga.orig/files/patch-ad 2000-10-30 07:35:15.000000000 +0900 +++ xgalaga/files/patch-ad 1970-01-01 09:00:00.000000000 +0900 @@ -1,15 +0,0 @@ ---- struct.h.orig Sun Oct 22 00:36:24 2000 -+++ struct.h Sun Oct 22 00:37:03 2000 -@@ -1,3 +1,6 @@ -+#ifndef __struct_h__ -+#define __struct_h__ -+ - #include "Wlib.h" - - struct torp { -@@ -38,3 +41,5 @@ - int count; - W_Image *shape; - }; -+ -+#endif /* __struct_h__ */ diff -urN xgalaga.orig/files/patch-ae xgalaga/files/patch-ae --- xgalaga.orig/files/patch-ae 2007-07-18 16:43:45.000000000 +0900 +++ xgalaga/files/patch-ae 2012-04-23 23:39:31.000000000 +0900 @@ -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 -urN xgalaga.orig/files/patch-data.h xgalaga/files/patch-data.h --- xgalaga.orig/files/patch-data.h 2007-06-29 17:32:31.000000000 +0900 +++ xgalaga/files/patch-data.h 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN xgalaga.orig/files/patch-libsprite__data.h xgalaga/files/patch-libsprite__data.h --- xgalaga.orig/files/patch-libsprite__data.h 2007-06-29 17:32:31.000000000 +0900 +++ xgalaga/files/patch-libsprite__data.h 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN xgalaga.orig/files/patch-score.c xgalaga/files/patch-score.c --- xgalaga.orig/files/patch-score.c 2007-06-29 17:32:31.000000000 +0900 +++ xgalaga/files/patch-score.c 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN xgalaga.orig/files/patch-titile.c xgalaga/files/patch-titile.c --- xgalaga.orig/files/patch-titile.c 2007-06-29 17:32:31.000000000 +0900 +++ xgalaga/files/patch-titile.c 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN xgalaga.orig/files/patch-title.c xgalaga/files/patch-title.c --- xgalaga.orig/files/patch-title.c 1970-01-01 09:00:00.000000000 +0900 +++ xgalaga/files/patch-title.c 2012-04-23 14:34:33.000000000 +0900 @@ -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 -urN xgalaga.orig/pkg-plist xgalaga/pkg-plist --- xgalaga.orig/pkg-plist 2005-03-15 02:01:09.000000000 +0900 +++ xgalaga/pkg-plist 2012-04-23 23:04:12.000000000 +0900 @@ -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/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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204231445.q3NEjjEY026304>