Date: Wed, 5 Jun 2013 19:52:29 +0000 (UTC) From: Nikolai Lifanov <lifanov@mail.lifanov.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/179347: [patch] [update] games/stonesoup Message-ID: <20130605195229.CD0CD1A2A02@mail.lifanov.com> Resent-Message-ID: <201306052000.r55K00sf017528@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179347 >Category: ports >Synopsis: [patch] [update] games/stonesoup >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jun 05 20:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Nikolai Lifanov >Release: FreeBSD 9.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD mail.lifanov.com 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update games/stonesoup from 0.11.1 to 0.12.2 Changelog: https://gitorious.org/crawl/crawl/blobs/raw/stone_soup-0.12/crawl-ref/docs/changelog.txt >How-To-Repeat: make -C /usr/ports/games/stonesoup >Fix: Apply this patch to games/stonesoup: --- patch.txt begins here --- Index: Makefile =================================================================== --- Makefile (revision 320012) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= stonesoup -PORTVERSION= 0.11.1 +PORTVERSION= 0.12.2 CATEGORIES= games MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION} DISTNAME= stone_soup-${PORTVERSION}-nodeps Index: files/patch-Makefile =================================================================== --- files/patch-Makefile (revision 320012) +++ files/patch-Makefile (working copy) @@ -1,6 +1,6 @@ ---- ./Makefile.orig 2012-09-30 23:25:31.000000000 +0200 -+++ ./Makefile 2012-10-27 20:49:08.837330946 +0200 -@@ -66,7 +66,7 @@ +--- ./Makefile.orig 2013-06-05 15:45:43.000000000 -0400 ++++ ./Makefile 2013-06-05 15:45:31.000000000 -0400 +@@ -69,7 +69,7 @@ # ask for a package with convenience libraries instead -- we'll try to provide # them somewhere in the near future. @@ -9,25 +9,16 @@ # Disable GNU Make implicit rules and variables. Leaving them enabled will slow # down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have -@@ -112,7 +112,7 @@ +@@ -101,7 +101,7 @@ include Makefile.obj + # - else --CFOPTIMIZE := -O2 -+CFOPTIMIZE := - - endif # USE_ICC - -@@ -120,7 +120,7 @@ - CFOPTIMIZE += -flto=jobserver -fwhole-program - endif - -CFOTHERS := -pipe $(EXTERNAL_FLAGS) +CFOTHERS := $(CFLAGS) CFWARN := -Wall -Wformat-security CFWARN_L := -Wundef -@@ -133,8 +133,6 @@ +@@ -118,8 +118,6 @@ endif # AR = ar RANLIB = ranlib @@ -36,7 +27,16 @@ RM = rm -f COPY = cp COPY_R = cp -r -@@ -530,30 +528,19 @@ +@@ -532,7 +530,7 @@ else + # subsequent point releases of 4.2. + CFOPTIMIZE := -O1 + else +- CFOPTIMIZE := -O2 ++ CFOPTIMIZE := + endif + endif + +@@ -570,31 +568,20 @@ else ifndef BUILD_LUA ifdef NO_PKGCONFIG BUILD_LUA = yes @@ -48,7 +48,7 @@ + else + LUA_PACKAGE := $(shell for lua in lua51 lua5.1 lua-5.1 lua; do \ + $(PKGCONFIG) $$lua --exists && test `$(PKGCONFIG) $$lua --modversion | head -c 3` = 5.1 && \ -+ echo $$lua && break;\ ++ echo $$lua && break;\ + done) + ifeq (,$(LUA_PACKAGE)) BUILD_LUA = yes @@ -59,24 +59,25 @@ - BUILD_LUA = yes - endif + INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I) -+ CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other) ++ CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other) + LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs) endif - else - LUA_PACKAGE = lua5.1 -- endif --endif + endif + endif -ifndef BUILD_LUA - ifndef LUA_PACKAGE - LUA_PACKAGE = lua5.1 - endif +- endif - INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I) - CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other) - LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs) - endif +-endif ifndef BUILD_SQLITE -@@ -707,7 +694,7 @@ + ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes) +@@ -740,7 +727,7 @@ ifndef NOWIZARD DEFINES += -DWIZARD endif ifdef NO_OPTIMIZE @@ -85,13 +86,13 @@ endif ifdef PCH -@@ -831,10 +818,12 @@ +@@ -864,10 +851,12 @@ ifdef PROPORTIONAL_FONT INSTALL_FONTS += $(PROPORTIONAL_FONT) endif else -- SYS_PROPORTIONAL_FONT = $(shell find /usr/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) +- SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) - ifeq (,$(SYS_PROPORTIONAL_FONT)) -- SYS_PROPORTIONAL_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) +- SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) - endif + SYS_PROPORTIONAL_FONT = $(shell name=$(OUR_PROPORTIONAL_FONT);\ + {\ @@ -102,13 +103,13 @@ ifneq (,$(SYS_PROPORTIONAL_FONT)) ifeq (,$(COPY_FONTS)) DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\" -@@ -854,10 +843,12 @@ +@@ -887,10 +876,12 @@ ifdef MONOSPACED_FONT INSTALL_FONTS += $(MONOSPACED_FONT) endif else -- SYS_MONOSPACED_FONT = $(shell find /usr/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1) +- SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) - ifeq (,$(SYS_MONOSPACED_FONT)) -- SYS_MONOSPACED_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1) +- SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) - endif + SYS_MONOSPACED_FONT = $(shell name=$(OUR_MONOSPACED_FONT);\ + {\ @@ -119,7 +120,7 @@ ifneq (,$(SYS_MONOSPACED_FONT)) ifeq (,$(COPY_FONTS)) DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\" -@@ -1036,7 +1027,7 @@ +@@ -1073,7 +1064,7 @@ GENERATED_FILES := $(GENERATED_HEADERS) cmd-name.h $(INI_OBJECTS) SRC_PKG_BASE := stone_soup @@ -128,11 +129,3 @@ MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|sed -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/') export SRC_VERSION -@@ -1049,6 +1040,7 @@ - greet: - @if [ ! -e $(GAME) ]; then\ - printf " * If you experience any problems building Crawl, please take a second look\\n"\ -+ ;printf\ - " * at INSTALL.txt: the solution to your problem just might be in there!\\n";\ - fi - Index: files/patch-rltiles__Makefile =================================================================== --- files/patch-rltiles__Makefile (revision 320012) +++ files/patch-rltiles__Makefile (working copy) @@ -1,31 +1,31 @@ ---- ./rltiles/Makefile.orig 2012-09-30 23:25:31.000000000 +0200 -+++ ./rltiles/Makefile 2012-10-27 20:49:55.957667879 +0200 +--- ./rltiles/Makefile.orig 2013-06-05 15:20:43.000000000 -0400 ++++ ./rltiles/Makefile 2013-06-05 15:25:01.000000000 -0400 @@ -1,7 +1,7 @@ uname_S := $(shell uname -s) ifneq (,$(findstring MINGW,$(uname_S))) -LDFLAGS += -lmingw32 -+L_LDFLAGS += -lmingw32 ++L_DFLAGS += -lmingw32 endif # Note: since generation of tiles is done on the host, we don't care about -@@ -10,7 +10,7 @@ +@@ -10,7 +10,7 @@ endif # Also, cross-compilation with no system libraries for host rather than target # is not supported. If host=target, contribs are enough. -CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter -+L_CFLAGS := $(CFLAGS) ++L_CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter - ifdef TILES - ifndef CONTRIB_SDL -@@ -29,24 +29,24 @@ + ifdef ANDROID + CXXFLAGS := +@@ -35,24 +35,24 @@ ifdef TILES PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a endif - CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) - LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) + L_CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) -+ L_LDFLAGS += $(LDFLAGS) $(SDL_LDFLAGS) $(PNG_LIB) ++ L_LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) - CFLAGS += -DUSE_TILE + L_CFLAGS += -DUSE_TILE @@ -50,7 +50,7 @@ endif # Attempt to use a full compiler name, to make -@@ -58,7 +58,7 @@ +@@ -64,7 +64,7 @@ endif ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),) LMACH := endif @@ -59,25 +59,26 @@ DELETE = rm -f -@@ -98,7 +98,7 @@ - $(QUIET_GEN)$(TILEGEN) -c $< +@@ -109,7 +109,7 @@ endif + $(QUIET_GEN)$(TILEGEN) -c $< # CFLAGS difference check -TRACK_CFLAGS = $(subst ','\'',$(HOSTCXX) $(CFLAGS)) # (stray ' for highlights) +TRACK_CFLAGS = $(subst ','\'',$(HOSTCXX) $(L_CFLAGS)) # (stray ' for highlights) .cflags: .force-cflags - @FLAGS='$(TRACK_CFLAGS)'; \ -@@ -127,9 +127,13 @@ + @FLAGS='$(TRACK_CFLAGS)'; \ +@@ -138,9 +138,14 @@ clean: distclean: clean %.o: %.cc .cflags -- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@ -+ifdef NO_INLINE_DEPGEN +- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ ++ifdef NO_INLINE_DEPGEN + $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MT,$@ -c $< -o $@ +else + $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@ +endif ++ $(TILEGEN): $(OBJECTS) - $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) --- patch.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130605195229.CD0CD1A2A02>