Sun Jul 2 14:27:25 2017 UTC ()
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


(seb)
diff -r1.47 -r1.48 pkgsrc/games/xpuyopuyo/Makefile
diff -r1.6 -r1.7 pkgsrc/games/xpuyopuyo/PLIST
diff -r1.7 -r1.8 pkgsrc/games/xpuyopuyo/distinfo
diff -r0 -r1.1 pkgsrc/games/xpuyopuyo/patches/patch-Makefile.am
diff -r0 -r1.1 pkgsrc/games/xpuyopuyo/patches/patch-configure.in
diff -r1.6 -r0 pkgsrc/games/xpuyopuyo/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/games/xpuyopuyo/patches/patch-ab
diff -r1.4 -r1.5 pkgsrc/games/xpuyopuyo/patches/patch-ac
diff -r1.1 -r0 pkgsrc/games/xpuyopuyo/patches/patch-pgame_pfield.c

cvs diff -r1.47 -r1.48 pkgsrc/games/xpuyopuyo/Makefile (expand / switch to unified diff)

--- pkgsrc/games/xpuyopuyo/Makefile 2017/07/02 00:58:17 1.47
+++ pkgsrc/games/xpuyopuyo/Makefile 2017/07/02 14:27:25 1.48
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.47 2017/07/02 00:58:17 seb Exp $ 1# $NetBSD: Makefile,v 1.48 2017/07/02 14:27:25 seb Exp $
2 2
3DISTNAME= xpuyopuyo-0.9.1 3DISTNAME= xpuyopuyo-0.9.8
4PKGREVISION= 10 4#PKGREVISION= 1
5CATEGORIES= games x11 5CATEGORIES= games x11
6MASTER_SITES= http://chaos2.org/xpuyopuyo/ 6MASTER_SITES= http://chaos2.org/xpuyopuyo/
7MASTER_SITES+= http://lenin.dabney.caltech.edu./~justins/xpuyopuyo/ 7MASTER_SITES+= http://lenin.dabney.caltech.edu./~justins/xpuyopuyo/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://chaos2.org/xpuyopuyo/ 10HOMEPAGE= http://chaos2.org/xpuyopuyo/
11COMMENT= Tetris-like puzzle game 11COMMENT= Tetris-like puzzle game
 12LICENSE= gnu-gpl-v2
12 13
13USE_TOOLS+= automake autoconf gmake 14USE_TOOLS+= automake autoconf gmake
14USE_LIBTOOL= YES 15USE_LIBTOOL= YES
15 16
16GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
17CONFIGURE_ARGS+= --with-gnome # install desktop and pixmap files 18CONFIGURE_ARGS+= --with-gnome # install desktop and pixmap files
18CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=${GNOME_CONFIG:Q} 19CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=${GNOME_CONFIG:Q}
19 20
20GNOME_CONFIG= ${WRKDIR}/gnome-config 21GNOME_CONFIG= ${WRKDIR}/gnome-config
21 22
22pre-configure: 23pre-configure:
23 cd ${WRKSRC} && autoreconf --force --install 24 cd ${WRKSRC} && autoreconf --force --install
24 ${SED} -e "s,@PREFIX@,${PREFIX},g" ${FILESDIR}/gnome-config \ 25 ${SED} -e "s,@PREFIX@,${PREFIX},g" ${FILESDIR}/gnome-config \

cvs diff -r1.6 -r1.7 pkgsrc/games/xpuyopuyo/PLIST (expand / switch to unified diff)

