Received: by mail.netbsd.org (Postfix, from userid 605) id 9737784DA2; Sun, 2 Jul 2017 14:27:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2868184CE2 for ; Sun, 2 Jul 2017 14:27:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 9rT1cUfu8dRs for ; Sun, 2 Jul 2017 14:27:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0EE9C84CDD for ; Sun, 2 Jul 2017 14:27:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 060ACFAE8; Sun, 2 Jul 2017 14:27:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149900564679650" MIME-Version: 1.0 Date: Sun, 2 Jul 2017 14:27:26 +0000 From: "Stoned Elipot" Subject: CVS commit: pkgsrc/games/xpuyopuyo To: pkgsrc-changes@NetBSD.org Reply-To: seb@netbsd.org X-Mailer: log_accum Message-Id: <20170702142726.060ACFAE8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_149900564679650 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: seb Date: Sun Jul 2 14:27:25 UTC 2017 Modified Files: pkgsrc/games/xpuyopuyo: Makefile PLIST distinfo pkgsrc/games/xpuyopuyo/patches: patch-ab patch-ac Added Files: pkgsrc/games/xpuyopuyo/patches: patch-Makefile.am patch-configure.in Removed Files: pkgsrc/games/xpuyopuyo/patches: patch-aa patch-pgame_pfield.c Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 pkgsrc/games/xpuyopuyo/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/xpuyopuyo/PLIST cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/xpuyopuyo/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/games/xpuyopuyo/patches/patch-Makefile.am \ pkgsrc/games/xpuyopuyo/patches/patch-configure.in cvs rdiff -u -r1.6 -r0 pkgsrc/games/xpuyopuyo/patches/patch-aa cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/xpuyopuyo/patches/patch-ab \ pkgsrc/games/xpuyopuyo/patches/patch-ac cvs rdiff -u -r1.1 -r0 pkgsrc/games/xpuyopuyo/patches/patch-pgame_pfield.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_149900564679650 Content-Disposition: inline Content-Length: 10879 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/xpuyopuyo/Makefile diff -u pkgsrc/games/xpuyopuyo/Makefile:1.47 pkgsrc/games/xpuyopuyo/Makefile:1.48 --- pkgsrc/games/xpuyopuyo/Makefile:1.47 Sun Jul 2 00:58:17 2017 +++ pkgsrc/games/xpuyopuyo/Makefile Sun Jul 2 14:27:25 2017 @@ -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.calt 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 Index: pkgsrc/games/xpuyopuyo/PLIST diff -u pkgsrc/games/xpuyopuyo/PLIST:1.6 pkgsrc/games/xpuyopuyo/PLIST:1.7 --- pkgsrc/games/xpuyopuyo/PLIST:1.6 Sun Jun 14 17:57:00 2009 +++ pkgsrc/games/xpuyopuyo/PLIST Sun Jul 2 14:27:25 2017 @@ -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_ 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.x 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 Index: pkgsrc/games/xpuyopuyo/distinfo diff -u pkgsrc/games/xpuyopuyo/distinfo:1.7 pkgsrc/games/xpuyopuyo/distinfo:1.8 --- pkgsrc/games/xpuyopuyo/distinfo:1.7 Sun Jul 2 00:58:17 2017 +++ pkgsrc/games/xpuyopuyo/distinfo Sun Jul 2 14:27:25 2017 @@ -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 Index: pkgsrc/games/xpuyopuyo/patches/patch-ab diff -u pkgsrc/games/xpuyopuyo/patches/patch-ab:1.4 pkgsrc/games/xpuyopuyo/patches/patch-ab:1.5 --- pkgsrc/games/xpuyopuyo/patches/patch-ab:1.4 Fri Aug 25 06:22:28 2000 +++ pkgsrc/games/xpuyopuyo/patches/patch-ab Sun Jul 2 14:27:25 2017 @@ -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 Index: pkgsrc/games/xpuyopuyo/patches/patch-ac diff -u pkgsrc/games/xpuyopuyo/patches/patch-ac:1.4 pkgsrc/games/xpuyopuyo/patches/patch-ac:1.5 --- pkgsrc/games/xpuyopuyo/patches/patch-ac:1.4 Fri Aug 25 06:22:28 2000 +++ pkgsrc/games/xpuyopuyo/patches/patch-ac Sun Jul 2 14:27:25 2017 @@ -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 Added files: Index: pkgsrc/games/xpuyopuyo/patches/patch-Makefile.am diff -u /dev/null pkgsrc/games/xpuyopuyo/patches/patch-Makefile.am:1.1 --- /dev/null Sun Jul 2 14:27:25 2017 +++ pkgsrc/games/xpuyopuyo/patches/patch-Makefile.am Sun Jul 2 14:27:25 2017 @@ -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 + + Index: pkgsrc/games/xpuyopuyo/patches/patch-configure.in diff -u /dev/null pkgsrc/games/xpuyopuyo/patches/patch-configure.in:1.1 --- /dev/null Sun Jul 2 14:27:25 2017 +++ pkgsrc/games/xpuyopuyo/patches/patch-configure.in Sun Jul 2 14:27:25 2017 @@ -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" + + --_----------=_149900564679650--