From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 19 20:20:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A5C47E3D for ; Mon, 19 Nov 2012 20:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 789478FC0C for ; Mon, 19 Nov 2012 20:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJKK07e044457 for ; Mon, 19 Nov 2012 20:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qAJKK0Yf044456; Mon, 19 Nov 2012 20:20:00 GMT (envelope-from gnats) Resent-Date: Mon, 19 Nov 2012 20:20:00 GMT Resent-Message-Id: <201211192020.qAJKK0Yf044456@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Nikolai Lifanov Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E390FDF8 for ; Mon, 19 Nov 2012 20:16:44 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id C8B228FC18 for ; Mon, 19 Nov 2012 20:16:44 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJKGinm057145 for ; Mon, 19 Nov 2012 20:16:44 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qAJKGi1C057144; Mon, 19 Nov 2012 20:16:44 GMT (envelope-from nobody) Message-Id: <201211192016.qAJKGi1C057144@red.freebsd.org> Date: Mon, 19 Nov 2012 20:16:44 GMT From: Nikolai Lifanov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/173726: [patch] games/stonesup X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2012 20:20:00 -0000 >Number: 173726 >Category: ports >Synopsis: [patch] games/stonesup >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Nov 19 20:20:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Nikolai Lifanov >Release: 10.0-CURRENT >Organization: >Environment: FreeBSD lifanovbsd0 10.0-CURRENT FreeBSD 10.0-CURRENT #30 r243152: Fri Nov 16 11:10:18 EST 2012 >Description: This affects both games/stonesoup and games/stonesoup-sdl on CURRENT. There is a test in the Makefile to fix the clang build by setting NO_INLINE_DEPGEN. If WITH_CLANG_IS_CC option is defined, "cc" actually becomes "clang". Since r242624, "cc" is "clang" unless WITHOUT_CLANG_IS_CC is specified. Before this revision, this test wasn't true for HEAD compiled with WITH_CLANG_IS_CC set. After this revision, the test in the Makefile is not true unless WITHOUT_CLANG_IS_CC is set. See the exact change here: http://svnweb.freebsd.org/base/head/share/mk/bsd.own.mk?r1=241823&r2=242624 >How-To-Repeat: Build a FreeBSD system in which "cc" is "clang". Try to build games/stonesoup or games/stonesoup-sdl >Fix: --- Makefile.orig 2012-11-19 14:54:04.582269914 -0500 +++ Makefile 2012-11-19 14:53:54.686268822 -0500 @@ -52,7 +52,7 @@ .include -.if ${CC:T:M*clang*} +.if ${CC:T:M*clang*} || ${OSVERSION} > 1000023 MAKE_ARGS+= NO_INLINE_DEPGEN=1 .endif Patch attached with submission follows: # 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: # # stonesoup # stonesoup/pkg-plist # stonesoup/Makefile # stonesoup/distinfo # stonesoup/files # stonesoup/files/patch-rltiles__Makefile # stonesoup/files/README.FreeBSD.in # stonesoup/files/patch-ng-setup.cc # stonesoup/files/patch-rltiles__tool__tile.cc # stonesoup/files/patch-files.cc # stonesoup/files/patch-Makefile # stonesoup/files/patch-rltiles__tool__tile_list_processor.cc # stonesoup/files/patch-startup.cc # stonesoup/pkg-descr # echo c - stonesoup mkdir -p stonesoup > /dev/null 2>&1 echo x - stonesoup/pkg-plist sed 's/^X//' >stonesoup/pkg-plist << 'ab82ad360c802d6fdb0e31c244358caa' Xbin/stonesoup X%%DATADIR%%/dat/clua/autofight.lua X%%DATADIR%%/dat/clua/gearset.lua X%%DATADIR%%/dat/clua/kills.lua X%%DATADIR%%/dat/clua/runrest.lua X%%DATADIR%%/dat/clua/stash.lua X%%DATADIR%%/dat/clua/trapwalk.lua X%%DATADIR%%/dat/clua/wield.lua X%%DATADIR%%/dat/database/FAQ.txt X%%DATADIR%%/dat/database/el/monflee.txt X%%DATADIR%%/dat/database/el/rand_all.txt X%%DATADIR%%/dat/database/godname.txt X%%DATADIR%%/dat/database/godspeak.txt X%%DATADIR%%/dat/database/help.txt X%%DATADIR%%/dat/database/insult.txt X%%DATADIR%%/dat/database/miscname.txt X%%DATADIR%%/dat/database/monflee.txt X%%DATADIR%%/dat/database/monname.txt X%%DATADIR%%/dat/database/monspeak.txt X%%DATADIR%%/dat/database/monspell.txt X%%DATADIR%%/dat/database/pl/godspeak.txt X%%DATADIR%%/dat/database/pl/miscname.txt X%%DATADIR%%/dat/database/rand_all.txt X%%DATADIR%%/dat/database/rand_arm.txt X%%DATADIR%%/dat/database/rand_wpn.txt X%%DATADIR%%/dat/database/randbook.txt X%%DATADIR%%/dat/database/randname.txt X%%DATADIR%%/dat/database/shout.txt X%%DATADIR%%/dat/database/wpnnoise.txt X%%DATADIR%%/dat/defaults/autopickup_exceptions.txt X%%DATADIR%%/dat/defaults/food_colouring.txt X%%DATADIR%%/dat/defaults/menu_colours.txt X%%DATADIR%%/dat/defaults/messages.txt X%%DATADIR%%/dat/defaults/misc.txt X%%DATADIR%%/dat/defaults/runrest_messages.txt X%%DATADIR%%/dat/defaults/standard_colours.txt X%%DATADIR%%/dat/des/altar/altar.des X%%DATADIR%%/dat/des/altar/fedhas_garden.des X%%DATADIR%%/dat/des/altar/grunt_ashenzari_visionary.des X%%DATADIR%%/dat/des/altar/grunt_nemelex_the_gamble.des X%%DATADIR%%/dat/des/altar/kiku_cage.des X%%DATADIR%%/dat/des/altar/lugonu_bribe.des X%%DATADIR%%/dat/des/altar/overflow.des X%%DATADIR%%/dat/des/altar/trog_burn_book.des X%%DATADIR%%/dat/des/altar/trog_wizard.des X%%DATADIR%%/dat/des/altar/vehumet_trees.des X%%DATADIR%%/dat/des/altar/xom_monty_hall.des X%%DATADIR%%/dat/des/altar/yredelemnul_ordeal.des X%%DATADIR%%/dat/des/branches/abyss.des X%%DATADIR%%/dat/des/branches/blade.des X%%DATADIR%%/dat/des/branches/crypt.des X%%DATADIR%%/dat/des/branches/dwarf.des X%%DATADIR%%/dat/des/branches/elf.des X%%DATADIR%%/dat/des/branches/hells.des X%%DATADIR%%/dat/des/branches/lair.des X%%DATADIR%%/dat/des/branches/orc.des X%%DATADIR%%/dat/des/branches/pan.des X%%DATADIR%%/dat/des/branches/shoals.des X%%DATADIR%%/dat/des/branches/slime.des X%%DATADIR%%/dat/des/branches/snake.des X%%DATADIR%%/dat/des/branches/spider.des X%%DATADIR%%/dat/des/branches/swamp.des X%%DATADIR%%/dat/des/branches/temple.des X%%DATADIR%%/dat/des/branches/tomb.des X%%DATADIR%%/dat/des/branches/vaults.des X%%DATADIR%%/dat/des/branches/zot.des X%%DATADIR%%/dat/des/builder/arena.des X%%DATADIR%%/dat/des/builder/dummy.des X%%DATADIR%%/dat/des/builder/food.des X%%DATADIR%%/dat/des/builder/layout.des X%%DATADIR%%/dat/des/builder/layout_loops.des X%%DATADIR%%/dat/des/builder/rooms.des X%%DATADIR%%/dat/des/builder/shops.des X%%DATADIR%%/dat/des/builder/uniques.des X%%DATADIR%%/dat/des/entry/entry_guide.txt X%%DATADIR%%/dat/des/entry/large.des X%%DATADIR%%/dat/des/entry/simple.des X%%DATADIR%%/dat/des/entry/small.des X%%DATADIR%%/dat/des/entry/twisted.des X%%DATADIR%%/dat/des/guide.txt X%%DATADIR%%/dat/des/portals/bailey.des X%%DATADIR%%/dat/des/portals/bazaar.des X%%DATADIR%%/dat/des/portals/icecave.des X%%DATADIR%%/dat/des/portals/lab.des X%%DATADIR%%/dat/des/portals/ossuary.des X%%DATADIR%%/dat/des/portals/sewer.des X%%DATADIR%%/dat/des/portals/trove.des X%%DATADIR%%/dat/des/portals/volcano.des X%%DATADIR%%/dat/des/portals/wizlab.des X%%DATADIR%%/dat/des/portals/ziggurat.des X%%DATADIR%%/dat/des/serial/aquarium.des X%%DATADIR%%/dat/des/serial/bayou.des X%%DATADIR%%/dat/des/serial/column_ruins.des X%%DATADIR%%/dat/des/serial/corridors.des X%%DATADIR%%/dat/des/serial/curves.des X%%DATADIR%%/dat/des/serial/forest.des X%%DATADIR%%/dat/des/serial/glass.des X%%DATADIR%%/dat/des/serial/gnoll_camp.des X%%DATADIR%%/dat/des/serial/ice.des X%%DATADIR%%/dat/des/serial/magic_research.des X%%DATADIR%%/dat/des/serial/ponds.des X%%DATADIR%%/dat/des/serial/serial_guide.txt X%%DATADIR%%/dat/des/serial/undead.des X%%DATADIR%%/dat/des/serial/window.des X%%DATADIR%%/dat/des/sprint/menkaure.des X%%DATADIR%%/dat/des/sprint/red_sonja.des X%%DATADIR%%/dat/des/sprint/sprint_fedhas.des X%%DATADIR%%/dat/des/sprint/sprint_mu.des X%%DATADIR%%/dat/des/sprint/zigsprint.des X%%DATADIR%%/dat/des/test.des X%%DATADIR%%/dat/des/traps/beogh_trap.des X%%DATADIR%%/dat/des/traps/boulders.des X%%DATADIR%%/dat/des/traps/cloud_traps.des X%%DATADIR%%/dat/des/traps/collapsing_statue.des X%%DATADIR%%/dat/des/traps/grate.des X%%DATADIR%%/dat/des/traps/monster_doors.des X%%DATADIR%%/dat/des/traps/rats_trap.des X%%DATADIR%%/dat/des/traps/spider_basket.des X%%DATADIR%%/dat/des/traps/xom_trap.des X%%DATADIR%%/dat/des/tutorial/tutorial_lesson1.des X%%DATADIR%%/dat/des/tutorial/tutorial_lesson2.des X%%DATADIR%%/dat/des/tutorial/tutorial_lesson3.des X%%DATADIR%%/dat/des/tutorial/tutorial_lesson4.des X%%DATADIR%%/dat/des/tutorial/tutorial_lesson5.des X%%DATADIR%%/dat/des/variable/ancient_champions.des X%%DATADIR%%/dat/des/variable/cathedral_bats.des X%%DATADIR%%/dat/des/variable/dk_crumbling.des X%%DATADIR%%/dat/des/variable/encompass.des X%%DATADIR%%/dat/des/variable/evilmike_ambush.des X%%DATADIR%%/dat/des/variable/float.des X%%DATADIR%%/dat/des/variable/grunt_fire_pits.des X%%DATADIR%%/dat/des/variable/large_abstract.des X%%DATADIR%%/dat/des/variable/large_themed.des X%%DATADIR%%/dat/des/variable/lemuel_castle.des X%%DATADIR%%/dat/des/variable/mini.des X%%DATADIR%%/dat/des/variable/mini_features.des X%%DATADIR%%/dat/des/variable/mini_monsters.des X%%DATADIR%%/dat/des/variable/tomb_raider.des X%%DATADIR%%/dat/des/zotdef/zotdef.des X%%DATADIR%%/dat/descript/ability.txt X%%DATADIR%%/dat/descript/backgrounds.txt X%%DATADIR%%/dat/descript/branches.txt X%%DATADIR%%/dat/descript/cards.txt X%%DATADIR%%/dat/descript/commands.txt X%%DATADIR%%/dat/descript/cs/ability.txt X%%DATADIR%%/dat/descript/cs/branches.txt X%%DATADIR%%/dat/descript/cs/commands.txt X%%DATADIR%%/dat/descript/cs/features.txt X%%DATADIR%%/dat/descript/cs/gods.txt X%%DATADIR%%/dat/descript/cs/items.txt X%%DATADIR%%/dat/descript/cs/species.txt X%%DATADIR%%/dat/descript/cs/spells.txt X%%DATADIR%%/dat/descript/cs/unident.txt X%%DATADIR%%/dat/descript/da/items.txt X%%DATADIR%%/dat/descript/da/monsters.txt X%%DATADIR%%/dat/descript/da/species.txt X%%DATADIR%%/dat/descript/da/unident.txt X%%DATADIR%%/dat/descript/de/backgrounds.txt X%%DATADIR%%/dat/descript/de/commands.txt X%%DATADIR%%/dat/descript/de/features.txt X%%DATADIR%%/dat/descript/de/gods.txt X%%DATADIR%%/dat/descript/de/items.txt X%%DATADIR%%/dat/descript/de/monsters.txt X%%DATADIR%%/dat/descript/de/species.txt X%%DATADIR%%/dat/descript/de/unident.txt X%%DATADIR%%/dat/descript/de/unrand.txt X%%DATADIR%%/dat/descript/el/ability.txt X%%DATADIR%%/dat/descript/el/backgrounds.txt X%%DATADIR%%/dat/descript/el/gods.txt X%%DATADIR%%/dat/descript/el/items.txt X%%DATADIR%%/dat/descript/el/species.txt X%%DATADIR%%/dat/descript/el/unident.txt X%%DATADIR%%/dat/descript/es/ability.txt X%%DATADIR%%/dat/descript/es/backgrounds.txt X%%DATADIR%%/dat/descript/es/branches.txt X%%DATADIR%%/dat/descript/es/cards.txt X%%DATADIR%%/dat/descript/es/commands.txt X%%DATADIR%%/dat/descript/es/features.txt X%%DATADIR%%/dat/descript/es/gods.txt X%%DATADIR%%/dat/descript/es/items.txt X%%DATADIR%%/dat/descript/es/monsters.txt X%%DATADIR%%/dat/descript/es/quotes.txt X%%DATADIR%%/dat/descript/es/skills.txt X%%DATADIR%%/dat/descript/es/species.txt X%%DATADIR%%/dat/descript/es/unident.txt X%%DATADIR%%/dat/descript/es/unrand.txt X%%DATADIR%%/dat/descript/features.txt X%%DATADIR%%/dat/descript/fi/ability.txt X%%DATADIR%%/dat/descript/fi/backgrounds.txt X%%DATADIR%%/dat/descript/fi/cards.txt X%%DATADIR%%/dat/descript/fi/commands.txt X%%DATADIR%%/dat/descript/fi/features.txt X%%DATADIR%%/dat/descript/fi/items.txt X%%DATADIR%%/dat/descript/fi/monsters.txt X%%DATADIR%%/dat/descript/fi/quotes.txt X%%DATADIR%%/dat/descript/fi/species.txt X%%DATADIR%%/dat/descript/fi/spells.txt X%%DATADIR%%/dat/descript/fi/unident.txt X%%DATADIR%%/dat/descript/fi/unrand.txt X%%DATADIR%%/dat/descript/fr/ability.txt X%%DATADIR%%/dat/descript/fr/backgrounds.txt X%%DATADIR%%/dat/descript/fr/branches.txt X%%DATADIR%%/dat/descript/fr/cards.txt X%%DATADIR%%/dat/descript/fr/commands.txt X%%DATADIR%%/dat/descript/fr/features.txt X%%DATADIR%%/dat/descript/fr/gods.txt X%%DATADIR%%/dat/descript/fr/items.txt X%%DATADIR%%/dat/descript/fr/monsters.txt X%%DATADIR%%/dat/descript/fr/quotes.txt X%%DATADIR%%/dat/descript/fr/skills.txt X%%DATADIR%%/dat/descript/fr/species.txt X%%DATADIR%%/dat/descript/fr/spells.txt X%%DATADIR%%/dat/descript/fr/unident.txt X%%DATADIR%%/dat/descript/fr/unrand.txt X%%DATADIR%%/dat/descript/gods.txt X%%DATADIR%%/dat/descript/hints.txt X%%DATADIR%%/dat/descript/hu/species.txt X%%DATADIR%%/dat/descript/it/backgrounds.txt X%%DATADIR%%/dat/descript/it/gods.txt X%%DATADIR%%/dat/descript/it/skills.txt X%%DATADIR%%/dat/descript/it/species.txt X%%DATADIR%%/dat/descript/items.txt X%%DATADIR%%/dat/descript/ko/ability.txt X%%DATADIR%%/dat/descript/ko/backgrounds.txt X%%DATADIR%%/dat/descript/ko/branches.txt X%%DATADIR%%/dat/descript/ko/cards.txt X%%DATADIR%%/dat/descript/ko/commands.txt X%%DATADIR%%/dat/descript/ko/features.txt X%%DATADIR%%/dat/descript/ko/gods.txt X%%DATADIR%%/dat/descript/ko/items.txt X%%DATADIR%%/dat/descript/ko/monsters.txt X%%DATADIR%%/dat/descript/ko/quotes.txt X%%DATADIR%%/dat/descript/ko/skills.txt X%%DATADIR%%/dat/descript/ko/species.txt X%%DATADIR%%/dat/descript/ko/spells.txt X%%DATADIR%%/dat/descript/ko/unident.txt X%%DATADIR%%/dat/descript/ko/unrand.txt X%%DATADIR%%/dat/descript/lt/backgrounds.txt X%%DATADIR%%/dat/descript/lt/branches.txt X%%DATADIR%%/dat/descript/lt/commands.txt X%%DATADIR%%/dat/descript/lt/monsters.txt X%%DATADIR%%/dat/descript/lt/skills.txt X%%DATADIR%%/dat/descript/lt/species.txt X%%DATADIR%%/dat/descript/lt/unident.txt X%%DATADIR%%/dat/descript/lv/backgrounds.txt X%%DATADIR%%/dat/descript/lv/cards.txt X%%DATADIR%%/dat/descript/lv/commands.txt X%%DATADIR%%/dat/descript/lv/gods.txt X%%DATADIR%%/dat/descript/lv/items.txt X%%DATADIR%%/dat/descript/lv/monsters.txt X%%DATADIR%%/dat/descript/lv/skills.txt X%%DATADIR%%/dat/descript/lv/spells.txt X%%DATADIR%%/dat/descript/lv/unrand.txt X%%DATADIR%%/dat/descript/monsters.txt X%%DATADIR%%/dat/descript/pl/backgrounds.txt X%%DATADIR%%/dat/descript/pl/items.txt X%%DATADIR%%/dat/descript/pl/quotes.txt X%%DATADIR%%/dat/descript/pl/species.txt X%%DATADIR%%/dat/descript/pl/spells.txt X%%DATADIR%%/dat/descript/pl/tutorial.txt X%%DATADIR%%/dat/descript/pl/unident.txt X%%DATADIR%%/dat/descript/pl/unrand.txt X%%DATADIR%%/dat/descript/pt/commands.txt X%%DATADIR%%/dat/descript/pt/gods.txt X%%DATADIR%%/dat/descript/pt/items.txt X%%DATADIR%%/dat/descript/pt/unident.txt X%%DATADIR%%/dat/descript/quotes.txt X%%DATADIR%%/dat/descript/ru/ability.txt X%%DATADIR%%/dat/descript/ru/backgrounds.txt X%%DATADIR%%/dat/descript/ru/branches.txt X%%DATADIR%%/dat/descript/ru/cards.txt X%%DATADIR%%/dat/descript/ru/commands.txt X%%DATADIR%%/dat/descript/ru/features.txt X%%DATADIR%%/dat/descript/ru/gods.txt X%%DATADIR%%/dat/descript/ru/items.txt X%%DATADIR%%/dat/descript/ru/monsters.txt X%%DATADIR%%/dat/descript/ru/quotes.txt X%%DATADIR%%/dat/descript/ru/skills.txt X%%DATADIR%%/dat/descript/ru/species.txt X%%DATADIR%%/dat/descript/ru/unident.txt X%%DATADIR%%/dat/descript/ru/unrand.txt X%%DATADIR%%/dat/descript/skills.txt X%%DATADIR%%/dat/descript/species.txt X%%DATADIR%%/dat/descript/spells.txt X%%DATADIR%%/dat/descript/tutorial.txt X%%DATADIR%%/dat/descript/unident.txt X%%DATADIR%%/dat/descript/unrand.txt X%%DATADIR%%/dat/descript/zh/ability.txt X%%DATADIR%%/dat/descript/zh/backgrounds.txt X%%DATADIR%%/dat/descript/zh/branches.txt X%%DATADIR%%/dat/descript/zh/cards.txt X%%DATADIR%%/dat/descript/zh/commands.txt X%%DATADIR%%/dat/descript/zh/features.txt X%%DATADIR%%/dat/descript/zh/gods.txt X%%DATADIR%%/dat/descript/zh/items.txt X%%DATADIR%%/dat/descript/zh/monsters.txt X%%DATADIR%%/dat/descript/zh/skills.txt X%%DATADIR%%/dat/descript/zh/species.txt X%%DATADIR%%/dat/descript/zh/unident.txt X%%DATADIR%%/dat/dlua/debug.lua X%%DATADIR%%/dat/dlua/dungeon.lua X%%DATADIR%%/dat/dlua/fnwrap.lua X%%DATADIR%%/dat/dlua/init.lua X%%DATADIR%%/dat/dlua/iter.lua X%%DATADIR%%/dat/dlua/lm_1way.lua X%%DATADIR%%/dat/dlua/lm_door.lua X%%DATADIR%%/dat/dlua/lm_flags.lua X%%DATADIR%%/dat/dlua/lm_fog.lua X%%DATADIR%%/dat/dlua/lm_items.lua X%%DATADIR%%/dat/dlua/lm_mon_prop.lua X%%DATADIR%%/dat/dlua/lm_monst.lua X%%DATADIR%%/dat/dlua/lm_mslav.lua X%%DATADIR%%/dat/dlua/lm_pdesc.lua X%%DATADIR%%/dat/dlua/lm_props.lua X%%DATADIR%%/dat/dlua/lm_timed.lua X%%DATADIR%%/dat/dlua/lm_tmsg.lua X%%DATADIR%%/dat/dlua/lm_toll.lua X%%DATADIR%%/dat/dlua/lm_trig.lua X%%DATADIR%%/dat/dlua/lm_trove.lua X%%DATADIR%%/dat/dlua/loadmaps.lua X%%DATADIR%%/dat/dlua/luamark.lua X%%DATADIR%%/dat/dlua/macro.lua X%%DATADIR%%/dat/dlua/mapinit.lua X%%DATADIR%%/dat/dlua/point.lua X%%DATADIR%%/dat/dlua/sanity.lua X%%DATADIR%%/dat/dlua/sprint.lua X%%DATADIR%%/dat/dlua/stress.lua X%%DATADIR%%/dat/dlua/tags.lua X%%DATADIR%%/dat/dlua/test.lua X%%DATADIR%%/dat/dlua/tutorial.lua X%%DATADIR%%/dat/dlua/userbase.lua X%%DATADIR%%/dat/dlua/util.lua X%%DATADIR%%/dat/dlua/ziggurat.lua X%%DATADIR%%/dat/lua/autofight.lua X%%DATADIR%%/dat/lua/gearset.lua X%%DATADIR%%/dat/lua/kills.lua X%%DATADIR%%/dat/lua/runrest.lua X%%DATADIR%%/dat/lua/stash.lua X%%DATADIR%%/dat/lua/trapwalk.lua X%%DATADIR%%/dat/lua/wield.lua X%%DATADIR%%/docs/CREDITS.txt X%%DATADIR%%/docs/aptitudes.txt X%%DATADIR%%/docs/arena.txt X%%DATADIR%%/docs/changelog.txt X%%DATADIR%%/docs/crawl_manual.txt X%%DATADIR%%/docs/develop/IRC.txt X%%DATADIR%%/docs/develop/coding_conventions.txt X%%DATADIR%%/docs/develop/gdb_tips.txt X%%DATADIR%%/docs/develop/levels/advanced.txt X%%DATADIR%%/docs/develop/levels/introduction.txt X%%DATADIR%%/docs/develop/levels/syntax.txt X%%DATADIR%%/docs/develop/levels/triggerables.txt X%%DATADIR%%/docs/develop/monster_speech.txt X%%DATADIR%%/docs/develop/new_dev_checklist.txt X%%DATADIR%%/docs/develop/patch_guide.txt X%%DATADIR%%/docs/develop/process.txt X%%DATADIR%%/docs/develop/release.txt X%%DATADIR%%/docs/develop/save_compatibility.txt X%%DATADIR%%/docs/develop/spells.txt X%%DATADIR%%/docs/develop/testing.txt X%%DATADIR%%/docs/develop/tiles_creation.txt X%%DATADIR%%/docs/fight_simulator.txt X%%DATADIR%%/docs/key_changes.txt X%%DATADIR%%/docs/keybind.txt X%%DATADIR%%/docs/license/lgpl.txt X%%DATADIR%%/docs/license/libpng-LICENSE.txt X%%DATADIR%%/docs/license/lualicense.txt X%%DATADIR%%/docs/license/pcre_license.txt X%%DATADIR%%/docs/macros_guide.txt X%%DATADIR%%/docs/options_guide.txt X%%DATADIR%%/docs/quickstart.txt X%%DATADIR%%/docs/ssh_guide.txt X%%DATADIR%%/docs/tiles_help.txt X%%DATADIR%%/docs/translation.txt X%%DATADIR%%/settings/0.9_monster_glyphs.txt X%%DATADIR%%/settings/034_command_keys.txt X%%DATADIR%%/settings/034_monster_glyphs.txt X%%DATADIR%%/settings/052_monster_glyphs.txt X%%DATADIR%%/settings/060_monster_glyphs.txt X%%DATADIR%%/settings/071_monster_glyphs.txt X%%DATADIR%%/settings/080_monster_glyphs.txt X%%DATADIR%%/settings/advanced_optioneering.txt X%%DATADIR%%/settings/autopickup_exceptions.txt X%%DATADIR%%/settings/dvorak_command_keys.txt X%%DATADIR%%/settings/food_colouring.txt X%%DATADIR%%/settings/init.txt X%%DATADIR%%/settings/menu_colours.txt X%%DATADIR%%/settings/messages.txt X%%DATADIR%%/settings/no_vi_command_keys.txt X%%DATADIR%%/settings/runrest_messages.txt X%%DATADIR%%/settings/standard_colours.txt X%%DATADIR%%/settings/tiles_options.txt X%%SDL%%%%DATADIR%%/dat/tiles/feat.png X%%SDL%%%%DATADIR%%/dat/tiles/floor.png X%%SDL%%%%DATADIR%%/dat/tiles/gui.png X%%SDL%%%%DATADIR%%/dat/tiles/icons.png X%%SDL%%%%DATADIR%%/dat/tiles/logo.png X%%SDL%%%%DATADIR%%/dat/tiles/main.png X%%SDL%%%%DATADIR%%/dat/tiles/player.png X%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-32x32.png X%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-512x512.png X%%SDL%%%%DATADIR%%/dat/tiles/stone_soup_icon-win32.png X%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_dragon.png X%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_evil_mage.png X%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_invasion.png X%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_kitchen_duty.png X%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_summoner.png X%%SDL%%%%DATADIR%%/dat/tiles/title_denzi_undead_warrior.png X%%SDL%%%%DATADIR%%/dat/tiles/title_firemage.png X%%SDL%%%%DATADIR%%/dat/tiles/title_omndra_zot_demon.png X%%SDL%%%%DATADIR%%/dat/tiles/title_pooryurik_knight.png X%%SDL%%%%DATADIR%%/dat/tiles/title_shadyamish_octm.png X%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_entering_the_dungeon.png X%%SDL%%%%DATADIR%%/dat/tiles/title_white_noise_grabbing_the_orb.png X%%SDL%%%%DATADIR%%/dat/tiles/wall.png X%%SDL%%@dirrm %%DATADIR%%/dat/tiles X@dirrm %%DATADIR%%/settings X@dirrm %%DATADIR%%/docs/license X@dirrm %%DATADIR%%/docs/develop/levels X@dirrm %%DATADIR%%/docs/develop X@dirrm %%DATADIR%%/docs X@dirrm %%DATADIR%%/dat/lua X@dirrm %%DATADIR%%/dat/dlua X@dirrm %%DATADIR%%/dat/descript/zh X@dirrm %%DATADIR%%/dat/descript/ru X@dirrm %%DATADIR%%/dat/descript/pt X@dirrm %%DATADIR%%/dat/descript/pl X@dirrm %%DATADIR%%/dat/descript/lv X@dirrm %%DATADIR%%/dat/descript/lt X@dirrm %%DATADIR%%/dat/descript/ko X@dirrm %%DATADIR%%/dat/descript/it X@dirrm %%DATADIR%%/dat/descript/hu X@dirrm %%DATADIR%%/dat/descript/fr X@dirrm %%DATADIR%%/dat/descript/fi X@dirrm %%DATADIR%%/dat/descript/es X@dirrm %%DATADIR%%/dat/descript/el X@dirrm %%DATADIR%%/dat/descript/de X@dirrm %%DATADIR%%/dat/descript/da X@dirrm %%DATADIR%%/dat/descript/cs X@dirrm %%DATADIR%%/dat/descript X@dirrm %%DATADIR%%/dat/des/zotdef X@dirrm %%DATADIR%%/dat/des/variable X@dirrm %%DATADIR%%/dat/des/tutorial X@dirrm %%DATADIR%%/dat/des/traps X@dirrm %%DATADIR%%/dat/des/sprint X@dirrm %%DATADIR%%/dat/des/serial X@dirrm %%DATADIR%%/dat/des/portals X@dirrm %%DATADIR%%/dat/des/entry X@dirrm %%DATADIR%%/dat/des/builder X@dirrm %%DATADIR%%/dat/des/branches X@dirrm %%DATADIR%%/dat/des/altar X@dirrm %%DATADIR%%/dat/des X@dirrm %%DATADIR%%/dat/defaults X@dirrm %%DATADIR%%/dat/database/pl X@dirrm %%DATADIR%%/dat/database/el X@dirrm %%DATADIR%%/dat/database X@dirrm %%DATADIR%%/dat/clua X@dirrm %%DATADIR%%/dat X@dirrm %%DATADIR%% X%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD X%%PORTDOCS%%@dirrm %%DOCSDIR%% X%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.crawlrc X%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% ab82ad360c802d6fdb0e31c244358caa echo x - stonesoup/Makefile sed 's/^X//' >stonesoup/Makefile << 'a0e67317a33a8d996bd479ea90a0340d' X# New ports collection makefile for: dcss X# Date created: 2008-07-11 X# Whom: Tobias Rehbein X# X# $FreeBSD: head/games/stonesoup/Makefile 307325 2012-11-12 03:11:28Z knu $ X# X XPORTNAME= stonesoup XPORTVERSION= 0.11.0 XCATEGORIES= games XMASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION} XDISTNAME= stone_soup-${PORTVERSION}-nodeps X XMAINTAINER= tobias.rehbein@web.de XCOMMENT= Dungeon Crawl Stone Soup - a fun, free rogue-like game X XLICENSE= GPLv2 XLICENSE_FILE= ${WRKDIR}/stone_soup-${PORTVERSION}/licence.txt X XUSE_SQLITE= yes XUSE_XZ= yes XUSE_BISON= build XUSE_GMAKE= yes XUSE_LUA= 5.1 XUSE_PERL5_BUILD= yes X XMAKE_JOBS_SAFE= yes X XSAVEDIR= \~/.stonesoup XWRKSRC= ${WRKDIR}/stone_soup-${PORTVERSION}/source/ X XSUB_FILES= README.FreeBSD XPLIST_SUB= SAVEDIR="${SAVEDIR}" X XOPTIONS_DEFINE= SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES X XSOUND_DESC= Sound support XWIZARD_DESC= Wizard mode XLUA_BINDINGS_DESC= Bindings for LUA user scripts X XMAKE_ARGS= prefix=${PREFIX} \ X DATADIR=${DATADIR} \ X SAVEDIR=${SAVEDIR} \ X INSTALL_UGRP=root:games \ X NO_AUTO_OPT=YesPlease \ X NO_OPTIMIZE=YesPlease \ X LUA_INCLUDE_DIR=${LOCALBASE}/include/lua51 \ X LUA_LIB=-llua-5.1 \ X SQLITE_INCLUDE_DIR=${LOCALBASE}/include \ X SQLITE_LIB=-lsqlite3 \ X LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/lua51" X X.include X X.if ${CC:T:M*clang*} || ${OSVERSION} > 1000023 XMAKE_ARGS+= NO_INLINE_DEPGEN=1 X.endif X X.if defined(VERBOSE) XMAKE_ARGS+= V=yes X.endif X X.if empty(PORT_OPTIONS:MWIZARD) XMAKE_ARGS+= NOWIZARD=y X.endif X X.if ${PORT_OPTIONS:MSDL} XCONFLICTS+= ${PORTNAME}-[0-9]* XMAKE_ARGS+= TILES=y XPLIST_SUB+= SDL="" XPKGNAMESUFFIX= -sdl XUSE_PKGCONFIG= yes XBUILD_DEPENDS+= fc-list:${PORTSDIR}/x11-fonts/fontconfig \ X ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu XRUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu XLIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ X freetype:${PORTSDIR}/print/freetype2 XUSE_SDL= sdl image X.else XUSE_NCURSES= yes XCONFLICTS+= ${PORTNAME}-sdl-[0-9]* XPLIST_SUB+= SDL="@comment " X.endif X X.if ${PORT_OPTIONS:MSOUND} XRUN_DEPENDS+= sox:${PORTSDIR}/audio/sox X.endif X X.if empty(PORT_OPTIONS:MLUA_BINDINGS) XMAKE_ARGS+= NO_LUA_BINDINGS=yes X.endif X Xpost-patch: X.if ${PORT_OPTIONS:MSOUND} X @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h X @${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h X.else X @${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/AppHdr.h X.endif X Xpost-install: X.if ${PORT_OPTIONS:MDOCS} X ${MKDIR} ${DOCSDIR} X ${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${DOCSDIR} X.endif X.if ${PORT_OPTIONS:MEXAMPLES} X ${MKDIR} ${EXAMPLESDIR} X ${INSTALL_DATA} ${DATADIR}/settings/init.txt ${EXAMPLESDIR}/sample.crawlrc X.endif X X.include a0e67317a33a8d996bd479ea90a0340d echo x - stonesoup/distinfo sed 's/^X//' >stonesoup/distinfo << '50d69349f394340587e51521ee2db723' XSHA256 (stone_soup-0.11.0-nodeps.tar.xz) = 2a39307c9f88608ee2a33d3b831c51d9190c91ccdedadececda5edae6dd69002 XSIZE (stone_soup-0.11.0-nodeps.tar.xz) = 7516360 50d69349f394340587e51521ee2db723 echo c - stonesoup/files mkdir -p stonesoup/files > /dev/null 2>&1 echo x - stonesoup/files/patch-rltiles__Makefile sed 's/^X//' >stonesoup/files/patch-rltiles__Makefile << '6fdfa4aea2884ecfd430fc0d0cc94490' X--- ./rltiles/Makefile.orig 2012-09-30 23:25:31.000000000 +0200 X+++ ./rltiles/Makefile 2012-10-27 20:49:55.957667879 +0200 X@@ -1,7 +1,7 @@ X uname_S := $(shell uname -s) X X ifneq (,$(findstring MINGW,$(uname_S))) X-LDFLAGS += -lmingw32 X+L_LDFLAGS += -lmingw32 X endif X X # Note: since generation of tiles is done on the host, we don't care about X@@ -10,7 +10,7 @@ X # Also, cross-compilation with no system libraries for host rather than target X # is not supported. If host=target, contribs are enough. X X-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter X+L_CFLAGS := $(CFLAGS) X X ifdef TILES X ifndef CONTRIB_SDL X@@ -29,24 +29,24 @@ X PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a X endif X X- CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) X- LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) X+ L_CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) X+ L_LDFLAGS += $(LDFLAGS) $(SDL_LDFLAGS) $(PNG_LIB) X X- CFLAGS += -DUSE_TILE X+ L_CFLAGS += -DUSE_TILE X endif X X ifdef DEBUG X-CFLAGS += -O0 -DDEBUG -ggdb X+L_CFLAGS += -O0 -DDEBUG -ggdb X endif X X ifneq (,$(findstring MINGW,$(uname_S))) X-LDFLAGS += -lgdi32 -lwinmm X+L_LDFLAGS += -lgdi32 -lwinmm X endif X ifeq ($(uname_S),Darwin) X-LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL X+L_LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL X endif X ifeq ($(uname_S),Linux) X-LDFLAGS += -ldl -lpthread X+L_LDFLAGS += -ldl -lpthread X endif X X # Attempt to use a full compiler name, to make X@@ -58,7 +58,7 @@ X ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),) X LMACH := X endif X-HOSTCXX ?= $(LMACH)g++ X+HOSTCXX ?= $(LMACH)$(CXX) X X DELETE = rm -f X X@@ -98,7 +98,7 @@ X $(QUIET_GEN)$(TILEGEN) -c $< X X # CFLAGS difference check X-TRACK_CFLAGS = $(subst ','\'',$(HOSTCXX) $(CFLAGS)) # (stray ' for highlights) X+TRACK_CFLAGS = $(subst ','\'',$(HOSTCXX) $(L_CFLAGS)) # (stray ' for highlights) X X .cflags: .force-cflags X @FLAGS='$(TRACK_CFLAGS)'; \ X@@ -127,9 +127,13 @@ X distclean: clean X X %.o: %.cc .cflags X- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@ X+ifdef NO_INLINE_DEPGEN X+ $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MT,$@ -c $< -o $@ X+else X+ $(QUIET_HOSTCXX)$(HOSTCXX) $(L_CFLAGS) -Wp,-MMD,$*.d,-MT,$@ -c $< -o $@ X+endif X X $(TILEGEN): $(OBJECTS) X- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) X+ $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(L_LDFLAGS) X X .PHONY: all clean distclean 6fdfa4aea2884ecfd430fc0d0cc94490 echo x - stonesoup/files/README.FreeBSD.in sed 's/^X//' >stonesoup/files/README.FreeBSD.in << '2903d04a3d5218b2e7f0dc94def83dad' XThe end-user documentation for ``Dungeon Crawl Stone Soup`` can be found Xin-game and in `%%DATADIR%%/docs`. X XIf the game fails to start after an upgrade try to delete the old save games Xusing `rm -rf ~/.stonesoup/saves`. X XHappy crawling! 2903d04a3d5218b2e7f0dc94def83dad echo x - stonesoup/files/patch-ng-setup.cc sed 's/^X//' >stonesoup/files/patch-ng-setup.cc << 'b8e0c5fefd008766860f415c918c1ed0' X--- ./ng-setup.cc.orig 2012-09-30 23:25:31.000000000 +0200 X+++ ./ng-setup.cc 2012-10-27 20:49:08.841950945 +0200 X@@ -1427,9 +1427,11 @@ X you.nemelex_sacrificing = true; X X // Create the save file. X+#ifdef WIZARD X if (Options.no_save) X you.save = new package(); X else X+#endif X you.save = new package(get_savedir_filename(you.your_name).c_str(), X true, true); X } b8e0c5fefd008766860f415c918c1ed0 echo x - stonesoup/files/patch-rltiles__tool__tile.cc sed 's/^X//' >stonesoup/files/patch-rltiles__tool__tile.cc << 'f9e88fe17393c4a980413229170e9fcc' X--- ./rltiles/tool/tile.cc.orig 2012-09-30 23:25:33.000000000 +0200 X+++ ./rltiles/tool/tile.cc 2012-10-27 20:49:08.845367925 +0200 X@@ -125,10 +125,10 @@ X if (flags[x + y * m_width]) X continue; X X- if (x > 0 && flags[(x-1) + y * m_width] X- || y > 0 && flags[x + (y-1) * m_width] X- || x < m_width - 1 && flags[(x+1) + y * m_width] X- || y < m_height - 1 && flags[x + (y+1) * m_width]) X+ if ((x > 0 && flags[(x-1) + y * m_width]) X+ || (y > 0 && flags[x + (y-1) * m_width]) X+ || (x < m_width - 1 && flags[(x+1) + y * m_width]) X+ || (y < m_height - 1 && flags[x + (y+1) * m_width])) X { X get_pixel(x,y) = rim; X } f9e88fe17393c4a980413229170e9fcc echo x - stonesoup/files/patch-files.cc sed 's/^X//' >stonesoup/files/patch-files.cc << '731cf455e4fea2e39f0dccb6446bfa4b' X--- ./files.cc.orig 2012-09-30 23:25:31.000000000 +0200 X+++ ./files.cc 2012-10-27 20:49:08.839666272 +0200 X@@ -618,8 +618,10 @@ X { X std::vector chars; X X+#ifdef WIZARD X if (Options.no_save) X return chars; X+#endif X X #ifndef DISABLE_SAVEGAME_LISTS X std::string searchpath = _get_savefile_directory(); X@@ -1741,8 +1743,10 @@ X // returns false if a new game should start instead X static bool _restore_game(const std::string& filename) X { X+#ifdef WIZARD X if (Options.no_save) X return false; X+#endif X X you.save = new package((_get_savefile_directory() + filename).c_str(), true); X 731cf455e4fea2e39f0dccb6446bfa4b echo x - stonesoup/files/patch-Makefile sed 's/^X//' >stonesoup/files/patch-Makefile << '32c7f81b858336b7db0b143a5c138a49' X--- ./Makefile.orig 2012-09-30 23:25:31.000000000 +0200 X+++ ./Makefile 2012-10-27 20:49:08.837330946 +0200 X@@ -66,7 +66,7 @@ X # ask for a package with convenience libraries instead -- we'll try to provide X # them somewhere in the near future. X X-GAME = crawl X+GAME = stonesoup X X # Disable GNU Make implicit rules and variables. Leaving them enabled will slow X # down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have X@@ -112,7 +112,7 @@ X X else X X-CFOPTIMIZE := -O2 X+CFOPTIMIZE := X X endif # USE_ICC X X@@ -120,7 +120,7 @@ X CFOPTIMIZE += -flto=jobserver -fwhole-program X endif X X-CFOTHERS := -pipe $(EXTERNAL_FLAGS) X+CFOTHERS := $(CFLAGS) X CFWARN := -Wall -Wformat-security X CFWARN_L := -Wundef X X@@ -133,8 +133,6 @@ X # X AR = ar X RANLIB = ranlib X-CC = $(GCC) X-CXX = $(GXX) X RM = rm -f X COPY = cp X COPY_R = cp -r X@@ -530,30 +528,19 @@ X ifndef BUILD_LUA X ifdef NO_PKGCONFIG X BUILD_LUA = yes X- endif X-endif X-ifndef BUILD_LUA X- ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),) X- ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),) X+ else X+ LUA_PACKAGE := $(shell for lua in lua51 lua5.1 lua-5.1 lua; do \ X+ $(PKGCONFIG) $$lua --exists && test `$(PKGCONFIG) $$lua --modversion | head -c 3` = 5.1 && \ X+ echo $$lua && break;\ X+ done) X+ ifeq (,$(LUA_PACKAGE)) X BUILD_LUA = yes X else X- ifeq ($(shell $(PKGCONFIG) lua --modversion | head -c 3),5.1) X- LUA_PACKAGE = lua X- else X- BUILD_LUA = yes X- endif X+ INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I) X+ CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other) X+ LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs) X endif X- else X- LUA_PACKAGE = lua5.1 X- endif X-endif X-ifndef BUILD_LUA X- ifndef LUA_PACKAGE X- LUA_PACKAGE = lua5.1 X endif X- INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I) X- CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other) X- LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs) X endif X X ifndef BUILD_SQLITE X@@ -707,7 +694,7 @@ X DEFINES += -DWIZARD X endif X ifdef NO_OPTIMIZE X-CFOPTIMIZE := -O0 X+CFOPTIMIZE := X endif X X ifdef PCH X@@ -831,10 +818,12 @@ X INSTALL_FONTS += $(PROPORTIONAL_FONT) X endif X else X- SYS_PROPORTIONAL_FONT = $(shell find /usr/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) X- ifeq (,$(SYS_PROPORTIONAL_FONT)) X- SYS_PROPORTIONAL_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) X- endif X+ SYS_PROPORTIONAL_FONT = $(shell name=$(OUR_PROPORTIONAL_FONT);\ X+ {\ X+ fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ X+ for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ X+ do [ -d $$dir ] && echo $$dir; done;\ X+ } 2>/dev/null | xargs -I% find % -type f -iname $$name -print | head -n1) X ifneq (,$(SYS_PROPORTIONAL_FONT)) X ifeq (,$(COPY_FONTS)) X DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\" X@@ -854,10 +843,12 @@ X INSTALL_FONTS += $(MONOSPACED_FONT) X endif X else X- SYS_MONOSPACED_FONT = $(shell find /usr/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1) X- ifeq (,$(SYS_MONOSPACED_FONT)) X- SYS_MONOSPACED_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1) X- endif X+ SYS_MONOSPACED_FONT = $(shell name=$(OUR_MONOSPACED_FONT);\ X+ {\ X+ fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ X+ for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\ X+ do [ -d $$dir ] && echo $$dir; done;\ X+ } 2>/dev/null | xargs -I% find % -type f -iname $$name -print | head -n1) X ifneq (,$(SYS_MONOSPACED_FONT)) X ifeq (,$(COPY_FONTS)) X DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\" X@@ -1036,7 +1027,7 @@ X cmd-name.h $(INI_OBJECTS) X X SRC_PKG_BASE := stone_soup X-SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver) X+SRC_VERSION := $(shell cat util/release_ver) X MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|sed -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/') X X export SRC_VERSION X@@ -1049,6 +1040,7 @@ X greet: X @if [ ! -e $(GAME) ]; then\ X printf " * If you experience any problems building Crawl, please take a second look\\n"\ X+ ;printf\ X " * at INSTALL.txt: the solution to your problem just might be in there!\\n";\ X fi X 32c7f81b858336b7db0b143a5c138a49 echo x - stonesoup/files/patch-rltiles__tool__tile_list_processor.cc sed 's/^X//' >stonesoup/files/patch-rltiles__tool__tile_list_processor.cc << 'cc785511c1c1210627c64a4082e7a686' X--- ./rltiles/tool/tile_list_processor.cc.orig 2012-09-30 23:25:33.000000000 +0200 X+++ ./rltiles/tool/tile_list_processor.cc 2012-10-27 20:49:08.847233795 +0200 X@@ -51,7 +51,7 @@ X "" X }; X X- if (m_sdir != "" || background && m_back_sdir != "") X+ if (m_sdir != "" || (background && m_back_sdir != "")) X { X std::vector dirs; X if (m_sdir != "") cc785511c1c1210627c64a4082e7a686 echo x - stonesoup/files/patch-startup.cc sed 's/^X//' >stonesoup/files/patch-startup.cc << '1b491d2f52378dcd919af8150728086b' X--- ./startup.cc.orig 2012-09-30 23:25:33.000000000 +0200 X+++ ./startup.cc 2012-10-27 20:49:08.848667287 +0200 X@@ -234,8 +234,10 @@ X you.wizard = true; X #endif X // Save-less games are pointless except for tests. X+#ifdef WIZARD X if (Options.no_save) X you.wizard = true; X+#endif X X init_properties(); X burden_change(); 1b491d2f52378dcd919af8150728086b echo x - stonesoup/pkg-descr sed 's/^X//' >stonesoup/pkg-descr << '6b36ecd2a3cec281893063a99b828911' XDungeon Crawl Stone Soup is a fun, free rogue-like game of exploration and Xtreasure-hunting in dungeons filled with dangerous and unfriendly monsters Xin a quest for the mystifyingly fabulous Orb of Zot. X XDungeon Crawl Stone Soup is a variant of Linley's Dungeon Crawl that's openly Xdeveloped and invites participation from the Crawl community. X XThis port comes with two interfaces: X X games/stonesoup - the traditional tty interfaced X games/stonesoup-sdl - the fancy SDL interface X XWWW: http://crawl.develz.org/ 6b36ecd2a3cec281893063a99b828911 exit >Release-Note: >Audit-Trail: >Unformatted: