I'm fairly new to porting, so I'd appreciate pointing at any mistakes,
or some tips if I'm missing something obvious.
need OK
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/stone-soup/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile 26 Sep 2023 09:41:41 -0000 1.46
+++ Makefile 8 Nov 2023 19:18:22 -0000
@@ -2,11 +2,10 @@ BROKEN-hppa = ICE on dgn-shoals.cc:638
COMMENT = dungeon crawl stone soup
-VERSION = 0.27.1
+VERSION = 0.30.1
DISTNAME= stone_soup-${VERSION}-nodeps
PKGNAME= stone-soup-${VERSION}
-REVISION= 1
CATEGORIES = games
@@ -87,7 +86,8 @@ post-install:
${INSTALL_DATA} \
${PREFIX}/share/crawl/dat/tiles/stone_soup_icon-32x32.png \
${PREFIX}/share/pixmaps/stone-soup.png
- ${INSTALL_DATA} ${WRKDIST}/source/debian/crawl-tiles.desktop \
+ ${INSTALL_DATA} \
+ ${WRKDIST}/source/xdg-data/org.develz.Crawl_tiles.desktop \
${PREFIX}/share/applications
.endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/stone-soup/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 2 Sep 2021 17:03:29 -0000 1.8
+++ distinfo 8 Nov 2023 19:18:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.27.1-nodeps.tar.xz) =
4hcd2xSbSomFBC2nrA7224sZLCNIlnA7rw+pmjP0cFo=
-SIZE (stone_soup-0.27.1-nodeps.tar.xz) = 12418672
+SHA256 (stone_soup-0.30.1-nodeps.tar.xz) =
kG03bvgAH7+fegUkUDD2T5MAxs44VdL43IHNjUjvCkY=
+SIZE (stone_soup-0.30.1-nodeps.tar.xz) = 18901720
Index: patches/patch-source_Makefile
===================================================================
RCS file: /cvs/ports/games/stone-soup/patches/patch-source_Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 patch-source_Makefile
--- patches/patch-source_Makefile 11 Mar 2022 19:04:59 -0000 1.8
+++ patches/patch-source_Makefile 8 Nov 2023 19:18:22 -0000
@@ -1,7 +1,7 @@
Index: source/Makefile
--- source/Makefile.orig
+++ source/Makefile
-@@ -260,9 +260,6 @@ ifdef msys
+@@ -262,9 +262,6 @@ ifdef msys
BUILD_LIBPNG = YesPlease
COPY_FONTS = yes
endif
@@ -11,7 +11,7 @@ Index: source/Makefile
endif
ifeq ($(uname_S),Darwin)
ifdef MAC_TARGET
-@@ -371,11 +368,8 @@ endif
+@@ -374,11 +371,8 @@ endif
#
ifndef NO_APPLE_PLATFORM
ifeq ($(uname_S),Darwin)
@@ -23,7 +23,7 @@ Index: source/Makefile
ifdef WIN32
-@@ -501,15 +495,7 @@ ifneq ($(GCC_VER),)
+@@ -509,15 +503,7 @@ ifneq ($(GCC_VER),)
GCC_VER_SUFFIX:=-$(GCC_VER)
endif
@@ -39,12 +39,21 @@ Index: source/Makefile
ifneq ($(FORCE_CC),)
GCC := $(FORCE_CC)
-@@ -1151,51 +1137,6 @@ ifndef NO_OPTIMIZE
+@@ -1177,62 +1163,13 @@ OBJECTS += $(TILEDEFOBJS)
+
+ ifdef TILES_ANY
+ ifndef NO_OPTIMIZE
+- ifneq (,$(shell which advpng))
+- USE_ADVPNG = y
+- else
+ ifneq (,$(shell which pngcrush))
+ PNGCRUSH = pngcrush -q -m 113
+ PNGCRUSH_LABEL = PNGCRUSH
endif
- endif
+- endif
endif
--endif
--
+ endif
+
-ifdef BUILD_PCRE
-CONTRIBS += pcre
-CONTRIB_LIBS += $(LIBPCRE)
@@ -88,6 +97,26 @@ Index: source/Makefile
-ifdef BUILD_SQLITE
-CONTRIBS += sqlite
-CONTRIB_LIBS += $(LIBSQLITE)
- endif
-
+-endif
+-
EXTRA_OBJECTS += version.o
+
+ ifdef CONTRIBS
+@@ -1282,7 +1219,7 @@ LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/d
+ SRC_PKG_BASE := stone_soup
+ SRC_VERSION := $(shell git describe $(MERGE_BASE) 2>/dev/null || cat
util/release_ver)
+ MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r
's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
+-RECENT_TAG := $(shell git describe --abbrev=0 $(MERGE_BASE))
++RECENT_TAG = 0.30.1
+ WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo
win32)
+
+ export SRC_VERSION
+@@ -2090,8 +2027,6 @@ mac-app-console: all
+ #############################################################################
+ # Building the Android package
+ #
+-
+-NPROC := $(shell nproc)
+
+ android-project/app/build.gradle: android-project/app/build.gradle.in
+ sed -e "s/@ANDROID_VERSION@/${ANDROID}/" -e
"s/@CRAWL_VERSION@/${SRC_VERSION}/" -e "s/@NPROC@/${NPROC}/"
<android-project/app/build.gradle.in >android-project/app/build.gradle
Index: patches/patch-source_debian_crawl-tiles_desktop
===================================================================
RCS file: patches/patch-source_debian_crawl-tiles_desktop
diff -N patches/patch-source_debian_crawl-tiles_desktop
--- patches/patch-source_debian_crawl-tiles_desktop 11 Mar 2022 19:04:59
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- source/debian/crawl-tiles.desktop.orig Thu Sep 29 01:29:00 2016
-+++ source/debian/crawl-tiles.desktop Thu Sep 29 01:38:51 2016
-@@ -2,6 +2,6 @@
- Type=Application
-
- Name=Dungeon Crawl (tiles)
--Exec=/usr/games/crawl-tiles
--Icon=crawl
-+Exec=/usr/local/bin/crawl-ss
-+Icon=stone-soup
- Categories=Game;AdventureGame;
Index: patches/patch-source_rltiles_Makefile
===================================================================
RCS file: /cvs/ports/games/stone-soup/patches/patch-source_rltiles_Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-source_rltiles_Makefile
--- patches/patch-source_rltiles_Makefile 11 Mar 2022 19:04:59 -0000
1.4
+++ patches/patch-source_rltiles_Makefile 8 Nov 2023 19:18:22 -0000
@@ -1,7 +1,7 @@
Index: source/rltiles/Makefile
--- source/rltiles/Makefile.orig
+++ source/rltiles/Makefile
-@@ -50,13 +50,7 @@ endif
+@@ -57,13 +57,7 @@ endif
# Attempt to use a full compiler name, to make
# distcc builds work nicely.
Index: pkg/PFRAG.no-no_x11
===================================================================
RCS file: /cvs/ports/games/stone-soup/pkg/PFRAG.no-no_x11,v
retrieving revision 1.11
diff -u -p -r1.11 PFRAG.no-no_x11
--- pkg/PFRAG.no-no_x11 11 Mar 2022 19:04:59 -0000 1.11
+++ pkg/PFRAG.no-no_x11 8 Nov 2023 19:18:22 -0000
@@ -1,4 +1,4 @@
-share/applications/crawl-tiles.desktop
+share/applications/org.develz.Crawl_tiles.desktop
share/crawl/dat/tiles/
share/crawl/dat/tiles/feat.png
share/crawl/dat/tiles/floor.png
@@ -42,6 +42,13 @@ share/crawl/dat/tiles/title_sastrei_chei
share/crawl/dat/tiles/title_shadyamish_octm.png
share/crawl/dat/tiles/title_white_noise_entering_the_dungeon.png
share/crawl/dat/tiles/title_white_noise_grabbing_the_orb.png
+share/crawl/dat/tiles/title_SpinningBird_djinn_sears_gnolls.png
+share/crawl/dat/tiles/title_benadryl_antaeus.png
+share/crawl/dat/tiles/title_gompami_kohu_xbow.png
+share/crawl/dat/tiles/title_kaonedong_ignis_the_dying_flame.png
+share/crawl/dat/tiles/title_kaonedong_menkaure_prince_of_dust.png
+share/crawl/dat/tiles/title_micah_c_ereshkigal.png
+share/crawl/dat/tiles/title_philosopheropposite_palentonga_paladin.png
share/crawl/dat/tiles/wall.png
share/pixmaps/
share/pixmaps/stone-soup.png
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/stone-soup/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 11 Mar 2022 19:04:59 -0000 1.10
+++ pkg/PLIST 8 Nov 2023 19:18:22 -0000
@@ -33,6 +33,11 @@ share/crawl/dat/database/randbook.txt
share/crawl/dat/database/randname.txt
share/crawl/dat/database/shout.txt
share/crawl/dat/database/wpnnoise.txt
+share/crawl/dat/database/zh/
+share/crawl/dat/database/zh/FAQ.txt
+share/crawl/dat/database/zh/help.txt
+share/crawl/dat/database/zh/monflee.txt
+share/crawl/dat/database/zh/montitle.txt
share/crawl/dat/defaults/
share/crawl/dat/defaults/autopickup_exceptions.txt
share/crawl/dat/defaults/glyph_colours.txt
@@ -74,7 +79,9 @@ share/crawl/dat/des/branches/depths_enco
share/crawl/dat/des/branches/dis.des
share/crawl/dat/des/branches/elf.des
share/crawl/dat/des/branches/geh.des
+share/crawl/dat/des/branches/geh_lava_maze.des
share/crawl/dat/des/branches/hell.des
+share/crawl/dat/des/branches/hells.des
share/crawl/dat/des/branches/hilbert_zone.des
share/crawl/dat/des/branches/lair.des
share/crawl/dat/des/branches/orc.des
@@ -121,6 +128,7 @@ share/crawl/dat/des/builder/shops.des
share/crawl/dat/des/builder/uniques.des
share/crawl/dat/des/guide.txt
share/crawl/dat/des/portals/
+share/crawl/dat/des/portals/arena.des
share/crawl/dat/des/portals/bailey.des
share/crawl/dat/des/portals/bazaar.des
share/crawl/dat/des/portals/desolation.des
@@ -138,6 +146,7 @@ share/crawl/dat/des/serial/bayou.des
share/crawl/dat/des/serial/column_ruins.des
share/crawl/dat/des/serial/corridors.des
share/crawl/dat/des/serial/curves.des
+share/crawl/dat/des/serial/demonic.des
share/crawl/dat/des/serial/forest.des
share/crawl/dat/des/serial/glass.des
share/crawl/dat/des/serial/gnoll_camp.des
@@ -147,6 +156,7 @@ share/crawl/dat/des/serial/park.des
share/crawl/dat/des/serial/rivers.des
share/crawl/dat/des/serial/serial_guide.txt
share/crawl/dat/des/serial/sigils.des
+share/crawl/dat/des/serial/subway.des
share/crawl/dat/des/serial/undead.des
share/crawl/dat/des/serial/window.des
share/crawl/dat/des/sprint/
@@ -386,10 +396,12 @@ share/crawl/dat/descript/lv/tutorial.txt
share/crawl/dat/descript/lv/unident.txt
share/crawl/dat/descript/lv/unrand.txt
share/crawl/dat/descript/monsters.txt
+share/crawl/dat/descript/mutations.txt
share/crawl/dat/descript/nl/
share/crawl/dat/descript/nl/ability.txt
share/crawl/dat/descript/nl/tutorial.txt
share/crawl/dat/descript/nl/unident.txt
+share/crawl/dat/descript/passives.txt
share/crawl/dat/descript/pl/
share/crawl/dat/descript/pl/ability.txt
share/crawl/dat/descript/pl/backgrounds.txt
@@ -470,10 +482,13 @@ share/crawl/dat/descript/zh/gods.txt
share/crawl/dat/descript/zh/hints.txt
share/crawl/dat/descript/zh/items.txt
share/crawl/dat/descript/zh/monsters.txt
+share/crawl/dat/descript/zh/mutations.txt
+share/crawl/dat/descript/zh/passives.txt
share/crawl/dat/descript/zh/quotes.txt
share/crawl/dat/descript/zh/skills.txt
share/crawl/dat/descript/zh/species.txt
share/crawl/dat/descript/zh/spells.txt
+share/crawl/dat/descript/zh/status.txt
share/crawl/dat/descript/zh/tutorial.txt
share/crawl/dat/descript/zh/unident.txt
share/crawl/dat/descript/zh/unrand.txt
