Attachment #107120 for bug #147828




#

PORTNAME=	stonesoup
PORTVERSION=	0.6.1
CATEGORIES=	games
MASTER_SITES=	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
DISTNAME=	stone_soup-${PORTVERSION}-nodeps

MAINTAINER=	tobias.rehbein@web.de
COMMENT=	Dungeon Crawl Stone Soup - a fun, free rogue-like game

USE_SQLITE=	yes
RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar

USE_BZIP2=	yes
USE_BISON=	build
USE_GMAKE=	yes

SUB_FILES=	README.FreeBSD
PLIST_SUB=	SAVEDIR="${SAVEDIR}"

OPTIONS=	SOUND		"Sound support"			off \
		SOUND		"Sound support"			off \
		LUA_BINDINGS	"LUA bindings for user scripts"	on \
		UNICODE		"Unicode glyphs (UTF-8)"	off \
		WIZARD		"Wizard mode"			off

MAKE_ARGS+=	wizard
.endif

.if defined(WITH_SDL)
CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
PLIST_SUB+=	SDL="@comment "
.else
CONFLICTS+=	${PORTNAME}-[0-9]*
MAKE_ARGS+=	TILES=y
PLIST_SUB+=	SDL=""
PKGNAMESUFFIX=	-sdl
USE_FREETYPE=	yes
BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
		freetype:${PORTSDIR}/print/freetype2
USE_SDL=	sdl image
.else
CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
PLIST_SUB+=	SDL="@comment "
.endif

.if defined(WITH_SOUND)

Lines 1-3 Link Here

(-)games/stonesoup/distinfo (-3 / +3 lines)
1	MD5 (stone_soup-0.6.0-nodeps.tar.bz2) = 866e315470a592572e7ce8a7214c7615	1	MD5 (stone_soup-0.6.1-nodeps.tar.bz2) = 864e00b6a3bd74c9690a3aeb8572dff9
2	SHA256 (stone_soup-0.6.0-nodeps.tar.bz2) = f05ba17b64f3f669da3fb4185ed2e1425bd6a2fa8375fa4671807c67b2e4f8ff	2	SHA256 (stone_soup-0.6.1-nodeps.tar.bz2) = 950ee04ae185871782a7b8c37fecf8c7dadcc15771225879384601719f7a0a0c
3	SIZE (stone_soup-0.6.0-nodeps.tar.bz2) = 4597191	3	SIZE (stone_soup-0.6.1-nodeps.tar.bz2) = 4527222




--- ./AppHdr.h.orig	2010-04-06 13:16:37.000000000 +0200
+++ ./AppHdr.h	2010-06-29 19:45:19.000000000 +0200
@@ -158,7 +158,7 @@
     //          setuid or setgid. Filenames passed to this command *are not
     //          validated in any way*.
     //

 
     // For cases when the game will be played on terms that don't support the
     // curses "bold == lighter" 16 colour mode. -- bwr
@@ -457,8 +457,8 @@
     #ifndef SAVE_PACKAGE_NONE
     #ifdef USE_TAR
       #define PACKAGE_SUFFIX ".tar.gz"
-      #define SAVE_PACKAGE_CMD "tar"
-      #define LOAD_UNPACKAGE_CMD "tar -zxf %s"PACKAGE_SUFFIX" -C %s"
+      #define SAVE_PACKAGE_CMD "gtar"
+      #define LOAD_UNPACKAGE_CMD "gtar -zxf %s"PACKAGE_SUFFIX" -C %s"
       #define UNPACK_SPECIFIC_FILE_CMD LOAD_UNPACKAGE_CMD " %s"
     #else
     #ifdef USE_ZIP




--- ./makefile.orig	2010-06-08 22:49:23.000000000 +0200
+++ ./makefile	2010-06-29 19:46:08.000000000 +0200
@@ -44,7 +44,7 @@
 #    ask for a package with convenience libraries instead -- we'll try to provide
 #    them somewhere in the near future.

 RM = rm -f
 COPY = cp
 COPY_R = cp -r
@@ -273,7 +285,7 @@
 MCHMOD_LOGS := 664
 # Permissions to set on the save directory.
 MCHMOD_SAVEDIR := 775
+MCHMOD_LOGS := 664
 
 # The user:group to install the game as.
-INSTALL_UGRP := games:games

 
 chroot_prefix :=
 prefix        :=
@@ -389,25 +401,34 @@
 endif
 endif
 

 endif
 
 RLTILES = rltiles
