CVS commit: pkgsrc/games/puzzles

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jan  6 20:37:14 UTC 2019

Modified Files:
        pkgsrc/games/puzzles: Makefile distinfo
Added Files:
        pkgsrc/games/puzzles/patches: patch-net.R
Removed Files:
        pkgsrc/games/puzzles/patches: patch-aa

Log Message:
games/puzzles: update to 20181212

Upstream changes since 20160429:
- lots of small bug fixes in the individual games

Pkgsrc changes: To avoid the distfile that changes every day, the package
is built from a Git snapshot (with fixed commit). As a consequence, this
package depends on Perl, autoreconf and textproc/halibut now.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/games/puzzles/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/games/puzzles/distinfo
cvs rdiff -u -r1.8 -r0 pkgsrc/games/puzzles/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/games/puzzles/patches/patch-net.R

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/puzzles/Makefile
diff -u pkgsrc/games/puzzles/Makefile:1.61 pkgsrc/games/puzzles/Makefile:1.62
--- pkgsrc/games/puzzles/Makefile:1.61  Wed Nov 14 22:21:31 2018
+++ pkgsrc/games/puzzles/Makefile       Sun Jan  6 20:37:14 2019
@@ -1,34 +1,32 @@
-# $NetBSD: Makefile,v 1.61 2018/11/14 22:21:31 kleink Exp $
+# $NetBSD: Makefile,v 1.62 2019/01/06 20:37:14 rillig Exp $
 
-DISTNAME=      puzzles
-PKGNAME=       puzzles-20160429
-PKGREVISION=   6
+DISTNAME=      puzzles-20181212
+GIT_COMMIT=    ced51ada363d895eee796dd03923042f97f95321
 CATEGORIES=    games
-# distfile changes every day
-MASTER_SITES=  # https://www.chiark.greenend.org.uk/~sgtatham/puzzles/
-DIST_SUBDIR=   ${PKGNAME_NOREV}
+MASTER_SITES=  -https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=${GIT_COMMIT};sf=tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.chiark.greenend.org.uk/~sgtatham/puzzles/
 COMMENT=       Collection of small one-player puzzle games by Simon Tatham
 LICENSE=       mit
 
-INSTALLATION_DIRS=     bin share/doc/puzzles
+WRKSRC=                ${WRKDIR}/puzzles-${GIT_COMMIT:C,(.......).*,\1,}
+USE_TOOLS+=    gmake pkg-config perl autoreconf autoconf automake
+AUTO_MKDIRS=   yes
 
-WRKSRC=                ${WRKDIR}/puzzles-20160429.b31155b
-USE_TOOLS+=    gmake pkg-config
+BUILD_DEPENDS+=                halibut>=1.1:../../textproc/halibut
 
+USE_LANGUAGES=         c99
+GNU_CONFIGURE=         yes
 BUILDLINK_TRANSFORM+=  rm:-Werror
 MAKE_FLAGS=            prefix=${PREFIX}
-MAKE_FLAGS=            gamesdir=${PREFIX}/bin
-MAKE_FILE=             Makefile.gtk
-CFLAGS+=               -DREVISION=${DISTNAME:S/puzzles-r//}
-
-SUBST_CLASSES+=                ldflags
-SUBST_SED.ldflags+=    -e 's/$$(CC)/$$(CC) $$(LDFLAGS)/g'
-SUBST_FILES.ldflags+=  Makefile.gtk
-SUBST_MESSAGE.ldflags= Honoring LDFLAGS.
-SUBST_STAGE.ldflags=   pre-build
+MAKE_FLAGS+=           gamesdir=${PREFIX}/bin
+CFLAGS+=               -DREVISION=${DISTNAME:S/puzzles-//}
+
+pre-configure:
+       cd ${WRKSRC} && perl mkfiles.pl
+       cd ${WRKSRC} && ${SH} mkauto.sh
+       cd ${WRKSRC} && gmake -f Makefile.doc puzzles.txt
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/puzzles.txt \

Index: pkgsrc/games/puzzles/distinfo
diff -u pkgsrc/games/puzzles/distinfo:1.27 pkgsrc/games/puzzles/distinfo:1.28
--- pkgsrc/games/puzzles/distinfo:1.27  Wed Oct  5 13:09:38 2016
+++ pkgsrc/games/puzzles/distinfo       Sun Jan  6 20:37:14 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.27 2016/10/05 13:09:38 wiz Exp $
+$NetBSD: distinfo,v 1.28 2019/01/06 20:37:14 rillig Exp $
 
-SHA1 (puzzles-20160429/puzzles.tar.gz) = 3fd39e4d2f658654e3b28c007eae00710ec656c5
-RMD160 (puzzles-20160429/puzzles.tar.gz) = d8736c7358071bd61f3d7d41a1cdd7d4bdefdfd7
-SHA512 (puzzles-20160429/puzzles.tar.gz) = 7bf3d97f0a48bba27070148f6b68b13f01a2baaf48b0bce05ad4e61ca35f0f2d7b9c1996e4eca5e64d84eacb86935468f7ae394c37aaee974d468476108ec2f0
-Size (puzzles-20160429/puzzles.tar.gz) = 2896119 bytes
-SHA1 (patch-aa) = 515d93b8c43bb22646ffa812309e92af8682855d
+SHA1 (puzzles-20181212.tar.gz) = 3bfd4f57c36484e834cdd5bfb9e9b86e45752b39
+RMD160 (puzzles-20181212.tar.gz) = d1417a19ff840f18d2c0bc735f364c13f7a358ac
+SHA512 (puzzles-20181212.tar.gz) = 228534debb8cdefc0844d5660b224776df6f59b17576335eb76813a6f8ac131a640bc6fc1a7d1ea9d9f5997fe62ae938176428f2eb4260de11e2d631b4cd34a5
+Size (puzzles-20181212.tar.gz) = 1184217 bytes
+SHA1 (patch-net.R) = b0a2f41dd8a6cef51908cc2b9eba129ad9881154

Added files:

Index: pkgsrc/games/puzzles/patches/patch-net.R
diff -u /dev/null pkgsrc/games/puzzles/patches/patch-net.R:1.1
--- /dev/null   Sun Jan  6 20:37:14 2019
+++ pkgsrc/games/puzzles/patches/patch-net.R    Sun Jan  6 20:37:14 2019
@@ -0,0 +1,25 @@
+$NetBSD: patch-net.R,v 1.1 2019/01/06 20:37:14 rillig Exp $
+
+Rename 'net' to 'netgame' (like on Windows) to avoid a conflict with
+net/samba and net/samba4.
+
+--- net.R.orig 2018-12-12 22:18:00.000000000 +0000
++++ net.R
+@@ -2,7 +2,7 @@
+ 
+ NET_EXTRA = tree234 dsf findloop
+ 
+-net      : [X] GTK COMMON net NET_EXTRA net-icon|no-icon
++netgame  : [X] GTK COMMON net NET_EXTRA net-icon|no-icon
+ 
+ # The Windows Net shouldn't be called `net.exe' since Windows
+ # already has a reasonably important utility program by that name!
+@@ -11,7 +11,7 @@ netgame  : [G] WINDOWS COMMON net NET_EX
+ ALL += net[COMBINED] NET_EXTRA
+ 
+ !begin am gtk
+-GAMES += net
++GAMES += netgame
+ !end
+ 
+ !begin >list.c