Update xpuyopuyo to 0.9.8. Changes since the last upstream packaged version 0.9.1:

Changes in v0.9.8:
   *  Correcting a packaging error, and addressing compiler warnings
      that surface in GCC 3.3.

Changes in v0.9.7:
   *  Fixed compiler warnings on Debian, and installer problems.

Changes in v0.9.6:
   *  New theme ``fabo''

Changes in v0.9.5:
   *  Porting some dialog bugfixes in xscorch over to xpuyopuyo
   *  Porting over xscorch's help system into xpuyopuyo
   *  Cleaned up configure script a bit

Changes in v0.9.4:
   *  More verbose error message if theme load fails
   *  Fixed '//' path problem that prevented execution on cygwin

Changes in v0.9.3:
   *  New theme added -- Spheres
   *  Some documentation cleaning

Changes in v0.9.2:
   *  Fixed p_ai_decide() prototype error (spotted by Patrick Markiewicz)
   *  Fixed configure error that was introduced by the stow patch.
   *  Minor correction in network timeout code.
   *  Sound effects implemented, although we're still experimenting with
      the actual effects.  Command-line options

9 files changed, 159 insertions, 71 deletions

diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index a76860dce5a..eddc384a5a2 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2017/07/02 00:58:17 seb Exp $
+# $NetBSD: Makefile,v 1.48 2017/07/02 14:27:25 seb Exp $
 
-DISTNAME=		xpuyopuyo-0.9.1
-PKGREVISION=		10
+DISTNAME=		xpuyopuyo-0.9.8
+#PKGREVISION=		1
 CATEGORIES=		games x11
 MASTER_SITES=		http://chaos2.org/xpuyopuyo/
 MASTER_SITES+=		http://lenin.dabney.caltech.edu./~justins/xpuyopuyo/
@@ -9,6 +9,7 @@ MASTER_SITES+=		http://lenin.dabney.caltech.edu./~justins/xpuyopuyo/
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://chaos2.org/xpuyopuyo/
 COMMENT=		Tetris-like puzzle game
+LICENSE=		gnu-gpl-v2
 
 USE_TOOLS+=		automake autoconf gmake
 USE_LIBTOOL=		YES
diff --git a/games/xpuyopuyo/PLIST b/games/xpuyopuyo/PLIST
index 752381ba0b5..6a35f397565 100644
--- a/games/xpuyopuyo/PLIST
+++ b/games/xpuyopuyo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:57:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/07/02 14:27:25 seb Exp $
 bin/xpuyopuyo
 man/man6/xpuyopuyo.6
 share/gnome/apps/Games/xpuyopuyo.desktop
@@ -100,6 +100,53 @@ share/xpuyopuyo/themes/default/img_tile_top.xpm
 share/xpuyopuyo/themes/default/img_title.xpm
 share/xpuyopuyo/themes/default/img_top.xpm
 share/xpuyopuyo/themes/default/img_trans.xpm