--- pkgsrc/games/xpuyopuyo/PLIST 2009/06/14 17:57:00 1.6
+++ pkgsrc/games/xpuyopuyo/PLIST 2017/07/02 14:27:25 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:57:00 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.7 2017/07/02 14:27:25 seb Exp $
2bin/xpuyopuyo 2bin/xpuyopuyo
3man/man6/xpuyopuyo.6 3man/man6/xpuyopuyo.6
4share/gnome/apps/Games/xpuyopuyo.desktop 4share/gnome/apps/Games/xpuyopuyo.desktop
5share/pixmaps/xpuyopuyo.xpm 5share/pixmaps/xpuyopuyo.xpm
6share/xpuyopuyo/copying.txt 6share/xpuyopuyo/copying.txt
7share/xpuyopuyo/sounds/game.xm 7share/xpuyopuyo/sounds/game.xm
8share/xpuyopuyo/sounds/gameover.xm 8share/xpuyopuyo/sounds/gameover.xm
9share/xpuyopuyo/sounds/prelude.xm 9share/xpuyopuyo/sounds/prelude.xm
10share/xpuyopuyo/themes/3dRokz/img_0.xpm 10share/xpuyopuyo/themes/3dRokz/img_0.xpm
11share/xpuyopuyo/themes/3dRokz/img_0j.xpm 11share/xpuyopuyo/themes/3dRokz/img_0j.xpm
12share/xpuyopuyo/themes/3dRokz/img_1.xpm 12share/xpuyopuyo/themes/3dRokz/img_1.xpm
13share/xpuyopuyo/themes/3dRokz/img_1j.xpm 13share/xpuyopuyo/themes/3dRokz/img_1j.xpm
14share/xpuyopuyo/themes/3dRokz/img_2.xpm 14share/xpuyopuyo/themes/3dRokz/img_2.xpm
@@ -90,31 +90,125 @@ share/xpuyopuyo/themes/default/img_tile_ @@ -90,31 +90,125 @@ share/xpuyopuyo/themes/default/img_tile_
90share/xpuyopuyo/themes/default/img_tile_bottom3.xpm 90share/xpuyopuyo/themes/default/img_tile_bottom3.xpm
91share/xpuyopuyo/themes/default/img_tile_left.xpm 91share/xpuyopuyo/themes/default/img_tile_left.xpm
92share/xpuyopuyo/themes/default/img_tile_leftbottom.xpm 92share/xpuyopuyo/themes/default/img_tile_leftbottom.xpm
93share/xpuyopuyo/themes/default/img_tile_lefttop.xpm 93share/xpuyopuyo/themes/default/img_tile_lefttop.xpm
94share/xpuyopuyo/themes/default/img_tile_ltrans.xpm 94share/xpuyopuyo/themes/default/img_tile_ltrans.xpm
95share/xpuyopuyo/themes/default/img_tile_right.xpm 95share/xpuyopuyo/themes/default/img_tile_right.xpm
96share/xpuyopuyo/themes/default/img_tile_rightbottom.xpm 96share/xpuyopuyo/themes/default/img_tile_rightbottom.xpm
97share/xpuyopuyo/themes/default/img_tile_righttop.xpm 97share/xpuyopuyo/themes/default/img_tile_righttop.xpm
98share/xpuyopuyo/themes/default/img_tile_rtrans.xpm 98share/xpuyopuyo/themes/default/img_tile_rtrans.xpm
99share/xpuyopuyo/themes/default/img_tile_top.xpm 99share/xpuyopuyo/themes/default/img_tile_top.xpm
100share/xpuyopuyo/themes/default/img_title.xpm 100share/xpuyopuyo/themes/default/img_title.xpm
101share/xpuyopuyo/themes/default/img_top.xpm 101share/xpuyopuyo/themes/default/img_top.xpm
102share/xpuyopuyo/themes/default/img_trans.xpm 102share/xpuyopuyo/themes/default/img_trans.xpm
 103share/xpuyopuyo/themes/fabo/img_0.xpm
 104share/xpuyopuyo/themes/fabo/img_0j.xpm
 105share/xpuyopuyo/themes/fabo/img_1.xpm
 106share/xpuyopuyo/themes/fabo/img_1j.xpm
 107share/xpuyopuyo/themes/fabo/img_2.xpm
 108share/xpuyopuyo/themes/fabo/img_2j.xpm
 109share/xpuyopuyo/themes/fabo/img_3.xpm
 110share/xpuyopuyo/themes/fabo/img_3j.xpm
 111share/xpuyopuyo/themes/fabo/img_4.xpm
 112share/xpuyopuyo/themes/fabo/img_4j.xpm
 113share/xpuyopuyo/themes/fabo/img_5.xpm
 114share/xpuyopuyo/themes/fabo/img_5j.xpm
 115share/xpuyopuyo/themes/fabo/img_clear.xpm
 116share/xpuyopuyo/themes/fabo/img_clearb.xpm
 117share/xpuyopuyo/themes/fabo/img_expl.xpm
 118share/xpuyopuyo/themes/fabo/img_gameover.xpm
 119share/xpuyopuyo/themes/fabo/img_ind.xpm
 120share/xpuyopuyo/themes/fabo/img_num0.xpm
 121share/xpuyopuyo/themes/fabo/img_num1.xpm
 122share/xpuyopuyo/themes/fabo/img_num2.xpm
 123share/xpuyopuyo/themes/fabo/img_num3.xpm
 124share/xpuyopuyo/themes/fabo/img_num4.xpm
 125share/xpuyopuyo/themes/fabo/img_num5.xpm
 126share/xpuyopuyo/themes/fabo/img_num6.xpm
 127share/xpuyopuyo/themes/fabo/img_num7.xpm
 128share/xpuyopuyo/themes/fabo/img_num8.xpm
 129share/xpuyopuyo/themes/fabo/img_num9.xpm
 130share/xpuyopuyo/themes/fabo/img_paused.xpm
 131share/xpuyopuyo/themes/fabo/img_rock.xpm
 132share/xpuyopuyo/themes/fabo/img_rockbig.xpm
 133share/xpuyopuyo/themes/fabo/img_rockdemon.xpm
 134share/xpuyopuyo/themes/fabo/img_side.xpm
 135share/xpuyopuyo/themes/fabo/img_tile_bottom1.xpm
 136share/xpuyopuyo/themes/fabo/img_tile_bottom2.xpm
 137share/xpuyopuyo/themes/fabo/img_tile_bottom3.xpm
 138share/xpuyopuyo/themes/fabo/img_tile_left.xpm
 139share/xpuyopuyo/themes/fabo/img_tile_leftbottom.xpm
 140share/xpuyopuyo/themes/fabo/img_tile_lefttop.xpm
 141share/xpuyopuyo/themes/fabo/img_tile_ltrans.xpm
 142share/xpuyopuyo/themes/fabo/img_tile_right.xpm
 143share/xpuyopuyo/themes/fabo/img_tile_rightbottom.xpm
 144share/xpuyopuyo/themes/fabo/img_tile_righttop.xpm
 145share/xpuyopuyo/themes/fabo/img_tile_rtrans.xpm
 146share/xpuyopuyo/themes/fabo/img_tile_top.xpm
 147share/xpuyopuyo/themes/fabo/img_title.xpm
 148share/xpuyopuyo/themes/fabo/img_top.xpm
 149share/xpuyopuyo/themes/fabo/img_trans.xpm
