Sun Jan 6 20:37:14 2019 UTC ()
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.


(rillig)
diff -r1.61 -r1.62 pkgsrc/games/puzzles/Makefile
diff -r1.27 -r1.28 pkgsrc/games/puzzles/distinfo
diff -r1.8 -r0 pkgsrc/games/puzzles/patches/patch-aa
diff -r0 -r1.1 pkgsrc/games/puzzles/patches/patch-net.R
cvs diff -r1.61 -r1.62 pkgsrc/games/puzzles/Makefile (expand / switch to unified diff)

--- pkgsrc/games/puzzles/Makefile 2018/11/14 22:21:31 1.61
+++ pkgsrc/games/puzzles/Makefile 2019/01/06 20:37:14 1.62
@@ -1,38 +1,36 @@ @@ -1,38 +1,36 @@
1# $NetBSD: Makefile,v 1.61 2018/11/14 22:21:31 kleink Exp $ 1# $NetBSD: Makefile,v 1.62 2019/01/06 20:37:14 rillig Exp $
2 2
3DISTNAME= puzzles 3DISTNAME= puzzles-20181212
4PKGNAME= puzzles-20160429 4GIT_COMMIT= ced51ada363d895eee796dd03923042f97f95321
5PKGREVISION= 6 
6CATEGORIES= games 5CATEGORIES= games
7# distfile changes every day 6MASTER_SITES= -https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=${GIT_COMMIT};sf=tgz
8MASTER_SITES= # https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ 
9DIST_SUBDIR= ${PKGNAME_NOREV} 
10 7
11MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ 9HOMEPAGE= https://www.chiark.greenend.org.uk/~sgtatham/puzzles/
13COMMENT= Collection of small one-player puzzle games by Simon Tatham 10COMMENT= Collection of small one-player puzzle games by Simon Tatham
14LICENSE= mit 11LICENSE= mit
15 12
16INSTALLATION_DIRS= bin share/doc/puzzles 13WRKSRC= ${WRKDIR}/puzzles-${GIT_COMMIT:C,(.......).*,\1,}
 14USE_TOOLS+= gmake pkg-config perl autoreconf autoconf automake
 15AUTO_MKDIRS= yes
17 16
18WRKSRC= ${WRKDIR}/puzzles-20160429.b31155b 17BUILD_DEPENDS+= halibut>=1.1:../../textproc/halibut
19USE_TOOLS+= gmake pkg-config 
20 18
 19USE_LANGUAGES= c99
 20GNU_CONFIGURE= yes
21BUILDLINK_TRANSFORM+= rm:-Werror 21BUILDLINK_TRANSFORM+= rm:-Werror
22MAKE_FLAGS= prefix=${PREFIX} 22MAKE_FLAGS= prefix=${PREFIX}
23MAKE_FLAGS= gamesdir=${PREFIX}/bin 23MAKE_FLAGS+= gamesdir=${PREFIX}/bin
24MAKE_FILE= Makefile.gtk 24CFLAGS+= -DREVISION=${DISTNAME:S/puzzles-//}
25CFLAGS+= -DREVISION=${DISTNAME:S/puzzles-r//} 25
26 26pre-configure:
27SUBST_CLASSES+= ldflags 27 cd ${WRKSRC} && perl mkfiles.pl
28SUBST_SED.ldflags+= -e 's/$$(CC)/$$(CC) $$(LDFLAGS)/g' 28 cd ${WRKSRC} && ${SH} mkauto.sh
29SUBST_FILES.ldflags+= Makefile.gtk 29 cd ${WRKSRC} && gmake -f Makefile.doc puzzles.txt
30SUBST_MESSAGE.ldflags= Honoring LDFLAGS. 
31SUBST_STAGE.ldflags= pre-build 
32 30
33post-install: 31post-install:
34 ${INSTALL_DATA} ${WRKSRC}/puzzles.txt \ 32 ${INSTALL_DATA} ${WRKSRC}/puzzles.txt \
35 ${DESTDIR}${PREFIX}/share/doc/puzzles 33 ${DESTDIR}${PREFIX}/share/doc/puzzles
36 34
37.include "../../x11/gtk2/buildlink3.mk" 35.include "../../x11/gtk2/buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.27 -r1.28 pkgsrc/games/puzzles/distinfo (expand / switch to unified diff)

--- pkgsrc/games/puzzles/distinfo 2016/10/05 13:09:38 1.27
+++ pkgsrc/games/puzzles/distinfo 2019/01/06 20:37:14 1.28
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.27 2016/10/05 13:09:38 wiz Exp $ 1$NetBSD: distinfo,v 1.28 2019/01/06 20:37:14 rillig Exp $
2 2
3SHA1 (puzzles-20160429/puzzles.tar.gz) = 3fd39e4d2f658654e3b28c007eae00710ec656c5 3SHA1 (puzzles-20181212.tar.gz) = 3bfd4f57c36484e834cdd5bfb9e9b86e45752b39
4RMD160 (puzzles-20160429/puzzles.tar.gz) = d8736c7358071bd61f3d7d41a1cdd7d4bdefdfd7 4RMD160 (puzzles-20181212.tar.gz) = d1417a19ff840f18d2c0bc735f364c13f7a358ac
5SHA512 (puzzles-20160429/puzzles.tar.gz) = 7bf3d97f0a48bba27070148f6b68b13f01a2baaf48b0bce05ad4e61ca35f0f2d7b9c1996e4eca5e64d84eacb86935468f7ae394c37aaee974d468476108ec2f0 5SHA512 (puzzles-20181212.tar.gz) = 228534debb8cdefc0844d5660b224776df6f59b17576335eb76813a6f8ac131a640bc6fc1a7d1ea9d9f5997fe62ae938176428f2eb4260de11e2d631b4cd34a5
6Size (puzzles-20160429/puzzles.tar.gz) = 2896119 bytes 6Size (puzzles-20181212.tar.gz) = 1184217 bytes
7SHA1 (patch-aa) = 515d93b8c43bb22646ffa812309e92af8682855d 7SHA1 (patch-net.R) = b0a2f41dd8a6cef51908cc2b9eba129ad9881154
File Deleted: pkgsrc/games/puzzles/patches/Attic/patch-aa
File Added: pkgsrc/games/puzzles/patches/Attic/patch-net.R
$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