+share/xpuyopuyo/themes/fabo/img_0.xpm
+share/xpuyopuyo/themes/fabo/img_0j.xpm
+share/xpuyopuyo/themes/fabo/img_1.xpm
+share/xpuyopuyo/themes/fabo/img_1j.xpm
+share/xpuyopuyo/themes/fabo/img_2.xpm
+share/xpuyopuyo/themes/fabo/img_2j.xpm
+share/xpuyopuyo/themes/fabo/img_3.xpm
+share/xpuyopuyo/themes/fabo/img_3j.xpm
+share/xpuyopuyo/themes/fabo/img_4.xpm
+share/xpuyopuyo/themes/fabo/img_4j.xpm
+share/xpuyopuyo/themes/fabo/img_5.xpm
+share/xpuyopuyo/themes/fabo/img_5j.xpm
+share/xpuyopuyo/themes/fabo/img_clear.xpm
+share/xpuyopuyo/themes/fabo/img_clearb.xpm
+share/xpuyopuyo/themes/fabo/img_expl.xpm
+share/xpuyopuyo/themes/fabo/img_gameover.xpm
+share/xpuyopuyo/themes/fabo/img_ind.xpm
+share/xpuyopuyo/themes/fabo/img_num0.xpm
+share/xpuyopuyo/themes/fabo/img_num1.xpm
+share/xpuyopuyo/themes/fabo/img_num2.xpm
+share/xpuyopuyo/themes/fabo/img_num3.xpm
+share/xpuyopuyo/themes/fabo/img_num4.xpm
+share/xpuyopuyo/themes/fabo/img_num5.xpm
+share/xpuyopuyo/themes/fabo/img_num6.xpm
+share/xpuyopuyo/themes/fabo/img_num7.xpm
+share/xpuyopuyo/themes/fabo/img_num8.xpm
+share/xpuyopuyo/themes/fabo/img_num9.xpm
+share/xpuyopuyo/themes/fabo/img_paused.xpm
+share/xpuyopuyo/themes/fabo/img_rock.xpm
+share/xpuyopuyo/themes/fabo/img_rockbig.xpm
+share/xpuyopuyo/themes/fabo/img_rockdemon.xpm
+share/xpuyopuyo/themes/fabo/img_side.xpm
+share/xpuyopuyo/themes/fabo/img_tile_bottom1.xpm
+share/xpuyopuyo/themes/fabo/img_tile_bottom2.xpm
+share/xpuyopuyo/themes/fabo/img_tile_bottom3.xpm
+share/xpuyopuyo/themes/fabo/img_tile_left.xpm
+share/xpuyopuyo/themes/fabo/img_tile_leftbottom.xpm
+share/xpuyopuyo/themes/fabo/img_tile_lefttop.xpm
+share/xpuyopuyo/themes/fabo/img_tile_ltrans.xpm
+share/xpuyopuyo/themes/fabo/img_tile_right.xpm
+share/xpuyopuyo/themes/fabo/img_tile_rightbottom.xpm
+share/xpuyopuyo/themes/fabo/img_tile_righttop.xpm
+share/xpuyopuyo/themes/fabo/img_tile_rtrans.xpm
+share/xpuyopuyo/themes/fabo/img_tile_top.xpm
+share/xpuyopuyo/themes/fabo/img_title.xpm
+share/xpuyopuyo/themes/fabo/img_top.xpm
+share/xpuyopuyo/themes/fabo/img_trans.xpm
 share/xpuyopuyo/themes/smileys/img_0.xpm
 share/xpuyopuyo/themes/smileys/img_0j.xpm
 share/xpuyopuyo/themes/smileys/img_1.xpm
@@ -117,4 +164,51 @@ share/xpuyopuyo/themes/smileys/img_ind.xpm
 share/xpuyopuyo/themes/smileys/img_rock.xpm
 share/xpuyopuyo/themes/smileys/img_rockbig.xpm
 share/xpuyopuyo/themes/smileys/img_rockdemon.xpm
