Updated to version 0.79

- obey VARBASE
- support SETGIDGAME installations, simplify patch-ad

Changes:

- fixes some minor bugs and memory leaks (Patrice Duhamel and Jozef Behran)
- duplicates the set of cursor movement keys on the numeric keypad (modus)
- disables the F key (full screen) while inputting a player name

5 files changed, 47 insertions, 110 deletions

diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile
index d64b2576457..e5909f64822 100644
--- a/games/powermanga/Makefile
+++ b/games/powermanga/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:14:46 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/30 23:48:32 salo Exp $
 #
 
-DISTNAME=	powermanga
-PKGNAME=	${DISTNAME}-0.78
-PKGREVISION=	1
+DISTNAME=	powermanga-0.79
 CATEGORIES=	games
-MASTER_SITES=	http://www.tlk.fr/lesjeux/
+MASTER_SITES=	http://linux.tlk.fr/games/Powermanga/download/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://linux.tlk.fr/games/Powermanga/
@@ -14,7 +12,9 @@ COMMENT=	Arcade 2D shoot-em-up game
 USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 USE_X11=	yes
-WRKSRC=		${WRKDIR}/powermanga-0.78
+
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+MAKE_ENV+=	TOUCH=${TOUCH}
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/games/powermanga/PLIST b/games/powermanga/PLIST
index c709b23e221..2f4f2ac667f 100644
--- a/games/powermanga/PLIST
+++ b/games/powermanga/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/16 19:34:08 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/30 23:48:32 salo Exp $
 bin/powermanga
 man/man6/powermanga.6
 share/powermanga/graphics/BIGSTAR0.SPR
@@ -316,7 +316,6 @@ share/powermanga/graphics/meteor42.spr
 share/powermanga/graphics/nrjblue.spr
 share/powermanga/graphics/nrjgreen.spr
 share/powermanga/graphics/nrjred.spr
-share/powermanga/graphics/null
 share/powermanga/graphics/option.spr
 share/powermanga/graphics/pmorder.xxx
 share/powermanga/graphics/scores.spr
diff --git a/games/powermanga/distinfo b/games/powermanga/distinfo
index 7ee2c94d9f5..98889906c84 100644
--- a/games/powermanga/distinfo
+++ b/games/powermanga/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/16 19:34:08 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2005/01/30 23:48:32 salo Exp $
 
-SHA1 (powermanga.tar.gz) = e17d217caead1d60a546a7917af0848d0eaa3a10
-Size (powermanga.tar.gz) = 6802816 bytes
+SHA1 (powermanga-0.79.tar.gz) = 59372bd67cfa603109387e3bdc0c51daec2585d7
+Size (powermanga-0.79.tar.gz) = 6808225 bytes
 SHA1 (patch-aa) = 7653196f6ae42a9a176afdcf3588432e36da55c9
 SHA1 (patch-ab) = e8b538813f269c1971ebe7e50b21c0cdc5edc4de
 SHA1 (patch-ac) = 7f45ee51f2863bf37e92f5c16978528d57bc97d7
-SHA1 (patch-ad) = 9a53afa7dbc2c8522585711bd7ec8c058c08c1e4
-SHA1 (patch-ae) = 6bd5f08cdc5eeefe8184d423745debbf80cfad11
+SHA1 (patch-ad) = 934c74e7e48e637e1e9a84434e4db8aff4a6de50
+SHA1 (patch-ae) = 644908551b6036368308d91b61dfc5d2a0e22cff
diff --git a/games/powermanga/patches/patch-ad b/games/powermanga/patches/patch-ad
index 99b883b4543..2e7b521ae35 100644
--- a/games/powermanga/patches/patch-ad
+++ b/games/powermanga/patches/patch-ad
@@ -1,104 +1,42 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/04/16 19:34:10 xtraeme Exp $
+$NetBSD: patch-ad,v 1.2 2005/01/30 23:48:32 salo Exp $
 
---- src/Makefile.in.orig	Mon Jan 26 09:18:03 2004
-+++ src/Makefile.in	Mon Jan 26 09:46:41 2004
-@@ -28,7 +28,7 @@
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
- INSTALL_HEADER = $(INSTALL_DATA)
--transform = $(program_transform_name)
-+transform =
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -137,7 +137,7 @@
- scoredir = /var/games
+--- src/Makefile.in.orig	2004-08-01 22:37:57.000000000 +0200
++++ src/Makefile.in	2005-01-30 21:45:13.000000000 +0100
+@@ -133,8 +133,8 @@
+ target_vendor = @target_vendor@
+ 
+ NULL = 
+-gamesdir = $(prefix)/games
+-scoredir = /var/games
++gamesdir = $(prefix)/bin
++scoredir = $(localstatedir)/games
  score = powermanga.hi
  
