Bug 147828 - [maintainer-update] games/stonesoup: split up games/stonesoup-sdl
Summary: [maintainer-update] games/stonesoup: split up games/stonesoup-sdl
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Rene Ladan
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-06-13 09:30 UTC by Tobias Rehbein
Modified: 2010-08-08 19:10 UTC (History)
0 users

See Also:


Attachments
games-stonesoup-sdl.shar (786 bytes, text/plain)
2010-06-13 09:30 UTC, Tobias Rehbein
no flags Details
file.diff (1.02 KB, patch)
2010-06-13 09:30 UTC, Tobias Rehbein
no flags Details | Diff
games-stonesoup-0.6.1.diff (6.41 KB, patch)
2010-06-29 19:15 UTC, Tobias Rehbein
no flags Details | Diff
games-stonesoup-sdl.shar (817 bytes, application/x-shar)
2010-06-29 19:15 UTC, Tobias Rehbein
no flags Details
games-stonesoup-sdl.shar (817 bytes, application/x-shar)
2010-06-29 19:43 UTC, Tobias Rehbein
no flags Details
games-stonesoup-0.6.1.diff (6.41 KB, patch)
2010-06-29 19:44 UTC, Tobias Rehbein
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tobias Rehbein 2010-06-13 09:30:05 UTC
	
        Create a new slave port games/stonesoup-sdl for the sdl based tiles version of games/stonesoup.

Fix: - games-stonesoup-sdl.shar contains the new slave port
        - games-stonesoup.diff contains trivial changes to support the slave port
Comment 1 Tobias Rehbein 2010-06-25 21:49:39 UTC
Hi.

Thanks for commiting this stuff. It's the first patch I created which has been
commited to the FreeBSD base system ;)

Nonetheless I wanted to query the state of this PR. The attached patch has been
committed but the PR is still open and no one has taken responsibility for this
PR. I thought it should have been closed or at least set to state 'patched'.

Regards Tobias
Comment 2 Tobias Rehbein 2010-06-25 21:56:50 UTC
Am Fri, Jun 25, 2010 at 10:49:39PM +0200 schrieb Tobias Rehbein:
> Thanks for commiting this stuff. It's the first patch I created which has been
> commited to the FreeBSD base system ;)


Ooops, wrong PR. Sorry for the noise.


-- 
Tobias Rehbein

PGP key:         4F2AE314
    server:      keys.gnupg.net
    fingerprint: ECDA F300 1B6E 9B87 8524  8663 E8B6 3138 4F2A E314
Comment 3 Tobias Rehbein 2010-06-29 19:15:28 UTC
In the meantime games/stonesoup version 0.6.1 has been released. Find attached
the updated patch for games/stonesoup. The shar for the new slave port is still
the same but to make matters easy I reattached it.

===

From the projects site:

Well, watching people kill themselves using vampiric weapons may have been fun,
but after some time, it gets boring.  Thus, here's an update of the stable
release that fixes worst of the problems you reported.

Changes:

    * Fix instant starvation bug related to vampiric weapon butchery.
    * Fix Cheibriados excommunication permanent stat gain.
      No more 72/72/72 for you.
    * Reenable sound for mingw builds.
    * Xcode, Visual C++ and clang build fixes.
    * Fix save handling on BSD systems.
    * Fix some triggers being dropped when viewing
      other levels.
      This was exploitable to get unlimited Troves
      or Bazaars.
    * Selected other bug fixes.

Comment 4 Tobias Rehbein 2010-06-29 19:43:14 UTC
Seems as if GNATS has garbled my attachements. I'll resend the one by one.

First the shar...
Comment 5 Tobias Rehbein 2010-06-29 19:44:07 UTC
... and second the patch.
Comment 6 Tobias Rehbein 2010-08-05 19:19:40 UTC
In the meantime stonesoup 0.7.1 has been released.

Link to the changelog: http://crawl.develz.org/main/0.7.1.txt

Find inline attached the shar for the new games/stonesoup-sdl slave port an=
d the
diff to upgrade games/stonesoup to the latest version (including the changes
needed to make games/stonesoup-sdl work).

