Attachment #231780 for bug #261904

View | Details | Raw Unified | Return to bug 261904
Collapse All | Expand All




# Created by: Tobias Rehbein <tobias.rehbein@web.de>

PORTNAME=	stonesoup
DISTVERSION=	0.28.0
CATEGORIES=	games

MAINTAINER=	fuz@fuz.su

OPTIONS_DEFAULT=LUA
OPTIONS_SUB=	yes

SOUND_DESC=	Sound support
NOWIZARD_DESC=	Disable Wizard mode
LUA_DESC=	Bindings for LUA user scripts


USE_GL=		gl glu
MAKE_ARGS+=	TILES=y SOUND=y
BUILD_DEPENDS+=	\
		advpng:archivers/advancecomp \
		fc-list:x11-fonts/fontconfig \
		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
		pngcrush:graphics/pngcrush
RUN_DEPENDS+=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
LIB_DEPENDS+=libpng.so:graphics/png \
		libfreetype.so:print/freetype2
DESKTOP_ENTRIES=	"Dungeon Crawl Stone Soup" "${COMMENT}" "${DATADIR}/dat/tiles/stone_soup_icon-512x512.png" "${GAME}" "Game;" false
.else
USES+=		ncurses
OPTIONS_DEFINE+=	SOUND
SOUND_DESC=	Sound support
SOUND_MAKE_ARGS=	SOUND=y
SOUND_RUN_DEPENDS=	sox:audio/sox
.endif

NOWIZARD_MAKE_ARGS=	NOWIZARD=y
SOUND_MAKE_ARGS=	SOUND=y
SOUND_RUN_DEPENDS=	sox:audio/sox
LUA_MAKE_ARGS_OFF=	NO_LUA_BINDINGS=yes

post-patch-SOUND-on:

	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/sound.h

pre-build:
	@${ECHO} ${PKGVERSION} > ${WRKSRC}/util/release_ver

pre-install:
	@${FIND} ${WRKSRC}/dat -type f -name '*.orig' -delete

Lines 1-3 Link Here

(-)b/games/stonesoup/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1635418020	1	TIMESTAMP = 1644677272
2	SHA256 (crawl-crawl-0.27.1_GH0.tar.gz) = 062f1285852fced23ecb2f272ad132467e12e7e251e02aaa84f37280b55ba63e	2	SHA256 (crawl-crawl-0.28.0_GH0.tar.gz) = 287f35476d20bbe8aaa3e663140704462b4e304a4e1ed5c2b5da1d273dd1f383
3	SIZE (crawl-crawl-0.27.1_GH0.tar.gz) = 14647180	3	SIZE (crawl-crawl-0.28.0_GH0.tar.gz) = 16311050




--- Makefile.orig	2022-01-25 18:04:53 UTC
+++ Makefile
@@ -131,7 +131,7 @@ include Makefile.obj
 # Which C++ standard to support

 #
 # The GCC and GXX variables are set later.
 #
@@ -505,7 +501,7 @@ endif
 
 # Attempt to use a full compiler name, to make
 # distcc builds work nicely.

 ifeq ($(LMACH),-)
 LMACH :=
 endif
@@ -551,15 +547,6 @@ ifdef USE_ICC
 
 # Some very good optimization flags.
   CFOPTIMIZE := -O2 -parallel

 endif
 
 # Define this to automatically generate code optimized for your machine
@@ -860,7 +847,7 @@ ifndef NOWIZARD
 DEFINES += -DWIZARD
 endif
 ifdef NO_OPTIMIZE

Lines 1-6 Link Here

(-)b/games/stonesoup/files/patch-initfile.cc (-3 / +3 lines)
1	--- initfile.cc.orig 2021-08-20 10:45:00 UTC	1	--- initfile.cc.orig 2022-01-25 18:04:53 UTC
2	+++ initfile.cc	2	+++ initfile.cc
3	@@ -4529,7 +4529,7 @@ static void _bones_rewrite(const string filename, cons	3	@@ -4795,7 +4795,7 @@ static void _bones_rewrite(const string filename, cons
4	if (dups)	4	if (dups)
5	cout << ", " << dups << " duplicates removed";	5	cout << ", " << dups << " duplicates removed";
6	cout << "\n";	6	cout << "\n";
Lines 9-15 Link Here
9	_write_bones(filename, out);	9	_write_bones(filename, out);
10	}	10	}
11	else	11	else
12	@@ -4554,7 +4554,7 @@ static void _bones_merge(const vector<string> files, c	12	@@ -4820,7 +4820,7 @@ static void _bones_merge(const vector<string> files, c
13	break;	13	break;
14	}	14	}
15	if (file_exists(out_name))	15	if (file_exists(out_name))




