13 files changed, 48 insertions, 243 deletions
diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile
index 9cbc5c7..177de84 100644
--- a/games/powermanga/Makefile
+++ b/games/powermanga/Makefile
@@ -6,25 +6,39 @@
 #
 
 PORTNAME=		powermanga
-PORTVERSION=		0.78
-PORTREVISION=	2
+PORTVERSION=		0.79
 CATEGORIES=		games
-MASTER_SITES=		http://www.tlk.fr/lesjeux/
-DISTNAME=		${PORTNAME}
+MASTER_SITES=		http://linux.tlk.fr/games/Powermanga/download/
+EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		jylefort@brutele.be
 COMMENT=		An arcade 2D shoot-em-up
 
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_X_PREFIX=		yes
 USE_SDL=		sdl mixer
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--program-prefix=""
 USE_REINPLACE=		yes
 
 MAN6=			powermanga.6
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/powermanga.6
+	@${REINPLACE_CMD} -e 's|^CXXFLAGS="-O3.*||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|/usr/share/games/\(powermanga/graphics\)|${PREFIX}/share/\1|; \
+		 s|/usr/share/games/\(powermanga\)/sound|${PREFIX}/share/\1/sounds|' \
+		${WRKSRC}/powermanga.6
+	@${REINPLACE_CMD} -e 's|(mandir)|&/man6|' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|\((prefix)\)/games|\1/bin|' \
+		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|games/\(powermanga\)|\1|' \
+		${WRKSRC}/graphics/Makefile.in \
+		${WRKSRC}/sounds/Makefile.in \
+		${WRKSRC}/src/linuxroutines.cpp
+	@${REINPLACE_CMD} -e 's|SDL/||' \
+		${WRKSRC}/src/powermanga.hpp \
+		${WRKSRC}/src/sdl_mixer.cpp
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/games/powermanga/distinfo b/games/powermanga/distinfo
index 91b8b10..d3bb5f2 100644
--- a/games/powermanga/distinfo
+++ b/games/powermanga/distinfo
@@ -1,2 +1,2 @@
-MD5 (powermanga.tar.gz) = 6d84fac8f9f838dd5654735bbc68b9d7
-SIZE (powermanga.tar.gz) = 6802816
+MD5 (powermanga-0.79.tgz) = 3a4f00658496921b7327413ac476c1b7
+SIZE (powermanga-0.79.tgz) = 6808225
diff --git a/games/powermanga/files/patch-Makefile.in b/games/powermanga/files/patch-Makefile.in
deleted file mode 100644
index 408f23c..0000000
--- a/games/powermanga/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Jan 26 09:15:26 2004
-+++ Makefile.in	Mon Jan 26 09:16:25 2004
-@@ -38,7 +38,7 @@
- host_triplet = @host@
- target_triplet = @target@
- 
--pkgdatadir = $(mandir)
-+pkgdatadir = $(mandir)/man6
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
diff --git a/games/powermanga/files/patch-configure b/games/powermanga/files/patch-configure
deleted file mode 100644
index abd9a74..0000000
--- a/games/powermanga/files/patch-configure
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure.orig	Mon Jan 26 09:24:51 2004
-+++ configure	Mon Jan 26 09:26:18 2004
-@@ -2362,21 +2362,7 @@
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
--if test "$ac_test_CFLAGS" = set; then
--  CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
--else
--  if test "$GCC" = yes; then
--    CFLAGS="-O2"
--  else
--    CFLAGS=
--  fi
--fi
-+CFLAGS=$ac_save_CFLAGS
- echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
- echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_stdc+set}" = set; then
-@@ -2966,21 +2952,7 @@
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
--if test "$ac_test_CXXFLAGS" = set; then
--  CXXFLAGS=$ac_save_CXXFLAGS
--elif test $ac_cv_prog_cxx_g = yes; then
--  if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
--  else
--    CXXFLAGS="-g"
--  fi
--else
--  if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
--  else
--    CXXFLAGS=
--  fi
--fi
-+CXXFLAGS=$ac_save_CXXFLAGS
- for ac_declaration in \
-    ''\
-    '#include <stdlib.h>' \
-@@ -3158,7 +3130,6 @@
- 
- 
- 
--CXXFLAGS="-O3 -Wall"
- 
- 
- ac_ext=c
diff --git a/games/powermanga/files/patch-graphics::Makefile.in b/games/powermanga/files/patch-graphics::Makefile.in
deleted file mode 100644
index f083160..0000000
--- a/games/powermanga/files/patch-graphics::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- graphics/Makefile.in.orig	Mon Jan 26 09:16:58 2004
-+++ graphics/Makefile.in	Mon Jan 26 09:17:15 2004
-@@ -37,7 +37,7 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--pkgdatadir = $(datadir)/games/powermanga/graphics
-+pkgdatadir = $(datadir)/powermanga/graphics
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
diff --git a/games/powermanga/files/patch-powermanga.6 b/games/powermanga/files/patch-powermanga.6
index bf1c910..591fbe7 100644
--- a/games/powermanga/files/patch-powermanga.6
+++ b/games/powermanga/files/patch-powermanga.6
@@ -1,17 +1,13 @@
---- powermanga.6.orig	Mon Jan 26 09:48:45 2004
-+++ powermanga.6	Mon Jan 26 09:57:22 2004
-@@ -99,12 +99,12 @@
- .B \--hard
- make the game harder
- .SH FILES
--.B /usr/share/games/powermanga/graphics/
-+.B %%PREFIX%%/share/powermanga/graphics/
+--- powermanga.6.orig	Tue Jan 18 04:53:21 2005
++++ powermanga.6	Tue Jan 18 04:53:43 2005
+@@ -115,9 +115,7 @@
+ Used to search for graphics and sounds.
+ .SH AUTHOR
+ Powermanga - Copyright TLK Games. You are free to redistribute
+-and/or change it under the terms of the GNU General Public License. See the
+-.I /usr/share/doc/powermanga/copyright
+-for details.
++and/or change it under the terms of the GNU General Public License.
  .br
