Attachment #97126 for bug #135838

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




#

PORTNAME=	stonesoup
PORTVERSION=	0.5
CATEGORIES=	games
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	crawl-ref

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

OPTIONS=	SDL		"SDL support (tiles interface)"	off \
		SOUND		"Sound support"			off \
		LUA_BINDINGS	"LUA bindings for user scripts"	on \
		UNICODE		"Unicode glyphs (UTF-8)"	off

.include <bsd.port.options.mk>

.if defined(WITH_SDL)
MAKEFILE=	makefile_tiles.unix
MAKE_JOBS_UNSAFE=	yes
PLIST_SUB+=	SDL=""
USE_SDL=	image
LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
		freetype:${PORTSDIR}/print/freetype2
.else
MAKEFILE=	makefile.unix
MAKE_JOBS_SAFE=	yes
PLIST_SUB+=	SDL="@comment "
.endif

.if defined(WITH_SOUND)
RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
.endif #WITH_SOUND

post-patch:
	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/${MAKEFILE}
	@${REINPLACE_CMD} -e "s,%%SAVEDIR%%,${SAVEDIR}," ${WRKSRC}/${MAKEFILE}
	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/${MAKEFILE}
	@${REINPLACE_CMD} -e "s,%%SAVEDIR%%,${SAVEDIR}," ${WRKSRC}/${makefile}
	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/${makefile}
.if defined(WITHOUT_LUA_BINDINGS)
	@${REINPLACE_CMD} -e "s,-DCLUA_BINDINGS,," ${WRKSRC}/${MAKEFILE}
.endif
.if defined(WITH_UNICODE)
	@${REINPLACE_CMD} -e "s,%%UNICODE%%,y," ${WRKSRC}/${MAKEFILE}
.else
	@${REINPLACE_CMD} -e "s,%%UNICODE%%,n," ${WRKSRC}/${MAKEFILE}
.endif
.endfor
	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
.if defined(WITH_SOUND)
	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h
.else
	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/AppHdr.h
.endif
.if defined(WITH_SDL)
	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/tilesdl.cc
.endif

pre-build:
	@cd ${WRKSRC} && ${GMAKE} depend

post-install:
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
.for doc in CREDITS.txt README.txt licence.txt
	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${doc} ${DOCSDIR}
.endfor
	${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${DOCSDIR}

	${INSTALL_DATA} ${DATADIR}/settings/init.txt ${EXAMPLESDIR}/sample.crawlrc
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/games/stonesoup/distinfo (-3 / +3 lines)
1	MD5 (stone_soup-0.4.5-src.tbz2) = fc4214fc79d162c855aa48aa1c6eee68	1	MD5 (stone_soup-0.5-src.tbz2) = ee43ae01f6900a88727aa4299f0f41d7
2	SHA256 (stone_soup-0.4.5-src.tbz2) = d78da12e0fc9211dd28dd4cac2775567f51118fca23fc44fc9672caf64bb4cec	2	SHA256 (stone_soup-0.5-src.tbz2) = 34a96d3b7d4ad91d3e0f548c9134d7df3afe7131fd858d0adf60a3ca604a7ec8
3	SIZE (stone_soup-0.4.5-src.tbz2) = 3768835	3	SIZE (stone_soup-0.5-src.tbz2) = 5884852

Lines 1-6 Link Here

(-)b/games/stonesoup/files/patch-AppHdr.h (-4 / +4 lines)
1	--- AppHdr.h.orig 2008-07-14 04:17:51.000000000 +0200	1	--- ./AppHdr.h.orig 2009-06-12 12:32:16.000000000 +0200
2	+++ AppHdr.h 2008-07-17 10:34:43.000000000 +0200	2	+++ ./AppHdr.h 2009-06-19 13:54:51.000000000 +0200
3	@@ -146,7 +146,7 @@	3	@@ -124,7 +124,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-15 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	@@ -408,8 +408,8 @@	12	@@ -401,8 +401,8 @@
13	// PACKAGE_SUFFIX is used when the package file name is needed	13	// PACKAGE_SUFFIX is used when the package file name is needed
14	//	14	//
15	// Comment these lines out if you want to leave the save files uncompressed.	15	// Comment these lines out if you want to leave the save files uncompressed.

Lines 1-9 Link Here

(-)b/games/stonesoup/files/patch-initfile.cc (-5 / +5 lines)
1	--- initfile.cc.orig 2009-01-19 20:08:34.000000000 +0000	1	--- ./initfile.cc.orig 2009-06-12 12:32:16.000000000 +0200
2	+++ initfile.cc 2009-01-19 20:09:20.000000000 +0000	2	+++ ./initfile.cc 2009-06-19 13:54:51.000000000 +0200
3	@@ -2196,12 +2196,12 @@	3	@@ -2333,12 +2333,12 @@
4	#endif	4	#ifndef USE_TILE
5	else BOOL_OPTION(show_gold_turns);
6	else BOOL_OPTION(show_beam);	5	else BOOL_OPTION(show_beam);
		6	#endif
7	-#ifndef SAVE_DIR_PATH	7	-#ifndef SAVE_DIR_PATH
8	+// #ifndef SAVE_DIR_PATH	8	+// #ifndef SAVE_DIR_PATH
9	else if (key == "morgue_dir")	9	else if (key == "morgue_dir")




--- ./makefile.unix.orig	2009-06-12 12:39:29.000000000 +0200
+++ ./makefile.unix	2009-06-19 13:54:52.000000000 +0200
@@ -4,7 +4,7 @@
 # Modified for Crawl Reference by $Author: ennewalker $ on $Date: 2009-02-14 17:59:13 +0100 (Sa, 14 Feb 2009) $
 #
 
-GAME = crawl

 # it will make a variable called OBJECTS that contains all the libraries
@@ -12,7 +12,6 @@
 
 OBJECTS += libunix.o crash-u.o
 
-CXX = g++
 DELETE = rm -f
 COPY = cp
 OS_TYPE = UNIX
@@ -21,7 +20,7 @@
 
 # Change this to y (case-sensitive!) if you want to use Unicode glyphs
 # in the map, and you have libncursesw available.
-UNICODE_GLYPHS = n
+UNICODE_GLYPHS = %%UNICODE%%
 
 # If you're using UNICODE_GLYPHS=y, and have a preferred Unicode
 # (UTF-8) locale you want Crawl to use, you can set it here. The
@@ -39,16 +38,15 @@
 MCHMOD_SAVEDIR := 775
 
 # The user:group to install the game as.
-INSTALL_UGRP := games:games
-
-INSTALLDIR   := /usr/games/crawl
+INSTALL_UGRP := root:games
+INSTALLDIR   := %%PREFIX%%/bin
 
 # If you're installing Crawl for multiple users, you *must* set this to a
 # valid path before building Crawl. This is not necessary if you are building

 
-# SAVEDIR := /usr/games/crawl/saves/
-# DATADIR := /usr/games/crawl/data/
+SAVEDIR := %%SAVEDIR%%
+DATADIR := %%DATADIR%%
 
 LEX  := flex
 YACC := bison -y
@@ -70,17 +68,8 @@
 NDBM_FILE := /usr/include/ndbm.h
 
 HAVE_DBH  := $(shell [ -f $(DBH_FILE) ] && echo y)
-HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a "`uname`" = "Darwin" ] && echo y)
+HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a \( "`uname`" = "Darwin" -o "`uname`" = "FreeBSD" \) ] && echo y)
 
 ifeq ($(strip $(HAVE_DBH)),y)
 ifneq ($(shell grep dbm_open $(DBH_FILE)),)
@@ -70,9 +69,11 @@
 ifeq ($(strip $(HAVE_NDBM)),y)
 SELDBM ?= -DDB_NDBM
 ifeq ($(SELDBM),-DDB_NDBM)
+ifneq ($(shell echo "`uname`"),FreeBSD)
 LIBDBM := -ldbm
 endif
 endif
+endif
 
 SQLSRC   := util/sqlite
 SQLLIB   := sqlite3
@@ -89,17 +90,8 @@
 
 INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES)
 
-CFWARN := -Wall -Wno-parentheses -Wwrite-strings -Wshadow -pedantic
-
 CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS
 

 ifneq ($(strip $(SAVEDIR)),)
 CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'
 endif
@@ -117,8 +106,8 @@
 LIBCURS  = ncurses
 endif
 
-CFLAGS  := $(INCLUDES) $(CFWARN) $(CFOTHERS)
-YCFLAGS := $(INCLUDES) $(CFOTHERS)
+LOCAL_CFLAGS  := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
+YCFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
 
 UTIL = util/
 
@@ -160,7 +149,7 @@
 	rm -f $(DEPENDENCY_MKF).tmp
 	@for i in $^; do \
 	    echo "Updating dependencies for $$i"; \