--- util/gen_ver.pl.orig	2022-01-25 18:04:53 UTC
+++ util/gen_ver.pl
@@ -20,8 +20,7 @@ mkdir dirname($outfile);
 #
 # Source tarbells distributed as part of a release include this file already
 # generated with the release version.
-$_ = `git describe --tags $mergebase 2> /dev/null`
-    || (open(IN, "<", "$scriptpath/release_ver") ? <IN>
+$_ = (open(IN, "<", "$scriptpath/release_ver") ? <IN>
         : die "Can't get version information: `git describe --tags` failed (no git, no repository, or shallow clone), and $scriptpath/release_ver doesn't exist.\n")
     or die "couldn't get the version information\n";
 




%%DATADIR%%/dat/des/branches/dis.des
%%DATADIR%%/dat/des/branches/elf.des
%%DATADIR%%/dat/des/branches/geh.des
%%DATADIR%%/dat/des/branches/geh_lava_maze.des
%%DATADIR%%/dat/des/branches/hell.des
%%DATADIR%%/dat/des/branches/hells.des
%%DATADIR%%/dat/des/branches/hilbert_zone.des
%%DATADIR%%/dat/des/branches/lair.des
%%DATADIR%%/dat/des/branches/orc.des

%%DATADIR%%/dat/des/builder/shops.des
%%DATADIR%%/dat/des/builder/uniques.des
%%DATADIR%%/dat/des/guide.txt
%%DATADIR%%/dat/des/portals/arena.des
%%DATADIR%%/dat/des/portals/bailey.des
%%DATADIR%%/dat/des/portals/bazaar.des
%%DATADIR%%/dat/des/portals/desolation.des

%%DATADIR%%/dat/des/serial/rivers.des
%%DATADIR%%/dat/des/serial/serial_guide.txt
%%DATADIR%%/dat/des/serial/sigils.des
%%DATADIR%%/dat/des/serial/subway.des
%%DATADIR%%/dat/des/serial/undead.des
%%DATADIR%%/dat/des/serial/window.des
%%DATADIR%%/dat/des/sprint/arena_sprint.des

%%DATADIR%%/dat/descript/lv/unident.txt
%%DATADIR%%/dat/descript/lv/unrand.txt
%%DATADIR%%/dat/descript/monsters.txt
%%DATADIR%%/dat/descript/mutations.txt
%%DATADIR%%/dat/descript/nl/ability.txt
%%DATADIR%%/dat/descript/nl/tutorial.txt
%%DATADIR%%/dat/descript/nl/unident.txt

%%SDL%%%%DATADIR%%/dat/tiles/title_froggy_natasha_and_boris.png
%%SDL%%%%DATADIR%%/dat/tiles/title_froggy_rune_and_run_failed_on_dis.png
%%SDL%%%%DATADIR%%/dat/tiles/title_froggy_thunder_fist_nikola.png
%%SDL%%%%DATADIR%%/dat/tiles/title_kaonedong_ignis_the_dying_flame.png
%%SDL%%%%DATADIR%%/dat/tiles/title_kaonedong_menkaure_prince_of_dust.png
%%SDL%%%%DATADIR%%/dat/tiles/title_nibiki_octopode.png
%%SDL%%%%DATADIR%%/dat/tiles/title_omndra_zot_demon.png
%%SDL%%%%DATADIR%%/dat/tiles/title_peileppe_bloax_eye.png
- 

Return to bug 261904

Lines 1-7 Link Here

(-)b/games/stonesoup/Makefile (-8 / +7 lines)
1	# Created by: Tobias Rehbein <tobias.rehbein@web.de>	1	# Created by: Tobias Rehbein <tobias.rehbein@web.de>
2		2
3	PORTNAME= stonesoup	3	PORTNAME= stonesoup
4	PORTVERSION= 0.27.1	4	DISTVERSION= 0.28.0
5	CATEGORIES= games	5	CATEGORIES= games
6		6
7	MAINTAINER= fuz@fuz.su	7	MAINTAINER= fuz@fuz.su
Lines 59-65 OPTIONS_DEFINE= LUA NOWIZARD SOUND Link Here
59	OPTIONS_DEFAULT=LUA	59	OPTIONS_DEFAULT=LUA
60	OPTIONS_SUB= yes	60	OPTIONS_SUB= yes
61		61
62	SOUND_DESC= Sound support
63	NOWIZARD_DESC= Disable Wizard mode	62	NOWIZARD_DESC= Disable Wizard mode
64	LUA_DESC= Bindings for LUA user scripts	63	LUA_DESC= Bindings for LUA user scripts
65		64
Lines 69-89 USE_SDL= sdl2 image2 mixer2 Link Here
69	USE_GL= gl glu	68	USE_GL= gl glu
70	MAKE_ARGS+= TILES=y SOUND=y	69	MAKE_ARGS+= TILES=y SOUND=y
71	BUILD_DEPENDS+= \	70	BUILD_DEPENDS+= \
72	advpng:archivers/advancecomp \
73	fc-list:x11-fonts/fontconfig \	71	fc-list:x11-fonts/fontconfig \
74	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \	72	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
75	pngcrush:graphics/pngcrush
76	RUN_DEPENDS+= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu	73	RUN_DEPENDS+= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
77	LIB_DEPENDS+=libpng.so:graphics/png \	74	LIB_DEPENDS+=libpng.so:graphics/png \
78	libfreetype.so:print/freetype2	75	libfreetype.so:print/freetype2
79	DESKTOP_ENTRIES= "Dungeon Crawl Stone Soup" "${COMMENT}" "${DATADIR}/dat/tiles/stone_soup_icon-512x512.png" "${GAME}" "Game;" false	76	DESKTOP_ENTRIES= "Dungeon Crawl Stone Soup" "${COMMENT}" "${DATADIR}/dat/tiles/stone_soup_icon-512x512.png" "${GAME}" "Game;" false
80	.else	77	.else
81	USES+= ncurses	78	USES+= ncurses
		79	OPTIONS_DEFINE+= SOUND
		80	SOUND_DESC= Sound support
		81	SOUND_MAKE_ARGS= SOUND=y
		82	SOUND_RUN_DEPENDS= sox:audio/sox
82	.endif	83	.endif
83		84
84	NOWIZARD_MAKE_ARGS= NOWIZARD=y	85	NOWIZARD_MAKE_ARGS= NOWIZARD=y
85	SOUND_MAKE_ARGS= SOUND=y
86	SOUND_RUN_DEPENDS= sox:audio/sox
87	LUA_MAKE_ARGS_OFF= NO_LUA_BINDINGS=yes	86	LUA_MAKE_ARGS_OFF= NO_LUA_BINDINGS=yes
88		87
89	post-patch-SOUND-on:	88	post-patch-SOUND-on:
Lines 94-100 post-patch-SOUND-off: Link Here
94	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/sound.h	93	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/sound.h
95		94
96	pre-build:	95	pre-build:
97	@${ECHO} ${PORTVERSION} > ${WRKSRC}/util/release_ver	96	@${ECHO} ${PKGVERSION} > ${WRKSRC}/util/release_ver
98		97
99	pre-install:	98	pre-install:
100	@${FIND} ${WRKSRC}/dat -type f -name '*.orig' -delete	99	@${FIND} ${WRKSRC}/dat -type f -name '*.orig' -delete

Lines 1-4 Link Here

(-)b/games/stonesoup/files/patch-Makefile (-4 / +4 lines)
1	--- Makefile.orig 2021-08-20 10:45:00 UTC	1	--- Makefile.orig 2022-01-25 18:04:53 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -131,7 +131,7 @@ include Makefile.obj	3	@@ -131,7 +131,7 @@ include Makefile.obj
4	# Which C++ standard to support	4	# Which C++ standard to support
Lines 20-26 Link Here
20	#	20	#
21	# The GCC and GXX variables are set later.	21	# The GCC and GXX variables are set later.
22	#	22	#
23	@@ -503,7 +499,7 @@ endif	23	@@ -505,7 +501,7 @@ endif
24		24
25	# Attempt to use a full compiler name, to make	25	# Attempt to use a full compiler name, to make
26	# distcc builds work nicely.	26	# distcc builds work nicely.
Lines 29-35 Link Here
29	ifeq ($(LMACH),-)	29	ifeq ($(LMACH),-)
30	LMACH :=	30	LMACH :=
31	endif	31	endif
32	@@ -549,15 +545,6 @@ ifdef USE_ICC	32	@@ -551,15 +547,6 @@ ifdef USE_ICC
33		33
34	# Some very good optimization flags.	34	# Some very good optimization flags.
35	CFOPTIMIZE := -O2 -parallel	35	CFOPTIMIZE := -O2 -parallel
Lines 45-51 Link Here
45	endif	45	endif
46		46
47	# Define this to automatically generate code optimized for your machine	47	# Define this to automatically generate code optimized for your machine
48	@@ -858,7 +845,7 @@ ifndef NOWIZARD	48	@@ -860,7 +847,7 @@ ifndef NOWIZARD
49	DEFINES += -DWIZARD	49	DEFINES += -DWIZARD
50	endif	50	endif
51	ifdef NO_OPTIMIZE	51	ifdef NO_OPTIMIZE

Lines 1-12 Link Here

(-)b/games/stonesoup/files/patch-util_gen__ver.pl (-6 / +6 lines)
1	--- util/gen_ver.pl.orig 2021-10-28 09:37:07 UTC	1	--- util/gen_ver.pl.orig 2022-01-25 18:04:53 UTC
2	+++ util/gen_ver.pl	2	+++ util/gen_ver.pl
3	@@ -13,8 +13,7 @@ $mergebase or $mergebase = "";	3	@@ -20,8 +20,7 @@ mkdir dirname($outfile);
4		4	#
5	mkdir dirname($outfile);	5	# Source tarbells distributed as part of a release include this file already
6		6	# generated with the release version.
7	-$_ = `git describe --tags $mergebase 2> /dev/null`	7	-$_ = `git describe --tags $mergebase 2> /dev/null`
8	- \|\| (open(IN, "<", "$scriptpath/release_ver") ? <IN>	8	- \|\| (open(IN, "<", "$scriptpath/release_ver") ? <IN>
9	+$_ = (open(IN, "<", "$scriptpath/release_ver") ? <IN>	9	+$_ = (open(IN, "<", "$scriptpath/release_ver") ? <IN>
10	: die "No Git, and $scriptpath/release_ver doesn't exist.\n")	10	: die "Can't get version information: `git describe --tags` failed (no git, no repository, or shallow clone), and $scriptpath/release_ver doesn't exist.\n")
11	or die "couldn't get the version information\n";	11	or die "couldn't get the version information\n";
12		12

Lines 57-63 bin/%%GAME%% Link Here

(-)b/games/stonesoup/pkg-plist (-1 / +7 lines)
57	%%DATADIR%%/dat/des/branches/dis.des	57	%%DATADIR%%/dat/des/branches/dis.des
58	%%DATADIR%%/dat/des/branches/elf.des	58	%%DATADIR%%/dat/des/branches/elf.des
59	%%DATADIR%%/dat/des/branches/geh.des	59	%%DATADIR%%/dat/des/branches/geh.des
		60	%%DATADIR%%/dat/des/branches/geh_lava_maze.des
60	%%DATADIR%%/dat/des/branches/hell.des	61	%%DATADIR%%/dat/des/branches/hell.des
		62	%%DATADIR%%/dat/des/branches/hells.des
61	%%DATADIR%%/dat/des/branches/hilbert_zone.des	63	%%DATADIR%%/dat/des/branches/hilbert_zone.des
62	%%DATADIR%%/dat/des/branches/lair.des	64	%%DATADIR%%/dat/des/branches/lair.des
63	%%DATADIR%%/dat/des/branches/orc.des	65	%%DATADIR%%/dat/des/branches/orc.des
Lines 102-107 bin/%%GAME%% Link Here
102	%%DATADIR%%/dat/des/builder/shops.des	104	%%DATADIR%%/dat/des/builder/shops.des
103	%%DATADIR%%/dat/des/builder/uniques.des	105	%%DATADIR%%/dat/des/builder/uniques.des
104	%%DATADIR%%/dat/des/guide.txt	106	%%DATADIR%%/dat/des/guide.txt
		107	%%DATADIR%%/dat/des/portals/arena.des
105	%%DATADIR%%/dat/des/portals/bailey.des	108	%%DATADIR%%/dat/des/portals/bailey.des
106	%%DATADIR%%/dat/des/portals/bazaar.des	109	%%DATADIR%%/dat/des/portals/bazaar.des
107	%%DATADIR%%/dat/des/portals/desolation.des	110	%%DATADIR%%/dat/des/portals/desolation.des
Lines 127-132 bin/%%GAME%% Link Here
127	%%DATADIR%%/dat/des/serial/rivers.des	130	%%DATADIR%%/dat/des/serial/rivers.des
128	%%DATADIR%%/dat/des/serial/serial_guide.txt	131	%%DATADIR%%/dat/des/serial/serial_guide.txt
129	%%DATADIR%%/dat/des/serial/sigils.des	132	%%DATADIR%%/dat/des/serial/sigils.des
		133	%%DATADIR%%/dat/des/serial/subway.des
130	%%DATADIR%%/dat/des/serial/undead.des	134	%%DATADIR%%/dat/des/serial/undead.des
131	%%DATADIR%%/dat/des/serial/window.des	135	%%DATADIR%%/dat/des/serial/window.des
132	%%DATADIR%%/dat/des/sprint/arena_sprint.des	136	%%DATADIR%%/dat/des/sprint/arena_sprint.des
Lines 347-352 bin/%%GAME%% Link Here
347	%%DATADIR%%/dat/descript/lv/unident.txt	351	%%DATADIR%%/dat/descript/lv/unident.txt
348	%%DATADIR%%/dat/descript/lv/unrand.txt	352	%%DATADIR%%/dat/descript/lv/unrand.txt
349	%%DATADIR%%/dat/descript/monsters.txt	353	%%DATADIR%%/dat/descript/monsters.txt
		354	%%DATADIR%%/dat/descript/mutations.txt
350	%%DATADIR%%/dat/descript/nl/ability.txt	355	%%DATADIR%%/dat/descript/nl/ability.txt
351	%%DATADIR%%/dat/descript/nl/tutorial.txt	356	%%DATADIR%%/dat/descript/nl/tutorial.txt
352	%%DATADIR%%/dat/descript/nl/unident.txt	357	%%DATADIR%%/dat/descript/nl/unident.txt
Lines 640-645 bin/%%GAME%% Link Here
640	%%SDL%%%%DATADIR%%/dat/tiles/title_froggy_natasha_and_boris.png	645	%%SDL%%%%DATADIR%%/dat/tiles/title_froggy_natasha_and_boris.png
641	%%SDL%%%%DATADIR%%/dat/tiles/title_froggy_rune_and_run_failed_on_dis.png	646	%%SDL%%%%DATADIR%%/dat/tiles/title_froggy_rune_and_run_failed_on_dis.png
642	%%SDL%%%%DATADIR%%/dat/tiles/title_froggy_thunder_fist_nikola.png	647	%%SDL%%%%DATADIR%%/dat/tiles/title_froggy_thunder_fist_nikola.png
		648	%%SDL%%%%DATADIR%%/dat/tiles/title_kaonedong_ignis_the_dying_flame.png
		649	%%SDL%%%%DATADIR%%/dat/tiles/title_kaonedong_menkaure_prince_of_dust.png
643	%%SDL%%%%DATADIR%%/dat/tiles/title_nibiki_octopode.png	650	%%SDL%%%%DATADIR%%/dat/tiles/title_nibiki_octopode.png
644	%%SDL%%%%DATADIR%%/dat/tiles/title_omndra_zot_demon.png	651	%%SDL%%%%DATADIR%%/dat/tiles/title_omndra_zot_demon.png
645	%%SDL%%%%DATADIR%%/dat/tiles/title_peileppe_bloax_eye.png	652	%%SDL%%%%DATADIR%%/dat/tiles/title_peileppe_bloax_eye.png
646	-