103share/xpuyopuyo/themes/smileys/img_0.xpm 150share/xpuyopuyo/themes/smileys/img_0.xpm
104share/xpuyopuyo/themes/smileys/img_0j.xpm 151share/xpuyopuyo/themes/smileys/img_0j.xpm
105share/xpuyopuyo/themes/smileys/img_1.xpm 152share/xpuyopuyo/themes/smileys/img_1.xpm
106share/xpuyopuyo/themes/smileys/img_1j.xpm 153share/xpuyopuyo/themes/smileys/img_1j.xpm
107share/xpuyopuyo/themes/smileys/img_2.xpm 154share/xpuyopuyo/themes/smileys/img_2.xpm
108share/xpuyopuyo/themes/smileys/img_2j.xpm 155share/xpuyopuyo/themes/smileys/img_2j.xpm
109share/xpuyopuyo/themes/smileys/img_3.xpm 156share/xpuyopuyo/themes/smileys/img_3.xpm
110share/xpuyopuyo/themes/smileys/img_3j.xpm 157share/xpuyopuyo/themes/smileys/img_3j.xpm
111share/xpuyopuyo/themes/smileys/img_4.xpm 158share/xpuyopuyo/themes/smileys/img_4.xpm
112share/xpuyopuyo/themes/smileys/img_4j.xpm 159share/xpuyopuyo/themes/smileys/img_4j.xpm
113share/xpuyopuyo/themes/smileys/img_5.xpm 160share/xpuyopuyo/themes/smileys/img_5.xpm
114share/xpuyopuyo/themes/smileys/img_5j.xpm 161share/xpuyopuyo/themes/smileys/img_5j.xpm
115share/xpuyopuyo/themes/smileys/img_expl.xpm 162share/xpuyopuyo/themes/smileys/img_expl.xpm
116share/xpuyopuyo/themes/smileys/img_ind.xpm 163share/xpuyopuyo/themes/smileys/img_ind.xpm
117share/xpuyopuyo/themes/smileys/img_rock.xpm 164share/xpuyopuyo/themes/smileys/img_rock.xpm
118share/xpuyopuyo/themes/smileys/img_rockbig.xpm 165share/xpuyopuyo/themes/smileys/img_rockbig.xpm
119share/xpuyopuyo/themes/smileys/img_rockdemon.xpm 166share/xpuyopuyo/themes/smileys/img_rockdemon.xpm
 167share/xpuyopuyo/themes/spheres/img_0.xpm
 168share/xpuyopuyo/themes/spheres/img_0j.xpm
 169share/xpuyopuyo/themes/spheres/img_1.xpm
 170share/xpuyopuyo/themes/spheres/img_1j.xpm
 171share/xpuyopuyo/themes/spheres/img_2.xpm
 172share/xpuyopuyo/themes/spheres/img_2j.xpm
 173share/xpuyopuyo/themes/spheres/img_3.xpm
 174share/xpuyopuyo/themes/spheres/img_3j.xpm
 175share/xpuyopuyo/themes/spheres/img_4.xpm
 176share/xpuyopuyo/themes/spheres/img_4j.xpm
 177share/xpuyopuyo/themes/spheres/img_5.xpm
 178share/xpuyopuyo/themes/spheres/img_5j.xpm
 179share/xpuyopuyo/themes/spheres/img_clear.xpm
 180share/xpuyopuyo/themes/spheres/img_clearb.xpm
 181share/xpuyopuyo/themes/spheres/img_expl.xpm
 182share/xpuyopuyo/themes/spheres/img_gameover.xpm
 183share/xpuyopuyo/themes/spheres/img_ind.xpm
 184share/xpuyopuyo/themes/spheres/img_num0.xpm
 185share/xpuyopuyo/themes/spheres/img_num1.xpm
 186share/xpuyopuyo/themes/spheres/img_num2.xpm
 187share/xpuyopuyo/themes/spheres/img_num3.xpm
 188share/xpuyopuyo/themes/spheres/img_num4.xpm
 189share/xpuyopuyo/themes/spheres/img_num5.xpm
 190share/xpuyopuyo/themes/spheres/img_num6.xpm
 191share/xpuyopuyo/themes/spheres/img_num7.xpm
 192share/xpuyopuyo/themes/spheres/img_num8.xpm
 193share/xpuyopuyo/themes/spheres/img_num9.xpm
 194share/xpuyopuyo/themes/spheres/img_paused.xpm
 195share/xpuyopuyo/themes/spheres/img_rock.xpm
 196share/xpuyopuyo/themes/spheres/img_rockbig.xpm
 197share/xpuyopuyo/themes/spheres/img_rockdemon.xpm
 198share/xpuyopuyo/themes/spheres/img_side.xpm
 199share/xpuyopuyo/themes/spheres/img_tile_bottom1.xpm
 200share/xpuyopuyo/themes/spheres/img_tile_bottom2.xpm
 201share/xpuyopuyo/themes/spheres/img_tile_bottom3.xpm
 202share/xpuyopuyo/themes/spheres/img_tile_left.xpm
 203share/xpuyopuyo/themes/spheres/img_tile_leftbottom.xpm
 204share/xpuyopuyo/themes/spheres/img_tile_lefttop.xpm
 205share/xpuyopuyo/themes/spheres/img_tile_ltrans.xpm
 206share/xpuyopuyo/themes/spheres/img_tile_right.xpm
 207share/xpuyopuyo/themes/spheres/img_tile_rightbottom.xpm
 208share/xpuyopuyo/themes/spheres/img_tile_righttop.xpm
 209share/xpuyopuyo/themes/spheres/img_tile_rtrans.xpm
 210share/xpuyopuyo/themes/spheres/img_tile_top.xpm
 211share/xpuyopuyo/themes/spheres/img_title.xpm
 212share/xpuyopuyo/themes/spheres/img_top.xpm
 213share/xpuyopuyo/themes/spheres/img_trans.xpm
