ports/147828: [maintainer-update] games/stonesoup: split up games/stonesoup-sdl

Tue Jun 29 18:50:05 UTC 2010

The following reply was made to PR ports/147828; it has been noted by GNATS.

From: Tobias Rehbein <tobias.rehbein at web.de>
To: bug-followup at freebsd.org
Cc:  
Subject: Re: ports/147828: [maintainer-update] games/stonesoup: split up games/stonesoup-sdl
Date: Tue, 29 Jun 2010 20:44:07 +0200

 --i0/AhcQY5QxfSsSZ
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline

 ... and second the patch.

 --i0/AhcQY5QxfSsSZ
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="games-stonesoup-0.6.1.diff"

 diff -ruN games/stonesoup.orig/Makefile games/stonesoup/Makefile
 --- games/stonesoup.orig/Makefile	2010-06-29 19:25:10.000000000 +0200
 +++ games/stonesoup/Makefile	2010-06-29 19:30:04.000000000 +0200
 @@ -6,7 +6,7 @@
  #

  PORTNAME=	stonesoup
 -PORTVERSION=	0.6.0
 +PORTVERSION=	0.6.1
  CATEGORIES=	games
  MASTER_SITES=	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
  DISTNAME=	stone_soup-${PORTVERSION}-nodeps
 @@ -14,9 +14,7 @@
  MAINTAINER=	tobias.rehbein at web.de
  COMMENT=	Dungeon Crawl Stone Soup - a fun, free rogue-like game

 -LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
 -RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
 -
 +USE_SQLITE=	yes
  USE_BZIP2=	yes
  USE_BISON=	build
  USE_GMAKE=	yes
 @@ -31,8 +29,7 @@
  SUB_FILES=	README.FreeBSD
  PLIST_SUB=	SAVEDIR="${SAVEDIR}"

 -OPTIONS=	SDL		"SDL support (tiles interface)"	off \
 -		SOUND		"Sound support"			off \
 +OPTIONS=	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+=	wizard
  .endif

 -.if defined(WITHOUT_SDL)
 -CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
 -PLIST_SUB+=	SDL="@comment "
 -.else
 +.if defined(WITH_SDL)
  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
 +LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
  USE_SDL=	sdl image
 +.else
 +CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
 +PLIST_SUB+=	SDL="@comment "
  .endif

  .if defined(WITH_SOUND)
 diff -ruN games/stonesoup.orig/distinfo games/stonesoup/distinfo
 --- games/stonesoup.orig/distinfo	2010-06-29 19:25:10.000000000 +0200
 +++ games/stonesoup/distinfo	2010-06-29 19:31:02.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (stone_soup-0.6.0-nodeps.tar.bz2) = 866e315470a592572e7ce8a7214c7615
 -SHA256 (stone_soup-0.6.0-nodeps.tar.bz2) = f05ba17b64f3f669da3fb4185ed2e1425bd6a2fa8375fa4671807c67b2e4f8ff
 -SIZE (stone_soup-0.6.0-nodeps.tar.bz2) = 4597191
 +MD5 (stone_soup-0.6.1-nodeps.tar.bz2) = 864e00b6a3bd74c9690a3aeb8572dff9
 +SHA256 (stone_soup-0.6.1-nodeps.tar.bz2) = 950ee04ae185871782a7b8c37fecf8c7dadcc15771225879384601719f7a0a0c
 +SIZE (stone_soup-0.6.1-nodeps.tar.bz2) = 4527222
 diff -ruN games/stonesoup.orig/files/patch-AppHdr.h games/stonesoup/files/patch-AppHdr.h
 --- games/stonesoup.orig/files/patch-AppHdr.h	2010-06-29 19:25:10.000000000 +0200
 +++ games/stonesoup/files/patch-AppHdr.h	2010-06-29 19:46:11.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-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*.
       //
 @@ -9,14 +9,3 @@

       // 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
 diff -ruN games/stonesoup.orig/files/patch-makefile games/stonesoup/files/patch-makefile
 --- games/stonesoup.orig/files/patch-makefile	2010-06-29 19:25:10.000000000 +0200
 +++ games/stonesoup/files/patch-makefile	2010-06-29 19:46:11.000000000 +0200
 @@ -1,5 +1,5 @@
 ---- ./makefile.orig	2010-03-27 00:43:25.000000000 +0100
 -+++ ./makefile	2010-04-18 13:18:41.000000000 +0200
 +--- ./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.
 @@ -41,11 +41,8 @@
   RM = rm -f
   COPY = cp
   COPY_R = cp -r
 -@@ -268,9 +280,10 @@
 - 
 - # Permissions to set on the save directory.
 - MCHMOD_SAVEDIR := 775
 -+MCHMOD_LOGS := 664
 +@@ -273,7 +285,7 @@
 + MCHMOD_LOGS := 664

   # The user:group to install the game as.
  -INSTALL_UGRP := games:games
 @@ -53,7 +50,7 @@

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

 @@ -103,7 +100,7 @@
   endif

   RLTILES = rltiles
 -@@ -476,11 +498,13 @@
 +@@ -479,11 +500,13 @@

   endif # TILES

 @@ -117,7 +114,7 @@
   CFOTHERS_L = $(EXTERNAL_FLAGS_L) $(EXTRA_FLAGS) $(DEFINES) $(SDL_CFLAGS)

   ifndef NO_LUA_BINDINGS
 -@@ -519,6 +543,7 @@
 +@@ -522,6 +545,7 @@
   	NO_OPTIMIZE=YesPlease
   endif

 @@ -125,7 +122,7 @@
   ifdef FULLDEBUG
   DEFINES += -DFULLDEBUG
   endif
 -@@ -544,6 +569,11 @@
 +@@ -547,6 +571,11 @@
   CFWARN_L += -Wno-uninitialized
   endif
   endif
 @@ -137,16 +134,20 @@

   ifneq ($(strip $(chroot_prefix)),)
   	USE_CHROOT=YesPlease
 -@@ -756,7 +786,7 @@
 - SRC_VERSION   := $(shell git describe --tags --long 2>/dev/null || cat util/release_ver)
 +@@ -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 := $(shell git describe --tags 2>/dev/null || cat util/release_ver)
 ++SRC_VERSION_SHORT := $(cat util/release_ver)
   ifneq (,$(SRC_VERSION_SHORT))
     ifeq (,$(findstring -,$(SRC_VERSION_SHORT)))
       SRC_VERSION := $(SRC_VERSION_SHORT)
 -@@ -907,9 +937,11 @@
 +@@ -910,9 +939,11 @@
   	$(COPY) dat/tiles/VeraMono.ttf $(datadir_fp)/dat/tiles/
   endif
   endif
 @@ -158,12 +159,3 @@
   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

 --i0/AhcQY5QxfSsSZ--