--- games-stonesoup-sdl-7.1.shar begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	games/stonesoup-sdl/
#	games/stonesoup-sdl/Makefile
#
echo c - games/stonesoup-sdl/
mkdir -p games/stonesoup-sdl/ > /dev/null 2>&1
echo x - games/stonesoup-sdl/Makefile
sed 's/^X//' >games/stonesoup-sdl/Makefile << 'c8603e2deb0e0eef26f372ed5ec6=
e998'
X# New ports collection makefile for:   stonesoup-sdl
X# Date created:              13 June 2010
X# Whom:                   tobias.rehbein@web.de
X#
X# $FreeBSD$
X#
X
XWITH_SDL=3D   yes
X
XMASTERDIR=3D       ${.CURDIR}/../stonesoup
X
X.include        "${MASTERDIR}/Makefile"
c8603e2deb0e0eef26f372ed5ec6e998
exit
--- games-stonesoup-sdl-7.1.shar ends here ---

--- games-stonesoup-7.1.diff begins here ---
diff -ruN games/stonesoup.orig/Makefile games/stonesoup/Makefile
--- games/stonesoup.orig/Makefile	2010-08-05 08:39:47.000000000 +0200
+++ games/stonesoup/Makefile	2010-08-05 08:40:08.000000000 +0200
@@ -6,7 +6,7 @@
 #
=20
 PORTNAME=3D	stonesoup
-PORTVERSION=3D	0.6.0
+PORTVERSION=3D	0.7.1
 CATEGORIES=3D	games
 MASTER_SITES=3D	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
 DISTNAME=3D	stone_soup-${PORTVERSION}-nodeps
@@ -14,9 +14,7 @@
 MAINTAINER=3D	tobias.rehbein@web.de
 COMMENT=3D	Dungeon Crawl Stone Soup - a fun, free rogue-like game
=20
-LIB_DEPENDS=3D	sqlite3:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=3D	gtar:${PORTSDIR}/archivers/gtar
-
+USE_SQLITE=3D	yes
 USE_BZIP2=3D	yes
 USE_BISON=3D	build
 USE_GMAKE=3D	yes
@@ -26,13 +24,12 @@
 MAKE_JOBS_SAFE=3D	yes
=20
 SAVEDIR?=3D	/var/games/${PORTNAME}
-WRKSRC=3D		${WRKDIR}/stone_soup-${PORTVERSION}/source/
+WRKSRC=3D		${WRKDIR}/stone_soup-${PORTVERSION}-1-g7ce9b19/source/
=20
 SUB_FILES=3D	README.FreeBSD
 PLIST_SUB=3D	SAVEDIR=3D"${SAVEDIR}"
=20
-OPTIONS=3D	SDL		"SDL support (tiles interface)"	off \
-		SOUND		"Sound support"			off \
+OPTIONS=3D	SOUND		"Sound support"			off \
 		LUA_BINDINGS	"LUA bindings for user scripts"	on \
 		UNICODE		"Unicode glyphs (UTF-8)"	off \
 		WIZARD		"Wizard mode"			off
@@ -51,18 +48,18 @@
 MAKE_ARGS+=3D	wizard
 .endif
=20
-.if defined(WITHOUT_SDL)
-CONFLICTS+=3D	${PORTNAME}-sdl-[0-9]*
-PLIST_SUB+=3D	SDL=3D"@comment "
-.else
+.if defined(WITH_SDL)
 CONFLICTS+=3D	${PORTNAME}-[0-9]*
 MAKE_ARGS+=3D	TILES=3Dy
 PLIST_SUB+=3D	SDL=3D""
 PKGNAMESUFFIX=3D	-sdl
+USE_FREETYPE=3D	yes
 BUILD_DEPENDS+=3D	pkg-config:${PORTSDIR}/devel/pkg-config
-LIB_DEPENDS+=3D	png.6:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=3D	png.6:${PORTSDIR}/graphics/png
 USE_SDL=3D	sdl image
+.else
+CONFLICTS+=3D	${PORTNAME}-sdl-[0-9]*
+PLIST_SUB+=3D	SDL=3D"@comment "
 .endif
=20
 .if defined(WITH_SOUND)
diff -ruN games/stonesoup.orig/distinfo games/stonesoup/distinfo
--- games/stonesoup.orig/distinfo	2010-08-05 08:39:47.000000000 +0200
+++ games/stonesoup/distinfo	2010-08-05 08:40:08.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (stone_soup-0.6.0-nodeps.tar.bz2) =3D 866e315470a592572e7ce8a7214c7615
-SHA256 (stone_soup-0.6.0-nodeps.tar.bz2) =3D f05ba17b64f3f669da3fb4185ed2e=
1425bd6a2fa8375fa4671807c67b2e4f8ff
-SIZE (stone_soup-0.6.0-nodeps.tar.bz2) =3D 4597191
+MD5 (stone_soup-0.7.1-nodeps.tar.bz2) =3D e5fa03fc9206ede190f288bf0b24500b
+SHA256 (stone_soup-0.7.1-nodeps.tar.bz2) =3D 4978869637595e6c3573f0cc72e7a=
a1be05ab2b73fcef691692c5cbc044251bb
+SIZE (stone_soup-0.7.1-nodeps.tar.bz2) =3D 4878043
diff -ruN games/stonesoup.orig/files/patch-AppHdr.h games/stonesoup/files/p=
atch-AppHdr.h
--- games/stonesoup.orig/files/patch-AppHdr.h	2010-08-05 08:39:47.000000000=
 +0200