@@ -479,11 +500,13 @@
 
 endif # TILES
 

 CFOTHERS_L = $(EXTERNAL_FLAGS_L) $(EXTRA_FLAGS) $(DEFINES) $(SDL_CFLAGS)
 
 ifndef NO_LUA_BINDINGS
@@ -522,6 +545,7 @@
 	NO_OPTIMIZE=YesPlease
 endif
 

 ifdef FULLDEBUG
 DEFINES += -DFULLDEBUG
 endif
@@ -547,6 +571,11 @@
 CFWARN_L += -Wno-uninitialized
 endif
 endif

 
 ifneq ($(strip $(chroot_prefix)),)
 	USE_CHROOT=YesPlease
@@ -756,10 +785,10 @@
 
 GAME_DEPENDS  := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS)
 SRC_PKG_BASE  := stone_soup
-SRC_VERSION   := $(shell git describe --tags --long 2>/dev/null || cat util/release_ver)
+SRC_VERSION   := $(cat util/release_ver)
 
 # when making release builds, use just the bare tag
-SRC_VERSION_SHORT := $(shell git describe --tags 2>/dev/null)
+SRC_VERSION_SHORT := $(cat util/release_ver)
 ifneq (,$(SRC_VERSION_SHORT))
   ifeq (,$(findstring -,$(SRC_VERSION_SHORT)))
     SRC_VERSION := $(SRC_VERSION_SHORT)
@@ -910,9 +939,11 @@
 	$(COPY) dat/tiles/VeraMono.ttf $(datadir_fp)/dat/tiles/
 endif
 endif

 ifneq ($(SAVEDIR),)
 	mkdir -p $(savedir_fp)/saves
 ifneq ($(patsubst /var/%,%,$(savedir_fp)),$(savedir_fp))
@@ -924,6 +956,8 @@
 	$(CHOWN) -R $(INSTALL_UGRP) $(savedir_fp) || true
 	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp) || true
 	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp)/saves || true
+	$(CHMOD) $(MCHMOD_LOGS) $(savedir_fp)/saves/logfile || true
+	$(CHMOD) $(MCHMOD_LOGS) $(savedir_fp)/saves/scores || true
 	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp)/morgue || true
 endif
 endif

Return to bug 147828

Lines 6-12 Link Here

(-)games/stonesoup/Makefile (-12 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= stonesoup	8	PORTNAME= stonesoup
9	PORTVERSION= 0.6.0	9	PORTVERSION= 0.6.1
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION}	11	MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION}
12	DISTNAME= stone_soup-${PORTVERSION}-nodeps	12	DISTNAME= stone_soup-${PORTVERSION}-nodeps
Lines 14-22 Link Here
14	MAINTAINER= tobias.rehbein@web.de	14	MAINTAINER= tobias.rehbein@web.de
15	COMMENT= Dungeon Crawl Stone Soup - a fun, free rogue-like game	15	COMMENT= Dungeon Crawl Stone Soup - a fun, free rogue-like game
16		16
17	LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3	17	USE_SQLITE= yes
18	RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar
19
20	USE_BZIP2= yes	18	USE_BZIP2= yes
21	USE_BISON= build	19	USE_BISON= build
22	USE_GMAKE= yes	20	USE_GMAKE= yes
Lines 31-38 Link Here
31	SUB_FILES= README.FreeBSD	29	SUB_FILES= README.FreeBSD
32	PLIST_SUB= SAVEDIR="${SAVEDIR}"	30	PLIST_SUB= SAVEDIR="${SAVEDIR}"
33		31
34	OPTIONS= SDL "SDL support (tiles interface)" off \	32	OPTIONS= SOUND "Sound support" off \
35	SOUND "Sound support" off \
36	LUA_BINDINGS "LUA bindings for user scripts" on \	33	LUA_BINDINGS "LUA bindings for user scripts" on \
37	UNICODE "Unicode glyphs (UTF-8)" off \	34	UNICODE "Unicode glyphs (UTF-8)" off \
38	WIZARD "Wizard mode" off	35	WIZARD "Wizard mode" off
Lines 51-68 Link Here
51	MAKE_ARGS+= wizard	48	MAKE_ARGS+= wizard
52	.endif	49	.endif
53		50
54	.if defined(WITHOUT_SDL)	51	.if defined(WITH_SDL)
55	CONFLICTS+= ${PORTNAME}-sdl-[0-9]*
56	PLIST_SUB+= SDL="@comment "
57	.else
58	CONFLICTS+= ${PORTNAME}-[0-9]*	52	CONFLICTS+= ${PORTNAME}-[0-9]*
59	MAKE_ARGS+= TILES=y	53	MAKE_ARGS+= TILES=y
60	PLIST_SUB+= SDL=""	54	PLIST_SUB+= SDL=""
61	PKGNAMESUFFIX= -sdl	55	PKGNAMESUFFIX= -sdl
		56	USE_FREETYPE= yes
