This isn't a 32-bit program, it's an ordinary program that for some curious

reason believes that "x86_64" is a 32-bit Intel platform. Fix that, and
reenable Dragonfly.

While here, add patch comments and include desktopdb.mk. Bump PKGREVISION
for the latter.

4 files changed, 23 insertions, 8 deletions

diff --git a/games/liquidwar/Makefile b/games/liquidwar/Makefile
index 0b8dbf9af55..12ba3240d4b 100644
--- a/games/liquidwar/Makefile
+++ b/games/liquidwar/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/12/12 07:10:24 marino Exp $
+# $NetBSD: Makefile,v 1.10 2011/12/12 16:26:37 dholland Exp $
 #
 
 DISTNAME=	liquidwar-5.6.4
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.ufoot.org/download/liquidwar/v5/5.6.4/
 
@@ -9,7 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ufoot.org/liquidwar/v5
 COMMENT=	Unique multiplayer wargame
 
-NOT_FOR_PLATFORM=	DragonFly-*-x86_64     # Can't build 32-bit binaries
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	gmake
@@ -18,6 +18,7 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--disable-doc-ps --disable-doc-pdf
 #CONFIGURE_ARGS+=	--enable-debug
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../devel/allegro/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/liquidwar/distinfo b/games/liquidwar/distinfo
index 6c087792a09..4ba188298dc 100644
--- a/games/liquidwar/distinfo
+++ b/games/liquidwar/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2007/11/29 17:28:24 wiz Exp $
+$NetBSD: distinfo,v 1.7 2011/12/12 16:26:37 dholland Exp $
 
 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
+SHA1 (patch-aa) = b47749852d8e56844bd5f21791f6b0b8f2389968
+SHA1 (patch-ab) = da49f5a2695fb95ceff6b9445b4cae34031d215b
diff --git a/games/liquidwar/patches/patch-aa b/games/liquidwar/patches/patch-aa
index e3e6fc0c4e9..e82d8e58458 100644
--- a/games/liquidwar/patches/patch-aa
+++ b/games/liquidwar/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2007/11/29 17:28:24 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2011/12/12 16:26:37 dholland Exp $
+
+Configure for pkgsrc.
 
 --- Makefile.in.orig	2007-10-17 20:00:47.000000000 +0000
 +++ Makefile.in
diff --git a/games/liquidwar/patches/patch-ab b/games/liquidwar/patches/patch-ab
index 457a9c42743..6f43bae7558 100644
--- a/games/liquidwar/patches/patch-ab
+++ b/games/liquidwar/patches/patch-ab
@@ -1,7 +1,19 @@
-$NetBSD: patch-ab,v 1.2 2007/11/29 17:28:24 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2011/12/12 16:26:37 dholland Exp $
 
---- configure.orig	2007-11-29 17:22:02.000000000 +0000
+- remove bashisms
+- correct strange belief that 32-bit asm works on x86_64
+
+--- configure.orig	2007-10-17 20:00:50.000000000 +0000
 +++ configure
+@@ -6024,7 +6024,7 @@ fi
+ 
+ 
+ I386="no"
+-for i in i386 i486 i586 i686 i786 x86_64 ; do
++for i in i386 i486 i586 i686 i786 ; do
+   if test "$i" = "$target_cpu" ; then
+     I386="yes"
+   fi;
 @@ -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