- .RS
- Graphics files.
- .RE
--.B /usr/share/games/powermanga/sound/
-+.B %%PREFIX%%/share/powermanga/sounds/
- .br
- .RS
- Sound files.
+ This manual page was written by Jeronimo Pellegrini <pellegrini@mpcnet.com.br>, based on the previous one by Samuel Hocevar <sam@zoy.org>, for the Debian GNU/Linux system (but may be used by others).
+ 
diff --git a/games/powermanga/files/patch-sounds::Makefile.in b/games/powermanga/files/patch-sounds::Makefile.in
deleted file mode 100644
index 0fe096e..0000000
--- a/games/powermanga/files/patch-sounds::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sounds/Makefile.in.orig	Mon Jan 26 09:17:41 2004
-+++ sounds/Makefile.in	Mon Jan 26 09:17:49 2004
-@@ -37,7 +37,7 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--pkgdatadir = $(datadir)/games/powermanga/sounds
-+pkgdatadir = $(datadir)/powermanga/sounds
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
diff --git a/games/powermanga/files/patch-src::Makefile.in b/games/powermanga/files/patch-src::Makefile.in
deleted file mode 100644
index fa9399c..0000000
--- a/games/powermanga/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,102 +0,0 @@
---- 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
- 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
- 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)
- 	@$(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 @@
- 
- 
- 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 \
--	  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"; \
- 	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/files/patch-src::linuxroutines.cpp b/games/powermanga/files/patch-src::linuxroutines.cpp
deleted file mode 100644
index 68e08cf..0000000
--- a/games/powermanga/files/patch-src::linuxroutines.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
diff --git a/games/powermanga/files/patch-src::powermanga.hpp.rej b/games/powermanga/files/patch-src::powermanga.hpp.rej
new file mode 100644
index 0000000..01c6d6e
--- /dev/null
+++ b/games/powermanga/files/patch-src::powermanga.hpp.rej
@@ -0,0 +1,13 @@
+***************
+*** 1,10 ****
+- --- src/powermanga.hpp.orig	Mon Jan 26 14:13:52 2004
+- +++ src/powermanga.hpp	Mon Jan 26 14:14:25 2004
+- @@ -1096,6 +1096,6 @@
+-  #include "etbfonte1.hpp"
+-  #include "score.hpp"
+-  #ifdef SDL_TLK
+- -#include "SDL/SDL.h"
+- +#include <SDL.h>
+-  #endif
+-  #endif
+--- 0 ----
diff --git a/games/powermanga/files/patch-src::sdl_mixer.cpp b/games/powermanga/files/patch-src::sdl_mixer.cpp
deleted file mode 100644
index 11faa34..0000000
--- a/games/powermanga/files/patch-src::sdl_mixer.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/sdl_mixer.cpp.orig	Mon Jan 26 09:11:21 2004
-+++ src/sdl_mixer.cpp	Mon Jan 26 09:11:31 2004
-@@ -40,9 +40,9 @@
- //..............................................................................
- #include "powermanga.hpp"
- #ifdef UTILISE_SEAL
--#include <SDL/SDL.h>
--#include <SDL/SDL_thread.h>
--#include <SDL/SDL_mixer.h>
-+#include <SDL.h>
-+#include <SDL_thread.h>
-+#include <SDL_mixer.h>
- //..............................................................................
- //..............................................................................
- extern unsigned int     iVerbeux;                              //1=affiche les arguments
diff --git a/games/powermanga/pkg-descr b/games/powermanga/pkg-descr
index 440269f..5ed92d4 100644
--- a/games/powermanga/pkg-descr
+++ b/games/powermanga/pkg-descr
@@ -3,7 +3,7 @@ than 200 sprites. It runs in 320x200 or 640x400 pixels, with Window
 mode or direct to screen (DGA) and support for 8, 15, 16, 24, and 32
 bpp.
 
-WWW: http://linux.tlk.fr/
+WWW: http://linux.tlk.fr/games/Powermanga/
 
 - Jean-Yves Lefort
 jylefort@brutele.be
diff --git a/games/powermanga/pkg-plist b/games/powermanga/pkg-plist
index 0351f8d..dd42286 100644
--- a/games/powermanga/pkg-plist
+++ b/games/powermanga/pkg-plist
@@ -314,7 +314,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