-	    $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
+	    $(CXX) -MM $(LOCAL_CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
 	done
 	mv -f $(DEPENDENCY_MKF).tmp $(DEPENDENCY_MKF)
 
@@ -257,17 +246,17 @@
@@ -277,17 +269,17 @@
 	$(DELETE) $(DEPENDENCY_MKF)
 
 $(GAME): $(GAME_DEPENDS)
-	${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+	${CXX} ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
 
 .PHONY : debug
 

 
 profile: $(GAME_DEPENDS)
-	${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+	${CXX} -g -p ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
 
 .cc.o:
-	${CXX} ${CFLAGS} -c $<
+	${CXX} ${LOCAL_CFLAGS} -c $<
 
 # [ds] Note we don't use the standard CFLAGS here; that's intentional, most
 # flex/bison combos I've tried don't produce code that passes the warnings




--- makefile.x11.orig	2008-07-14 04:17:51.000000000 +0200
+++ makefile.x11	2008-07-18 08:49:37.000000000 +0200
@@ -4,7 +4,7 @@
 # Modified for Crawl Reference by $Author: dshaligram $ on $Date: 2007-06-24T16:27:58.475101Z $
 #
 
-GAME = crawl
+GAME = stonesoup
 
 # this file contains a list of the libraries.
 # it will make a variable called OBJECTS that contains all the libraries
@@ -12,7 +12,6 @@
 
 OBJECTS += libgui.o tile1.o tile2.o libx11.o guic.o guic-x11.o
 
-CXX = g++
 DELETE = rm -f
 COPY = cp
 OS_TYPE = UNIX
@@ -22,8 +21,13 @@
 PNG_INCLUDE := -I/sw/include
 PNG_LIB := -L/sw/lib
 else
+ifneq ($(shell echo "`uname`"),FreeBSD)
 PNG_INCLUDE :=
 PNG_LIB :=
+else
+PNG_INCLUDE := -I%%LOCALBASE%%/include
+PNG_LIB := -L%%LOCALBASE%%/lib
+endif
 endif
 
 # If you have lex and yacc, set DOYACC to y (lowercase y).
@@ -36,15 +40,15 @@
 MCHMOD_SAVEDIR := 775
 
 # The user:group to install the game as.
-INSTALL_UGRP ?= games:games
-INSTALLDIR   ?= /usr/games/crawl
+INSTALL_UGRP ?= root:games
+INSTALLDIR   ?= %%PREFIX%%/bin
 
 # If you're installing Crawl for multiple users, you *must* set this to a
 # valid path before building Crawl. This is not necessary if you are building
 # Crawl for a single user.
 
-# SAVEDIR := /usr/games/crawl/saves/
-# DATADIR := /usr/games/crawl/data/
+SAVEDIR := %%SAVEDIR%%/
+DATADIR := %%DATADIR%%/
 
 LEX  := flex
 YACC := bison -y
@@ -57,7 +61,7 @@
 NDBM_FILE := /usr/include/ndbm.h
 
 HAVE_DBH  := $(shell [ -f $(DBH_FILE) ] && echo y)
-HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a "`uname`" = "Darwin" ] && echo y)
+HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a \( "`uname`" = "Darwin" -o "`uname`" = "FreeBSD" \) ] && echo y)
 
 ifeq ($(strip $(HAVE_DBH)),y)
 ifneq ($(shell grep dbm_open $(DBH_FILE)),)
@@ -69,9 +73,11 @@
 ifeq ($(strip $(HAVE_NDBM)),y)
 SELDBM ?= -DDB_NDBM
 ifeq ($(SELDBM),-DDB_NDBM)
+ifneq ($(shell echo "`uname`"),FreeBSD)
 LIBDBM := -ldbm
 endif
 endif
+endif
 
 SQLSRC   := util/sqlite
 SQLLIB   := sqlite3
@@ -88,17 +94,8 @@
 
 INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES) $(PNG_INCLUDE)
 
-CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic
-
 CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS
 
-ifneq ($(HURRY),y)
-ifneq ($(DEBUG_CRAWL),y)
-CFWARN += -Wuninitialized
-CFOTHERS += -O2
-endif
-endif
-
 ifneq ($(strip $(SAVEDIR)),)
 CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'
 endif
@@ -109,8 +106,8 @@
 
 CFOTHERS += $(SELDBM)
 
-CFLAGS  := $(INCLUDES) $(CFWARN) $(CFOTHERS)
-YCFLAGS := $(INCLUDES) $(CFOTHERS)
+LOCAL_CXXFLAGS  := $(INCLUDES) $(CFWARN) $(CXXFLAGS) $(CFOTHERS)
+YCFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
 
 UTIL = util/
 
@@ -170,7 +167,7 @@
 	rm -f $(DEPENDENCY_MKF)
 	@for i in $^; do \
 	    echo "Updating dependencies for $$i"; \
-	    $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF) 2>/dev/null; \
+	    $(CXX) -MM $(LOCAL_CXXFLAGS) $$i >>$(DEPENDENCY_MKF) 2>/dev/null; \
 	done
 
 -include $(DEPENDENCY_MKF)
@@ -215,7 +212,7 @@
 $(ORIGTILEHEADERS): makerltiles
 
 makerltiles:
-	cd $(RLTILES) && make -f makefile.unix all CFLAGS="$(PNG_INCLUDE)" LDFLAGS="$(PNG_LIB)" && cd ..
+	cd $(RLTILES) && gmake -f makefile.unix all CFLAGS="$(CFLAGS) $(PNG_INCLUDE)" LDFLAGS="$(PNG_LIB)" && cd ..
 
 $(TILEHEADERS): $(ORIGTILEHEADERS)
 	cp $(RLTILES)$@ .
@@ -227,7 +224,7 @@
 	$(COPY) $< $@
 
 clean-rltiles:
-	cd $(RLTILES) && make -f makefile.unix distclean && cd ..
+	cd $(RLTILES) && gmake -f makefile.unix distclean && cd ..
 	$(DELETE) $(TILEHEADERS)
 
 ##########################################################################
@@ -293,16 +290,16 @@
 	$(DELETE) $(DEPENDENCY_MKF)
 
 $(GAME): $(GAME_DEPENDS)
