Update to 9893: bug fixes.diff -r1.32 -r1.33 pkgsrc/games/puzzles/Makefile
(wiz)
@@ -1,28 +1,29 @@ | @@ -1,28 +1,29 @@ | |||
1 | # $NetBSD: Makefile,v 1.32 2013/06/09 08:36:28 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.33 2013/07/07 10:37:56 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= puzzles-r9861 | 3 | DISTNAME= puzzles-r9893 | |
4 | PKGNAME= ${DISTNAME:S/-r/-/} | 4 | PKGNAME= ${DISTNAME:S/-r/-/} | |
5 | CATEGORIES= games | 5 | CATEGORIES= games | |
6 | # distfile changes daily | 6 | # distfile changes daily | |
7 | MASTER_SITES= # http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ | 7 | MASTER_SITES= # http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ | |
8 | 8 | |||
9 | MAINTAINER= wiz@NetBSD.org | 9 | MAINTAINER= wiz@NetBSD.org | |
10 | HOMEPAGE= http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ | 10 | HOMEPAGE= http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ | |
11 | COMMENT= Collection of small one-player puzzle games by Simon Tatham | 11 | COMMENT= Collection of small one-player puzzle games by Simon Tatham | |
12 | LICENSE= mit | 12 | LICENSE= mit | |
13 | 13 | |||
14 | INSTALLATION_DIRS= bin share/doc/puzzles | 14 | INSTALLATION_DIRS= bin share/doc/puzzles | |
15 | 15 | |||
16 | USE_TOOLS+= gmake pkg-config | 16 | USE_TOOLS+= gmake pkg-config | |
17 | 17 | |||
18 | BUILDLINK_TRANSFORM+= rm:-Werror | 18 | BUILDLINK_TRANSFORM+= rm:-Werror | |
19 | MAKE_FLAGS= prefix=${PREFIX} | 19 | MAKE_FLAGS= prefix=${PREFIX} | |
20 | MAKE_FLAGS= gamesdir=${PREFIX}/bin | 20 | MAKE_FLAGS= gamesdir=${PREFIX}/bin | |
21 | MAKE_FILE= Makefile.gtk | |||
21 | CFLAGS+= -DREVISION=${DISTNAME:S/puzzles-r//} | 22 | CFLAGS+= -DREVISION=${DISTNAME:S/puzzles-r//} | |
22 | 23 | |||
23 | post-install: | 24 | post-install: | |
24 | ${INSTALL_DATA} ${WRKSRC}/puzzles.txt \ | 25 | ${INSTALL_DATA} ${WRKSRC}/puzzles.txt \ | |
25 | ${DESTDIR}${PREFIX}/share/doc/puzzles | 26 | ${DESTDIR}${PREFIX}/share/doc/puzzles | |
26 | 27 | |||
27 | .include "../../x11/gtk2/buildlink3.mk" | 28 | .include "../../x11/gtk2/buildlink3.mk" | |
28 | .include "../../mk/bsd.pkg.mk" | 29 | .include "../../mk/bsd.pkg.mk" |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.12 2013/06/09 08:36:28 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.13 2013/07/07 10:37:56 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (puzzles-r9861.tar.gz) = 7fd67d9773bbc45156ade852629f9dbef7ae18d3 | 3 | SHA1 (puzzles-r9893.tar.gz) = 0b6d10f5d6eb8440b1d826b5a761f371d78cfaf0 | |
4 | RMD160 (puzzles-r9861.tar.gz) = d54a41be64a941a2acd7d58674b18fef3f128420 | 4 | RMD160 (puzzles-r9893.tar.gz) = d287a809243bf693213a367322c29520b2c7009f | |
5 | Size (puzzles-r9861.tar.gz) = 3255410 bytes | 5 | Size (puzzles-r9893.tar.gz) = 3124824 bytes | |
6 | SHA1 (patch-aa) = 126800f5545a74d32284a3ee13fc192c82707660 | 6 | SHA1 (patch-aa) = dbea43f7cf4368d18b92a8c7788cf1e5cd058487 |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | $NetBSD: patch-aa,v 1.6 2013/05/26 18:43:17 wiz Exp $ | 1 | $NetBSD: patch-aa,v 1.7 2013/07/07 10:37:56 wiz Exp $ | |
2 | 2 | |||
3 | Rename "net" to "netgame" so there's less chances of conflicts | 3 | Rename "net" to "netgame" so there's less chances of conflicts | |
4 | with other packages. | 4 | with other packages. | |
5 | 5 | |||
6 | --- Makefile.orig 2013-05-26 00:35:23.000000000 +0000 | 6 | --- Makefile.gtk.orig 2013-05-26 00:35:23.000000000 +0000 | |
7 | +++ Makefile | 7 | +++ Makefile.gtk | |
8 | @@ -38,7 +38,7 @@ all: $(BINPREFIX)blackbox $(BINPREFIX)br | 8 | @@ -38,7 +38,7 @@ all: $(BINPREFIX)blackbox $(BINPREFIX)br | |
9 | $(BINPREFIX)loopysolver $(BINPREFIX)magnets \ | 9 | $(BINPREFIX)loopysolver $(BINPREFIX)magnets \ | |
10 | $(BINPREFIX)magnetssolver $(BINPREFIX)map \ | 10 | $(BINPREFIX)magnetssolver $(BINPREFIX)map \ | |
11 | $(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc \ | 11 | $(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc \ | |
12 | - $(BINPREFIX)mines $(BINPREFIX)net $(BINPREFIX)netslide \ | 12 | - $(BINPREFIX)mines $(BINPREFIX)net $(BINPREFIX)netslide \ | |
13 | + $(BINPREFIX)mines $(BINPREFIX)netgame $(BINPREFIX)netslide \ | 13 | + $(BINPREFIX)mines $(BINPREFIX)netgame $(BINPREFIX)netslide \ | |
14 | $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)pattern \ | 14 | $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)pattern \ | |
15 | $(BINPREFIX)patternsolver $(BINPREFIX)pearl \ | 15 | $(BINPREFIX)patternsolver $(BINPREFIX)pearl \ | |
16 | $(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range \ | 16 | $(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range \ | |
17 | @@ -199,7 +199,7 @@ $(BINPREFIX)mines: drawing.o gtk.o mallo | 17 | @@ -199,7 +199,7 @@ $(BINPREFIX)mines: drawing.o gtk.o mallo | |
18 | misc.o printing.o ps.o random.o tree234.o version.o \ | 18 | misc.o printing.o ps.o random.o tree234.o version.o \ | |
19 | $(XLFLAGS) $(XLIBS) | 19 | $(XLFLAGS) $(XLIBS) | |
20 | 20 |