+++ games/stonesoup/files/patch-AppHdr.h	2010-08-05 09:26:42.000000000 +0200
@@ -1,6 +1,6 @@
---- ./AppHdr.h.orig	2010-03-27 00:43:25.000000000 +0100
-+++ ./AppHdr.h	2010-04-18 13:17:52.000000000 +0200
-@@ -157,7 +157,7 @@
+--- ./AppHdr.h.orig	2010-07-24 05:31:45.000000000 +0200
++++ ./AppHdr.h	2010-08-05 09:25:27.000000000 +0200
+@@ -161,7 +161,7 @@
      //          setuid or setgid. Filenames passed to this command *are n=
ot
      //          validated in any way*.
      //
@@ -9,14 +9,3 @@
 =20
      // For cases when the game will be played on terms that don't support=
 the
      // curses "bold =3D=3D 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
diff -ruN games/stonesoup.orig/files/patch-makefile games/stonesoup/files/p=
atch-makefile
--- games/stonesoup.orig/files/patch-makefile	2010-08-05 08:39:47.000000000=
 +0200
+++ games/stonesoup/files/patch-makefile	2010-08-05 09:26:42.000000000 +0200
@@ -1,22 +1,36 @@
---- ./makefile.orig	2010-03-27 00:43:25.000000000 +0100
-+++ ./makefile	2010-04-18 13:18:41.000000000 +0200
-@@ -44,7 +44,7 @@
+--- ./makefile.orig	2010-07-24 05:31:49.000000000 +0200
++++ ./makefile	2010-08-05 09:25:27.000000000 +0200
+@@ -45,14 +45,7 @@
  #    ask for a package with convenience libraries instead -- we'll try to=
 provide
  #    them somewhere in the near future.
 =20
 -GAME =3D crawl
+-
+-ASSERTS =3D yes
+-
+-# Disable GNU Make implicit rules and variables. Leaving them enabled wil=
l slow
+-# down MinGW and Cygwin builds by a very VERY noticeable degree. Besides,=
 we have
+-# _explicit_ rules defined for everything. So we don't need them.
+-MAKEFLAGS +=3D -rR
 +GAME =3D stonesoup
 =20
  #
  # Compiler Flags
-@@ -82,19 +82,31 @@
+@@ -86,24 +79,39 @@
+=20
+ else
+=20
++ifndef FREEBSD_PORT
+ CFOPTIMIZE :=3D -O2
++endif
 =20
  endif # USE_ICC
 =20
 +ifndef FREEBSD_PORT
- CFOTHERS :=3D -fno-strict-aliasing -pipe $(EXTERNAL_FLAGS)
+ CFOTHERS :=3D -pipe $(EXTERNAL_FLAGS)
  CFOTHERS_L :=3D -fsigned-char
  CFWARN :=3D -Wall
+ CFWARN_L :=3D -Wundef
 =20
  DEFINES :=3D $(EXTERNAL_DEFINES)
 +else
@@ -25,6 +39,7 @@
 +CFOTHERS :=3D $(CFLAGS)
 +CFOTHERS_L :=3D -fsigned-char
 +CFWARN :=3D=20
++CFWARN_L :=3D=20
 +
 +DEFINES :=3D $(EXTERNAL_DEFINES)
 +endif
@@ -41,11 +56,23 @@
  RM =3D rm -f
  COPY =3D cp
  COPY_R =3D cp -r
-@@ -268,9 +280,10 @@
+@@ -135,10 +143,10 @@
+ endif
+ LIBZ :=3D contrib/install/lib/libz.a
+=20
+-LUA_INCLUDE_DIR :=3D /usr/include/lua5.1
+-LUA_LIB :=3D -llua5.1
+-SQLITE_INCLUDE_DIR :=3D /usr/include
+-SQLITE_LIB :=3D -lsqlite3
++LUA_INCLUDE_DIR :=3D ${LOCALBASE}/include/lua51
++LUA_LIB :=3D -L${LOCALBASE}/lib/lua51 -llua-5.1
++SQLITE_INCLUDE_DIR :=3D ${LOCALBASE}/include
++SQLITE_LIB :=3D -L${LOCALBASE}/lib -lsqlite3
 =20