--games_PROGRAMS = powermanga
-+bin_PROGRAMS = powermanga
- powermanga_SOURCES = $(SOURCES_MAIN) $(SOURCES_EXTRA)
- powermanga_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@
- powermanga_LDADD = @XLIB_LIBS@ @SDL_LIBS@
-@@ -199,8 +199,8 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--games_PROGRAMS = powermanga$(EXEEXT)
--PROGRAMS = $(games_PROGRAMS)
-+bin_PROGRAMS = powermanga$(EXEEXT)
-+PROGRAMS = $(bin_PROGRAMS)
- 
- am__powermanga_SOURCES_DIST = afficheEtoiles.cpp bonus.cpp caractere.cpp \
- 	caractere.hpp cercle.hpp chaine.cpp chaine.hpp \
-@@ -320,17 +320,17 @@
- 	  $(AUTOMAKE) --foreign  src/Makefile
+ games_PROGRAMS = powermanga
+@@ -321,7 +321,7 @@
+ 	  $(AUTOMAKE) --gnu  src/Makefile
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 -gamesPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
--install-gamesPROGRAMS: $(games_PROGRAMS)
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+install-binPROGRAMS: $(bin_PROGRAMS)
++gamesPROGRAMS_INSTALL = $(BSD_INSTALL_GAME)
+ install-gamesPROGRAMS: $(games_PROGRAMS)
  	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(gamesdir)
--	@list='$(games_PROGRAMS)'; for p in $$list; do \
-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
- 	  ; then \
- 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(gamesPROGRAMS_INSTALL) $$p $(DESTDIR)$(gamesdir)/$$f"; \
--	   $(INSTALL_PROGRAM_ENV) $(gamesPROGRAMS_INSTALL) $$p $(DESTDIR)$(gamesdir)/$$f || exit 1; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
- 	  else :; fi; \
- 	done
- 
-@@ -1420,7 +1420,7 @@
- all-am: Makefile $(PROGRAMS)
- 
- installdirs:
--	$(mkinstalldirs) $(DESTDIR)$(gamesdir)
-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
- 
- install: install-am
- install-exec: install-exec-am
-@@ -1463,7 +1463,7 @@
- 
- info-am:
- 
--install-data-am: install-gamesPROGRAMS
-+install-data-am: install-binPROGRAMS
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
-@@ -1498,7 +1498,7 @@
- 	distclean-depend distclean-generic distclean-tags distdir dvi \
- 	dvi-am info info-am install install-am install-data \
- 	install-data-am install-exec install-exec-am \
--	install-gamesPROGRAMS install-info install-info-am install-man \
-+	install-binPROGRAMS install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-@@ -1507,13 +1507,13 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(gamesdir)
+@@ -1505,13 +1505,10 @@
  
  
  install-data-hook:
 -	-chown root:games "$(DESTDIR)/$(gamesdir)/powermanga"
 -	-chmod 2755 "$(DESTDIR)/$(gamesdir)/powermanga"
 -	$(INSTALL) -d $(DESTDIR)/$(scoredir)
-+	-chown root:games "$(DESTDIR)/$(bindir)/powermanga"
-+	-chmod 2755 "$(DESTDIR)/$(bindir)/powermanga"
-+	$(INSTALL) -d $(scoredir)
- 	-for suffix in "-easy" "" "-hard"; do \
+-	-for suffix in "-easy" "" "-hard"; do \
 -	  touch "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
 -	  chown root:games "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
 -	  chmod 644 "$(DESTDIR)/$(scoredir)/$(score)$$suffix"; \
-+	  touch "$(scoredir)/$(score)$$suffix"; \
-+	  chown root:games "$(scoredir)/$(score)$$suffix"; \
-+	  chmod 664 "$(scoredir)/$(score)$$suffix"; \
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(scoredir)
++	@for suffix in "-easy" "" "-hard"; do \
++	  $(TOUCH) "$(WRKSRC)/$(score)$$suffix" && \
++	  $(BSD_INSTALL_GAME_DATA) "$(WRKSRC)/$(score)$$suffix" $(DESTDIR)/$(scoredir)/; \
  	done
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/games/powermanga/patches/patch-ae b/games/powermanga/patches/patch-ae
index 5e5bd738655..ee64596a94b 100644
--- a/games/powermanga/patches/patch-ae
+++ b/games/powermanga/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/04/16 19:34:10 xtraeme Exp $
+$NetBSD: patch-ae,v 1.2 2005/01/30 23:48:32 salo Exp $
 
---- src/linuxroutines.cpp.orig	Mon Jan 26 09:36:29 2004
-+++ src/linuxroutines.cpp	Mon Jan 26 09:37:01 2004
-@@ -449,7 +449,7 @@
-   for(const char **p = data_directories;; p++)
-   { char                   *pathname;
-     if(*p == 0)
--    { const char             *subdir = "/share/games/powermanga/";
-+    { const char             *subdir = "/share/powermanga/";
-       pathname=(char *)malloc(strlen(nomprefix) + strlen(subdir) + strlen(name) + 1);
-       if(pathname == 0)
-       { fflush(stdout);
+--- src/linuxroutines.cpp.orig	2004-08-01 08:43:56.000000000 +0200
++++ src/linuxroutines.cpp	2005-01-30 21:47:46.000000000 +0100
+@@ -457,7 +457,7 @@
+   for(const char **p = data_directories;; p++)

+   { char *pathname;

+     if(*p == 0)

+-    { const char *subdir = "/share/games/powermanga/";

++    { const char *subdir = "/share/powermanga/";

+       pathname = &pathstring[0];

+       /*pathname=(char *)malloc(strlen(nomprefix) + strlen(subdir) + strlen(name) + 1);

+       if(pathname == 0)