+share/xpuyopuyo/themes/spheres/img_0.xpm
+share/xpuyopuyo/themes/spheres/img_0j.xpm
+share/xpuyopuyo/themes/spheres/img_1.xpm
+share/xpuyopuyo/themes/spheres/img_1j.xpm
+share/xpuyopuyo/themes/spheres/img_2.xpm
+share/xpuyopuyo/themes/spheres/img_2j.xpm
+share/xpuyopuyo/themes/spheres/img_3.xpm
+share/xpuyopuyo/themes/spheres/img_3j.xpm
+share/xpuyopuyo/themes/spheres/img_4.xpm
+share/xpuyopuyo/themes/spheres/img_4j.xpm
+share/xpuyopuyo/themes/spheres/img_5.xpm
+share/xpuyopuyo/themes/spheres/img_5j.xpm
+share/xpuyopuyo/themes/spheres/img_clear.xpm
+share/xpuyopuyo/themes/spheres/img_clearb.xpm
+share/xpuyopuyo/themes/spheres/img_expl.xpm
+share/xpuyopuyo/themes/spheres/img_gameover.xpm
+share/xpuyopuyo/themes/spheres/img_ind.xpm
+share/xpuyopuyo/themes/spheres/img_num0.xpm
+share/xpuyopuyo/themes/spheres/img_num1.xpm
+share/xpuyopuyo/themes/spheres/img_num2.xpm
+share/xpuyopuyo/themes/spheres/img_num3.xpm
+share/xpuyopuyo/themes/spheres/img_num4.xpm
+share/xpuyopuyo/themes/spheres/img_num5.xpm
+share/xpuyopuyo/themes/spheres/img_num6.xpm
+share/xpuyopuyo/themes/spheres/img_num7.xpm
+share/xpuyopuyo/themes/spheres/img_num8.xpm
+share/xpuyopuyo/themes/spheres/img_num9.xpm
+share/xpuyopuyo/themes/spheres/img_paused.xpm
+share/xpuyopuyo/themes/spheres/img_rock.xpm
+share/xpuyopuyo/themes/spheres/img_rockbig.xpm
+share/xpuyopuyo/themes/spheres/img_rockdemon.xpm
+share/xpuyopuyo/themes/spheres/img_side.xpm
+share/xpuyopuyo/themes/spheres/img_tile_bottom1.xpm
+share/xpuyopuyo/themes/spheres/img_tile_bottom2.xpm
+share/xpuyopuyo/themes/spheres/img_tile_bottom3.xpm
+share/xpuyopuyo/themes/spheres/img_tile_left.xpm
+share/xpuyopuyo/themes/spheres/img_tile_leftbottom.xpm
+share/xpuyopuyo/themes/spheres/img_tile_lefttop.xpm
+share/xpuyopuyo/themes/spheres/img_tile_ltrans.xpm
+share/xpuyopuyo/themes/spheres/img_tile_right.xpm
+share/xpuyopuyo/themes/spheres/img_tile_rightbottom.xpm
+share/xpuyopuyo/themes/spheres/img_tile_righttop.xpm
+share/xpuyopuyo/themes/spheres/img_tile_rtrans.xpm
+share/xpuyopuyo/themes/spheres/img_tile_top.xpm
+share/xpuyopuyo/themes/spheres/img_title.xpm
+share/xpuyopuyo/themes/spheres/img_top.xpm
+share/xpuyopuyo/themes/spheres/img_trans.xpm
 share/xpuyopuyo/xpuyopuyo.txt
diff --git a/games/xpuyopuyo/distinfo b/games/xpuyopuyo/distinfo
index d044759c7bc..13a131cb1e1 100644
--- a/games/xpuyopuyo/distinfo
+++ b/games/xpuyopuyo/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2017/07/02 00:58:17 seb Exp $
+$NetBSD: distinfo,v 1.8 2017/07/02 14:27:25 seb Exp $
 