- # Permissions to set on the save directory.
- MCHMOD_SAVEDIR :=3D 775
-+MCHMOD_LOGS :=3D 664
+ #
+ # Platform Detection
+@@ -314,7 +322,7 @@
+ MCHMOD_LOGS :=3D 664
 =20
  # The user:group to install the game as.
 -INSTALL_UGRP :=3D games:games
@@ -53,83 +80,25 @@
 =20
  chroot_prefix :=3D
  prefix        :=3D
-@@ -386,25 +399,34 @@
- endif
- endif
-=20
--ifndef BUILD_LUA
--  ifneq (,$(wildcard /usr/include/lua5.1))
--    INCLUDES_L +=3D -I/usr/include/lua5.1
--    LIBS +=3D -llua5.1
--  else
--    ifneq (,$(wildcard /usr/include/lua.h))
--      LIBS +=3D -llua
-+ifndef FREEBSD_PORT
-+  ifndef BUILD_LUA
-+    ifneq (,$(wildcard /usr/include/lua5.1))
-+      INCLUDES_L +=3D -I/usr/include/lua5.1
-+      LIBS +=3D -llua5.1
-     else
--      BUILD_LUA =3D yes
-+      ifneq (,$(wildcard /usr/include/lua.h))
-+        LIBS +=3D -llua
-+      else
-+        BUILD_LUA =3D yes
-+      endif
-     endif
-   endif
--endif
--
--ifndef BUILD_SQLITE
--  ifneq ($(shell grep -q sqlite3_prepare_v2 /usr/include/sqlite3.h 2>/dev=
/null && echo yes),yes)
--    BUILD_SQLITE =3D yes
--  else
--    LIBS +=3D -lsqlite3
-+ =20
-+  ifndef BUILD_SQLITE
-+    ifneq ($(shell grep -q sqlite3_prepare_v2 /usr/include/sqlite3.h 2>/d=
ev/null && echo yes),yes)
-+      BUILD_SQLITE =3D yes
-+    else
-+      LIBS +=3D -lsqlite3
-+    endif
-   endif
-+else
-+  INCLUDES_L +=3D -I${LOCALBASE}/include/
-+  INCLUDES_L +=3D -I${LOCALBASE}/include/lua51
-+  LIBS +=3D -L${LOCALBASE}/lib/
-+  LIBS +=3D -L${LOCALBASE}/lib/lua51
-+  LIBS +=3D -llua-5.1
-+  LIBS +=3D -lsqlite3
- endif
-=20
- RLTILES =3D rltiles
-@@ -476,11 +498,13 @@
+@@ -540,6 +548,7 @@
 =20
  endif # TILES
 =20
 +ifndef FREEBSD_PORT
- ifeq ($(GCC_GTE_4_3_0),1)
- CFWARN_L +=3D -Wno-array-bounds
- endif
-=20
- CFWARN_L +=3D -Wno-parentheses -Wwrite-strings -Wshadow -pedantic -D_FORT=
IFY_SOURCE=3D0
-+endif
- CFOTHERS_L =3D $(EXTERNAL_FLAGS_L) $(EXTRA_FLAGS) $(DEFINES) $(SDL_CFLAGS)
+ # On clang, unknown -Wfoo is merely a warning, thus -Werror.
+ CFWARN_L +=3D $(shell w=3D-Wno-array-bounds;echo|$(GCC) -E - -Werror $$w =
>/dev/null 2>&1 && echo $$w)
 =20
- ifndef NO_LUA_BINDINGS
-@@ -519,6 +543,7 @@
- 	NO_OPTIMIZE=3DYesPlease
- endif
-=20
-+ifndef FREEBSD_PORT
- ifdef FULLDEBUG
- DEFINES +=3D -DFULLDEBUG
- endif
-@@ -544,6 +569,11 @@
- CFWARN_L +=3D -Wno-uninitialized
- endif
+@@ -607,6 +616,17 @@
+ ifndef NO_OPTIMIZE
+ CFWARN_L +=3D -Wuninitialized
  endif
 +else # ifdef FREEBSD_PORT
++CFOTHERS_L =3D $(EXTERNAL_FLAGS_L) $(EXTRA_FLAGS) $(DEFINES) $(SDL_CFLAGS)
++
++ifndef NO_LUA_BINDINGS
++CFOTHERS_L +=3D -DCLUA_BINDINGS
++endif
++
 +ifdef WIZARD
 +DEFINES +=3D -DWIZARD
 +endif