120share/xpuyopuyo/xpuyopuyo.txt 214share/xpuyopuyo/xpuyopuyo.txt

cvs diff -r1.7 -r1.8 pkgsrc/games/xpuyopuyo/distinfo (expand / switch to unified diff)

--- pkgsrc/games/xpuyopuyo/distinfo 2017/07/02 00:58:17 1.7
+++ pkgsrc/games/xpuyopuyo/distinfo 2017/07/02 14:27:25 1.8
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.7 2017/07/02 00:58:17 seb Exp $ 1$NetBSD: distinfo,v 1.8 2017/07/02 14:27:25 seb Exp $
2 2
3SHA1 (xpuyopuyo-0.9.1.tar.gz) = deadbd3171be68e5684a099a4f27cd68fd7c5bd6 3SHA1 (xpuyopuyo-0.9.8.tar.gz) = 07c4a6b87b4a42778af69c2b223cd27b79fe2d41
4RMD160 (xpuyopuyo-0.9.1.tar.gz) = 4ec08df617414f2c95d22b8c50b4499742cfffd3 4RMD160 (xpuyopuyo-0.9.8.tar.gz) = a5512e897d807764c0432de515b75d76b54a21a0
5SHA512 (xpuyopuyo-0.9.1.tar.gz) = ebdfcb3f0f7dfe40037fd282af450316ac22cbc40ccf2d4b2b94935fca1c3d7680a279c3c4c145d71b16039f47b5c38545754feee4ad4642b38e1af89487f820 5SHA512 (xpuyopuyo-0.9.8.tar.gz) = 4277e0d05f30446070af38dd3b690efdbc4c45fc255513529bd29af2f9986f2e7d6d12e0e31ecf9a228bf5bd025aedd659953b6d19933ee447a6a9c9216a6a49
6Size (xpuyopuyo-0.9.1.tar.gz) = 577373 bytes 6Size (xpuyopuyo-0.9.8.tar.gz) = 1235619 bytes
7SHA1 (patch-aa) = 4c83a8341c72d381ebf3459b22cb15e1ce646958 7SHA1 (patch-Makefile.am) = 0d603f8bb821edd4d4639232488fb6c00154c508
8SHA1 (patch-ab) = 76e9d2d3da387e49f87525bc0218cc90faffa92d 8SHA1 (patch-ab) = bf5c4e87ecc2546dc446f05c523f65a96cbdebba
9SHA1 (patch-ac) = ab7ec69a6e90bf6821e4fc5ff527b9ec025df081 9SHA1 (patch-ac) = 39fd8d5b08465381f61b46e3241ae873362b5f16
10SHA1 (patch-pgame_pfield.c) = e2fc58d2a680c54d7728f589ecaa227ebdd91141 10SHA1 (patch-configure.in) = 4dd4199ccb4404aefc18212a060c07a6e3d08669

