From: Stuart Henderson <stu@spacehopper.org>
Subject: Re: games/stone-soup 0.32.0p1->0.32.1
To: Stefan Moran <ssm@howdoesmycode.work>
Cc: <ports@openbsd.org>
Date: Thu, 17 Apr 2025 08:44:50 +0100

yes it is correct to use LOCALBASE for "files from other ports", I wouldn't 
have said it otherwise.

PREFIX is just for where files from this port should be installed.

-- 
  Sent from a phone, apologies for poor formatting.

On 17 April 2025 06:12:34 Stefan Moran <ssm@howdoesmycode.work> wrote:

> On 2025/04/14 07:11, Stuart Henderson wrote:
>> On 2025/04/13 02:12, Stefan Moran wrote:
>>>  Substitute LOCALBASE with PREFIX, saves some horizontal
>>>  room.
>>
>> That's not correct, they're gor different things. PREFIX is for where
>> files from this port should be installed, LOCALBASE is for files from
>> dependencies etc.
>
> LOCALBASE seems to normally be reserved for when PREFIX needs to
> be changed to a location that isn't the default /usr/local (a
> location like ${VARBASE}).  This port isn't one of those (LOCALBASE
> and PREFIX are both used, but PREFIX is never redefined), I don't
> know why the previous maintainer was using it if this is the case.
> The porter's handbook backs up this implication:
>
> Section from www/faq/ports/specialtopics.html:
>
>        Packages should only install files under ${PREFIX}, which
>        is /usr/local by default.
>
> Thanks for the suggestion for using MAKEJOBS for NPROC.  If you
> still think using LOCALBASE instead is a good idea, I can switch
> it back.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/stone-soup/Makefile,v
> diff -u -p -r1.51 Makefile
> --- Makefile 21 Dec 2024 11:38:01 -0000 1.51
> +++ Makefile 17 Apr 2025 05:05:10 -0000
> @@ -1,74 +1,67 @@
> BROKEN-hppa = ICE on dgn-shoals.cc:638
>
> -COMMENT = dungeon crawl stone soup
> +COMMENT = dungeon crawl stone soup
>
> -VERSION = 0.32.0
> -TAGNAME = Gods and Makers
> +VERSION = 0.32.1
>
> -DISTNAME= stone_soup-${VERSION}-nodeps
> -PKGNAME= stone-soup-${VERSION}
> -REVISION= 1
> +DISTNAME = stone_soup-${VERSION}-nodeps
> +PKGNAME = stone-soup-${VERSION}
>
> -CATEGORIES = games
> +CATEGORIES = games
>
> -HOMEPAGE = https://crawl.develz.org/
> +HOMEPAGE = https://crawl.develz.org/
>
> MAINTAINER = Stefan Moran <ssm@howdoesmycode.work>
>
> # GPLv2+
> -PERMIT_PACKAGE= Yes
> +PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c m sqlite3
>
> SITES = https://github.com/crawl/crawl/releases/download/${VERSION}/
> -EXTRACT_SUFX= .tar.xz
> +EXTRACT_SUFX = .tar.xz
>
> COMPILER = base-clang ports-gcc
> -MODULES = lang/python \
> +MODULES = lang/python \
>  lang/lua
>
> -MODLUA_VERSION = 5.1
> +MODLUA_VERSION = 5.1
>
> -BUILD_DEPENDS = graphics/pngcrush \
> +BUILD_DEPENDS = graphics/pngcrush \
>  textproc/py-yaml
> -LIB_DEPENDS = databases/sqlite3
> +LIB_DEPENDS = databases/sqlite3
>
> -MAKE_FLAGS = CC="${CC}" GCC="${GCC}" GXX="${CXX}" \
> - CXX="${CXX}" HOSTCXX="${CXX}" \
> - LUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
> - LUA_LIB=${MODLUA_LIB} \
> - SQLITE_INCLUDE_DIR=${LOCALBASE}/include \
> - LDFLAGS=-L${LOCALBASE}/lib \
> - INSTALL_UGRP=root:wheel \
> - prefix=${PREFIX} \
> - SAVEDIR="~/.crawl" \
> - NO_YACC=1 V=1 \
> - SRC_VERSION=${VERSION} RECENT_TAG="${TAGNAME}"
> +MAKE_FLAGS = CC="${CC}" CXX="${CXX}" GCC="${GCC}" GXX="${CXX}" \
> + HOSTCXX="${CXX}" INSTALL_UGRP=root:wheel \
> + LDFLAGS=-L${PREFIX}/lib LUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
> + LUA_LIB=${MODLUA_LIB} NO_TRY_GOLD=1 NO_YACC=1 \
> + NPROC="${MAKE_JOBS}" SAVEDIR="~/.crawl" \
> + SQLITE_INCLUDE_DIR=${PREFIX}/include V=1 prefix=${PREFIX}
>
> -USE_GMAKE = Yes
> -CONFIGURE_STYLE = none
> +USE_GMAKE = Yes
> +CONFIGURE_STYLE = none
>
> -MODPY_RUN_DEPENDS = No
> +MODPY_RUN_DEPENDS = No
> MODPY_ADJ_FILES = util/species-gen.py \
>  util/tag-35-upgrade.py
>
> -FLAVORS = no_x11
> +FLAVORS = no_x11
> FLAVOR ?=
>
> .if ${FLAVOR:Mno_x11}
> -WANTLIB += curses pthread z
> -MAKE_FLAGS += USE_UNICODE=y UNICODE_LOCALE=y
> +WANTLIB += curses pthread z
> +MAKE_FLAGS += USE_UNICODE=y UNICODE_LOCALE=y
> .else
> # This should be automatically set during "gmake -C rltiles..." but isn't...
> CFLAGS += -DUSE_TILE
> CXXFLAGS += -DUSE_TILE
>
> -MAKE_FLAGS += TILES=y \
> - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib \
> +MAKE_FLAGS += TILES=y \
> + LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib \
>  -lSDL2 -lSDL2_image -lpng -pthread"
> -WANTLIB += GL GLU SDL2 SDL2_image freetype png pthread z
> +WANTLIB += GL GLU SDL2 SDL2_image freetype png pthread z
> RUN_DEPENDS = devel/desktop-file-utils
> -LIB_DEPENDS += devel/sdl2 \
> +LIB_DEPENDS += devel/sdl2 \
>  devel/sdl2-image \
>  databases/sqlite3 \
>  graphics/png
> @@ -76,11 +69,11 @@ LIB_DEPENDS += devel/sdl2 \
>
> NO_TEST = Yes
>
> -CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2
> -CXXFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2
> +CFLAGS += -I${PREFIX}/include -I${PREFIX}/include/SDL2
> +CXXFLAGS += -I${PREFIX}/include -I${PREFIX}/include/SDL2
>
> -WRKDIST = ${WRKDIR}/stone_soup-${VERSION}
> -WRKSRC = ${WRKDIST}/source
> +WRKDIST = ${WRKDIR}/stone_soup-${VERSION}
> +WRKSRC = ${WRKDIST}/source
>
> post-install:
>  mv ${PREFIX}/bin/crawl ${PREFIX}/bin/crawl-ss
> @@ -94,5 +87,8 @@ post-install:
>  ${PREFIX}/share/crawl/dat/tiles/stone_soup_icon-32x32.png \
>  ${PREFIX}/share/pixmaps/stone-soup.png
> .endif
> + rm -r ${PREFIX}/share/crawl/docs/{license,develop} \
> + ${PREFIX}/share/crawl/settings/mac
> + mv ${PREFIX}/share/crawl/docs ${PREFIX}/share/doc/crawl
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/stone-soup/distinfo,v
> diff -u -p -r1.11 distinfo
> --- distinfo 4 Oct 2024 01:11:00 -0000 1.11
> +++ distinfo 17 Apr 2025 05:05:10 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (stone_soup-0.32.0-nodeps.tar.xz) = 
> tJNABX09YqWQb81PA3opnemlAOe3x1Qfd9/Bhj++fVY=
> -SIZE (stone_soup-0.32.0-nodeps.tar.xz) = 21311400
> +SHA256 (stone_soup-0.32.1-nodeps.tar.xz) = 
> 5OxgcgiMc/QjNjRillQ5WwXniGGZGGvm0/jJX6NFH8c=
> +SIZE (stone_soup-0.32.1-nodeps.tar.xz) = 21335728
> Index: patches/patch-source_Makefile
> ===================================================================
> RCS file: /cvs/ports/games/stone-soup/patches/patch-source_Makefile,v
> diff -u -p -r1.11 patch-source_Makefile
> --- patches/patch-source_Makefile 4 Oct 2024 01:11:00 -0000 1.11
> +++ patches/patch-source_Makefile 17 Apr 2025 05:05:10 -0000
> @@ -32,22 +32,14 @@ Index: source/Makefile
>  endif
>  endif
>
> -@@ -1280,9 +1268,7 @@ GENERATED_FILES := $(GENERATED_HEADERS) art-data.h mi-
> +@@ -1280,9 +1268,8 @@ GENERATED_FILES := $(GENERATED_HEADERS) art-data.h mi-
>
>  LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
>  SRC_PKG_BASE  := stone_soup
> -SRC_VERSION   := $(shell git describe $(MERGE_BASE) 2>/dev/null || cat 
> util/release_ver)
> ++SRC_VERSION   := $(shell cat util/release_ver)
>  MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 
>  's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
> -RECENT_TAG    := $(shell git describe --abbrev=0 $(MERGE_BASE))
>  WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || 
>  echo win32)
>
>  export SRC_VERSION
> -@@ -2106,7 +2092,7 @@ 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: pkg/PFRAG.no-no_x11
> ===================================================================
> RCS file: /cvs/ports/games/stone-soup/pkg/PFRAG.no-no_x11,v
> diff -u -p -r1.13 PFRAG.no-no_x11
> --- pkg/PFRAG.no-no_x11 5 Mar 2024 03:10:19 -0000 1.13
> +++ pkg/PFRAG.no-no_x11 17 Apr 2025 05:05:10 -0000
> @@ -52,7 +52,7 @@ share/crawl/dat/tiles/title_shadyamish_o
> 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/wall.png
> -share/crawl/docs/tiles_help.txt
> +share/doc/crawl/tiles_help.txt
> share/pixmaps/
> share/pixmaps/stone-soup.png
> @tag update-desktop-database
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/games/stone-soup/pkg/PLIST,v
> diff -u -p -r1.13 PLIST
> --- pkg/PLIST 4 Oct 2024 01:11:00 -0000 1.13
> +++ pkg/PLIST 17 Apr 2025 05:05:10 -0000
> @@ -617,52 +617,6 @@ share/crawl/dat/dlua/v_rooms.lua
> share/crawl/dat/dlua/v_shapes.lua
> share/crawl/dat/dlua/vault.lua
> share/crawl/dat/dlua/ziggurat.lua
> -share/crawl/docs/
> -share/crawl/docs/CREDITS.txt
> -share/crawl/docs/aptitudes-wide.txt
> -share/crawl/docs/aptitudes.txt
> -share/crawl/docs/arena.txt
> -@comment share/crawl/docs/changelog.txt
> -share/crawl/docs/crawl_manual.txt
> -@comment share/crawl/docs/develop/coding_conventions.txt
> -@comment share/crawl/docs/develop/background_creation.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/arena.txt
> -@comment share/crawl/docs/develop/ctags.txt
> -@comment share/crawl/docs/develop/editor_tips.txt
> -@comment share/crawl/docs/develop/gdb_tips.txt
> -@comment share/crawl/docs/develop/god_creation.txt
> -@comment share/crawl/docs/develop/keys.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_creation.txt
> -@comment share/crawl/docs/develop/monster_speech.txt
> -@comment share/crawl/docs/develop/mutation_creation.txt
> -@comment share/crawl/docs/develop/patch_guide.txt
> -@comment share/crawl/docs/develop/save_compatibility.txt
> -@comment share/crawl/docs/develop/spells.txt
> -@comment share/crawl/docs/develop/test_plug_and_play_cc.txt
> -@comment share/crawl/docs/develop/tiles_creation.txt
> -@comment share/crawl/docs/develop/translation.txt
> -share/crawl/docs/fight_simulator.txt
> -share/crawl/docs/keybind.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/macros_guide.txt
> -share/crawl/docs/options_guide.txt
> -share/crawl/docs/quickstart.md
> -share/crawl/docs/quickstart.txt
> -@comment share/crawl/docs/ssh_guide.txt
> share/crawl/settings/
> share/crawl/settings/advanced_optioneering.txt
> share/crawl/settings/colemak_command_keys.txt
> @@ -670,10 +624,22 @@ share/crawl/settings/dec_glyphs.txt
> share/crawl/settings/dvorak_command_keys.txt
> share/crawl/settings/ibm_glyphs.txt
> share/crawl/settings/init.txt
> -@comment share/crawl/settings/mac/
> -@comment share/crawl/settings/mac/Crawl profile.terminal
> share/crawl/settings/neo_command_keys.txt
> share/crawl/settings/no_vi_command_keys.txt
> share/crawl/settings/old_unicode_glyphs.txt
> share/crawl/settings/safe_move_shift.txt
> +share/doc/crawl/
> +@comment share/doc/crawl/CREDITS.txt
> +share/doc/crawl/aptitudes-wide.txt
> +share/doc/crawl/aptitudes.txt
> +share/doc/crawl/arena.txt
> +@comment share/doc/crawl/changelog.txt
> +share/doc/crawl/crawl_manual.txt
> +share/doc/crawl/fight_simulator.txt
> +share/doc/crawl/keybind.txt
> +share/doc/crawl/macros_guide.txt
> +share/doc/crawl/options_guide.txt
> +share/doc/crawl/quickstart.md
> +share/doc/crawl/quickstart.txt
> +@comment share/doc/crawl/ssh_guide.txt
> !%%no_x11%%