@@ -137,16 +106,20 @@
 =20
  ifneq ($(strip $(chroot_prefix)),)
  	USE_CHROOT=3DYesPlease
-@@ -756,7 +786,7 @@
- SRC_VERSION   :=3D $(shell git describe --tags --long 2>/dev/null || cat =
util/release_ver)
+@@ -822,10 +842,10 @@
+=20
+ GAME_DEPENDS  :=3D $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB=
_LIBS)
+ SRC_PKG_BASE  :=3D stone_soup
+-SRC_VERSION   :=3D $(shell git describe --tags --long $(MERGE_BASE) 2>/de=
v/null || cat util/release_ver)
++SRC_VERSION   :=3D $(cat util/release_ver)
 =20
  # when making release builds, use just the bare tag
--SRC_VERSION_SHORT :=3D $(shell git describe --tags 2>/dev/null)
-+SRC_VERSION_SHORT :=3D $(shell git describe --tags 2>/dev/null || cat uti=
l/release_ver)
+-SRC_VERSION_SHORT :=3D $(shell git describe --tags $(MERGE_BASE) 2>/dev/n=
ull || cat util/release_ver)
++SRC_VERSION_SHORT :=3D $(cat util/release_ver)
  ifneq (,$(SRC_VERSION_SHORT))
    ifeq (,$(findstring -,$(SRC_VERSION_SHORT)))
      SRC_VERSION :=3D $(SRC_VERSION_SHORT)
-@@ -907,9 +937,11 @@
+@@ -983,9 +1003,11 @@
  	$(COPY) dat/tiles/VeraMono.ttf $(datadir_fp)/dat/tiles/
  endif
  endif
@@ -155,15 +128,6 @@
  	$(CHOWN) -R $(INSTALL_UGRP) $(datadir_fp) || true
  endif
 +endif
- ifneq ($(SAVEDIR),)
+ ifneq ($(savedir_fp),)
  	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