62	BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config	57	BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
63	LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \	58	LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
64	freetype:${PORTSDIR}/print/freetype2
65	USE_SDL= sdl image	59	USE_SDL= sdl image
		60	.else
		61	CONFLICTS+= ${PORTNAME}-sdl-[0-9]*
		62	PLIST_SUB+= SDL="@comment "
66	.endif	63	.endif
67		64
68	.if defined(WITH_SOUND)	65	.if defined(WITH_SOUND)

Lines 1-6 Link Here

(-)games/stonesoup/files/patch-AppHdr.h (-14 / +3 lines)
1	--- ./AppHdr.h.orig 2010-03-27 00:43:25.000000000 +0100	1	--- ./AppHdr.h.orig 2010-04-06 13:16:37.000000000 +0200
2	+++ ./AppHdr.h 2010-04-18 13:17:52.000000000 +0200	2	+++ ./AppHdr.h 2010-06-29 19:45:19.000000000 +0200
3	@@ -157,7 +157,7 @@	3	@@ -158,7 +158,7 @@
4	// setuid or setgid. Filenames passed to this command *are not	4	// setuid or setgid. Filenames passed to this command *are not
5	// validated in any way*.	5	// validated in any way*.
6	//	6	//
Lines 9-22 Link Here
9		9
10	// For cases when the game will be played on terms that don't support the	10	// For cases when the game will be played on terms that don't support the
11	// curses "bold == lighter" 16 colour mode. -- bwr	11	// curses "bold == lighter" 16 colour mode. -- bwr
12	@@ -457,8 +457,8 @@
13	#ifndef SAVE_PACKAGE_NONE
14	#ifdef USE_TAR
15	#define PACKAGE_SUFFIX ".tar.gz"
16	- #define SAVE_PACKAGE_CMD "tar"
17	- #define LOAD_UNPACKAGE_CMD "tar -zxf %s"PACKAGE_SUFFIX" -C %s"
18	+ #define SAVE_PACKAGE_CMD "gtar"
19	+ #define LOAD_UNPACKAGE_CMD "gtar -zxf %s"PACKAGE_SUFFIX" -C %s"
20	#define UNPACK_SPECIFIC_FILE_CMD LOAD_UNPACKAGE_CMD " %s"
21	#else
22	#ifdef USE_ZIP

Lines 1-5 Link Here