-SHA1 (xpuyopuyo-0.9.1.tar.gz) = deadbd3171be68e5684a099a4f27cd68fd7c5bd6
-RMD160 (xpuyopuyo-0.9.1.tar.gz) = 4ec08df617414f2c95d22b8c50b4499742cfffd3
-SHA512 (xpuyopuyo-0.9.1.tar.gz) = ebdfcb3f0f7dfe40037fd282af450316ac22cbc40ccf2d4b2b94935fca1c3d7680a279c3c4c145d71b16039f47b5c38545754feee4ad4642b38e1af89487f820
-Size (xpuyopuyo-0.9.1.tar.gz) = 577373 bytes
-SHA1 (patch-aa) = 4c83a8341c72d381ebf3459b22cb15e1ce646958
-SHA1 (patch-ab) = 76e9d2d3da387e49f87525bc0218cc90faffa92d
-SHA1 (patch-ac) = ab7ec69a6e90bf6821e4fc5ff527b9ec025df081
-SHA1 (patch-pgame_pfield.c) = e2fc58d2a680c54d7728f589ecaa227ebdd91141
+SHA1 (xpuyopuyo-0.9.8.tar.gz) = 07c4a6b87b4a42778af69c2b223cd27b79fe2d41
+RMD160 (xpuyopuyo-0.9.8.tar.gz) = a5512e897d807764c0432de515b75d76b54a21a0
+SHA512 (xpuyopuyo-0.9.8.tar.gz) = 4277e0d05f30446070af38dd3b690efdbc4c45fc255513529bd29af2f9986f2e7d6d12e0e31ecf9a228bf5bd025aedd659953b6d19933ee447a6a9c9216a6a49
+Size (xpuyopuyo-0.9.8.tar.gz) = 1235619 bytes
+SHA1 (patch-Makefile.am) = 0d603f8bb821edd4d4639232488fb6c00154c508
+SHA1 (patch-ab) = bf5c4e87ecc2546dc446f05c523f65a96cbdebba
+SHA1 (patch-ac) = 39fd8d5b08465381f61b46e3241ae873362b5f16
+SHA1 (patch-configure.in) = 4dd4199ccb4404aefc18212a060c07a6e3d08669
diff --git a/games/xpuyopuyo/patches/patch-Makefile.am b/games/xpuyopuyo/patches/patch-Makefile.am
new file mode 100644
index 00000000000..1015f90dc8a
--- /dev/null
+++ b/games/xpuyopuyo/patches/patch-Makefile.am
@@ -0,0 +1,22 @@
+$NetBSD: patch-Makefile.am,v 1.1 2017/07/02 14:27:25 seb Exp $
+
+Fix link by reordering libraries
+
+--- Makefile.am.orig	2003-05-26 16:41:57.000000000 +0000
++++ Makefile.am
+@@ -33,13 +33,13 @@ xpuyopuyo_SOURCES=xpuyopuyo.c
+ INCLUDES=-Ipgame -Ipai -Ipnet
+ 
+ 
+-XPP_LIBS		=  $(NET_LIBS) pgame/libxpp_game.a pai/libxpp_ai.a
++XPP_LIBS		=  $(NET_LIBS) pgame/libxpp_game.a # pai/libxpp_ai.a
+ XPP_NET_LIBS		=  pnet/libxpp_net.a	# This must be after interface
+ XPP_SOUND_LIBS		=  $(LIBMIKMOD_LIBS) psound/libxpp_sound.a
+ 
+ 
+ if GTK
+-xpuyopuyo_LDADD=$(XPP_LIBS) pgtk/libxpp_interface.a $(XPP_NET_LIBS) $(XPP_SOUND_LIBS) $(GTK_LIBS) pgame/libxpp_game.a putil/libxpp_util.a
++xpuyopuyo_LDADD=$(XPP_LIBS) pgtk/libxpp_interface.a pai/libxpp_ai.a $(XPP_SOUND_LIBS) $(GTK_LIBS) pgame/libxpp_game.a $(XPP_NET_LIBS) putil/libxpp_util.a
+ endif
+ 
+ 
diff --git a/games/xpuyopuyo/patches/patch-aa b/games/xpuyopuyo/patches/patch-aa
deleted file mode 100644
index d0a16d4afff..00000000000
--- a/games/xpuyopuyo/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2017/07/02 00:58:17 seb Exp $
-
---- configure.in.orig	2000-08-01 17:19:42.000000000 +0000
-+++ configure.in
-@@ -2,17 +2,17 @@ dnl Process this file with autoconf to p
- AC_PREREQ(2.12)
- AC_INIT(xpuyopuyo.c)
- AM_INIT_AUTOMAKE(xpuyopuyo, 0.9.1)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_MAINTAINER_MODE
- 
- 
- dnl Watch out for problems with prefix, datadir
--if test "x$prefix" = "xNONE"; then 
-+if test "x$prefix" != "xNONE"; then 
-    myprefix="$prefix"
- else 
-    myprefix="$ac_default_prefix"
- fi
--if test "x$datadir" = 'x${prefix}/share'; then
-+if test "x$datadir" = 'x${datarootdir}'; then
-    mydatadir="${prefix}/share"
- else
-    mydatadir="$datadir"
diff --git a/games/xpuyopuyo/patches/patch-ab b/games/xpuyopuyo/patches/patch-ab
index 50d072dc360..f01b886da6b 100644
--- a/games/xpuyopuyo/patches/patch-ab
+++ b/games/xpuyopuyo/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2000/08/25 06:22:28 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2017/07/02 14:27:25 seb Exp $
+
+Flags for libmikmod
 
 --- pgame/Makefile.am.orig	Mon Jul 31 04:13:59 2000
 +++ pgame/Makefile.am