diff -ruN games/stonesoup.orig/files/patch-rltiles__Makefile games/stonesou=
p/files/patch-rltiles__Makefile
--- games/stonesoup.orig/files/patch-rltiles__Makefile	1970-01-01 01:00:00.=
000000000 +0100
+++ games/stonesoup/files/patch-rltiles__Makefile	2010-08-05 09:26:42.00000=
0000 +0200
@@ -0,0 +1,36 @@
+--- ./rltiles/Makefile.orig	2010-08-05 09:25:41.000000000 +0200
++++ ./rltiles/Makefile	2010-08-05 09:26:36.000000000 +0200
+@@ -10,7 +10,7 @@
+ PNG_INCLUDE :=3D $(shell pkg-config libpng --cflags 2> /dev/null || echo =
"-I../contrib/install/include")
+ PNG_LIB :=3D $(shell pkg-config libpng --libs 2> /dev/null || echo "../co=
ntrib/install/lib/libpng.a ../contrib/install/lib/libz.a")
+=20
+-CFLAGS :=3D -O2 $(SDL_CFLAGS) $(PNG_INCLUDE)
++CFLAGS_L :=3D $(CFLAGS) $(SDL_CFLAGS) $(PNG_INCLUDE)
+ LDFLAGS +=3D $(SDL_LDFLAGS) $(PNG_LIB)
+=20
+ ifneq (,$(findstring MINGW,$(uname_S)))
+@@ -25,6 +25,7 @@
+=20
+ # Attempt to use a full compiler name, to make
+ # distcc builds work nicely.
++ifndef FREEBSD_PORT
+ LMACH :=3D $(shell gcc -dumpmachine)-
+ ifeq ($(LMACH),-)
+ LMACH :=3D
+@@ -37,6 +38,7 @@
+ CF_ARCHS :=3D $(patsubst %,-arch %,$(ARCH))
+ CXX +=3D $(CF_ARCHS)
+ endif
++endif
+=20
+ DELETE =3D rm -f
+=20
+@@ -79,7 +81,7 @@
+ distclean: clean
+=20
+ %.o: %.cc
+-	$(QUIET_CXX)$(CXX) $(CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
++	$(QUIET_CXX)$(CXX) $(CFLAGS_L) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@
+=20
+ $(TILEGEN): $(OBJECTS)
+ 	$(QUIET_LINK)$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
diff -ruN games/stonesoup.orig/pkg-descr games/stonesoup/pkg-descr
--- games/stonesoup.orig/pkg-descr	2010-08-05 08:39:47.000000000 +0200
+++ games/stonesoup/pkg-descr	2010-08-05 08:40:08.000000000 +0200
@@ -5,4 +5,4 @@
 Dungeon Crawl Stone Soup is a variant of Linley's Dungeon Crawl that's ope=
nly=20
 developed and invites participation from the Crawl community.
=20
-WWW:	http://crawl-ref.sourceforge.net/
+WWW:	http://crawl.develz.org/
diff -ruN games/stonesoup.orig/pkg-plist games/stonesoup/pkg-plist
--- games/stonesoup.orig/pkg-plist	2010-08-05 08:39:47.000000000 +0200
+++ games/stonesoup/pkg-plist	2010-08-05 10:18:20.000000000 +0200
@@ -1,50 +1,57 @@
 bin/stonesoup
-%%DATADIR%%/dat/des/variable/mini_features.des
+%%DATADIR%%/dat/des/builder/arena.des
+%%DATADIR%%/dat/des/builder/didact.des
+%%DATADIR%%/dat/des/builder/dummy.des
+%%DATADIR%%/dat/des/builder/layout.des
+%%DATADIR%%/dat/des/builder/rooms.des
+%%DATADIR%%/dat/des/builder/uniques.des
+%%DATADIR%%/dat/des/tutorial/tutorial.des
+%%DATADIR%%/dat/des/sprint/sprint.des
+%%DATADIR%%/dat/des/sprint/sprint2.des
+%%DATADIR%%/dat/des/variable/large.des
 %%DATADIR%%/dat/des/variable/entry.des
 %%DATADIR%%/dat/des/variable/float.des
-%%DATADIR%%/dat/des/variable/large.des
-%%DATADIR%%/dat/des/variable/mini_monsters.des
 %%DATADIR%%/dat/des/variable/altar.des
 %%DATADIR%%/dat/des/variable/mini.des
-%%DATADIR%%/dat/des/portals/bailey.des
-%%DATADIR%%/dat/des/portals/trove.des
-%%DATADIR%%/dat/des/portals/bazaar.des
-%%DATADIR%%/dat/des/portals/sewer.des
-%%DATADIR%%/dat/des/portals/ziggurat.des
-%%DATADIR%%/dat/des/portals/ossuary.des
-%%DATADIR%%/dat/des/portals/wizlab.des
-%%DATADIR%%/dat/des/portals/icecave.des
-%%DATADIR%%/dat/des/portals/volcano.des
-%%DATADIR%%/dat/des/portals/lab.des
-%%DATADIR%%/dat/des/builder/arena.des
-%%DATADIR%%/dat/des/builder/uniques.des
-%%DATADIR%%/dat/des/builder/dummy.des
-%%DATADIR%%/dat/des/builder/didact.des
-%%DATADIR%%/dat/des/builder/rooms.des
-%%DATADIR%%/dat/des/builder/layout.des
-%%DATADIR%%/dat/des/branches/elf.des
-%%DATADIR%%/dat/des/branches/temple.des
-%%DATADIR%%/dat/des/branches/tomb.des
+%%DATADIR%%/dat/des/variable/mini_features.des
+%%DATADIR%%/dat/des/variable/mini_monsters.des
 %%DATADIR%%/dat/des/branches/zot.des
-%%DATADIR%%/dat/des/branches/lair.des
-%%DATADIR%%/dat/des/branches/shoals.des
-%%DATADIR%%/dat/des/branches/vaults.des
-%%DATADIR%%/dat/des/branches/crypt.des
 %%DATADIR%%/dat/des/branches/blade.des
-%%DATADIR%%/dat/des/branches/snake.des
-%%DATADIR%%/dat/des/branches/hive.des
+%%DATADIR%%/dat/des/branches/crypt.des
+%%DATADIR%%/dat/des/branches/elf.des
 %%DATADIR%%/dat/des/branches/hells.des
+%%DATADIR%%/dat/des/branches/hive.des
+%%DATADIR%%/dat/des/branches/lair.des
+%%DATADIR%%/dat/des/branches/orc.des
 %%DATADIR%%/dat/des/branches/pan.des
+%%DATADIR%%/dat/des/branches/shoals.des
 %%DATADIR%%/dat/des/branches/slime.des
+%%DATADIR%%/dat/des/branches/snake.des
 %%DATADIR%%/dat/des/branches/swamp.des
-%%DATADIR%%/dat/des/branches/orc.des
+%%DATADIR%%/dat/des/branches/temple.des
+%%DATADIR%%/dat/des/branches/tomb.des
+%%DATADIR%%/dat/des/branches/vaults.des
+%%DATADIR%%/dat/des/branches/abyss.des
+%%DATADIR%%/dat/des/portals/ziggurat.des
+%%DATADIR%%/dat/des/portals/bazaar.des
+%%DATADIR%%/dat/des/portals/icecave.des
+%%DATADIR%%/dat/des/portals/lab.des
+%%DATADIR%%/dat/des/portals/ossuary.des
+%%DATADIR%%/dat/des/portals/sewer.des
+%%DATADIR%%/dat/des/portals/spider.des
+%%DATADIR%%/dat/des/portals/trove.des
+%%DATADIR%%/dat/des/portals/volcano.des
+%%DATADIR%%/dat/des/portals/wizlab.des
+%%DATADIR%%/dat/des/portals/bailey.des
 %%DATADIR%%/dat/des/guide.txt
 %%DATADIR%%/dat/clua/debug.lua
 %%DATADIR%%/dat/clua/util.lua
 %%DATADIR%%/dat/clua/userbase.lua
 %%DATADIR%%/dat/clua/test.lua
+%%DATADIR%%/dat/clua/sprint.lua
 %%DATADIR%%/dat/clua/sanity.lua
 %%DATADIR%%/dat/clua/point.lua
+%%DATADIR%%/dat/clua/mapinit.lua
 %%DATADIR%%/dat/clua/macro.lua
 %%DATADIR%%/dat/clua/luamark.lua
 %%DATADIR%%/dat/clua/loadmaps.lua
@@ -58,6 +65,7 @@
 %%DATADIR%%/dat/clua/lm_mslav.lua
 %%DATADIR%%/dat/clua/lm_monst.lua
 %%DATADIR%%/dat/clua/lm_mon_prop.lua
+%%DATADIR%%/dat/clua/lm_items.lua
 %%DATADIR%%/dat/clua/lm_fog.lua
 %%DATADIR%%/dat/clua/lm_flags.lua
 %%DATADIR%%/dat/clua/lm_door.lua
@@ -92,6 +100,7 @@
 %%DATADIR%%/dat/database/wpnnoise.txt
 %%DATADIR%%/dat/descript/ability.txt
 %%DATADIR%%/dat/descript/spells.txt
+%%DATADIR%%/dat/descript/species.txt
 %%DATADIR%%/dat/descript/skills.txt
 %%DATADIR%%/dat/descript/monsters.txt
 %%DATADIR%%/dat/descript/items.txt
@@ -99,6 +108,7 @@
 %%DATADIR%%/dat/descript/features.txt
 %%DATADIR%%/dat/descript/cards.txt
 %%DATADIR%%/dat/descript/branches.txt
+%%DATADIR%%/dat/descript/backgrounds.txt
 %%DATADIR%%/dat/descript/unident.txt
 %%DATADIR%%/docs/develop/levels/triggerables.txt
 %%DATADIR%%/docs/develop/levels/syntax.txt
@@ -131,8 +141,8 @@
 %%DATADIR%%/docs/aptitudes.txt
 %%DATADIR%%/docs/tiles_help.txt
 %%DATADIR%%/settings/034_command_keys.txt
-%%DATADIR%%/settings/tiles_options.txt
 %%DATADIR%%/settings/standard_colours.txt
+%%DATADIR%%/settings/runrest_messages.txt
 %%DATADIR%%/settings/no_vi_command_keys.txt
 %%DATADIR%%/settings/messages.txt
 %%DATADIR%%/settings/menu_colours.txt
@@ -141,39 +151,44 @@
 %%DATADIR%%/settings/dvorak_command_keys.txt
 %%DATADIR%%/settings/dolls.txt
 %%DATADIR%%/settings/autopickup_exceptions.txt
+%%DATADIR%%/settings/060_monster_glyphs.txt
 %%DATADIR%%/settings/052_monster_glyphs.txt
 %%DATADIR%%/settings/034_monster_glyphs.txt
-%%DATADIR%%/settings/travel_stoppers.txt
-%%SDL%%%%DATADIR%%/dat/tiles/player.png
-%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png
-%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png
-%%SDL%%%%DATADIR%%/dat/tiles/title.png
-%%SDL%%%%DATADIR%%/dat/tiles/main.png
-%%SDL%%%%DATADIR%%/dat/tiles/gui.png
-%%SDL%%%%DATADIR%%/dat/tiles/dngn.png
-%%SDL%%%%DATADIR%%/dat/tiles/Vera.ttf
-%%SDL%%%%DATADIR%%/dat/tiles/VeraMono.ttf
-%%SDL%%@dirrm %%DATADIR%%/dat/tiles
-@dirrm %%DATADIR%%/dat/des/variable
-@dirrm %%DATADIR%%/dat/des/portals
+%%DATADIR%%/settings/tiles_options.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc
 @dirrm %%DATADIR%%/dat/des/builder
+@dirrm %%DATADIR%%/dat/des/tutorial
+@dirrm %%DATADIR%%/dat/des/sprint
+@dirrm %%DATADIR%%/dat/des/variable
 @dirrm %%DATADIR%%/dat/des/branches
+@dirrm %%DATADIR%%/dat/des/portals
 @dirrm %%DATADIR%%/dat/des
 @dirrm %%DATADIR%%/dat/clua
 @dirrm %%DATADIR%%/dat/lua
 @dirrm %%DATADIR%%/dat/database
 @dirrm %%DATADIR%%/dat/descript
-@dirrm %%DATADIR%%/dat
 @dirrm %%DATADIR%%/docs/develop/levels
 @dirrm %%DATADIR%%/docs/develop
 @dirrm %%DATADIR%%/docs/license
 @dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%/settings
-@dirrm %%DATADIR%%/
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/
+%%SDL%%%%DATADIR%%/dat/tiles/feat.png
+%%SDL%%%%DATADIR%%/dat/tiles/title.png
+%%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/gui.png
+%%SDL%%%%DATADIR%%/dat/tiles/floor.png
+%%SDL%%%%DATADIR%%/dat/tiles/wall.png
+%%SDL%%%%DATADIR%%/dat/tiles/Vera.ttf
+%%SDL%%%%DATADIR%%/dat/tiles/VeraMono.ttf
+%%SDL%%@dirrm %%DATADIR%%/dat/tiles
+@dirrm %%DATADIR%%/dat
+@dirrm %%DATADIR%%/
 @exec install -d -o root -g games -m 775 %%SAVEDIR%%/saves %%SAVEDIR%%/mor=
gue
 @exec touch %%SAVEDIR%%/saves/logfile %%SAVEDIR%%/saves/scores
 @exec chmod 664  %%SAVEDIR%%/saves/logfile %%SAVEDIR%%/saves/scores
--- games-stonesoup-7.1.diff ends here ---
Comment 7 Rene Ladan freebsd_committer freebsd_triage 2010-08-06 18:05:51 UTC
Responsible Changed
From-To: freebsd-ports-bugs->rene

Grab
Comment 8 dfilter service freebsd_committer freebsd_triage 2010-08-08 18:59:49 UTC
rene        2010-08-08 17:59:36 UTC

  FreeBSD ports repository

  Modified files:
    games/stonesoup      Makefile distinfo pkg-descr pkg-plist 
    games/stonesoup/files patch-AppHdr.h patch-makefile 
  Added files:
    games/stonesoup/files patch-rltiles__Makefile 
  Log:
  - Update to 0.7.1
  - Split off SDL version into games/stonesoup-sdl slave port
  - Note the new WWW site in pkg-descr
  
  PR:             ports/147828
  Submitted by:   maintainer
  Approved by:    tabthorpe (mentor, implicit)
  
  Revision  Changes    Path
  1.15      +8 -11     ports/games/stonesoup/Makefile
  1.10      +3 -3      ports/games/stonesoup/distinfo
  1.6       +3 -14     ports/games/stonesoup/files/patch-AppHdr.h
  1.2       +58 -94    ports/games/stonesoup/files/patch-makefile
  1.1       +36 -0     ports/games/stonesoup/files/patch-rltiles__Makefile (new)
  1.2       +1 -1      ports/games/stonesoup/pkg-descr
  1.7       +62 -47    ports/games/stonesoup/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 9 dfilter service freebsd_committer freebsd_triage 2010-08-08 19:05:06 UTC
rene        2010-08-08 18:04:52 UTC

  FreeBSD ports repository

  Added files:
    games/stonesoup-sdl  Makefile 
  Log:
  The SDL slave port of games/stonesoup
  
  PR:             ports/147828
  Submitted by:   maintainer
  Approved by:    tabthorpe (mentor, implicit)
  
  Revision  Changes    Path
  1.1       +12 -0     ports/games/stonesoup-sdl/Makefile (new)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 10 Rene Ladan freebsd_committer freebsd_triage 2010-08-08 19:06:48 UTC
State Changed
From-To: open->closed

Committed (both ports), thanks