On Sat, Sep 17, 2016 at 09:48:13PM -0300, Henrique N. Lengler wrote: > Could someone give me a feedback, anything wrong? > > -- > Henrique N. Lengler
I don't think we should remove BROKEN markers without clear evidence that they are no longer required. So please do not delete them unless you already got good feedback from ports developers about this change. If such a change got committed, and it happens to still be broken, we'd just be causing unnecessary duplicate work for people who are building ports on these platforms. The smartest thing to do would be to submit a separate diff which just removes the BROKEN markers and ask for testing, without updating the software in the same step. Let's deal with one problem at a time. A lot of @comment markers are removed from PLIST in your diff, which means the package will now install useless files such as stone-soup developer docs. These were @comment'ed out on purpose. I remember verifying that the in-game docs reachable from the help menu are still complete and working while trimming this list. You probably ran 'make update-plist' and it removed these markers, but these automated mechanisms don't always get everything right. You are removing some patches. Can you explain why you believe each of these patches is no longer necessary? Are any of these patches now included upstream? Thank you for picking this up! It's a neat game but I rarely have time to play it and even less time to work on updating the port myself. > > On Wed, Sep 14, 2016 at 02:30:21AM -0300, Henrique N. Lengler wrote: > > Hi, > > > > This is a update to games/stone-soup to the latest version. > > > > I'm not too experienced on porting. > > I uncommented the BROKEN lines, but I didn't test if there still problems > > since > > I don't have that hardware, so there will be need for testing. > > > > I only tested on amd64 and it is working well, both x11 an no_x11. > > > > Patch attached; > > > diff -u -p -N -r /usr/ports/games/stone-soup/Makefile > > /usr/ports/mystuff/games/stone-soup/Makefile > > --- /usr/ports/games/stone-soup/Makefile Fri Dec 4 18:47:53 2015 > > +++ /usr/ports/mystuff/games/stone-soup/Makefile Wed Sep 14 01:42:54 2016 > > @@ -1,14 +1,11 @@ > > # $OpenBSD: Makefile,v 1.23 2015/12/04 20:47:53 landry Exp $ > > > > -BROKEN-hppa = ICE on dgn-shoals.cc:638 > > -BROKEN-arm= tilegen.elf loops burning cpu > > - > > COMMENT = dungeon crawl stone soup > > CATEGORIES = games > > > > HOMEPAGE = http://crawl.develz.org/ > > -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=crawl-ref/} > > -VERSION = 0.15.2 > > +MASTER_SITES = http://crawl.develz.org/release/ > > +VERSION = 0.18.1 > > DISTNAME= stone_soup-${VERSION}-nodeps > > EXTRACT_SUFX= .tar.xz > > PKGNAME= stone-soup-${VERSION} > > @@ -17,35 +14,31 @@ REVISION= 0 > > WRKDIST = ${WRKDIR}/stone_soup-${VERSION} > > WRKSRC = ${WRKDIST}/source > > USE_GMAKE = Yes > > -CFLAGS += "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL" > > -CXXFLAGS += "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL" > > -MAKE_FLAGS = CC="${CC}" CXX="${CXX}" \ > > +CFLAGS += "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2" > > +CXXFLAGS += "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2" > > +MAKE_FLAGS = CC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}" \ > > LUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \ > > LUA_LIB=${MODLUA_LIB} \ > > SQLITE_INCLUDE_DIR=/usr/include \ > > LDFLAGS=-L${LOCALBASE}/lib \ > > INSTALL_UGRP=root:wheel \ > > prefix=${PREFIX} \ > > - SAVEDIR="~/.crawl" \ > > - PROPORTIONAL_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSans.ttf" > > \ > > - > > MONOSPACED_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSansMono.ttf" \ > > NO_YACC=1 \ > > - V=1 > > + SAVEDIR="~/.crawl" > > > > MAKE_ENV += MODLUA_DEP_VERSION=${MODLUA_DEP_VERSION} > > MODGCC4_ARCHS = * > > MODGCC4_LANGS = c++ > > MODULES = gcc4 lang/lua > > +MODLUA_VERSION = 5.1 > > WANTLIB = c m ${MODLUA_WANTLIB} sqlite3 > > > > -BUILD_DEPENDS = devel/bison \ > > - graphics/pngcrush > > +BUILD_DEPENDS = graphics/pngcrush > > > > -# Almost nethack... > > -PERMIT_PACKAGE_FTP = Yes > > -PERMIT_PACKAGE_CDROM = No gain > > +# License GPLv2+ > > +PERMIT_PACKAGE_CDROM = Yes > > > > -FLAVORS = no_x11 > > +FLAVORS = no_x11 > > FLAVOR ?= > > > > .if ${FLAVOR:Mno_x11} > > @@ -57,12 +50,11 @@ CFLAGS += -DUSE_TILE > > CXXFLAGS += -DUSE_TILE > > > > MAKE_FLAGS += TILES=y \ > > - YACC=yacc \ > > - LDFLAGS="-L${LOCALBASE}/lib -lSDL -lSDL_image -lpng -pthread" > > -WANTLIB += GL GLU SDL SDL_image freetype png pthread z > > + LDFLAGS="-L${LOCALBASE}/lib -lSDL2 -lSDL2_image -lpng -pthread" > > +WANTLIB += GL GLU SDL2 SDL2_image freetype png pthread z > > RUN_DEPENDS = devel/desktop-file-utils > > -LIB_DEPENDS += devel/sdl \ > > - devel/sdl-image \ > > +LIB_DEPENDS += devel/sdl2 \ > > + devel/sdl2-image \ > > graphics/png > > .endif > > > > @@ -70,13 +62,12 @@ post-install: > > mv ${PREFIX}/bin/crawl ${PREFIX}/bin/crawl-ss > > chmod 755 ${PREFIX}/bin/crawl-ss > > ${INSTALL_MAN} ${WRKDIST}/docs/crawl.6 ${PREFIX}/man/man6/crawl-ss.6 > > - ${INSTALL_DATA} ${WRKDIST}/README.txt ${PREFIX}/share/crawl/docs > > .if ! ${FLAVOR:Mno_x11} > > ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${PREFIX}/share/applications > > ${INSTALL_DATA} \ > > ${PREFIX}/share/crawl/dat/tiles/stone_soup_icon-32x32.png \ > > ${PREFIX}/share/pixmaps/stone-soup.png > > - ${INSTALL_DATA} ${FILESDIR}/stone-soup.desktop \ > > + ${INSTALL_DATA} ${WRKDIST}/source/debian/crawl-tiles.desktop \ > > ${PREFIX}/share/applications > > .endif > > > > diff -u -p -N -r /usr/ports/games/stone-soup/distinfo > > /usr/ports/mystuff/games/stone-soup/distinfo > > --- /usr/ports/games/stone-soup/distinfo Tue Apr 7 07:10:28 2015 > > +++ /usr/ports/mystuff/games/stone-soup/distinfo Tue Sep 13 01:52:37 2016 > > @@ -1,2 +1,2 @@ > > -SHA256 (stone_soup-0.15.2-nodeps.tar.xz) = > > 6TqCiAgB+2B5TJwFzLqwPVx+HxBeWWjSzrx2DTh6IeI= > > -SIZE (stone_soup-0.15.2-nodeps.tar.xz) = 8979684 > > +SHA256 (stone_soup-0.18.1-nodeps.tar.xz) = > > S9rXd4+IqZRwxyX/dKgUW91gAy+a5Izll/dLiueE2FA= > > +SIZE (stone_soup-0.18.1-nodeps.tar.xz) = 9716104 > > diff -u -p -N -r /usr/ports/games/stone-soup/patches/patch-source_Makefile > > /usr/ports/mystuff/games/stone-soup/patches/patch-source_Makefile > > --- /usr/ports/games/stone-soup/patches/patch-source_Makefile Tue Apr > > 7 07:10:28 2015 > > +++ /usr/ports/mystuff/games/stone-soup/patches/patch-source_Makefile > > Tue Sep 13 11:32:35 2016 > > @@ -1,23 +1,25 @@ > > -$OpenBSD: patch-source_Makefile,v 1.2 2015/04/07 10:10:28 stsp Exp $ > > ---- source/Makefile.orig Thu Aug 28 04:28:56 2014 > > -+++ source/Makefile Mon Apr 6 15:44:58 2015 > > -@@ -591,8 +591,8 @@ ifndef BUILD_LUA > > +$OpenBSD$ > > +--- source/Makefile.orig Sat Apr 30 00:53:03 2016 > > ++++ source/Makefile Tue Sep 13 11:32:23 2016 > > +@@ -639,9 +639,9 @@ ifndef BUILD_LUA > > BUILD_LUA = yes > > endif > > else > > - ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),) > > - ifneq ($(shell $(PKGCONFIG) lua-5.1 --exists || echo no),) > > -+ ifneq ($(shell $(PKGCONFIG) lua${MODLUA_DEP_VERSION} --exists || echo > > no),) > > -+ ifneq ($(shell $(PKGCONFIG) lua-${MODLUA_DEP_VERSION} --exists || > > echo no),) > > - ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),) > > +- ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),) > > ++ ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),) > > ++ ifneq ($(shell $(PKGCONFIG) lua${MODLUA_DEP_VERSION} --exists || > > echo no),) > > ++ ifneq ($(shell $(PKGCONFIG) lua${MODLUA_DEP_VERSION} --exists || > > echo no),) > > BUILD_LUA = yes > > else > > -@@ -603,16 +603,16 @@ ifndef BUILD_LUA > > + ifeq ($(shell $(PKGCONFIG) lua --modversion | head -c 3),5.1) > > +@@ -651,16 +651,16 @@ ifndef BUILD_LUA > > endif > > endif > > else > > - LUA_PACKAGE = lua-5.1 > > -+ LUA_PACKAGE = lua-${MODLUA_DEP_VERSION} > > ++ LUA_PACKAGE = lua${MODLUA_DEP_VERSION} > > endif > > else > > - LUA_PACKAGE = lua5.1 > > @@ -32,3 +34,55 @@ $OpenBSD: patch-source_Makefile,v 1.2 2015/04/07 10:10 > > endif > > INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I | sed > > -e 's/-I/-isystem /') > > CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other) > > +@@ -1122,51 +1122,6 @@ ifndef NO_OPTIMIZE > > + endif > > + endif > > + endif > > +-endif > > +- > > +-ifdef BUILD_PCRE > > +-CONTRIBS += pcre > > +-CONTRIB_LIBS += $(LIBPCRE) > > +-endif > > +-ifdef BUILD_FREETYPE > > +-CONTRIBS += freetype > > +-CONTRIB_LIBS += $(LIBFREETYPE) > > +-endif > > +-ifdef BUILD_LIBPNG > > +-CONTRIBS += libpng > > +-CONTRIB_LIBS := $(LIBPNG) $(CONTRIB_LIBS) > > +-endif > > +-ifdef BUILD_SDL2 > > +-CONTRIBS += sdl2 > > +-CONTRIB_LIBS := $(LIBSDL2) $(CONTRIB_LIBS) > > +-ifeq ($(uname_S),Linux) > > +-LIBS += -ldl -lrt > > +-endif > > +-endif > > +-ifdef BUILD_SDL2IMAGE > > +-CONTRIBS += sdl2-image > > +-CONTRIB_LIBS := $(LIBSDL2IMAGE) $(CONTRIB_LIBS) > > +-endif > > +-ifdef BUILD_SDL2MIXER > > +-CONTRIBS += sdl2-mixer > > +-CONTRIB_LIBS := $(LIBSDL2MIXER) $(CONTRIB_LIBS) > > +-endif > > +-ifdef BUILD_ZLIB > > +-CONTRIBS += zlib > > +-CONTRIB_LIBS += $(LIBZ) > > +-endif > > +-ifdef BUILD_LUA > > +-ifdef USE_LUAJIT > > +-CONTRIBS += luajit/src > > +-CFOTHER_L += -DUSE_LUAJIT > > +-else > > +-CONTRIBS += lua/src > > +-endif > > +-CONTRIB_LIBS += $(LIBLUA) > > +-endif > > +-ifdef BUILD_SQLITE > > +-CONTRIBS += sqlite > > +-CONTRIB_LIBS += $(LIBSQLITE) > > + endif > > + > > + EXTRA_OBJECTS += version.o > > diff -u -p -N -r > > /usr/ports/games/stone-soup/patches/patch-source_command_cc > > /usr/ports/mystuff/games/stone-soup/patches/patch-source_command_cc > > --- /usr/ports/games/stone-soup/patches/patch-source_command_cc Tue Apr > > 7 07:10:28 2015 > > +++ /usr/ports/mystuff/games/stone-soup/patches/patch-source_command_cc > > Wed Dec 31 21:00:00 1969 > > @@ -1,12 +0,0 @@ > > -$OpenBSD: patch-source_command_cc,v 1.3 2015/04/07 10:10:28 stsp Exp $ > > ---- source/command.cc.orig Thu Aug 28 04:29:10 2014 > > -+++ source/command.cc Mon Apr 6 15:27:57 2015 > > -@@ -698,7 +698,7 @@ struct help_file > > - static help_file help_files[] = > > - { > > - { "crawl_manual.txt", '*', true }, > > -- { "../README.txt", '!', false }, > > -+ { "README.txt", '!', false }, > > - { "aptitudes.txt", '%', false }, > > - { "quickstart.txt", '^', false }, > > - { "macros_guide.txt", '~', false }, > > diff -u -p -N -r > > /usr/ports/games/stone-soup/patches/patch-source_dat_des_branches_dis_des > > /usr/ports/mystuff/games/stone-soup/patches/patch-source_dat_des_branches_dis_des > > --- > > /usr/ports/games/stone-soup/patches/patch-source_dat_des_branches_dis_des > > Tue Apr 7 07:10:28 2015 > > +++ > > /usr/ports/mystuff/games/stone-soup/patches/patch-source_dat_des_branches_dis_des > > Wed Dec 31 21:00:00 1969 > > @@ -1,13 +0,0 @@ > > -$OpenBSD: patch-source_dat_des_branches_dis_des,v 1.1 2015/04/07 10:10:28 > > stsp Exp $ > > ---- source/dat/des/branches/dis.des.orig Mon Apr 6 16:05:20 2015 > > -+++ source/dat/des/branches/dis.des Mon Apr 6 16:05:29 2015 > > -@@ -209,8 +209,7 @@ KMONS: E = lich > > - KMONS: F = executioner > > - KMONS: ! = iron devil / skeletal warrior / hell knight / place:Zot:1 > > skeleton w:15 > > - KMONS: ? = patrolling iron imp > > --: dgn.delayed_decay(_G, '%', 'human corpse / human skeleton, \ > > --: human corpse / human skeleton') > > -+: dgn.delayed_decay(_G, '%', 'human corpse / human skeleton, human corpse > > / human skeleton') > > - : else > > - KMONS: 01 = ghost moth > > - KMONS: 23 = golden dragon > > diff -u -p -N -r > > /usr/ports/games/stone-soup/patches/patch-source_dat_des_builder_shops_des > > /usr/ports/mystuff/games/stone-soup/patches/patch-source_dat_des_builder_shops_des > > --- > > /usr/ports/games/stone-soup/patches/patch-source_dat_des_builder_shops_des > > Tue Apr 7 07:10:28 2015 > > +++ > > /usr/ports/mystuff/games/stone-soup/patches/patch-source_dat_des_builder_shops_des > > Wed Dec 31 21:00:00 1969 > > @@ -1,20 +0,0 @@ > > -$OpenBSD: patch-source_dat_des_builder_shops_des,v 1.1 2015/04/07 10:10:28 > > stsp Exp $ > > ---- source/dat/des/builder/shops.des.orig Mon Apr 6 16:15:14 2015 > > -+++ source/dat/des/builder/shops.des Mon Apr 6 16:16:25 2015 > > -@@ -387,15 +387,7 @@ SUBST: G : YlG > > - : local shopname = util.random_from({"type:Blasphemy suffix:Boutique", > > - : "type:Evil suffix:Emporium", "type:Profane suffix:Products", > > - : "type:Sacrilege suffix:Store", "type:Wicked suffix:Wares"}) > > --: kfeat("s = general shop " .. shopname .. " ; \ > > --: potion of blood | any weapon ego:draining w:15 | any weapon ego:pain > > w:5 | \ > > --: any weapon ego:vampirism w:5 | demon blade w:5 | \ > > --: demon whip w:5 | demon trident w:5 | wand of draining | scroll of > > torment | \ > > --: staff of death | \ > > --: lantern of shadows w:5 | book of necromancy | book of death | \ > > --: book of unlife | randbook disc:necromancy w:5 | necronomicon w:1 | \ > > --: grand grimoire w:1 | scythe unrand:scythe_of_curses w:1 | \ > > --: bastard sword unrand:sword_of_zonguldrok w:1 | mace > > unrand:sceptre_of_torment w:1") > > -+: kfeat("s = general shop " .. shopname .. " ; potion of blood | any > > weapon ego:draining w:15 | any weapon ego:pain w:5 | any weapon > > ego:vampirism w:5 | demon blade w:5 | demon whip w:5 | demon trident w:5 | > > wand of draining | scroll of torment | staff of death | lantern of shadows > > w:5 | book of necromancy | book of death | book of unlife | randbook > > disc:necromancy w:5 | necronomicon w:1 | grand grimoire w:1 | scythe > > unrand:scythe_of_curses w:1 | bastard sword unrand:sword_of_zonguldrok w:1 > > | mace unrand:sceptre_of_torment w:1") > > - KFEAT: a = altar_kikubaaqudgha / altar_yredelemnul / altar_makhleb / \ > > - altar_beogh w:1 / altar_lugonu w:1 > > - MAP > > diff -u -p -N -r > > /usr/ports/games/stone-soup/patches/patch-source_dat_des_variable_grated_community_des > > > > /usr/ports/mystuff/games/stone-soup/patches/patch-source_dat_des_variable_grated_community_des > > --- > > /usr/ports/games/stone-soup/patches/patch-source_dat_des_variable_grated_community_des > > Tue Apr 7 07:10:28 2015 > > +++ > > /usr/ports/mystuff/games/stone-soup/patches/patch-source_dat_des_variable_grated_community_des > > Wed Dec 31 21:00:00 1969 > > @@ -1,68 +0,0 @@ > > -$OpenBSD: patch-source_dat_des_variable_grated_community_des,v 1.1 > > 2015/04/07 10:10:28 stsp Exp $ > > ---- source/dat/des/variable/grated_community.des.orig Mon Apr 6 > > 16:17:17 2015 > > -+++ source/dat/des/variable/grated_community.des Mon Apr 6 16:20:14 2015 > > -@@ -67,11 +67,7 @@ KFEAT: B = food shop name:Jack type:Jerk-a-riffic suf > > - KFEAT: C = distillery shop type:Miraculous suffix:Elixirs count:10 \ > > - greed:50 ; potion of confusion > > - : local smithy = string.gsub(crawl.make_name(), " ", "_") > > --: kfeat("D = armour shop name:The_Legendary_" .. smithy .. " \ > > --: type:Legendary suffix:Smithy count:10 greed:40 ;\ > > --: damaged plate armour ego:none | damaged chain mail ego:none |\ > > --: damaged long sword ego:none | damaged shield ego:none |\ > > --: damaged large shield ego:none | damaged battleaxe ego:none") > > -+: kfeat("D = armour shop name:The_Legendary_" .. smithy .. " > > type:Legendary suffix:Smithy count:10 greed:40 ; damaged plate armour > > ego:none | damaged chain mail ego:none | damaged long sword ego:none | > > damaged shield ego:none | damaged large shield ego:none | damaged battleaxe > > ego:none") > > - SHUFFLE: QRSTUVX > > - SUBVAULT: Q : grated_community_mu_home1 > > - SUBVAULT: R : grated_community_mu_home2 > > -@@ -168,16 +164,11 @@ MARKER: + = lua:restrict_door() > > - KFEAT: ~ = closed_door > > - SUBST: * = *:35 -:1 > > - KITEM: - = animal skin > > --: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton /\ > > --: elf skeleton / kobold skeleton /\ > > --: elephant skeleton / sheep skeleton /\ > > --: manticore skeleton', 'animal skin') > > -+: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton / elf > > skeleton / kobold skeleton / elephant skeleton / sheep skeleton / manticore > > skeleton', 'animal skin') > > - KFEAT: 8 = granite_statue / orcish_idol / w:5 altar_trog /\ > > - w:5 altar_beogh / w:1 altar_makhleb / w:4 floor > > - KITEM: $ = q:5 meat ration, giant spiked club, q:2 beef jerky > > --: kitem("$ = q:" .. crawl.random_range(1, 5) .. " beef jerky / w:5 > > nothing, \ > > --: q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 > > nothing, \ > > --: giant spiked club / giant club / nothing") > > -+: kitem("$ = q:" .. crawl.random_range(1, 5) .. " beef jerky / w:5 > > nothing, q:" .. crawl.random_range(1, 3) .. " meat ration / w:5 nothing, > > giant spiked club / giant club / nothing") > > - : local frosty = crawl.random2(6) > > - : if frosty == 5 then > > - SUBST: 1 = 2 > > -@@ -220,10 +211,8 @@ MONS: lich / w:8 ancient lich / w:5 greater mummy > > - KFEAT: * = altar_kikubaaqudgha / w:4 altar_sif_muna / w:1 > > altar_yredelemnul > > - KITEM: " = gold, any wand / w:15 nothing, any scroll / nothing > > - KFEAT: 8 = granite_statue / w:2 fountain_blood / w:1 floor > > --: kitem("? = q:" .. crawl.random_range(1, 3) .. " scroll of torment /\ > > --: nothing, any scroll / nothing") > > --: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic /\ > > --: nothing, any potion / nothing") > > -+: kitem("? = q:" .. crawl.random_range(1, 3) .. " scroll of torment / > > nothing, any scroll / nothing") > > -+: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic / > > nothing, any potion / nothing") > > - KITEM: & = book of necromancy / book of death / book of unlife / w:12 > > nothing > > - KMONS: P = col:darkgrey plant name:withered name_adjective \ > > - tile:mons_withered_plant / col:lightgrey plant name:withered \ > > -@@ -235,8 +224,7 @@ KITEM: " = gold, any potion / nothing, any potion / no > > - nothing > > - KFEAT: 8 = granite_statue / fountain_sparkling / fountain_blue / w:1 floor > > - KITEM: ? = scroll of recharging / nothing, any scroll / nothing > > --: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic /\ > > --: nothing, any potion / nothing") > > -+: kitem("! = q:" .. crawl.random_range(1, 3) .. " potion of magic / > > nothing, any potion / nothing") > > - KITEM: & = book of wizardry / book of power / book of party tricks /\ > > - book of alchemy / w:12 nothing > > - KMONS: P = plant > > -@@ -248,8 +236,7 @@ KITEM: " = gold, wand of draining / wand of fire / wan > > - potion of brilliance / nothing > > - KFEAT: 8 = granite_statue / w:1 floor > > - KITEM: ? = scroll of immolation / nothing, any scroll / nothing > > --: kitem("! = q:" .. crawl.random_range(1, 3) .. " scroll of immolation /\ > > --: nothing, any potion / nothing") > > -+: kitem("! = q:" .. crawl.random_range(1, 3) .. " scroll of immolation / > > nothing, any potion / nothing") > > - KITEM: & = book of fire / book of power / book of ice /\ > > - book of the tempests / w:12 nothing > > - KFEAT: P = granite_statue > > diff -u -p -N -r /usr/ports/games/stone-soup/pkg/PFRAG.no-no_x11 > > /usr/ports/mystuff/games/stone-soup/pkg/PFRAG.no-no_x11 > > --- /usr/ports/games/stone-soup/pkg/PFRAG.no-no_x11 Tue Apr 7 07:10:28 2015 > > +++ /usr/ports/mystuff/games/stone-soup/pkg/PFRAG.no-no_x11 Wed Sep 14 > > 01:45:37 2016 > > @@ -1,16 +1,18 @@ > > -@comment $OpenBSD: PFRAG.no-no_x11,v 1.5 2015/04/07 10:10:28 stsp Exp $ > > -share/applications/stone-soup.desktop > > +$OpenBSD$ > > +share/applications/crawl-tiles.desktop > > share/crawl/dat/tiles/ > > share/crawl/dat/tiles/feat.png > > share/crawl/dat/tiles/floor.png > > share/crawl/dat/tiles/gui.png > > share/crawl/dat/tiles/icons.png > > share/crawl/dat/tiles/logo.png > > +share/crawl/dat/tiles/logosmall.png > > share/crawl/dat/tiles/main.png > > share/crawl/dat/tiles/player.png > > share/crawl/dat/tiles/stone_soup_icon-32x32.png > > -share/crawl/dat/tiles/stone_soup_icon-512x512.png > > +share/crawl/dat/tiles/stone_soup_icon-${MODLUA_DEP_VERSION}2x${MODLUA_DEP_VERSION}2.png > > share/crawl/dat/tiles/stone_soup_icon-win32.png > > +share/crawl/dat/tiles/title_baconkid_duvessa_dowan.png > > share/crawl/dat/tiles/title_baconkid_gastronok.png > > share/crawl/dat/tiles/title_baconkid_mnoleg.png > > share/crawl/dat/tiles/title_denzi_dragon.png > > diff -u -p -N -r /usr/ports/games/stone-soup/pkg/PLIST > > /usr/ports/mystuff/games/stone-soup/pkg/PLIST > > --- /usr/ports/games/stone-soup/pkg/PLIST Tue Apr 7 07:10:28 2015 > > +++ /usr/ports/mystuff/games/stone-soup/pkg/PLIST Wed Sep 14 01:21:01 2016 > > @@ -1,4 +1,4 @@ > > -@comment $OpenBSD: PLIST,v 1.5 2015/04/07 10:10:28 stsp Exp $ > > +@comment $OpenBSD$ > > @bin bin/crawl-ss > > @man man/man6/crawl-ss.6 > > share/crawl/ > > @@ -6,12 +6,9 @@ share/crawl/dat/ > > share/crawl/dat/clua/ > > share/crawl/dat/clua/autofight.lua > > share/crawl/dat/clua/automagic.lua > > -share/crawl/dat/clua/gearset.lua > > share/crawl/dat/clua/kills.lua > > share/crawl/dat/clua/runrest.lua > > share/crawl/dat/clua/stash.lua > > -share/crawl/dat/clua/trapwalk.lua > > -share/crawl/dat/clua/wield.lua > > share/crawl/dat/database/ > > share/crawl/dat/database/FAQ.txt > > share/crawl/dat/database/el/ > > @@ -40,6 +37,7 @@ share/crawl/dat/database/wpnnoise.txt > > share/crawl/dat/defaults/ > > share/crawl/dat/defaults/autopickup_exceptions.txt > > share/crawl/dat/defaults/food_colouring.txt > > +share/crawl/dat/defaults/glyph_colours.txt > > share/crawl/dat/defaults/menu_colours.txt > > share/crawl/dat/defaults/messages.txt > > share/crawl/dat/defaults/misc.txt > > @@ -54,6 +52,7 @@ share/crawl/dat/des/altar/lugonu_bribe.des > > share/crawl/dat/des/altar/nemelex_the_gamble.des > > share/crawl/dat/des/altar/okawaru_arena.des > > share/crawl/dat/des/altar/overflow.des > > +share/crawl/dat/des/altar/pakellas_experiments.des > > share/crawl/dat/des/altar/trog_burn_book.des > > share/crawl/dat/des/altar/trog_wizard.des > > share/crawl/dat/des/altar/vehumet_trees.des > > @@ -94,16 +93,20 @@ share/crawl/dat/des/branches/vaults_rooms_hard.des > > share/crawl/dat/des/branches/vaults_rooms_standard.des > > share/crawl/dat/des/branches/zot.des > > share/crawl/dat/des/builder/ > > +share/crawl/dat/des/builder/alphashops.des > > share/crawl/dat/des/builder/arena.des > > share/crawl/dat/des/builder/decor.des > > share/crawl/dat/des/builder/dummy.des > > share/crawl/dat/des/builder/food.des > > share/crawl/dat/des/builder/layout.des > > share/crawl/dat/des/builder/layout_caves.des > > +share/crawl/dat/des/builder/layout_cc.des > > share/crawl/dat/des/builder/layout_cellular.des > > share/crawl/dat/des/builder/layout_city.des > > +share/crawl/dat/des/builder/layout_delve.des > > share/crawl/dat/des/builder/layout_forest.des > > share/crawl/dat/des/builder/layout_geoelf.des > > +share/crawl/dat/des/builder/layout_geoelf_castle.des > > share/crawl/dat/des/builder/layout_grids.des > > share/crawl/dat/des/builder/layout_halls.des > > share/crawl/dat/des/builder/layout_loops.des > > @@ -138,7 +141,6 @@ share/crawl/dat/des/serial/gnoll_camp.des > > share/crawl/dat/des/serial/ice.des > > share/crawl/dat/des/serial/magic_research.des > > share/crawl/dat/des/serial/park.des > > -share/crawl/dat/des/serial/ponds.des > > share/crawl/dat/des/serial/serial_guide.txt > > share/crawl/dat/des/serial/sigils.des > > share/crawl/dat/des/serial/undead.des > > @@ -158,7 +160,6 @@ share/crawl/dat/des/test.des > > share/crawl/dat/des/test/suite-los.des > > share/crawl/dat/des/test/suite.des > > share/crawl/dat/des/traps/ > > -share/crawl/dat/des/traps/beogh_trap.des > > share/crawl/dat/des/traps/boulders.des > > share/crawl/dat/des/traps/grate.des > > share/crawl/dat/des/traps/rats_trap.des > > @@ -171,7 +172,6 @@ share/crawl/dat/des/tutorial/lesson4.des > > share/crawl/dat/des/tutorial/lesson5.des > > share/crawl/dat/des/variable/ > > share/crawl/dat/des/variable/ambush.des > > -share/crawl/dat/des/variable/ancient_champions.des > > share/crawl/dat/des/variable/arcadia.des > > share/crawl/dat/des/variable/cathedral_bats.des > > share/crawl/dat/des/variable/compat.des > > @@ -185,13 +185,12 @@ share/crawl/dat/des/variable/lemuel_castle.des > > share/crawl/dat/des/variable/mini.des > > share/crawl/dat/des/variable/mini_features.des > > share/crawl/dat/des/variable/mini_monsters.des > > -share/crawl/dat/des/zotdef/ > > -share/crawl/dat/des/zotdef/zotdef.des > > share/crawl/dat/descript/ > > share/crawl/dat/descript/ability.txt > > share/crawl/dat/descript/backgrounds.txt > > share/crawl/dat/descript/branches.txt > > share/crawl/dat/descript/cards.txt > > +share/crawl/dat/descript/clouds.txt > > share/crawl/dat/descript/commands.txt > > share/crawl/dat/descript/cs/ > > share/crawl/dat/descript/cs/ability.txt > > @@ -393,7 +392,6 @@ share/crawl/dat/descript/pl/features.txt > > share/crawl/dat/descript/pl/gods.txt > > share/crawl/dat/descript/pl/hints.txt > > share/crawl/dat/descript/pl/items.txt > > -share/crawl/dat/descript/pl/monsters.txt > > share/crawl/dat/descript/pl/quotes.txt > > share/crawl/dat/descript/pl/skills.txt > > share/crawl/dat/descript/pl/species.txt > > @@ -429,6 +427,7 @@ share/crawl/dat/descript/ru/unrand.txt > > share/crawl/dat/descript/skills.txt > > share/crawl/dat/descript/species.txt > > share/crawl/dat/descript/spells.txt > > +share/crawl/dat/descript/status.txt > > share/crawl/dat/descript/sv/ > > share/crawl/dat/descript/sv/ability.txt > > share/crawl/dat/descript/sv/cards.txt > > @@ -523,6 +522,7 @@ share/crawl/dat/dlua/loadmaps.lua > > share/crawl/dat/dlua/luamark.lua > > share/crawl/dat/dlua/macro.lua > > share/crawl/dat/dlua/mapinit.lua > > +share/crawl/dat/dlua/persist.lua > > share/crawl/dat/dlua/point.lua > > share/crawl/dat/dlua/profiler.lua > > share/crawl/dat/dlua/sanity.lua > > @@ -541,63 +541,66 @@ share/crawl/dat/dlua/v_shapes.lua > > share/crawl/dat/dlua/vault.lua > > share/crawl/dat/dlua/ziggurat.lua > > share/crawl/docs/ > > -@comment share/crawl/docs/034_changes.txt > > share/crawl/docs/CREDITS.txt > > -share/crawl/docs/README.txt > > share/crawl/docs/aptitudes.txt > > share/crawl/docs/arena.txt > > -@comment share/crawl/docs/changelog.txt > > +share/crawl/docs/changelog.txt > > share/crawl/docs/crawl_manual.txt > > -@comment share/crawl/docs/develop/ > > -@comment share/crawl/docs/develop/IRC.txt > > -@comment share/crawl/docs/develop/android.txt > > -@comment share/crawl/docs/develop/coding_conventions.txt > > -@comment share/crawl/docs/develop/gdb_tips.txt > > -@comment share/crawl/docs/develop/levels/ > > -@comment share/crawl/docs/develop/levels/advanced.txt > > -@comment share/crawl/docs/develop/levels/introduction.txt > > -@comment share/crawl/docs/develop/levels/syntax.txt > > -@comment share/crawl/docs/develop/levels/triggerables.txt > > -@comment share/crawl/docs/develop/monster_speech.txt > > -@comment share/crawl/docs/develop/new_dev_checklist.txt > > -@comment share/crawl/docs/develop/patch_guide.txt > > -@comment share/crawl/docs/develop/process.txt > > -@comment share/crawl/docs/develop/release.txt > > -@comment share/crawl/docs/develop/save_compatibility.txt > > -@comment share/crawl/docs/develop/spells.txt > > -@comment share/crawl/docs/develop/testing.txt > > -@comment share/crawl/docs/develop/tiles_creation.txt > > -@comment share/crawl/docs/develop/translation.txt > > +share/crawl/docs/develop/ > > +share/crawl/docs/develop/IRC.txt > > +share/crawl/docs/develop/android.txt > > +share/crawl/docs/develop/coding_conventions.txt > > +share/crawl/docs/develop/ctags.txt > > +share/crawl/docs/develop/editor_tips.txt > > +share/crawl/docs/develop/gdb_tips.txt > > +share/crawl/docs/develop/keys.txt > > +share/crawl/docs/develop/levels/ > > +share/crawl/docs/develop/levels/advanced.txt > > +share/crawl/docs/develop/levels/introduction.txt > > +share/crawl/docs/develop/levels/syntax.txt > > +share/crawl/docs/develop/levels/triggerables.txt > > +share/crawl/docs/develop/monster_speech.txt > > +share/crawl/docs/develop/new_dev_checklist.txt > > +share/crawl/docs/develop/patch_guide.txt > > +share/crawl/docs/develop/process.txt > > +share/crawl/docs/develop/save_compatibility.txt > > +share/crawl/docs/develop/spells.txt > > +share/crawl/docs/develop/testing.txt > > +share/crawl/docs/develop/tiles_creation.txt > > +share/crawl/docs/develop/translation.txt > > share/crawl/docs/fight_simulator.txt > > -@comment share/crawl/docs/key_changes.txt > > share/crawl/docs/keybind.txt > > -@comment share/crawl/docs/license/mt19937.txt > > -@comment share/crawl/docs/license/ > > -@comment share/crawl/docs/license/cc0.txt > > -@comment share/crawl/docs/license/lgpl.txt > > -@comment share/crawl/docs/license/libpng-LICENSE.txt > > -@comment share/crawl/docs/license/lualicense.txt > > -@comment share/crawl/docs/license/pcre_license.txt > > -@comment share/crawl/docs/license/worley.txt > > +share/crawl/docs/license/ > > +share/crawl/docs/license/cc0.txt > > +share/crawl/docs/license/lgpl.txt > > +share/crawl/docs/license/libpng-LICENSE.txt > > +share/crawl/docs/license/lualicense.txt > > +share/crawl/docs/license/pcre_license.txt > > +share/crawl/docs/license/worley.txt > > share/crawl/docs/macros_guide.txt > > share/crawl/docs/options_guide.txt > > share/crawl/docs/quickstart.txt > > -@comment share/crawl/docs/ssh_guide.txt > > +share/crawl/docs/ssh_guide.txt > > share/crawl/docs/tiles_help.txt > > share/crawl/settings/ > > share/crawl/settings/0.12_monster_glyphs.txt > > share/crawl/settings/0.13_monster_glyphs.txt > > share/crawl/settings/0.14_monster_glyphs.txt > > +share/crawl/settings/0.16_monster_glyphs.txt > > +share/crawl/settings/0.17_monster_glyphs.txt > > share/crawl/settings/0.9_monster_glyphs.txt > > share/crawl/settings/034_command_keys.txt > > -share/crawl/settings/034_monster_glyphs.txt > > share/crawl/settings/052_monster_glyphs.txt > > share/crawl/settings/060_monster_glyphs.txt > > share/crawl/settings/071_monster_glyphs.txt > > share/crawl/settings/080_monster_glyphs.txt > > share/crawl/settings/advanced_optioneering.txt > > share/crawl/settings/colemak_command_keys.txt > > +share/crawl/settings/dec_glyphs.txt > > share/crawl/settings/dvorak_command_keys.txt > > +share/crawl/settings/ibm_glyphs.txt > > share/crawl/settings/init.txt > > share/crawl/settings/no_vi_command_keys.txt > > +share/crawl/settings/old_unicode_glyphs.txt > > +share/crawl/settings/safe_move_shift.txt > > !%%no_x11%% >
