Update to 5.6.4:

2007-10-17  Christian Mauduit (ufoot@ufoot.org)

	* Released 5.6.4.

	* Updated config.guess & config.sub

	* NSIS packaging (windows .exe installer).


2007-10-15  Christian Mauduit (ufoot@ufoot.org)

	* MSVC -> MinGW

	* src/base.h now included in source tarball (for MS platforms...)


2007-10-06  Christian Mauduit (ufoot@ufoot.org)

	* Minor packaging & doc fixes.


2007-09-07  Christian Mauduit (ufoot@ufoot.org)

	* Included the (old) exploit http://www.securityfocus.com/bid/8629/


2007-09-06  Christian Mauduit (ufoot@ufoot.org)

	* Copyright 2006 -> 2007

	* Minor Makefile fix


2006-10-17  Christian Mauduit (ufoot@ufoot.org)

	* Gcc option -mpcu (deprecated) -> -march.


2006-10-16  Christian Mauduit (ufoot@ufoot.org)

	* Makefile patch for BSD by Thomas Klausner.


2006-04-04  Christian Mauduit (ufoot@ufoot.org)

	* Fixed atrocious bug in group_mesher. Almost 8 years old.


2006-04-02  Christian Mauduit (ufoot@ufoot.org)

	* Deleted lwtabto3.pcx which was a duplicate of lwtab006.pcx


2006-04-01  Christian Mauduit (ufoot@ufoot.org)

	* Deleted lwtab007.pcx which was a duplicate of lwtabto4.pcx


2006-03-08  Christian Mauduit (ufoot@ufoot.org)

	* Fixed segfault when graphics mode are not available.


2006-03-07  Christian Mauduit (ufoot@ufoot.org)

	* Created an NSIS installer script (not working yet).

	* Copyright 2005 -> 2006.

	* Minor patch, removed accent (ascii>127) from doc.


2005-12-11  Christian Mauduit (ufoot@ufoot.org)

	* Move Arch depot to Savannah.


2005-12-04  Christian Mauduit (ufoot@ufoot.org)

	* Changed ufoot.org/liquidwar to ufoot.org/liquidwar/v5

5 files changed, 33 insertions, 128 deletions

diff --git a/games/liquidwar/Makefile b/games/liquidwar/Makefile
index 6077de5804b..fc235cc1f97 100644
--- a/games/liquidwar/Makefile
+++ b/games/liquidwar/Makefile
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2007/09/09 16:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/11/29 17:28:24 wiz Exp $
 #
 
-DISTNAME=	liquidwar-5.6.3
-PKGREVISION=	1
+DISTNAME=	liquidwar-5.6.4
 CATEGORIES=	games
-MASTER_SITES=	http://ufoot.hd.free.fr/pub/archive/ \
-		http://www.ufoot.org/archive/ \
-		http://download.savannah.nongnu.org/releases/liquidwar/
+MASTER_SITES=	http://www.ufoot.org/download/liquidwar/v5/5.6.4/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.ufoot.org/liquidwar/
+HOMEPAGE=	http://www.ufoot.org/liquidwar/v5
 COMMENT=	Unique multiplayer wargame
 
 USE_DIRS+=	gnome2-1.5
diff --git a/games/liquidwar/distinfo b/games/liquidwar/distinfo
index ff5e4dbba39..6c087792a09 100644
--- a/games/liquidwar/distinfo
+++ b/games/liquidwar/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/10/16 00:48:29 wiz Exp $
+$NetBSD: distinfo,v 1.6 2007/11/29 17:28:24 wiz Exp $
 
-SHA1 (liquidwar-5.6.3.tar.gz) = a0126f0370a92e2db0f18d4bf8cf31a7f15081e2
-RMD160 (liquidwar-5.6.3.tar.gz) = 678304f624dcff4480b0398c79650ac3625dc86d
-Size (liquidwar-5.6.3.tar.gz) = 3292030 bytes
-SHA1 (patch-aa) = fc323d94c6f2752e0f190ad93ea0f5224bb221e1
-SHA1 (patch-ab) = effe830c3750d33bc7700aa817de05745166d541
-SHA1 (patch-ac) = 3573f01cb9f9ac39fa30a6856a0bd04112c1d4e4
+SHA1 (liquidwar-5.6.4.tar.gz) = a3006c4da9517c3af3b7bf165b2c86fa369a71c6
+RMD160 (liquidwar-5.6.4.tar.gz) = 991da4af05d1a8cf292faf23e9c06c1f7571672c
+Size (liquidwar-5.6.4.tar.gz) = 3268432 bytes
+SHA1 (patch-aa) = 91094d0ab8855eab63fb83fd2d8c0b88407d6f83
+SHA1 (patch-ab) = 58bb01680e34cd4d8b4f388e36d806559deadc71
diff --git a/games/liquidwar/patches/patch-aa b/games/liquidwar/patches/patch-aa
index fd6099889a8..e3e6fc0c4e9 100644
--- a/games/liquidwar/patches/patch-aa
+++ b/games/liquidwar/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2006/01/12 22:34:15 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2007/11/29 17:28:24 wiz Exp $
 
---- Makefile.in.orig	2004-02-11 20:43:58.000000000 +0000
+--- Makefile.in.orig	2007-10-17 20:00:47.000000000 +0000
 +++ Makefile.in
 @@ -7,7 +7,7 @@ mandir =          @mandir@
  infodir =         @infodir@
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.2 2006/01/12 22:34:15 joerg Exp $
  # We don't use the autoconf default infodir=$(prefix)/info info
  # directory since the FHS (File Hierarchy Standard recommends
  # to place info pages in $(datadir)/info (ie /usr/share/info).
-@@ -90,7 +90,7 @@ build_data:
+@@ -94,7 +94,7 @@ build_data:
  build_doc:	
  	@$(GMAKE) -C $(MAKE_DOC_DIR)
  
@@ -31,90 +31,3 @@ $NetBSD: patch-aa,v 1.2 2006/01/12 22:34:15 joerg Exp $
  
  # the install_nolink is for distribs where $(prefix)/games is in the PATH,
  # for instance Debian, where a link in $(prefix)/bin is pretty much useless
-@@ -105,9 +105,9 @@ install_nolink: install_bin install_data
- install_bin: src/liquidwar src/liquidwar-server src/liquidwar-mapgen
- 	@echo "Installing liquidwar binaries in $(GAMEDIR)."
- 	@install -d $(DESTDIR)$(GAMEDIR)
--	@install -s src/liquidwar $(DESTDIR)$(GAMEDIR)
--	@install -s src/liquidwar-server $(DESTDIR)$(GAMEDIR)
--	@install -s src/liquidwar-mapgen $(DESTDIR)$(GAMEDIR)
-+	@install -c -s src/liquidwar $(DESTDIR)$(GAMEDIR)
-+	@install -c -s src/liquidwar-server $(DESTDIR)$(GAMEDIR)
-+	@install -c -s src/liquidwar-mapgen $(DESTDIR)$(GAMEDIR)
- 
- install_link:
- 	@echo "Installing link in $(BINDIR)."
-@@ -122,56 +122,56 @@ install_link:
- install_data: data/liquidwar.dat
- 	@echo "Installing liquidwar datafile in $(DATADIR)."
- 	@install -d $(DESTDIR)$(DATADIR)
--	@install -m 0644 data/liquidwar.dat $(DESTDIR)$(DATADIR)
-+	@install -c -m 0644 data/liquidwar.dat $(DESTDIR)$(DATADIR)
- 
- install_custom_map: 
- 	@echo "Installing liquidwar custom maps in $(DATADIR)/map."
- 	@install -d $(DESTDIR)$(DATADIR)
- 	@install -d $(DESTDIR)$(DATADIR)/map
--	@install -m 0644 custom/map/*.* $(DESTDIR)$(DATADIR)/map
-+	@install -c -m 0644 custom/map/*.* $(DESTDIR)$(DATADIR)/map
- 
- install_custom_texture: 
- 	@echo "Installing liquidwar custom textures in $(DATADIR)/texture."
- 	@install -d $(DESTDIR)$(DATADIR)
- 	@install -d $(DESTDIR)$(DATADIR)/texture
--	@install -m 0644 custom/texture/*.* $(DESTDIR)$(DATADIR)/texture
-+	@install -c -m 0644 custom/texture/*.* $(DESTDIR)$(DATADIR)/texture
- 
- install_custom_music: 
- 	@echo "Installing liquidwar custom musics in $(DATADIR)/music."
- 	@install -d $(DESTDIR)$(DATADIR)
- 	@install -d $(DESTDIR)$(DATADIR)/music
--	@install -m 0644 custom/music/*.* $(DESTDIR)$(DATADIR)/music
-+	@install -c -m 0644 custom/music/*.* $(DESTDIR)$(DATADIR)/music
- 
- install_doc:
--	@if [ -f $(MAKE_DOC_DIR)/txt/rules.txt ]; then echo "Installing liquidwar plain text doc in $(DOCDIR)/txt."; install -d $(DESTDIR)$(DOCDIR)/txt; install -m 0644 $(MAKE_DOC_DIR)/txt/*.txt $(DESTDIR)$(DOCDIR)/txt; fi
--	@if [ -f $(MAKE_DOC_DIR)/html/rules.html ]; then echo "Installing liquidwar HTML doc in $(DOCDIR)/html."; install -d $(DESTDIR)$(DOCDIR)/html; install -m 0644 $(MAKE_DOC_DIR)/html/*.html $(DESTDIR)$(DOCDIR)/html; fi
--	@if [ -f $(MAKE_DOC_DIR)/man/liquidwar.6.gz ]; then echo "Installing liquidwar man page in $(MANDIR)."; install -d $(DESTDIR)$(MANDIR); install -m 0644 $(MAKE_DOC_DIR)/man/liquidwar.6.gz $(DESTDIR)$(MANDIR); ln -s -f liquidwar.6.gz $(DESTDIR)$(MANDIR)/liquidwar-server.6.gz; ln -s -f liquidwar.6.gz $(DESTDIR)$(MANDIR)/liquidwar-mapgen.6.gz; fi
--	@if [ -f $(MAKE_DOC_DIR)/info/liquidwar.info.gz ]; then echo "Installing info page $(INFODIR)/liquidwar.info.gz."; install -d $(DESTDIR)$(INFODIR); install -m 644 $(MAKE_DOC_DIR)/info/liquidwar.info* $(DESTDIR)$(INFODIR); if which install-info; then if test -d $(DESTDIR)$(INFODIRDIR); then if test -f $(DESTDIR)$(INFODIRDIR)/dir; then echo "Installing liquidwar info entry."; install-info --info-dir=$(DESTDIR)$(INFODIRDIR) $(MAKE_DOC_DIR)/info/liquidwar.info.gz; fi; fi; fi; fi
--	@if [ -f $(MAKE_DOC_DIR)/ps/liquidwar.ps ]; then echo "Installing liquidwar PostScript doc in $(DOCDIR)/ps."; install -d $(DESTDIR)$(DOCDIR)/ps; install -m 0644 $(MAKE_DOC_DIR)/ps/*.ps $(DESTDIR)$(DOCDIR)/ps; fi
--	@if [ -f $(MAKE_DOC_DIR)/pdf/liquidwar.pdf ]; then echo "Installing liquidwar PDF doc in $(DOCDIR)/pdf."; install -d $(DESTDIR)$(DOCDIR)/pdf; install -m 0644 $(MAKE_DOC_DIR)/pdf/*.pdf $(DESTDIR)$(DOCDIR)/pdf; fi
-+	@if [ -f $(MAKE_DOC_DIR)/txt/rules.txt ]; then echo "Installing liquidwar plain text doc in $(DOCDIR)/txt."; install -d $(DESTDIR)$(DOCDIR)/txt; install -c -m 0644 $(MAKE_DOC_DIR)/txt/*.txt $(DESTDIR)$(DOCDIR)/txt; fi
-+	@if [ -f $(MAKE_DOC_DIR)/html/rules.html ]; then echo "Installing liquidwar HTML doc in $(DOCDIR)/html."; install -d $(DESTDIR)$(DOCDIR)/html; install -c -m 0644 $(MAKE_DOC_DIR)/html/*.html $(DESTDIR)$(DOCDIR)/html; fi
-+	@if [ -f $(MAKE_DOC_DIR)/man/liquidwar.6.gz ]; then echo "Installing liquidwar man page in $(MANDIR)."; install -d $(DESTDIR)$(MANDIR); install -c -m 0644 $(MAKE_DOC_DIR)/man/liquidwar.6.gz $(DESTDIR)$(MANDIR); ln -s -f liquidwar.6.gz $(DESTDIR)$(MANDIR)/liquidwar-server.6.gz; ln -s -f liquidwar.6.gz $(DESTDIR)$(MANDIR)/liquidwar-mapgen.6.gz; fi
-+	@if [ -f $(MAKE_DOC_DIR)/info/liquidwar.info.gz ]; then echo "Installing info page $(INFODIR)/liquidwar.info.gz."; install -d $(DESTDIR)$(INFODIR); install -c -m 644 $(MAKE_DOC_DIR)/info/liquidwar.info* $(DESTDIR)$(INFODIR); if which install-info; then if test -d $(DESTDIR)$(INFODIRDIR); then if test -f $(DESTDIR)$(INFODIRDIR)/dir; then echo "Installing liquidwar info entry."; install-info --info-dir=$(DESTDIR)$(INFODIRDIR) $(MAKE_DOC_DIR)/info/liquidwar.info.gz; fi; fi; fi; fi
-+	@if [ -f $(MAKE_DOC_DIR)/ps/liquidwar.ps ]; then echo "Installing liquidwar PostScript doc in $(DOCDIR)/ps."; install -d $(DESTDIR)$(DOCDIR)/ps; install -c -m 0644 $(MAKE_DOC_DIR)/ps/*.ps $(DESTDIR)$(DOCDIR)/ps; fi
-+	@if [ -f $(MAKE_DOC_DIR)/pdf/liquidwar.pdf ]; then echo "Installing liquidwar PDF doc in $(DOCDIR)/pdf."; install -d $(DESTDIR)$(DOCDIR)/pdf; install -c -m 0644 $(MAKE_DOC_DIR)/pdf/*.pdf $(DESTDIR)$(DOCDIR)/pdf; fi
- 
- install_icon:
- 	@echo "Installing liquidwar icon in $(PIXDIR)."
- 	@install -d $(DESTDIR)$(PIXDIR)
--	@install -m 0644 misc/liquidwar.xpm $(DESTDIR)$(PIXDIR)
-+	@install -c -m 0644 misc/liquidwar.xpm $(DESTDIR)$(PIXDIR)
- 
- install_desktop:
- 	@echo "Installing desktop file in $(DESKTOPDIR)."
- 	@install -d $(DESTDIR)$(DESKTOPDIR)
--	@install -m 0644 misc/liquidwar.desktop $(DESTDIR)$(DESKTOPDIR)
-+	@install -c -m 0644 misc/liquidwar.desktop $(DESTDIR)$(DESKTOPDIR)
- 
- install_gpl:
- 	@echo "Installing GPL in $(DOCDIR)."
- 	@install -d $(DESTDIR)$(DOCDIR)
--	@install -m 0644 COPYING $(DESTDIR)$(DOCDIR)
-+	@install -c -m 0644 COPYING $(DESTDIR)$(DOCDIR)
- 
- install_readme:
- 	@echo "Installing README in $(DOCDIR)."
- 	@install -d $(DESTDIR)$(DOCDIR)
--	@install -m 0644 README $(DESTDIR)$(DOCDIR)
--	@install -m 0644 README.fr $(DESTDIR)$(DOCDIR)
--	@install -m 0644 README.de $(DESTDIR)$(DOCDIR)
--	@install -m 0644 README.dk $(DESTDIR)$(DOCDIR)
-+	@install -c -m 0644 README $(DESTDIR)$(DOCDIR)
-+	@install -c -m 0644 README.fr $(DESTDIR)$(DOCDIR)
-+	@install -c -m 0644 README.de $(DESTDIR)$(DOCDIR)
-+	@install -c -m 0644 README.dk $(DESTDIR)$(DOCDIR)
- 
- uninstall:
- 	@echo "Removing binary $(GAMEDIR)/liquidwar."
diff --git a/games/liquidwar/patches/patch-ab b/games/liquidwar/patches/patch-ab
index b6afdb03cf4..457a9c42743 100644
--- a/games/liquidwar/patches/patch-ab
+++ b/games/liquidwar/patches/patch-ab
@@ -1,13 +1,22 @@
-$NetBSD: patch-ab,v 1.1 2005/06/20 08:35:47 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2007/11/29 17:28:24 wiz Exp $
 
---- src/Makefile.in.orig	2004-02-11 15:43:58.000000000 -0500
-+++ src/Makefile.in
-@@ -19,7 +19,7 @@ PTHREAD =         @PTHREAD@
- ifeq ($(TARGET_OPT),yes)
- 	TARGET =          @target@
- 	TARGET_CPU =      @target_cpu@
--	TARGET_CPU_CC =   "-mcpu=@target_cpu@"
-+	TARGET_CPU_CC =
+--- configure.orig	2007-11-29 17:22:02.000000000 +0000
++++ configure
+@@ -6392,7 +6392,7 @@ echo $ECHO_N "checking for target specif
+ # Check whether --enable-target-opt was given.
+ if test "${enable_target_opt+set}" = set; then
+   enableval=$enable_target_opt;
+-  if test "$I386" == "yes" && test "$enableval" != "no" ; then
++  if test "$I386" = "yes" && test "$enableval" != "no" ; then
+     TARGET_OPT=yes
+     { echo "$as_me:$LINENO: result: enabled" >&5
+ echo "${ECHO_T}enabled" >&6; }
+@@ -6404,7 +6404,7 @@ echo "${ECHO_T}disabled" >&6; }
+ 
  else
- 	TARGET =          default
- 	TARGET_CPU =      default
+ 
+-  if test "$I386" == "yes" ; then
++  if test "$I386" = "yes" ; then
+     TARGET_OPT=yes
+     { echo "$as_me:$LINENO: result: enabled" >&5
+ echo "${ECHO_T}enabled" >&6; }
diff --git a/games/liquidwar/patches/patch-ac b/games/liquidwar/patches/patch-ac
deleted file mode 100644
index 3cbf4f93fb8..00000000000
--- a/games/liquidwar/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/10/16 00:48:29 wiz Exp $
-
---- misc/liquidwar_notify.sh.orig	2005-11-27 20:09:58.000000000 +0000
-+++ misc/liquidwar_notify.sh
-@@ -50,7 +50,7 @@ SUBJECT="[liquidwar-bot] Connection"
- 
- #RECEIVERS="ufoot@ufoot.org"
- 
--if test "$RECEIVERS" == "" ; then
-+if test "$RECEIVERS" = "" ; then
-     echo "You need to parameter this script first!"
-     exit 1
- fi