[pkgsrc/trunk]: pkgsrc/games/puzzles games/puzzles: update to 20181212

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/games/puzzles games/puzzles: update to 20181212
From: rillig <rillig%pkgsrc.org@localhost>
Date: Sun, 19 May 2019 16:52:17 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e202b6e67359
branches:  trunk
changeset: 327701:e202b6e67359
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jan 06 20:37:14 2019 +0000

description:
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.

diffstat:

 games/puzzles/Makefile            |  34 +++++++++++++++-----------------
 games/puzzles/distinfo            |  12 +++++-----
 games/puzzles/patches/patch-aa    |  40 ---------------------------------------
 games/puzzles/patches/patch-net.R |  25 ++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 64 deletions(-)

diffs (144 lines):

diff -r 7f6f1b12a230 -r e202b6e67359 games/puzzles/Makefile
--- a/games/puzzles/Makefile    Sun Jan 06 18:58:34 2019 +0000
+++ b/games/puzzles/Makefile    Sun Jan 06 20:37:14 2019 +0000
@@ -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//}
+MAKE_FLAGS+=           gamesdir=${PREFIX}/bin
+CFLAGS+=               -DREVISION=${DISTNAME:S/puzzles-//}
 
-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
+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 \
diff -r 7f6f1b12a230 -r e202b6e67359 games/puzzles/distinfo
--- a/games/puzzles/distinfo    Sun Jan 06 18:58:34 2019 +0000
+++ b/games/puzzles/distinfo    Sun Jan 06 20:37:14 2019 +0000
@@ -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
diff -r 7f6f1b12a230 -r e202b6e67359 games/puzzles/patches/patch-aa
--- a/games/puzzles/patches/patch-aa    Sun Jan 06 18:58:34 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2016/10/05 13:09:38 wiz Exp $
-
-Rename "net" to "netgame" so there's less chances of conflicts
-with other packages.
-
---- Makefile.gtk.orig  2016-04-29 00:37:35.000000000 +0000
-+++ Makefile.gtk
-@@ -39,7 +39,7 @@ all: $(BINPREFIX)blackbox $(BINPREFIX)br
-               $(BINPREFIX)loopysolver $(BINPREFIX)magnets \
-               $(BINPREFIX)magnetssolver $(BINPREFIX)map \
-               $(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc \
--              $(BINPREFIX)mines $(BINPREFIX)net $(BINPREFIX)netslide \
-+              $(BINPREFIX)mines $(BINPREFIX)netgame $(BINPREFIX)netslide \
-               $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)palisade \
-               $(BINPREFIX)pattern $(BINPREFIX)patternpicture \
-               $(BINPREFIX)patternsolver $(BINPREFIX)pearl \
-@@ -212,7 +212,7 @@ $(BINPREFIX)mines: drawing.o gtk.o mallo
-               misc.o printing.o ps.o random.o tree234.o version.o  \
-               $(XLFLAGS) $(XLIBS)
- 
--$(BINPREFIX)net: drawing.o dsf.o findloop.o gtk.o malloc.o midend.o misc.o \
-+$(BINPREFIX)netgame: drawing.o dsf.o findloop.o gtk.o malloc.o midend.o misc.o \
-               net.o net-icon.o printing.o ps.o random.o tree234.o \
-               version.o
-       $(CC) -o $@ drawing.o dsf.o findloop.o gtk.o malloc.o midend.o \
-@@ -769,7 +769,7 @@ GAMES += loopy
- GAMES += magnets
- GAMES += map
- GAMES += mines
--GAMES += net
-+GAMES += netgame
- GAMES += netslide
- GAMES += palisade
- GAMES += pattern
-@@ -806,4 +806,4 @@ benchmark.txt: benchmark.sh $(GAMES)
- 
- 
- clean:
--      rm -f *.o $(BINPREFIX)blackbox $(BINPREFIX)bridges $(BINPREFIX)cube $(BINPREFIX)dominosa $(BINPREFIX)fifteen $(BINPREFIX)fifteensolver $(BINPREFIX)filling $(BINPREFIX)fillingsolver 
$(BINPREFIX)flip $(BINPREFIX)flood $(BINPREFIX)galaxies $(BINPREFIX)galaxiespicture $(BINPREFIX)galaxiessolver $(BINPREFIX)guess $(BINPREFIX)inertia $(BINPREFIX)keen $(BINPREFIX)keensolver 
$(BINPREFIX)latincheck $(BINPREFIX)lightup $(BINPREFIX)lightupsolver $(BINPREFIX)loopy $(BINPREFIX)loopysolver $(BINPREFIX)magnets $(BINPREFIX)magnetssolver $(BINPREFIX)map $(BINPREFIX)mapsolver 
$(BINPREFIX)mineobfusc $(BINPREFIX)mines $(BINPREFIX)net $(BINPREFIX)netslide $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)palisade $(BINPREFIX)pattern $(BINPREFIX)patternpicture 
$(BINPREFIX)patternsolver $(BINPREFIX)pearl $(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range $(BINPREFIX)rect $(BINPREFIX)samegame $(BINPREFIX)signpost $(BINPREFIX)signpostsolver 
$(BINPREFIX)singles $(BINPREFIX)singlessolver $(BINPREFIX)sixteen $(BINPREFIX)slant $(BINPREFIX)slantsolver $(BINPREFIX)solo $(BINPREFIX)solosolver $(BINPREFIX)tents $(BINPREFIX)tentssolver 
$(BINPREFIX)towers $(BINPREFIX)towerssolver $(BINPREFIX)tracks $(BINPREFIX)twiddle $(BINPREFIX)undead $(BINPREFIX)unequal $(BINPREFIX)unequalsolver $(BINPREFIX)unruly $(BINPREFIX)unrulysolver 
$(BINPREFIX)untangle
-+      rm -f *.o $(BINPREFIX)blackbox $(BINPREFIX)bridges $(BINPREFIX)cube $(BINPREFIX)dominosa $(BINPREFIX)fifteen $(BINPREFIX)filling $(BINPREFIX)fillingsolver $(BINPREFIX)flip 
$(BINPREFIX)galaxies $(BINPREFIX)galaxiespicture $(BINPREFIX)galaxiessolver $(BINPREFIX)guess $(BINPREFIX)inertia $(BINPREFIX)keen $(BINPREFIX)keensolver $(BINPREFIX)latincheck $(BINPREFIX)lightup 
$(BINPREFIX)lightupsolver $(BINPREFIX)loopy $(BINPREFIX)loopysolver $(BINPREFIX)magnets $(BINPREFIX)magnetssolver $(BINPREFIX)map $(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc $(BINPREFIX)mines 
$(BINPREFIX)netgame $(BINPREFIX)netslide $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)pattern $(BINPREFIX)patternsolver $(BINPREFIX)pearl $(BINPREFIX)pearlbench $(BINPREFIX)pegs 
$(BINPREFIX)range $(BINPREFIX)rect $(BINPREFIX)samegame $(BINPREFIX)signpost $(BINPREFIX)signpostsolver $(BINPREFIX)singles $(BINPREFIX)singlessolver $(BINPREFIX)sixteen $(BINPREFIX)slant 
$(BINPREFIX)slantsolver $(BINPREFIX)solo $(BINPREFIX)solosolver $(BINPREFIX)tents $(BINPREFIX)tentssolver $(BINPREFIX)towers $(BINPREFIX)towerssolver $(BINPREFIX)twiddle $(BINPREFIX)undead 
$(BINPREFIX)unequal $(BINPREFIX)unequalsolver $(BINPREFIX)unruly $(BINPREFIX)unrulysolver $(BINPREFIX)untangle
diff -r 7f6f1b12a230 -r e202b6e67359 games/puzzles/patches/patch-net.R
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/puzzles/patches/patch-net.R Sun Jan 06 20:37:14 2019 +0000
@@ -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
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11/gtk2 x11/gtk2: document reason for patch in more d...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated games/puzzles to 20181212
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11/gtk2 x11/gtk2: document reason for patch in more d...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated games/puzzles to 20181212
Indexes:
Home | Main Index | Thread Index | Old Index