-	${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+	${CXX} ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
 
 debug: $(GAME_DEPENDS)
-	${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+	${CXX} ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
 
 profile: $(GAME_DEPENDS)
-	${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+	${CXX} -g -p ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
 
 .cc.o:
-	${CXX} ${CFLAGS} -c $<
+	${CXX} ${LOCAL_CXXFLAGS} -c $<
 
 # [ds] Note we don't use the standard CFLAGS here; that's intentional, most
 # flex/bison combos I've tried don't produce code that passes the warnings




--- ./makefile_tiles.unix.orig	2009-06-12 12:32:15.000000000 +0200
+++ ./makefile_tiles.unix	2009-06-19 13:54:52.000000000 +0200
@@ -4,7 +4,7 @@
 # Modified for Crawl Reference by $Author: dshaligram $ on $Date: 2007-06-24T16:27:58.475101Z $
 #
 
-GAME = crawl
+GAME = stonesoup
 
 # this file contains a list of the libraries.
 # it will make a variable called OBJECTS that contains all the libraries
@@ -15,7 +15,6 @@
 SDL_CFLAGS := $(shell sdl-config --cflags)
 SDL_LDFLAGS := $(shell sdl-config --libs) -lSDLmain
 
-CXX = g++
 DELETE = rm -f
 COPY = cp
 OS_TYPE = UNIX
@@ -25,7 +24,7 @@
 
 # Change this to y if you want to use Unicode glyphs in the map, and you have
 # libncursesw available.
-UNICODE_GLYPHS = n
+UNICODE_GLYPHS = %%UNICODE%%
 
 ifeq ($(strip $(OSX)),y)
 PNG_INCLUDE := -I/sw/include
@@ -41,7 +40,7 @@
 else
 PNG_INCLUDE :=
 PNG_LIB :=
-FREETYPE_INCLUDE := -I/usr/include/freetype2
+FREETYPE_INCLUDE := -I/usr/local/include/freetype2
 endif
 
 # If you have lex and yacc, set DOYACC to y (lowercase y).
@@ -54,16 +53,16 @@
 MCHMOD_SAVEDIR := 775
 
 # The user:group to install the game as.
-INSTALL_UGRP := games:games
+INSTALL_UGRP := root:games
 
-INSTALLDIR   := /usr/games/crawl
+INSTALLDIR   := %%PREFIX%%/bin
 
 # If you're installing Crawl for multiple users, you *must* set this to a
 # valid path before building Crawl. This is not necessary if you are building
 # Crawl for a single user.
 
-# SAVEDIR := /usr/games/crawl/saves/
-# DATADIR := /usr/games/crawl/data/
+SAVEDIR := %%SAVEDIR%%
+DATADIR := %%DATADIR%%
 
 LEX  := flex
 YACC := bison -y
@@ -105,17 +104,8 @@
 
 INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES) $(PNG_INCLUDE) $(FREETYPE_INCLUDE)
 
-CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic -Wno-parentheses
-
 CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS
 
-ifneq ($(HURRY),y)
-ifneq ($(DEBUG_CRAWL),y)
-CFWARN += -Wuninitialized
-CFOTHERS += -O2
-endif
-endif
-
 ifneq ($(strip $(SAVEDIR)),)
 CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'
 endif
@@ -124,8 +114,8 @@
 CFOTHERS += '-DDATA_DIR_PATH="$(strip $(DATADIR))"'
 endif
 
-CFLAGS  := $(INCLUDES) $(CFWARN) $(CFOTHERS) $(SDL_CFLAGS)
-YCFLAGS := $(INCLUDES) $(CFOTHERS)
+LOCAL_CFLAGS  := $(INCLUDES) $(CXXFLAGS) $(CFWARN) $(CFOTHERS) $(SDL_CFLAGS)
+YCFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
 
 UTIL = util/
 
@@ -167,7 +157,7 @@
 	rm -f $(DEPENDENCY_MKF).tmp
 	@for i in $^; do \
 	    echo "Updating dependencies for $$i"; \
-	    $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
+	    $(CXX) -MM $(LOCAL_CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
 	done
 	mv -f $(DEPENDENCY_MKF).tmp $(DEPENDENCY_MKF)
 
@@ -210,7 +200,7 @@
 ORIGTILEFILES = $(TILEFILES:%=$(RLTILES)/%)
 
 makerltiles:
-	cd $(RLTILES) && make -f makefile.unix all
+	cd $(RLTILES) && gmake -f makefile.unix all
 
 $(TILEDEFSRCS): makerltiles
 
@@ -222,7 +212,7 @@
 	$(COPY) $< $@
 
 clean-rltiles:
-	cd $(RLTILES) && make -f makefile.unix distclean && cd ..
+	cd $(RLTILES) && gmake -f makefile.unix distclean && cd ..
 
 ##########################################################################
 
@@ -287,21 +277,21 @@
 	$(DELETE) $(DEPENDENCY_MKF)
 
 $(GAME): $(GAME_DEPENDS)
-	${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+	${CXX} ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
 
 .PHONY : debug
 
 debug: $(GAME)
 
 profile: $(GAME_DEPENDS)
-	${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+	${CXX} -g -p ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
 
 %.o: %.cc $(TILEDEFHDRS)
-	${CXX} ${CFLAGS} -c $< -o $@
+	${CXX} ${LOCAL_CFLAGS} -c $< -o $@
 
 # STL is bad in debug.  Always compile this file with optimizations.
 tilebuf.o: tilebuf.cc $(TILEDEFHDRS)
-	${CXX} ${CFLAGS} -O2 -c $< -o $@
+	${CXX} ${LOCAL_CFLAGS} -O2 -c $< -o $@
 
 # [ds] Note we don't use the standard CFLAGS here; that's intentional, most
 # flex/bison combos I've tried don't produce code that passes the warnings

Removed Link Here

(-)a/games/stonesoup/files/patch-rltiles_bmp2png_makefile.lin (-12 lines)
1	--- rltiles/bmp2png/makefile.lin.orig 2008-07-18 08:50:02.000000000 +0200
2	+++ rltiles/bmp2png/makefile.lin 2008-07-18 08:50:58.000000000 +0200
3	@@ -8,8 +8,7 @@
4	BINDIR = /usr/local/bin
5	endif
6
7	-CC = gcc
8	-LD = gcc
9	+LD = $(CC)
10	ifndef INSTALL
11	INSTALL = install -s -m 755
12	endif

Removed Link Here

(-)a/games/stonesoup/files/patch-rltiles_makefile.unix (-33 lines)
1	--- rltiles/makefile.unix.orig 2008-07-14 04:17:52.000000000 +0200
2	+++ rltiles/makefile.unix 2008-07-18 08:50:43.000000000 +0200
3	@@ -12,7 +12,6 @@
4	B2P = bmp2png
5	B2PTOOL = $(B2PSRC)$(B2P)
6
7	-CC = cc
8	DELETE = rm -f
9
10	OBJECTS = \
11	@@ -104,11 +103,11 @@
12	#
13
14	$(B2PTOOL):
15	- cd $(B2PSRC) && make -f makefile.lin $(B2P) && cd ..
16	+ cd $(B2PSRC) && gmake -f makefile.lin $(B2P) && cd ..
17
18	%.png: %.bmp $(B2PTOOL)
19	$(DELETE) $@
20	- $(B2PTOOL) -Q $<
21	+ $(B2PTOOL) -X -Q $<
22
23	##########################################################################
24	# Cleaning...
25	@@ -117,7 +116,7 @@
26	clean:
27	$(DELETE) $(OBJECTS)
28	$(DELETE) $(ALLTOOLS)
29	- cd $(B2PSRC) && make -f makefile.lin clean && cd ..
30	+ cd $(B2PSRC) && gmake -f makefile.lin clean && cd ..
31
32	distclean: clean
33	$(DELETE) $(GENERATEDBMP)

Added Link Here

(-)b/games/stonesoup/files/patch-tilesdl.cc (+11 lines)
1	--- ./tilesdl.cc.orig 2009-06-19 13:55:52.000000000 +0200
2	+++ ./tilesdl.cc 2009-06-19 13:56:17.000000000 +0200
3	@@ -234,7 +234,7 @@
4	#ifdef WIN32TILES
5	const char *icon_name = "dat/tiles/stone_soup_icon-win32.png";
6	#else
7	- const char *icon_name = "dat/tiles/stone_soup_icon-32x32.png";
8	+ const char *icon_name = "%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png";
9	#endif
10	SDL_Surface *icon = IMG_Load(icon_name);
11	if (!icon)

Added Link Here

(-)b/games/stonesoup/files/patch-util__lua__src__Makefile (+11 lines)
1	--- ./util/lua/src/Makefile.orig 2009-06-12 12:24:43.000000000 +0200
2	+++ ./util/lua/src/Makefile 2009-06-19 13:54:52.000000000 +0200
3	@@ -9,8 +9,6 @@
4	# Your platform. See PLATS for possible values.
5	PLAT= none
6
7	-CC= gcc
8	-CFLAGS= -O2 -Wall $(MYCFLAGS)
9	AR= ar rcu
10	RANLIB= ranlib
11	RM= rm -f




--- ./util/sqlite/Makefile.orig	2009-06-12 12:27:11.000000000 +0200
+++ ./util/sqlite/Makefile	2009-06-19 13:54:52.000000000 +0200
@@ -4,12 +4,11 @@
 
 LIBSQL = libsqlite3.a
 AR     = ar rcu
-CC     = gcc
 RANLIB = ranlib
 RM_F   = rm -f
 
 # Omit SQLite features we don't need.
-CFLAGS = -DSQLITE_OMIT_AUTHORIZATION \
+CFLAGS += -DSQLITE_OMIT_AUTHORIZATION \
 		 -DSQLITE_OMIT_AUTOVACUUM \
 		 -DSQLITE_OMIT_COMPLETE \
 		 -DSQLITE_OMIT_BLOB_LITERAL \

Removed Link Here

(-)a/games/stonesoup/files/patch-util_lua_src_Makefile (-11 lines)
1	--- util/lua/src/Makefile.orig 2008-07-14 04:17:51.000000000 +0200
2	+++ util/lua/src/Makefile 2008-07-18 08:49:37.000000000 +0200
3	@@ -9,8 +9,6 @@
4	# Your platform. See PLATS for possible values.
5	PLAT= none
6
7	-CC= gcc
8	-CFLAGS= -O2 -Wall $(MYCFLAGS)
9	AR= ar rcu
10	RANLIB= ranlib
11	RM= rm -f




--- util/sqlite/Makefile.orig	2008-07-14 04:17:51.000000000 +0200
+++ util/sqlite/Makefile	2008-07-18 08:50:23.000000000 +0200
@@ -4,12 +4,11 @@
 
 LIBSQL = libsqlite3.a
 AR     = ar rcu
-CC     = gcc
 RANLIB = ranlib
 RM_F   = rm -f
 
 # Omit SQLite features we don't need.
-CFLAGS = -DSQLITE_OMIT_AUTHORIZATION \
+CFLAGS += -DSQLITE_OMIT_AUTHORIZATION \
 		 -DSQLITE_OMIT_AUTOVACUUM \
 		 -DSQLITE_OMIT_COMPLETE \
 		 -DSQLITE_OMIT_BLOB_LITERAL \




bin/stonesoup
%%DATADIR%%/dat/lua/runrest.lua
%%DATADIR%%/dat/lua/trapwalk.lua
%%DATADIR%%/dat/lua/stash.lua
%%DATADIR%%/dat/lua/wield.lua
%%DATADIR%%/dat/lua/runrest.lua
%%DATADIR%%/dat/lua/pickup.lua
%%DATADIR%%/dat/lua/kills.lua
%%DATADIR%%/dat/lua/gearset.lua
%%DATADIR%%/dat/lua/eat.lua
%%DATADIR%%/dat/lua/wield.lua
%%DATADIR%%/dat/clua/dungeon.lua
%%DATADIR%%/dat/clua/util.lua
%%DATADIR%%/dat/clua/userbase.lua
%%DATADIR%%/dat/clua/point.lua
%%DATADIR%%/dat/clua/macro.lua
%%DATADIR%%/dat/clua/luamark.lua
%%DATADIR%%/dat/clua/loadmaps.lua
%%DATADIR%%/dat/clua/lm_toll.lua
%%DATADIR%%/dat/clua/lm_tmsg.lua
%%DATADIR%%/dat/clua/lm_timed.lua
%%DATADIR%%/dat/clua/lm_props.lua

%%DATADIR%%/dat/clua/lm_fog.lua
%%DATADIR%%/dat/clua/lm_flags.lua
%%DATADIR%%/dat/clua/lm_1way.lua
%%DATADIR%%/dat/clua/ziggurat.lua
%%DATADIR%%/dat/descript/ability.txt
%%DATADIR%%/dat/descript/spells.txt
%%DATADIR%%/dat/descript/skills.txt

%%DATADIR%%/dat/descript/items.txt
%%DATADIR%%/dat/descript/gods.txt
%%DATADIR%%/dat/descript/features.txt
%%DATADIR%%/dat/descript/cards.txt
%%DATADIR%%/dat/descript/branches.txt
%%DATADIR%%/dat/descript/unident.txt
%%DATADIR%%/dat/database/FAQ.txt
%%DATADIR%%/dat/database/shout.txt
%%DATADIR%%/dat/database/randname.txt
%%DATADIR%%/dat/database/randbook.txt
%%DATADIR%%/dat/database/rand_wpn.txt
%%DATADIR%%/dat/database/rand_arm.txt
%%DATADIR%%/dat/database/rand_all.txt
%%DATADIR%%/dat/database/quotes.txt
%%DATADIR%%/dat/database/monspell.txt
%%DATADIR%%/dat/database/monspeak.txt
%%DATADIR%%/dat/database/monname.txt
%%DATADIR%%/dat/database/miscname.txt
%%DATADIR%%/dat/database/insult.txt
%%DATADIR%%/dat/database/help.txt
%%DATADIR%%/dat/database/godspeak.txt
%%DATADIR%%/dat/database/wpnnoise.txt
%%DATADIR%%/dat/altar.des
%%DATADIR%%/dat/ziggurat.des
%%DATADIR%%/dat/vaults.des
%%DATADIR%%/dat/temple.des
%%DATADIR%%/dat/sewer.des
%%DATADIR%%/dat/rooms.des
%%DATADIR%%/dat/pan.des
%%DATADIR%%/dat/orc.des
%%DATADIR%%/dat/minitomb.des
%%DATADIR%%/dat/mini.des
%%DATADIR%%/dat/layout.des
%%DATADIR%%/dat/large.des
%%DATADIR%%/dat/lair.des
%%DATADIR%%/dat/lab.des
%%DATADIR%%/dat/icecave.des
%%DATADIR%%/dat/hive.des
%%DATADIR%%/dat/hells.des
%%DATADIR%%/dat/float.des
%%DATADIR%%/dat/entry.des
%%DATADIR%%/dat/elf.des
%%DATADIR%%/dat/dummy.des
%%DATADIR%%/dat/didact.des
%%DATADIR%%/dat/crypt.des
%%DATADIR%%/dat/bazaar.des
%%DATADIR%%/dat/arena.des
%%DATADIR%%/dat/zot.des
%%SDL%%%%DATADIR%%/dat/tiles/Vera.ttf
%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png
%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png
%%SDL%%%%DATADIR%%/dat/tiles/player.png
%%SDL%%%%DATADIR%%/dat/tiles/main.png
%%SDL%%%%DATADIR%%/dat/tiles/dngn.png
%%SDL%%%%DATADIR%%/dat/tiles/VeraMono.ttf
%%SDL%%%%DATADIR%%/dat/tiles/title.png
%%DATADIR%%/settings/034_command_keys.txt
%%DATADIR%%/settings/tiles_options.txt
%%DATADIR%%/settings/standard_colours.txt

%%DATADIR%%/docs/monster_speech.txt
%%DATADIR%%/docs/macros_guide.txt
%%DATADIR%%/docs/lualicense.txt
%%DATADIR%%/docs/lgpl.txt
%%DATADIR%%/docs/level_design.txt
%%DATADIR%%/docs/keybind.txt
%%DATADIR%%/docs/key_changes.txt
%%DATADIR%%/docs/crawl_manual.txt
%%DATADIR%%/docs/coding_conventions.txt
%%DATADIR%%/docs/arena.txt
%%DATADIR%%/docs/aptitudes.txt
%%DATADIR%%/docs/tiles_help.txt
@exec chown -R root:games %D/%%DATADIR%%
@exec install -d -o root -g games -m 775 %%SAVEDIR%%
%%PORTDOCS%%%%DOCSDIR%%/CREDITS.txt
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/licence.txt
%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD

@dirrm %%DATADIR%%/dat/clua
@dirrm %%DATADIR%%/dat/descript
@dirrm %%DATADIR%%/dat/database
%%SDL%%@dirrm %%DATADIR%%/dat/tiles
@dirrm %%DATADIR%%/dat
@dirrm %%DATADIR%%/settings
@dirrm %%DATADIR%%/docs
@dirrm %%DATADIR%%/
@unexec rmdir %%SAVEDIR%% >/dev/null 2>&1 || echo 'stonesoup save-game directory (%%SAVEDIR%%) not removed due to existing save games. If you are permanently removing this port, you should do a ``rm -rf %%SAVEDIR%%``.' | fmt
%%PORTDOCS%%@dirrm %%DOCSDIR%%/
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
- 

Return to bug 135838

Lines 6-12 Link Here

(-)b/games/stonesoup/Makefile (-22 / +34 lines)
6	#	6	#
7		7
8	PORTNAME= stonesoup	8	PORTNAME= stonesoup
9	PORTVERSION= 0.4.5	9	PORTVERSION= 0.5
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12	MASTER_SITE_SUBDIR= crawl-ref	12	MASTER_SITE_SUBDIR= crawl-ref
Lines 25-71 WRKSRC= ${WRKDIR}/${DISTNAME}/source/ Link Here
25	SUB_FILES= README.FreeBSD	25	SUB_FILES= README.FreeBSD
26	PLIST_SUB= SAVEDIR="${SAVEDIR}"	26	PLIST_SUB= SAVEDIR="${SAVEDIR}"
27		27
28	OPTIONS= X11 "X11 support" off \	28	OPTIONS= SDL "SDL support (tiles interface)" off \
29	SOUND "sound support" off \	29	SOUND "Sound support" off \
30	LUA_BINDINGS "LUA bindings for user scripts" on	30	LUA_BINDINGS "LUA bindings for user scripts" on \
		31	UNICODE "Unicode glyphs (UTF-8)" off
31		32
32	.include <bsd.port.pre.mk>	33	.include <bsd.port.options.mk>
33		34
34	.if defined(WITH_X11)	35	.if defined(WITH_SDL)
35	USE_XORG= x11	36	MAKEFILE= makefile_tiles.unix
36	LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png	37	MAKE_JOBS_UNSAFE= yes
37	MAKEFILE= makefile.x11	38	PLIST_SUB+= SDL=""
38	PLIST_SUB+= X11=""	39	USE_SDL= image
		40	LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
		41	freetype:${PORTSDIR}/print/freetype2
39	.else	42	.else
40	MAKEFILE= makefile.unix	43	MAKEFILE= makefile.unix
41	PLIST_SUB+= X11="@comment "	44	MAKE_JOBS_SAFE= yes
		45	PLIST_SUB+= SDL="@comment "
42	.endif	46	.endif
43		47
44	.if defined(WITH_SOUND)	48	.if defined(WITH_SOUND)
45	RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox	49	RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox
46	.endif	50	.endif #WITH_SOUND
47		51
48	post-patch:	52	post-patch:
49	.for makefile in makefile.unix makefile.x11	53	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/${MAKEFILE}
50	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/${makefile}	54	@${REINPLACE_CMD} -e "s,%%SAVEDIR%%,${SAVEDIR}," ${WRKSRC}/${MAKEFILE}
51	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/${makefile}	55	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/${MAKEFILE}
52	@${REINPLACE_CMD} -e "s,%%SAVEDIR%%,${SAVEDIR}," ${WRKSRC}/${makefile}
53	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/${makefile}
54	.if defined(WITHOUT_LUA_BINDINGS)	56	.if defined(WITHOUT_LUA_BINDINGS)
55	@${REINPLACE_CMD} -e "s,-DCLUA_BINDINGS,," ${WRKSRC}/${makefile}	57	@${REINPLACE_CMD} -e "s,-DCLUA_BINDINGS,," ${WRKSRC}/${MAKEFILE}
		58	.endif
		59	.if defined(WITH_UNICODE)
		60	@${REINPLACE_CMD} -e "s,%%UNICODE%%,y," ${WRKSRC}/${MAKEFILE}
		61	.else
		62	@${REINPLACE_CMD} -e "s,%%UNICODE%%,n," ${WRKSRC}/${MAKEFILE}
56	.endif	63	.endif
57	.endfor
58	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
59	.if defined(WITH_SOUND)	64	.if defined(WITH_SOUND)
		65	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
60	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h	66	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h
61	.else	67	.else
62	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/AppHdr.h	68	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/AppHdr.h
63	.endif	69	.endif
		70	.if defined(WITH_SDL)
		71	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/tilesdl.cc
		72	.endif
		73
		74	pre-build:
		75	@cd ${WRKSRC} && ${GMAKE} depend
64		76
65	post-install:	77	post-install:
66	.if !defined(NOPORTDOCS)	78	.if !defined(NOPORTDOCS)
67	${MKDIR} ${DOCSDIR}	79	${MKDIR} ${DOCSDIR}
68	.for doc in CREDITS README.txt licence.txt	80	.for doc in CREDITS.txt README.txt licence.txt
69	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${doc} ${DOCSDIR}	81	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${doc} ${DOCSDIR}
70	.endfor	82	.endfor
71	${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${DOCSDIR}	83	${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${DOCSDIR}
Lines 75-78 post-install: Link Here
75	${INSTALL_DATA} ${DATADIR}/settings/init.txt ${EXAMPLESDIR}/sample.crawlrc	87	${INSTALL_DATA} ${DATADIR}/settings/init.txt ${EXAMPLESDIR}/sample.crawlrc
76	.endif	88	.endif
77		89
78	.include <bsd.port.post.mk>	90	.include <bsd.port.mk>

Lines 1-7 Link Here

(-)b/games/stonesoup/files/patch-makefile.unix (-47 / +36 lines)
1	--- makefile.unix.orig 2009-01-13 02:40:36.000000000 +0000	1	--- ./makefile.unix.orig 2009-06-12 12:39:29.000000000 +0200
2	+++ makefile.unix 2009-01-19 20:08:18.000000000 +0000	2	+++ ./makefile.unix 2009-06-19 13:54:52.000000000 +0200
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4	# Modified for Crawl Reference by $Author: zelgadis $ on $Date: 2008-12-20 01:20:09 -0500 (Sat, 20 Dec 2008) $	4	# Modified for Crawl Reference by $Author: ennewalker $ on $Date: 2009-02-14 17:59:13 +0100 (Sa, 14 Feb 2009) $
5	#	5	#
6		6
7	-GAME = crawl	7	-GAME = crawl
Lines 11-30 Link Here
11	# it will make a variable called OBJECTS that contains all the libraries	11	# it will make a variable called OBJECTS that contains all the libraries
12	@@ -12,7 +12,6 @@	12	@@ -12,7 +12,6 @@
13		13
14	OBJECTS += libunix.o	14	OBJECTS += libunix.o crash-u.o
15		15
16	-CXX = g++	16	-CXX = g++
17	DELETE = rm -f	17	DELETE = rm -f
18	COPY = cp	18	COPY = cp
19	OS_TYPE = UNIX	19	OS_TYPE = UNIX
20	@@ -37,15 +36,15 @@	20	@@ -21,7 +20,7 @@
		21
		22	# Change this to y (case-sensitive!) if you want to use Unicode glyphs
		23	# in the map, and you have libncursesw available.
		24	-UNICODE_GLYPHS = n
		25	+UNICODE_GLYPHS = %%UNICODE%%
		26
		27	# If you're using UNICODE_GLYPHS=y, and have a preferred Unicode
		28	# (UTF-8) locale you want Crawl to use, you can set it here. The
		29	@@ -39,16 +38,15 @@
21	MCHMOD_SAVEDIR := 775	30	MCHMOD_SAVEDIR := 775
22		31
23	# The user:group to install the game as.	32	# The user:group to install the game as.
24	-INSTALL_UGRP ?= games:games	33	-INSTALL_UGRP := games:games
25	-INSTALLDIR ?= /usr/games/crawl	34	-
26	+INSTALL_UGRP ?= root:games	35	-INSTALLDIR := /usr/games/crawl
27	+INSTALLDIR ?= %%PREFIX%%/bin	36	+INSTALL_UGRP := root:games
		37	+INSTALLDIR := %%PREFIX%%/bin
28		38
29	# If you're installing Crawl for multiple users, you must set this to a	39	# If you're installing Crawl for multiple users, you must set this to a
30	# valid path before building Crawl. This is not necessary if you are building	40	# valid path before building Crawl. This is not necessary if you are building
Lines 32-68 Link Here
32		42
33	-# SAVEDIR := /usr/games/crawl/saves/	43	-# SAVEDIR := /usr/games/crawl/saves/
34	-# DATADIR := /usr/games/crawl/data/	44	-# DATADIR := /usr/games/crawl/data/
35	+SAVEDIR := %%SAVEDIR%%/	45	+SAVEDIR := %%SAVEDIR%%
36	+DATADIR := %%DATADIR%%/	46	+DATADIR := %%DATADIR%%
37		47
38	LEX := flex	48	LEX := flex
39	YACC := bison -y	49	YACC := bison -y
40	@@ -58,7 +57,7 @@	50	@@ -70,17 +68,8 @@
41	NDBM_FILE := /usr/include/ndbm.h
42
43	HAVE_DBH := $(shell [ -f $(DBH_FILE) ] && echo y)
44	-HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a "`uname`" = "Darwin" ] && echo y)
45	+HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a \( "`uname`" = "Darwin" -o "`uname`" = "FreeBSD" \) ] && echo y)
46
47	ifeq ($(strip $(HAVE_DBH)),y)
48	ifneq ($(shell grep dbm_open $(DBH_FILE)),)
49	@@ -70,9 +69,11 @@
50	ifeq ($(strip $(HAVE_NDBM)),y)
51	SELDBM ?= -DDB_NDBM
52	ifeq ($(SELDBM),-DDB_NDBM)
53	+ifneq ($(shell echo "`uname`"),FreeBSD)
54	LIBDBM := -ldbm
55	endif
56	endif
57	+endif
58
59	SQLSRC := util/sqlite
60	SQLLIB := sqlite3
61	@@ -89,17 +90,8 @@
62		51
63	INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES)	52	INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES)
64		53
65	-CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic	54	-CFWARN := -Wall -Wno-parentheses -Wwrite-strings -Wshadow -pedantic
66	-	55	-
67	CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS	56	CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS
68		57
Lines 76-107 Link Here
76	ifneq ($(strip $(SAVEDIR)),)	65	ifneq ($(strip $(SAVEDIR)),)
77	CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'	66	CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'
78	endif	67	endif
79	@@ -138,8 +130,8 @@	68	@@ -117,8 +106,8 @@
80		69	LIBCURS = ncurses
81	CFOTHERS += $(SELDBM)	70	endif
82		71
83	-CFLAGS := $(INCLUDES) $(CFWARN) $(CFOTHERS)	72	-CFLAGS := $(INCLUDES) $(CFWARN) $(CFOTHERS)
84	-YCFLAGS := $(INCLUDES) $(CFOTHERS)	73	-YCFLAGS := $(INCLUDES) $(CFOTHERS)
85	+LOCAL_CXXFLAGS := $(INCLUDES) $(CFWARN) $(CXXFLAGS) $(CFOTHERS)	74	+LOCAL_CFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
86	+YCFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)	75	+YCFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
87		76
88	UTIL = util/	77	UTIL = util/
89		78
90	@@ -181,7 +173,7 @@	79	@@ -160,7 +149,7 @@
91	rm -f $(DEPENDENCY_MKF)	80	rm -f $(DEPENDENCY_MKF).tmp
92	@for i in $^; do \	81	@for i in $^; do \
93	echo "Updating dependencies for $$i"; \	82	echo "Updating dependencies for $$i"; \
94	- $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF) 2>/dev/null; \	83	- $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
95	+ $(CXX) -MM $(LOCAL_CXXFLAGS) $$i >>$(DEPENDENCY_MKF) 2>/dev/null; \	84	+ $(CXX) -MM $(LOCAL_CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
96	done	85	done
		86	mv -f $(DEPENDENCY_MKF).tmp $(DEPENDENCY_MKF)
97		87
98	-include $(DEPENDENCY_MKF)	88	@@ -257,17 +246,17 @@
99	@@ -277,17 +269,17 @@
100	$(DELETE) $(DEPENDENCY_MKF)	89	$(DELETE) $(DEPENDENCY_MKF)
101		90
102	$(GAME): $(GAME_DEPENDS)	91	$(GAME): $(GAME_DEPENDS)
103	- ${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)	92	- ${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
104	+ ${CXX} ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)	93	+ ${CXX} ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
105		94
106	.PHONY : debug	95	.PHONY : debug
107		96
Lines 109-119 Link Here
109		98
110	profile: $(GAME_DEPENDS)	99	profile: $(GAME_DEPENDS)
111	- ${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)	100	- ${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
112	+ ${CXX} -g -p ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)	101	+ ${CXX} -g -p ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
113		102
114	.cc.o:	103	.cc.o:
115	- ${CXX} ${CFLAGS} -c $<	104	- ${CXX} ${CFLAGS} -c $<
116	+ ${CXX} ${LOCAL_CXXFLAGS} -c $<	105	+ ${CXX} ${LOCAL_CFLAGS} -c $<
117		106
118	# [ds] Note we don't use the standard CFLAGS here; that's intentional, most	107	# [ds] Note we don't use the standard CFLAGS here; that's intentional, most
119	# flex/bison combos I've tried don't produce code that passes the warnings	108	# flex/bison combos I've tried don't produce code that passes the warnings

Removed Link Here

(-)a/games/stonesoup/files/patch-makefile.x11 (-151 lines)
1	--- makefile.x11.orig 2008-07-14 04:17:51.000000000 +0200
2	+++ makefile.x11 2008-07-18 08:49:37.000000000 +0200
3	@@ -4,7 +4,7 @@
4	# Modified for Crawl Reference by $Author: dshaligram $ on $Date: 2007-06-24T16:27:58.475101Z $
5	#
6
7	-GAME = crawl
8	+GAME = stonesoup
9
10	# this file contains a list of the libraries.
11	# it will make a variable called OBJECTS that contains all the libraries
12	@@ -12,7 +12,6 @@
13
14	OBJECTS += libgui.o tile1.o tile2.o libx11.o guic.o guic-x11.o
15
16	-CXX = g++
17	DELETE = rm -f
18	COPY = cp
19	OS_TYPE = UNIX
20	@@ -22,8 +21,13 @@
21	PNG_INCLUDE := -I/sw/include
22	PNG_LIB := -L/sw/lib
23	else
24	+ifneq ($(shell echo "`uname`"),FreeBSD)
25	PNG_INCLUDE :=
26	PNG_LIB :=
27	+else
28	+PNG_INCLUDE := -I%%LOCALBASE%%/include
29	+PNG_LIB := -L%%LOCALBASE%%/lib
30	+endif
31	endif
32
33	# If you have lex and yacc, set DOYACC to y (lowercase y).
34	@@ -36,15 +40,15 @@
35	MCHMOD_SAVEDIR := 775
36
37	# The user:group to install the game as.
38	-INSTALL_UGRP ?= games:games
39	-INSTALLDIR ?= /usr/games/crawl
40	+INSTALL_UGRP ?= root:games
41	+INSTALLDIR ?= %%PREFIX%%/bin
42
43	# If you're installing Crawl for multiple users, you must set this to a
44	# valid path before building Crawl. This is not necessary if you are building
45	# Crawl for a single user.
46
47	-# SAVEDIR := /usr/games/crawl/saves/
48	-# DATADIR := /usr/games/crawl/data/
49	+SAVEDIR := %%SAVEDIR%%/
50	+DATADIR := %%DATADIR%%/
51
52	LEX := flex
53	YACC := bison -y
54	@@ -57,7 +61,7 @@
55	NDBM_FILE := /usr/include/ndbm.h
56
57	HAVE_DBH := $(shell [ -f $(DBH_FILE) ] && echo y)
58	-HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a "`uname`" = "Darwin" ] && echo y)
59	+HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a \( "`uname`" = "Darwin" -o "`uname`" = "FreeBSD" \) ] && echo y)
60
61	ifeq ($(strip $(HAVE_DBH)),y)
62	ifneq ($(shell grep dbm_open $(DBH_FILE)),)
63	@@ -69,9 +73,11 @@
64	ifeq ($(strip $(HAVE_NDBM)),y)
65	SELDBM ?= -DDB_NDBM
66	ifeq ($(SELDBM),-DDB_NDBM)
67	+ifneq ($(shell echo "`uname`"),FreeBSD)
68	LIBDBM := -ldbm
69	endif
70	endif
71	+endif
72
73	SQLSRC := util/sqlite
74	SQLLIB := sqlite3
75	@@ -88,17 +94,8 @@
76
77	INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES) $(PNG_INCLUDE)
78
79	-CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic
80	-
81	CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS
82
83	-ifneq ($(HURRY),y)
84	-ifneq ($(DEBUG_CRAWL),y)
85	-CFWARN += -Wuninitialized
86	-CFOTHERS += -O2
87	-endif
88	-endif
89	-
90	ifneq ($(strip $(SAVEDIR)),)
91	CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'
92	endif
93	@@ -109,8 +106,8 @@
94
95	CFOTHERS += $(SELDBM)
96
97	-CFLAGS := $(INCLUDES) $(CFWARN) $(CFOTHERS)
98	-YCFLAGS := $(INCLUDES) $(CFOTHERS)
99	+LOCAL_CXXFLAGS := $(INCLUDES) $(CFWARN) $(CXXFLAGS) $(CFOTHERS)
100	+YCFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
101
102	UTIL = util/
103
104	@@ -170,7 +167,7 @@
105	rm -f $(DEPENDENCY_MKF)
106	@for i in $^; do \
107	echo "Updating dependencies for $$i"; \
108	- $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF) 2>/dev/null; \
109	+ $(CXX) -MM $(LOCAL_CXXFLAGS) $$i >>$(DEPENDENCY_MKF) 2>/dev/null; \
110	done
111
112	-include $(DEPENDENCY_MKF)
113	@@ -215,7 +212,7 @@
114	$(ORIGTILEHEADERS): makerltiles
115
116	makerltiles:
117	- cd $(RLTILES) && make -f makefile.unix all CFLAGS="$(PNG_INCLUDE)" LDFLAGS="$(PNG_LIB)" && cd ..
118	+ cd $(RLTILES) && gmake -f makefile.unix all CFLAGS="$(CFLAGS) $(PNG_INCLUDE)" LDFLAGS="$(PNG_LIB)" && cd ..
119
120	$(TILEHEADERS): $(ORIGTILEHEADERS)
121	cp $(RLTILES)$@ .
122	@@ -227,7 +224,7 @@
123	$(COPY) $< $@
124
125	clean-rltiles:
126	- cd $(RLTILES) && make -f makefile.unix distclean && cd ..
127	+ cd $(RLTILES) && gmake -f makefile.unix distclean && cd ..
128	$(DELETE) $(TILEHEADERS)
129
130	##########################################################################
131	@@ -293,16 +290,16 @@
132	$(DELETE) $(DEPENDENCY_MKF)
133
134	$(GAME): $(GAME_DEPENDS)
135	- ${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
136	+ ${CXX} ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
137
138	debug: $(GAME_DEPENDS)
139	- ${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
140	+ ${CXX} ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
141
142	profile: $(GAME_DEPENDS)
143	- ${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
144	+ ${CXX} -g -p ${LDFLAGS} $(LOCAL_CXXFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
145
146	.cc.o:
147	- ${CXX} ${CFLAGS} -c $<
148	+ ${CXX} ${LOCAL_CXXFLAGS} -c $<
149
150	# [ds] Note we don't use the standard CFLAGS here; that's intentional, most
151	# flex/bison combos I've tried don't produce code that passes the warnings

Added Link Here

(-)b/games/stonesoup/files/patch-makefile_tiles.unix (+140 lines)
1	--- ./makefile_tiles.unix.orig 2009-06-12 12:32:15.000000000 +0200
2	+++ ./makefile_tiles.unix 2009-06-19 13:54:52.000000000 +0200
3	@@ -4,7 +4,7 @@
4	# Modified for Crawl Reference by $Author: dshaligram $ on $Date: 2007-06-24T16:27:58.475101Z $
5	#
6
7	-GAME = crawl
8	+GAME = stonesoup
9
10	# this file contains a list of the libraries.
11	# it will make a variable called OBJECTS that contains all the libraries
12	@@ -15,7 +15,6 @@
13	SDL_CFLAGS := $(shell sdl-config --cflags)
14	SDL_LDFLAGS := $(shell sdl-config --libs) -lSDLmain
15
16	-CXX = g++
17	DELETE = rm -f
18	COPY = cp
19	OS_TYPE = UNIX
20	@@ -25,7 +24,7 @@
21
22	# Change this to y if you want to use Unicode glyphs in the map, and you have
23	# libncursesw available.
24	-UNICODE_GLYPHS = n
25	+UNICODE_GLYPHS = %%UNICODE%%
26
27	ifeq ($(strip $(OSX)),y)
28	PNG_INCLUDE := -I/sw/include
29	@@ -41,7 +40,7 @@
30	else
31	PNG_INCLUDE :=
32	PNG_LIB :=
33	-FREETYPE_INCLUDE := -I/usr/include/freetype2
34	+FREETYPE_INCLUDE := -I/usr/local/include/freetype2
35	endif
36
37	# If you have lex and yacc, set DOYACC to y (lowercase y).
38	@@ -54,16 +53,16 @@
39	MCHMOD_SAVEDIR := 775
40
41	# The user:group to install the game as.
42	-INSTALL_UGRP := games:games
43	+INSTALL_UGRP := root:games
44
45	-INSTALLDIR := /usr/games/crawl
46	+INSTALLDIR := %%PREFIX%%/bin
47
48	# If you're installing Crawl for multiple users, you must set this to a
49	# valid path before building Crawl. This is not necessary if you are building
50	# Crawl for a single user.
51
52	-# SAVEDIR := /usr/games/crawl/saves/
53	-# DATADIR := /usr/games/crawl/data/
54	+SAVEDIR := %%SAVEDIR%%
55	+DATADIR := %%DATADIR%%
56
57	LEX := flex
58	YACC := bison -y
59	@@ -105,17 +104,8 @@
60
61	INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES) $(PNG_INCLUDE) $(FREETYPE_INCLUDE)
62
63	-CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic -Wno-parentheses
64	-
65	CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS
66
67	-ifneq ($(HURRY),y)
68	-ifneq ($(DEBUG_CRAWL),y)
69	-CFWARN += -Wuninitialized
70	-CFOTHERS += -O2
71	-endif
72	-endif
73	-
74	ifneq ($(strip $(SAVEDIR)),)
75	CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'
76	endif
77	@@ -124,8 +114,8 @@
78	CFOTHERS += '-DDATA_DIR_PATH="$(strip $(DATADIR))"'
79	endif
80
81	-CFLAGS := $(INCLUDES) $(CFWARN) $(CFOTHERS) $(SDL_CFLAGS)
82	-YCFLAGS := $(INCLUDES) $(CFOTHERS)
83	+LOCAL_CFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFWARN) $(CFOTHERS) $(SDL_CFLAGS)
84	+YCFLAGS := $(INCLUDES) $(CXXFLAGS) $(CFOTHERS)
85
86	UTIL = util/
87
88	@@ -167,7 +157,7 @@
89	rm -f $(DEPENDENCY_MKF).tmp
90	@for i in $^; do \
91	echo "Updating dependencies for $$i"; \
92	- $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
93	+ $(CXX) -MM $(LOCAL_CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
94	done
95	mv -f $(DEPENDENCY_MKF).tmp $(DEPENDENCY_MKF)
96
97	@@ -210,7 +200,7 @@
98	ORIGTILEFILES = $(TILEFILES:%=$(RLTILES)/%)
99
100	makerltiles:
101	- cd $(RLTILES) && make -f makefile.unix all
102	+ cd $(RLTILES) && gmake -f makefile.unix all
103
104	$(TILEDEFSRCS): makerltiles
105
106	@@ -222,7 +212,7 @@
107	$(COPY) $< $@
108
109	clean-rltiles:
110	- cd $(RLTILES) && make -f makefile.unix distclean && cd ..
111	+ cd $(RLTILES) && gmake -f makefile.unix distclean && cd ..
112
113	##########################################################################
114
115	@@ -287,21 +277,21 @@
116	$(DELETE) $(DEPENDENCY_MKF)
117
118	$(GAME): $(GAME_DEPENDS)
119	- ${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
120	+ ${CXX} ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
121
122	.PHONY : debug
123
124	debug: $(GAME)
125
126	profile: $(GAME_DEPENDS)
127	- ${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
128	+ ${CXX} -g -p ${LDFLAGS} $(LOCAL_CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
129
130	%.o: %.cc $(TILEDEFHDRS)
131	- ${CXX} ${CFLAGS} -c $< -o $@
132	+ ${CXX} ${LOCAL_CFLAGS} -c $< -o $@
133
134	# STL is bad in debug. Always compile this file with optimizations.
135	tilebuf.o: tilebuf.cc $(TILEDEFHDRS)
136	- ${CXX} ${CFLAGS} -O2 -c $< -o $@
137	+ ${CXX} ${LOCAL_CFLAGS} -O2 -c $< -o $@
138
139	# [ds] Note we don't use the standard CFLAGS here; that's intentional, most
140	# flex/bison combos I've tried don't produce code that passes the warnings

Added Link Here

(-)b/games/stonesoup/files/patch-util__sqlite__Makefile (+16 lines)
1	--- ./util/sqlite/Makefile.orig 2009-06-12 12:27:11.000000000 +0200
2	+++ ./util/sqlite/Makefile 2009-06-19 13:54:52.000000000 +0200
3	@@ -4,12 +4,11 @@
4
5	LIBSQL = libsqlite3.a
6	AR = ar rcu
7	-CC = gcc
8	RANLIB = ranlib
9	RM_F = rm -f
10
11	# Omit SQLite features we don't need.
12	-CFLAGS = -DSQLITE_OMIT_AUTHORIZATION \
13	+CFLAGS += -DSQLITE_OMIT_AUTHORIZATION \
14	-DSQLITE_OMIT_AUTOVACUUM \
15	-DSQLITE_OMIT_COMPLETE \
16	-DSQLITE_OMIT_BLOB_LITERAL \

Removed Link Here

(-)a/games/stonesoup/files/patch-util_sqlite_Makefile (-16 lines)
1	--- util/sqlite/Makefile.orig 2008-07-14 04:17:51.000000000 +0200
2	+++ util/sqlite/Makefile 2008-07-18 08:50:23.000000000 +0200
3	@@ -4,12 +4,11 @@
4
5	LIBSQL = libsqlite3.a
6	AR = ar rcu
7	-CC = gcc
8	RANLIB = ranlib
9	RM_F = rm -f
10
11	# Omit SQLite features we don't need.
12	-CFLAGS = -DSQLITE_OMIT_AUTHORIZATION \
13	+CFLAGS += -DSQLITE_OMIT_AUTHORIZATION \
14	-DSQLITE_OMIT_AUTOVACUUM \
15	-DSQLITE_OMIT_COMPLETE \
16	-DSQLITE_OMIT_BLOB_LITERAL \

Lines 1-18 Link Here

(-)b/games/stonesoup/pkg-plist (-16 / +35 lines)
1	bin/stonesoup	1	bin/stonesoup
2	%%DATADIR%%/dat/lua/chnkdata.lua	2	%%DATADIR%%/dat/lua/runrest.lua
3	%%DATADIR%%/dat/lua/trapwalk.lua	3	%%DATADIR%%/dat/lua/trapwalk.lua
4	%%DATADIR%%/dat/lua/stash.lua	4	%%DATADIR%%/dat/lua/stash.lua
5	%%DATADIR%%/dat/lua/safechnk.lua	5	%%DATADIR%%/dat/lua/wield.lua
6	%%DATADIR%%/dat/lua/runrest.lua
7	%%DATADIR%%/dat/lua/pickup.lua	6	%%DATADIR%%/dat/lua/pickup.lua
8	%%DATADIR%%/dat/lua/kills.lua	7	%%DATADIR%%/dat/lua/kills.lua
9	%%DATADIR%%/dat/lua/gearset.lua	8	%%DATADIR%%/dat/lua/gearset.lua
10	%%DATADIR%%/dat/lua/eat.lua
11	%%DATADIR%%/dat/lua/wield.lua
12	%%DATADIR%%/dat/clua/dungeon.lua	9	%%DATADIR%%/dat/clua/dungeon.lua
		10	%%DATADIR%%/dat/clua/util.lua
		11	%%DATADIR%%/dat/clua/userbase.lua
		12	%%DATADIR%%/dat/clua/point.lua
13	%%DATADIR%%/dat/clua/macro.lua	13	%%DATADIR%%/dat/clua/macro.lua
14	%%DATADIR%%/dat/clua/luamark.lua	14	%%DATADIR%%/dat/clua/luamark.lua
15	%%DATADIR%%/dat/clua/loadmaps.lua	15	%%DATADIR%%/dat/clua/loadmaps.lua
		16	%%DATADIR%%/dat/clua/lm_toll.lua
16	%%DATADIR%%/dat/clua/lm_tmsg.lua	17	%%DATADIR%%/dat/clua/lm_tmsg.lua
17	%%DATADIR%%/dat/clua/lm_timed.lua	18	%%DATADIR%%/dat/clua/lm_timed.lua
18	%%DATADIR%%/dat/clua/lm_props.lua	19	%%DATADIR%%/dat/clua/lm_props.lua
Lines 20-26 bin/stonesoup Link Here
20	%%DATADIR%%/dat/clua/lm_fog.lua	21	%%DATADIR%%/dat/clua/lm_fog.lua
21	%%DATADIR%%/dat/clua/lm_flags.lua	22	%%DATADIR%%/dat/clua/lm_flags.lua
22	%%DATADIR%%/dat/clua/lm_1way.lua	23	%%DATADIR%%/dat/clua/lm_1way.lua
23	%%DATADIR%%/dat/clua/userbase.lua	24	%%DATADIR%%/dat/clua/ziggurat.lua
24	%%DATADIR%%/dat/descript/ability.txt	25	%%DATADIR%%/dat/descript/ability.txt
25	%%DATADIR%%/dat/descript/spells.txt	26	%%DATADIR%%/dat/descript/spells.txt
26	%%DATADIR%%/dat/descript/skills.txt	27	%%DATADIR%%/dat/descript/skills.txt
Lines 28-70 bin/stonesoup Link Here
28	%%DATADIR%%/dat/descript/items.txt	29	%%DATADIR%%/dat/descript/items.txt
29	%%DATADIR%%/dat/descript/gods.txt	30	%%DATADIR%%/dat/descript/gods.txt
30	%%DATADIR%%/dat/descript/features.txt	31	%%DATADIR%%/dat/descript/features.txt
		32	%%DATADIR%%/dat/descript/cards.txt
31	%%DATADIR%%/dat/descript/branches.txt	33	%%DATADIR%%/dat/descript/branches.txt
32	%%DATADIR%%/dat/descript/unident.txt	34	%%DATADIR%%/dat/descript/unident.txt
33	%%DATADIR%%/dat/database/godspeak.txt	35	%%DATADIR%%/dat/database/FAQ.txt
34	%%DATADIR%%/dat/database/shout.txt	36	%%DATADIR%%/dat/database/shout.txt
35	%%DATADIR%%/dat/database/randname.txt	37	%%DATADIR%%/dat/database/randname.txt
		38	%%DATADIR%%/dat/database/randbook.txt
36	%%DATADIR%%/dat/database/rand_wpn.txt	39	%%DATADIR%%/dat/database/rand_wpn.txt
37	%%DATADIR%%/dat/database/rand_arm.txt	40	%%DATADIR%%/dat/database/rand_arm.txt
38	%%DATADIR%%/dat/database/rand_all.txt	41	%%DATADIR%%/dat/database/rand_all.txt
		42	%%DATADIR%%/dat/database/quotes.txt
		43	%%DATADIR%%/dat/database/monspell.txt
39	%%DATADIR%%/dat/database/monspeak.txt	44	%%DATADIR%%/dat/database/monspeak.txt
40	%%DATADIR%%/dat/database/monname.txt	45	%%DATADIR%%/dat/database/monname.txt
41	%%DATADIR%%/dat/database/miscname.txt	46	%%DATADIR%%/dat/database/miscname.txt
42	%%DATADIR%%/dat/database/insult.txt	47	%%DATADIR%%/dat/database/insult.txt
43	%%DATADIR%%/dat/database/help.txt	48	%%DATADIR%%/dat/database/help.txt
		49	%%DATADIR%%/dat/database/godspeak.txt
44	%%DATADIR%%/dat/database/wpnnoise.txt	50	%%DATADIR%%/dat/database/wpnnoise.txt
45	%%DATADIR%%/dat/altar.des	51	%%DATADIR%%/dat/altar.des
		52	%%DATADIR%%/dat/ziggurat.des
46	%%DATADIR%%/dat/vaults.des	53	%%DATADIR%%/dat/vaults.des
47	%%DATADIR%%/dat/temple.des	54	%%DATADIR%%/dat/temple.des
48	%%DATADIR%%/dat/portal.des	55	%%DATADIR%%/dat/sewer.des
		56	%%DATADIR%%/dat/rooms.des
49	%%DATADIR%%/dat/pan.des	57	%%DATADIR%%/dat/pan.des
50	%%DATADIR%%/dat/orc.des	58	%%DATADIR%%/dat/orc.des
		59	%%DATADIR%%/dat/minitomb.des
51	%%DATADIR%%/dat/mini.des	60	%%DATADIR%%/dat/mini.des
52	%%DATADIR%%/dat/layout.des	61	%%DATADIR%%/dat/layout.des
53	%%DATADIR%%/dat/large.des	62	%%DATADIR%%/dat/large.des
54	%%DATADIR%%/dat/lair.des	63	%%DATADIR%%/dat/lair.des
55	%%DATADIR%%/dat/lab.des	64	%%DATADIR%%/dat/lab.des
		65	%%DATADIR%%/dat/icecave.des
56	%%DATADIR%%/dat/hive.des	66	%%DATADIR%%/dat/hive.des
57	%%DATADIR%%/dat/hells.des	67	%%DATADIR%%/dat/hells.des
58	%%DATADIR%%/dat/float.des	68	%%DATADIR%%/dat/float.des
59	%%DATADIR%%/dat/entry.des	69	%%DATADIR%%/dat/entry.des
60	%%DATADIR%%/dat/elf.des	70	%%DATADIR%%/dat/elf.des
		71	%%DATADIR%%/dat/dummy.des
		72	%%DATADIR%%/dat/didact.des
61	%%DATADIR%%/dat/crypt.des	73	%%DATADIR%%/dat/crypt.des
62	%%DATADIR%%/dat/bazaar.des	74	%%DATADIR%%/dat/bazaar.des
		75	%%DATADIR%%/dat/arena.des
63	%%DATADIR%%/dat/zot.des	76	%%DATADIR%%/dat/zot.des
64	%%X11%%%%DATADIR%%/dat/tiles/wall2d.png	77	%%SDL%%%%DATADIR%%/dat/tiles/Vera.ttf
65	%%X11%%%%DATADIR%%/dat/tiles/title.png	78	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png
66	%%X11%%%%DATADIR%%/dat/tiles/tile.png	79	%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png
67	%%X11%%%%DATADIR%%/dat/tiles/player.png	80	%%SDL%%%%DATADIR%%/dat/tiles/player.png
		81	%%SDL%%%%DATADIR%%/dat/tiles/main.png
		82	%%SDL%%%%DATADIR%%/dat/tiles/dngn.png
		83	%%SDL%%%%DATADIR%%/dat/tiles/VeraMono.ttf
		84	%%SDL%%%%DATADIR%%/dat/tiles/title.png
68	%%DATADIR%%/settings/034_command_keys.txt	85	%%DATADIR%%/settings/034_command_keys.txt
69	%%DATADIR%%/settings/tiles_options.txt	86	%%DATADIR%%/settings/tiles_options.txt
70	%%DATADIR%%/settings/standard_colours.txt	87	%%DATADIR%%/settings/standard_colours.txt
Lines 84-98 bin/stonesoup Link Here
84	%%DATADIR%%/docs/monster_speech.txt	101	%%DATADIR%%/docs/monster_speech.txt
85	%%DATADIR%%/docs/macros_guide.txt	102	%%DATADIR%%/docs/macros_guide.txt
86	%%DATADIR%%/docs/lualicense.txt	103	%%DATADIR%%/docs/lualicense.txt
		104	%%DATADIR%%/docs/lgpl.txt
87	%%DATADIR%%/docs/level_design.txt	105	%%DATADIR%%/docs/level_design.txt
88	%%DATADIR%%/docs/keybind.txt	106	%%DATADIR%%/docs/keybind.txt
		107	%%DATADIR%%/docs/key_changes.txt
89	%%DATADIR%%/docs/crawl_manual.txt	108	%%DATADIR%%/docs/crawl_manual.txt
90	%%DATADIR%%/docs/coding_conventions.txt	109	%%DATADIR%%/docs/coding_conventions.txt
		110	%%DATADIR%%/docs/arena.txt
91	%%DATADIR%%/docs/aptitudes.txt	111	%%DATADIR%%/docs/aptitudes.txt
92	%%DATADIR%%/docs/tiles_help.txt	112	%%DATADIR%%/docs/tiles_help.txt
93	@exec chown -R root:games %D/%%DATADIR%%	113	@exec chown -R root:games %D/%%DATADIR%%
94	@exec install -d -o root -g games -m 775 %%SAVEDIR%%	114	@exec install -d -o root -g games -m 775 %%SAVEDIR%%
95	%%PORTDOCS%%%%DOCSDIR%%/CREDITS	115	%%PORTDOCS%%%%DOCSDIR%%/CREDITS.txt
96	%%PORTDOCS%%%%DOCSDIR%%/README.txt	116	%%PORTDOCS%%%%DOCSDIR%%/README.txt
97	%%PORTDOCS%%%%DOCSDIR%%/licence.txt	117	%%PORTDOCS%%%%DOCSDIR%%/licence.txt
98	%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD	118	%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
Lines 101-111 bin/stonesoup Link Here
101	@dirrm %%DATADIR%%/dat/clua	121	@dirrm %%DATADIR%%/dat/clua
102	@dirrm %%DATADIR%%/dat/descript	122	@dirrm %%DATADIR%%/dat/descript
103	@dirrm %%DATADIR%%/dat/database	123	@dirrm %%DATADIR%%/dat/database
104	%%X11%%@dirrm %%DATADIR%%/dat/tiles/	124	%%SDL%%@dirrm %%DATADIR%%/dat/tiles
105	@dirrm %%DATADIR%%/dat	125	@dirrm %%DATADIR%%/dat
106	@dirrm %%DATADIR%%/settings	126	@dirrm %%DATADIR%%/settings
107	@dirrm %%DATADIR%%/docs	127	@dirrm %%DATADIR%%/docs
108	@dirrm %%DATADIR%%/	128	@dirrm %%DATADIR%%/
109	@unexec rmdir %%SAVEDIR%% >/dev/null 2>&1 \|\| echo 'stonesoup save-game directory (%%SAVEDIR%%) not removed due to existing save games. If you are permanently removing this port, you should do a ``rm -rf %%SAVEDIR%%``.' \| fmt	129	@unexec rmdir %%SAVEDIR%% >/dev/null 2>&1 \|\| echo 'stonesoup save-game directory (%%SAVEDIR%%) not removed due to existing save games. If you are permanently removing this port, you should do a ``rm -rf %%SAVEDIR%%``.' \| fmt
110	%%PORTDOCS%%@dirrm %%DOCSDIR%%	130	%%PORTDOCS%%@dirrm %%DOCSDIR%%/
111	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%	131	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
112	-