File Added: pkgsrc/games/xpuyopuyo/patches/patch-Makefile.am
$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
 
 

File Added: pkgsrc/games/xpuyopuyo/patches/patch-configure.in
$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"
 
 

File Deleted: pkgsrc/games/xpuyopuyo/patches/Attic/patch-aa

cvs diff -r1.4 -r1.5 pkgsrc/games/xpuyopuyo/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/games/xpuyopuyo/patches/patch-ab 2000/08/25 06:22:28 1.4
+++ pkgsrc/games/xpuyopuyo/patches/patch-ab 2017/07/02 14:27:25 1.5
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: patch-ab,v 1.4 2000/08/25 06:22:28 jlam Exp $ 1$NetBSD: patch-ab,v 1.5 2017/07/02 14:27:25 seb Exp $
 2
 3Flags for libmikmod
2 4
3--- pgame/Makefile.am.orig Mon Jul 31 04:13:59 2000 5--- pgame/Makefile.am.orig Mon Jul 31 04:13:59 2000
4+++ pgame/Makefile.am 6+++ pgame/Makefile.am
5@@ -45,4 +45,4 @@ 7@@ -45,4 +45,4 @@
6 pwindow.h  8 pwindow.h
7  9
8  10
9-INCLUDES = -I../putil -I../pai -I../pnet -I../psound 11-INCLUDES = -I../putil -I../pai -I../pnet -I../psound
10+INCLUDES = $(LIBMIKMOD_CFLAGS) -I../putil -I../pai -I../pnet -I../psound 12+INCLUDES = $(LIBMIKMOD_CFLAGS) -I../putil -I../pai -I../pnet -I../psound

cvs diff -r1.4 -r1.5 pkgsrc/games/xpuyopuyo/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/games/xpuyopuyo/patches/patch-ac 2000/08/25 06:22:28 1.4
+++ pkgsrc/games/xpuyopuyo/patches/patch-ac 2017/07/02 14:27:25 1.5
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ac,v 1.4 2000/08/25 06:22:28 jlam Exp $ 1$NetBSD: patch-ac,v 1.5 2017/07/02 14:27:25 seb Exp $
 2
 3Flags for libmikmod
2 4
3--- pgtk/Makefile.am.orig Tue Aug 1 13:04:51 2000 5--- pgtk/Makefile.am.orig Tue Aug 1 13:04:51 2000
4+++ pgtk/Makefile.am 6+++ pgtk/Makefile.am
5@@ -17,7 +17,7 @@ 7@@ -17,7 +17,7 @@
6 # GTK support 8 # GTK support
7 # 9 #
8 if GTK 10 if GTK
9-INCLUDES = $(GTK_CFLAGS) -I../putil -I../pgame -I../pai -I../pnet -I../psound 11-INCLUDES = $(GTK_CFLAGS) -I../putil -I../pgame -I../pai -I../pnet -I../psound
10+INCLUDES = $(LIBMIKMOD_CFLAGS) $(GTK_CFLAGS) -I../putil -I../pgame -I../pai -I../pnet -I../psound 12+INCLUDES = $(LIBMIKMOD_CFLAGS) $(GTK_CFLAGS) -I../putil -I../pgame -I../pai -I../pnet -I../psound
11 endif 13 endif
12  14
13  15

File Deleted: pkgsrc/games/xpuyopuyo/patches/Attic/patch-pgame_pfield.c