diff --git a/games/xpuyopuyo/patches/patch-ac b/games/xpuyopuyo/patches/patch-ac
index 4bf486afd93..e30fdcdd4ab 100644
--- a/games/xpuyopuyo/patches/patch-ac
+++ b/games/xpuyopuyo/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2000/08/25 06:22:28 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2017/07/02 14:27:25 seb Exp $
+
+Flags for libmikmod
 
 --- pgtk/Makefile.am.orig	Tue Aug  1 13:04:51 2000
 +++ pgtk/Makefile.am
diff --git a/games/xpuyopuyo/patches/patch-configure.in b/games/xpuyopuyo/patches/patch-configure.in
new file mode 100644
index 00000000000..dd5f58df681
--- /dev/null
+++ b/games/xpuyopuyo/patches/patch-configure.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure.in,v 1.1 2017/07/02 14:27:25 seb Exp $
+
+Handle newer autotools.
+
+--- configure.in.orig	2003-05-26 16:49:00.000000000 +0000
++++ configure.in
+@@ -2,14 +2,14 @@ dnl Process this file with autoconf to p
+ AC_PREREQ(2.12)
+ AC_INIT(xpuyopuyo.c)
+ AM_INIT_AUTOMAKE(xpuyopuyo, 0.9.8)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+ 
+ 
+ dnl Watch out for problems with prefix, datadir
+ dnl
+ test "x$prefix" = "xNONE" && prefix="$ac_default_prefix"
+-test "x$datadir" = 'x${prefix}/share' && datadir="${prefix}/share"
++test "x$datadir" = 'x${datarootdir}' && datadir="${prefix}/share"
+ test "x$mandir" = 'x${prefix}/man' && mandir="${prefix}/man"
+ 
+ 
diff --git a/games/xpuyopuyo/patches/patch-pgame_pfield.c b/games/xpuyopuyo/patches/patch-pgame_pfield.c
deleted file mode 100644
index 79ecdf0bd5c..00000000000
--- a/games/xpuyopuyo/patches/patch-pgame_pfield.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-pgame_pfield.c,v 1.1 2013/08/31 14:48:38 joerg Exp $
-
---- pgame/pfield.c.orig	2013-08-31 14:21:42.000000000 +0000
-+++ pgame/pfield.c
-@@ -29,7 +29,7 @@
- #include <pfield.h>
- 
- 
--inline void p_field_clear(pfield *f) {
-+void p_field_clear(pfield *f) {
- /* p_field_clear
- 
-    Clears the playing field to P_CLEAR.   */
-@@ -48,7 +48,7 @@ inline void p_field_clear(pfield *f) {
- }
- 
- 
--inline void p_field_copy(pfield *dest, const pfield *src) {
-+void p_field_copy(pfield *dest, const pfield *src) {
- /* p_field_copy
- 
-    Copies src playing field to the destination playing field given.  */
-@@ -183,7 +183,7 @@ void p_field_set(pfield *f, int x, int y
- }
- 
- 
--inline void _p_field_redraw(pfield *f, int x1, int y1, int x2, int y2, int redraw) {
-+static inline void _p_field_redraw(pfield *f, int x1, int y1, int x2, int y2, int redraw) {
- 
-    int *p;
-    int i;