(-)games/stonesoup/files/patch-makefile (-24 / +16 lines)
1	--- ./makefile.orig 2010-03-27 00:43:25.000000000 +0100	1	--- ./makefile.orig 2010-06-08 22:49:23.000000000 +0200
2	+++ ./makefile 2010-04-18 13:18:41.000000000 +0200	2	+++ ./makefile 2010-06-29 19:46:08.000000000 +0200
3	@@ -44,7 +44,7 @@	3	@@ -44,7 +44,7 @@
4	# ask for a package with convenience libraries instead -- we'll try to provide	4	# ask for a package with convenience libraries instead -- we'll try to provide
5	# them somewhere in the near future.	5	# them somewhere in the near future.
Lines 41-51 Link Here
41	RM = rm -f	41	RM = rm -f
42	COPY = cp	42	COPY = cp
43	COPY_R = cp -r	43	COPY_R = cp -r
44	@@ -268,9 +280,10 @@	44	@@ -273,7 +285,7 @@
45		45	MCHMOD_LOGS := 664
46	# Permissions to set on the save directory.
47	MCHMOD_SAVEDIR := 775
48	+MCHMOD_LOGS := 664
49		46
50	# The user:group to install the game as.	47	# The user:group to install the game as.
51	-INSTALL_UGRP := games:games	48	-INSTALL_UGRP := games:games
Lines 53-59 Link Here
53		50
54	chroot_prefix :=	51	chroot_prefix :=
55	prefix :=	52	prefix :=
56	@@ -386,25 +399,34 @@	53	@@ -389,25 +401,34 @@
57	endif	54	endif
58	endif	55	endif
59		56
Lines 103-109 Link Here
103	endif	100	endif
104		101
105	RLTILES = rltiles	102	RLTILES = rltiles
106	@@ -476,11 +498,13 @@	103	@@ -479,11 +500,13 @@
107		104
108	endif # TILES	105	endif # TILES
109		106
Lines 117-123 Link Here
117	CFOTHERS_L = $(EXTERNAL_FLAGS_L) $(EXTRA_FLAGS) $(DEFINES) $(SDL_CFLAGS)	114	CFOTHERS_L = $(EXTERNAL_FLAGS_L) $(EXTRA_FLAGS) $(DEFINES) $(SDL_CFLAGS)
118		115
119	ifndef NO_LUA_BINDINGS	116	ifndef NO_LUA_BINDINGS
120	@@ -519,6 +543,7 @@	117	@@ -522,6 +545,7 @@
121	NO_OPTIMIZE=YesPlease	118	NO_OPTIMIZE=YesPlease
122	endif	119	endif
123		120
Lines 125-131 Link Here
125	ifdef FULLDEBUG	122	ifdef FULLDEBUG
126	DEFINES += -DFULLDEBUG	123	DEFINES += -DFULLDEBUG
127	endif	124	endif
128	@@ -544,6 +569,11 @@	125	@@ -547,6 +571,11 @@
129	CFWARN_L += -Wno-uninitialized	126	CFWARN_L += -Wno-uninitialized
130	endif	127	endif
131	endif	128	endif
Lines 137-152 Link Here
137		134
138	ifneq ($(strip $(chroot_prefix)),)	135	ifneq ($(strip $(chroot_prefix)),)
139	USE_CHROOT=YesPlease	136	USE_CHROOT=YesPlease
140	@@ -756,7 +786,7 @@	137	@@ -756,10 +785,10 @@
141	SRC_VERSION := $(shell git describe --tags --long 2>/dev/null \|\| cat util/release_ver)	138
		139	GAME_DEPENDS := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS)
		140	SRC_PKG_BASE := stone_soup
		141	-SRC_VERSION := $(shell git describe --tags --long 2>/dev/null \|\| cat util/release_ver)
		142	+SRC_VERSION := $(cat util/release_ver)
142		143
143	# when making release builds, use just the bare tag	144	# when making release builds, use just the bare tag
144	-SRC_VERSION_SHORT := $(shell git describe --tags 2>/dev/null)	145	-SRC_VERSION_SHORT := $(shell git describe --tags 2>/dev/null)
145	+SRC_VERSION_SHORT := $(shell git describe --tags 2>/dev/null \|\| cat util/release_ver)	146	+SRC_VERSION_SHORT := $(cat util/release_ver)
146	ifneq (,$(SRC_VERSION_SHORT))	147	ifneq (,$(SRC_VERSION_SHORT))
147	ifeq (,$(findstring -,$(SRC_VERSION_SHORT)))	148	ifeq (,$(findstring -,$(SRC_VERSION_SHORT)))
148	SRC_VERSION := $(SRC_VERSION_SHORT)	149	SRC_VERSION := $(SRC_VERSION_SHORT)
149	@@ -907,9 +937,11 @@	150	@@ -910,9 +939,11 @@
150	$(COPY) dat/tiles/VeraMono.ttf $(datadir_fp)/dat/tiles/	151	$(COPY) dat/tiles/VeraMono.ttf $(datadir_fp)/dat/tiles/
151	endif	152	endif
152	endif	153	endif
Lines 158-169 Link Here
158	ifneq ($(SAVEDIR),)	159	ifneq ($(SAVEDIR),)
159	mkdir -p $(savedir_fp)/saves	160	mkdir -p $(savedir_fp)/saves
160	ifneq ($(patsubst /var/%,%,$(savedir_fp)),$(savedir_fp))	161	ifneq ($(patsubst /var/%,%,$(savedir_fp)),$(savedir_fp))
161	@@ -924,6 +956,8 @@
162	$(CHOWN) -R $(INSTALL_UGRP) $(savedir_fp) \|\| true
163	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp) \|\| true
164	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp)/saves \|\| true
165	+ $(CHMOD) $(MCHMOD_LOGS) $(savedir_fp)/saves/logfile \|\| true
166	+ $(CHMOD) $(MCHMOD_LOGS) $(savedir_fp)/saves/scores \|\| true
167	$(CHMOD) $(MCHMOD_SAVEDIR) $(savedir_fp)/morgue \|\| true
168	endif
169	endif