Re: [s...@spacehopper.org: Re: [NEW]: misc/openhab - open Home Automation Bus (openHAB)]
Stuart Henderson writes: > I've tweaked DESCR/README slightly for openhab-addons. This has been sitting > on ports@ for quite a while, as is usual for a java port there are some > things which sit a bit awkwardly compared to some other ports but I > think it's basically alright. Any oks to import? ok bentley@
Re: converters/k2pdfopt: unbreak/update to 2.55
Stuart Henderson writes: > Perhaps consider replacing pre-patch with this which I think is a little > clearer: > > FIX_CRLF_FILES = `find . -type f` Can this be tweaked to limit it to text files, without making it too complicated? I only see a single binary file in the distfile, but still...
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/18 03:29:25 Modified files: mail : Makefile Log message: +mailparser
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/18 03:28:41 Log message: Import mailparser-3.15.0. mail-parser is not only a wrapper for 'email' in the Python Standard Library. It gives you an easy way to pass raw mail to a Python object that you can use in your code. ok sthen@ landry@ Status: Vendor Tag: bentley Release Tags: bentley_20240418 N ports/mail/mailparser/Makefile N ports/mail/mailparser/distinfo N ports/mail/mailparser/pkg/DESCR N ports/mail/mailparser/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/18 03:20:38 Modified files: fonts/blockzone: Makefile fonts/blockzone/pkg: PLIST devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Rename BlockZone package back to blockzone. It was imported with a lowercase PKGNAME, but was unintentionally changed to UpperCase in Makefile rev 1.2.
NEW: mail/mailparser
Hi, mail-parser is not only a wrapper for 'email' in the Python Standard Library. It gives you an easy way to pass raw mail to a Python object that you can use in your code. There's a provided command-line tool that's easy to test. ok? -- Anthony J. Bentley mailparser.tar.gz Description: GNU Zip compressed data
Re: NEW: www/internetarchive
Stuart Henderson writes:
> On 2024/04/17 12:14, Anthony J. Bentley wrote:
> > > The internetarchive package provides a command-line tool named 'ia',
> > > as well as a Python module for programmatic access to Archive.org.
> > >
> > >
> > > Would have been fun to put it under archivers/, but I decided
> > > against it.
> > >
> > > ok?
> >
> > Updated RUN_DEPENDS.
>
> Generally python ports aren't using PKG_ARCH=*, I'd prefer to keep it
> like that.
>
> tests/cli/test_ia_download.py tests fail if ia isn't on the path so
> probably wants either a self-TEST_DEPENDS or adjusting the path to
> include the newly built files (TEST_ENV = PATH=${WRKINST}${PREFIX}/bin
> though this only works after 'make fake').
Added self-TEST_DEPENDS and removed PKG_ARCH.
internetarchive.tar.gz
Description: GNU Zip compressed data
Re: NEW: www/internetarchive
Hi, > The internetarchive package provides a command-line tool named 'ia', > as well as a Python module for programmatic access to Archive.org. > > > Would have been fun to put it under archivers/, but I decided > against it. > > ok? Updated RUN_DEPENDS. -- Anthony J. Bentley internetarchive.tar.gz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/17 04:45:52 Modified files: games/blobby : Makefile distinfo games/blobby/pkg: PLIST Added files: games/blobby/patches: patch-deps_CMakeLists_txt patch-src_CMakeLists_txt Log message: Update to blobby-1.1.1.
Re: UPDATE: games/minetest to 5.8.0
izder456 writes:
> > I am still looking to upgrade these. OK to merge?
>
> Whoops, forgot to attach the .diff with all the changes, here:
Thanks for this diff. A few things:
- USE_NOBTCFI required after switch to luajit (crashes on BTI
hardware otherwise)
- build fails due to missing include for getpid() call
- delete REVISION since the version number changed
- it's generally preferred not to reformat WANTLIB whitespace
Here's an updated diff, which I'll commit in a few days unless
someone objects.
Index: Makefile
===
RCS file: /cvs/ports/games/minetest/Makefile,v
diff -u -p -r1.39 Makefile
--- Makefile26 Sep 2023 09:41:38 - 1.39
+++ Makefile17 Apr 2024 09:43:24 -
@@ -1,38 +1,33 @@
COMMENT = infinite-world block sandbox game
-V =5.6.0
-GAME_V = 5.6.0
-IRRLICHTMT_V = 1.9.0mt7
-
-DISTNAME = minetest-${V}
-CATEGORIES = games x11
-REVISION = 0
+V =5.8.0
+PKGNAME = minetest-${V}
+
+DIST_TUPLE += github minetest minetest ${V} .
+DIST_TUPLE += github minetest irrlicht 1.9.0mt13 lib/irrlichtmt
+DIST_TUPLE += github minetest minetest_game 5.8.0 games/minetest_game
+
+CATEGORIES = games x11
HOMEPAGE = https://www.minetest.net/
# source LGPLv2.1/ datas CC BY-SA 3.0
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE SM X11 Xext Xi c curl
-WANTLIB += curses form freetype gmp iconv intl jpeg jsoncpp lua5.1
-WANTLIB += m ogg openal png pq spatialindex sqlite3 vorbis vorbisfile
-WANTLIB += z zstd
+WANTLIB += ${COMPILER_LIBCXX} GL GLU X11 Xi c curl curses form freetype
+WANTLIB += gmp iconv intl jpeg jsoncpp luajit-5.1 m ogg openal png pq
+WANTLIB += spatialindex sqlite3 vorbis vorbisfile z zstd
COMPILER = base-clang ports-gcc base-gcc
-SITES =https://github.com/minetest/
-
-DISTFILES =minetest-{minetest/archive/}${V}${EXTRACT_SUFX} \
-
minetest-game-{minetest_game/archive/}${GAME_V}${EXTRACT_SUFX} \
-
irrlichtmt-{irrlicht/archive/}${IRRLICHTMT_V}${EXTRACT_SUFX}
-
-MODULES = devel/cmake \
- lang/lua
+MODULES = devel/cmake
CONFIGURE_ARGS = -DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
CONFIGURE_ARGS+= -DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE
-CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DENABLE_LUAJIT=FALSE
-CONFIGURE_ARGS+= -DBUILD_SERVER=TRUE
+CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DBUILD_SERVER=TRUE
+
+# luajit
+USE_NOBTCFI = Yes
CXXFLAGS +=-I${X11BASE}/include
MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
@@ -42,8 +37,8 @@ BUILD_DEPENDS = devel/gettext,-tools
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
-LIB_DEPENDS = ${MODLUA_LIB_DEPENDS} \
- audio/openal \
+LIB_DEPENDS = audio/openal \
+ lang/luajit \
audio/libvorbis \
archivers/zstd \
devel/gettext,-runtime \
@@ -60,18 +55,11 @@ TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_P
TEST_ENV +=HOME=${WRKBUILD}/test \
LC_CTYPE="en_US.UTF-8"
-post-extract:
- mv ${WRKDIR}/irrlicht-${IRRLICHTMT_V} \
- ${WRKSRC}/lib/irrlichtmt
-
-# Use system cmake modules
-post-patch:
- rm ${WRKSRC}/cmake/Modules/FindLua*
-
post-install:
- mv ${WRKDIR}/minetest_game-${GAME_V}/ \
- ${PREFIX}/share/minetest/games/minetest_game
- chown -R ${SHAREOWN}:${SHAREGRP}
${PREFIX}/share/minetest/games/minetest_game
+ mkdir -p ${PREFIX}/share/minetest/games
+ mv ${WRKDIST}/games \
+ ${PREFIX}/share/minetest/
+ chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/gamesm/*
do-test:
mkdir -p ${WRKBUILD}/test
Index: distinfo
===
RCS file: /cvs/ports/games/minetest/distinfo,v
diff -u -p -r1.13 distinfo
--- distinfo21 Aug 2022 08:58:35 - 1.13
+++ distinfo17 Apr 2024 09:43:24 -
@@ -1,6 +1,6 @@
-SHA256 (irrlichtmt-1.9.0mt7.tar.gz) =
wSzb1KhS4ebr97oieJqgV6Gn8tWF3YGiQSpi9XoOJhk=
-SHA256 (minetest-5.6.0.tar.gz) = P9vAyNn2oYwSlUugyu21SKIvNnUg9Z0HmASiHeA0epE=
-SHA256 (minetest-game-5.6.0.tar.gz) =
/ZkdQsJT2zgFWcWTorA18i4HqB+Ge1OAovBF6aTQTIc=
-SIZE (irrlichtmt-1.9.0mt7.tar.gz) = 909510
-SIZE (minetest-5.6.0.tar.gz) = 9922682
-SIZE (minetest-game-5.6.0.tar.gz) = 2590530
+SHA256 (minetest-irrlicht-1.9.0mt13.tar.gz) =
L96OJxRJiCELnA/x4gKQWDTZ0lqqY85FJ2P9cXEJatw=
+SHA256 (minetest-minetest-5.8.0.tar.gz) =
YQyFok13rNwwQ6add3vtnmwAFpQGygnfIq1JD+DWjAw=
+SHA256 (minetest-minetest_game-5.8.0.tar.gz) =
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/16 13:40:46 Modified files: emulators/es-de: Makefile distinfo emulators/es-de/pkg: PLIST Log message: Update to es-de-3.0.1. Release notes: https://gitlab.com/es-de/emulationstation-de/-/releases/v3.0.1
NEW: www/internetarchive
Hi, The internetarchive package provides a command-line tool named 'ia', as well as a Python module for programmatic access to Archive.org. Would have been fun to put it under archivers/, but I decided against it. ok? -- Anthony J. Bentley internetarchive.tar.gz Description: GNU Zip compressed data
Re: update games/openttd --> 14.0
Paco Esteban writes: > Hi ports@, > > This is an update of games/openttd to its latest version 14.0 > Announcement here: https://www.openttd.org/news/2024/04/13/openttd-14-0 > Changelog here: https://cdn.openttd.org/openttd-releases/14.0/changelog.txt Hm! /usr/ports/pobj/openttd-14.0/openttd-14.0/src/core/random_func.cpp:137:3: warning: "No cryptographically-strong random generator available; using a fallback instead" [-W#warnings] There's a block that uses arc4random, but OpenBSD is missing: #elif defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) arc4random_buf(buf.data(), buf.size()); return;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/16 10:36:49 Modified files: devel/rgbds: Makefile distinfo devel/rgbds/patches: patch-Makefile patch-src_gfx_main_cpp Added files: devel/rgbds/patches: patch-src_asm_main_cpp patch-src_fix_main_cpp patch-src_link_main_cpp Removed files: devel/rgbds/patches: patch-src_asm_main_c patch-src_fix_main_c patch-src_link_main_c Log message: Update to rgbds-0.7.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/16 09:55:08 Modified files: www/apertium-apy: Makefile distinfo www/apertium-apy/pkg: PLIST Removed files: www/apertium-apy/patches: patch-apertium_apy_gateway_py patch-apertium_apy_handlers_base_py patch-apertium_apy_handlers_list_modes_py patch-apertium_apy_handlers_stats_py patch-setup_py Log message: Update to apertium-apy-0.12.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/16 09:20:57 Modified files: www/netsurf/browser: Makefile distinfo www/netsurf/browser/patches: patch-content_fetchers_curl_c www/netsurf/browser/pkg: PLIST www/netsurf/buildsystem: Makefile distinfo www/netsurf/buildsystem/patches: patch-makefiles_Makefile_top www/netsurf/hubbub: Makefile distinfo www/netsurf/libcss: Makefile distinfo www/netsurf/libcss/pkg: PLIST www/netsurf/libdom: Makefile distinfo www/netsurf/libdom/pkg: PLIST www/netsurf/libnsbmp: Makefile distinfo www/netsurf/libnsgif: Makefile distinfo www/netsurf/libnsgif/pkg: PLIST www/netsurf/libnspsl: Makefile distinfo www/netsurf/libnsutils: Makefile distinfo www/netsurf/libnsutils/pkg: PLIST www/netsurf/libparserutils: Makefile distinfo www/netsurf/libsvgtiny: Makefile distinfo www/netsurf/netsurf-fb: Makefile distinfo www/netsurf/netsurf-fb/patches: patch-content_fetchers_curl_c www/netsurf/netsurf-fb/pkg: PLIST www/netsurf/nsgenbind: Makefile distinfo Added files: www/netsurf/browser/patches: patch-content_fetchers_about_certificate_c patch-docs_netsurf-gtk_1 www/netsurf/netsurf-fb/patches: patch-content_fetchers_about_certificate_c Removed files: www/netsurf/browser/patches: patch-content_fetchers_about_c Log message: Update to netsurf-3.11. Tests and ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/16 06:12:01 Modified files: textproc/apertium-dicts/urd-hin: Makefile textproc/apertium-dicts/urd-hin/pkg: PLIST Log message: Unbreak build by rerunning autoconf.
Re: font module: add MODFONT_DOCFILES
Anthony J. Bentley writes:
> This diff adds the variables MODFONT_DOCDIR (which defaults to
> ${PREFIX}/share/doc/${MODFONT_FAMILY}) and MODFONT_DOCFILES (a user-
> specified list of files relative to WRKSRC).
And the manpage diff:
Index: port-modules.5
===
RCS file: /cvs/src/share/man/man5/port-modules.5,v
diff -u -p -r1.268 port-modules.5
--- port-modules.5 15 Apr 2024 16:11:01 - 1.268
+++ port-modules.5 15 Apr 2024 20:24:53 -
@@ -698,6 +698,8 @@ it sets
should be set to the name of the font family.
This sets
.Ev MODFONT_DIR
+and
+.Ev MODFONT_DOCDIR
using said family name.
A
.Cm do-install
@@ -709,6 +711,12 @@ If one or more file extensions are liste
.Ev MODFONT_TYPES ,
files of those types will be used.
Otherwise, otf files are preferred, with a fallback to ttf.
+If filenames (relative to
+.Ev WRKSRC )
+are listed in
+.Ev MODFONT_DOCFILES ,
+they will be installed to
+.Ev MODFONT_DOCDIR .
.It fortran
Sets
.Ev MODFORTRAN_LIB_DEPENDS ,
font module: add MODFONT_DOCFILES
The majority of font ports don't use the font module. One reason why
is that in a lot of cases, doing so doesn't make the makefile any
simpler.
One area where this can be easily improved is with font documentation.
It's very common for fonts to come with doc files like readmes, font
showcases, and licenses. Several dozen of our font ports install these
to /usr/local/share/doc. Since the module doesn't help with this, the
ports all define custom do-install or post-install targets.
This diff adds the variables MODFONT_DOCDIR (which defaults to
${PREFIX}/share/doc/${MODFONT_FAMILY}) and MODFONT_DOCFILES (a user-
specified list of files relative to WRKSRC).
This allows ports that use the font module and install docs to replace
their custom install targets with a single variable assignment. In this
diff I've gone ahead and eliminated most of the post-install targets in
ports using the font module. (I didn't start converting non-module fonts
yet; that will come after I've made further changes to the module.)
ok?
Index: infrastructure/mk/font.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/font.port.mk,v
diff -u -p -r1.7 font.port.mk
--- infrastructure/mk/font.port.mk 15 Apr 2024 16:08:14 - 1.7
+++ infrastructure/mk/font.port.mk 15 Apr 2024 20:22:23 -
@@ -12,8 +12,10 @@ PKGNAME ?= ${MODFONT_FAMILY}-${MODFONT_V
. endif
MODFONT_DIR ?= ${PREFIX}/share/fonts/${MODFONT_FAMILY}
+MODFONT_DOCDIR ?= ${PREFIX}/share/doc/${MODFONT_FAMILY}
MODFONT_TYPES ?=
+MODFONT_DOCFILES ?=
MODFONT_do-install = ${INSTALL_DATA_DIR} ${MODFONT_DIR};
@@ -23,6 +25,11 @@ MODFONT_do-install = ${INSTALL_DATA_DIR}
MODFONT_do-install += for t in otf ttf; do ${INSTALL_DATA} ${WRKSRC}/*.$$t
${MODFONT_DIR} && break; done
.else
MODFONT_do-install += for t in ${MODFONT_TYPES}; do ${INSTALL_DATA}
${WRKSRC}/*.$$t ${MODFONT_DIR}; done
+.endif
+
+.if !empty(MODFONT_DOCFILES)
+MODFONT_do-install += ; ${INSTALL_DATA_DIR} ${MODFONT_DOCDIR}
+MODFONT_do-install += ; for t in ${MODFONT_DOCFILES}; do ${INSTALL_DATA}
${WRKSRC}/$$t ${MODFONT_DOCDIR}; done
.endif
. if !target(do-install)
Index: fonts/abyssinica/Makefile
===
RCS file: /cvs/ports/fonts/abyssinica/Makefile,v
diff -u -p -r1.14 Makefile
--- fonts/abyssinica/Makefile 15 Apr 2024 16:08:15 - 1.14
+++ fonts/abyssinica/Makefile 15 Apr 2024 20:22:23 -
@@ -19,10 +19,6 @@ SITES = https://software.sil.org/downl
NO_BUILD = Yes
NO_TEST = Yes
-DOCDIR = ${PREFIX}/share/doc/abyssinica
-
-post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKDIST}/{README.txt,OFL.txt} ${DOCDIR}
+MODFONT_DOCFILES = README.txt OFL.txt
.include
Index: fonts/alkalami/Makefile
===
RCS file: /cvs/ports/fonts/alkalami/Makefile,v
diff -u -p -r1.10 Makefile
--- fonts/alkalami/Makefile 21 Sep 2023 15:28:01 - 1.10
+++ fonts/alkalami/Makefile 15 Apr 2024 20:22:23 -
@@ -1,5 +1,6 @@
COMMENT = Unicode font for African Arabic script
V =2.000
+MODFONT_FAMILY = alkalami
DISTNAME = Alkalami-${V}
PKGNAME = alkalami-${V}
CATEGORIES = fonts
@@ -18,12 +19,7 @@ MODULES =font
NO_BUILD = Yes
NO_TEST = Yes
-FONTDIR = ${PREFIX}/share/fonts/alkalami
-DOCDIR = ${PREFIX}/share/doc/alkalami
-
-do-install:
- ${INSTALL_DATA_DIR} ${FONTDIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKDIST}/*.ttf ${FONTDIR}
- ${INSTALL_DATA} ${WRKDIST}/{FONTLOG.txt,README.txt} ${DOCDIR}
+MODFONT_TYPES =ttf
+MODFONT_DOCFILES = FONTLOG.txt README.txt
.include
Index: fonts/andika/Makefile
===
RCS file: /cvs/ports/fonts/andika/Makefile,v
diff -u -p -r1.12 Makefile
--- fonts/andika/Makefile 15 Apr 2024 16:08:15 - 1.12
+++ fonts/andika/Makefile 15 Apr 2024 20:22:23 -
@@ -18,10 +18,6 @@ MODULES += font
NO_BUILD = Yes
NO_TEST = Yes
-DOCDIR = ${PREFIX}/share/doc/andika
-
-post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKDIST}/*.txt ${DOCDIR}
+MODFONT_DOCFILES = *.txt
.include
Index: fonts/atkinson-hyperlegible/Makefile
===
RCS file: /cvs/ports/fonts/atkinson-hyperlegible/Makefile,v
diff -u -p -r1.5 Makefile
--- fonts/atkinson-hyperlegible/Makefile15 Apr 2024 16:08:15 -
1.5
+++ fonts/atkinson-hyperlegible/Makefile15 Apr 2024 20:22:24 -
@@ -25,11 +25,10 @@ NO_BUILD = Yes
NO_TEST = Yes
WRKSRC = ${WRKDIST}/Print\ Fonts
-DOCDIR =
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/15 14:21:34 Modified files: textproc/apertium: Makefile distinfo textproc/apertium/patches: patch-apertium_adapt_docx_cc patch-apertium_apertium-header_sh patch-apertium_apertium-unformat-header_sh patch-apertium_apertium_interchunk_cc patch-apertium_apertium_postchunk_cc patch-apertium_apertium_transfer_cc patch-apertium_gen_modes_cc textproc/apertium/pkg: PLIST textproc/apertium-anaphora: Makefile distinfo textproc/apertium-anaphora/patches: patch-src_anaphora_cc textproc/apertium-dicts/afr: Makefile textproc/apertium-dicts/afr-nld: Makefile textproc/apertium-dicts/arg: Makefile textproc/apertium-dicts/arg-cat: Makefile textproc/apertium-dicts/bel: Makefile textproc/apertium-dicts/bel-rus: Makefile textproc/apertium-dicts/br-fr: Makefile textproc/apertium-dicts/cat: Makefile distinfo textproc/apertium-dicts/cat/pkg: PLIST textproc/apertium-dicts/cat-ita: Makefile distinfo textproc/apertium-dicts/cat-srd: Makefile distinfo textproc/apertium-dicts/crh: Makefile textproc/apertium-dicts/crh-tur: Makefile textproc/apertium-dicts/cy-en: Makefile textproc/apertium-dicts/dan: Makefile textproc/apertium-dicts/dan-nor: Makefile textproc/apertium-dicts/en-es: Makefile textproc/apertium-dicts/en-gl: Makefile textproc/apertium-dicts/eng: Makefile textproc/apertium-dicts/eng-cat: Makefile textproc/apertium-dicts/eo-ca: Makefile textproc/apertium-dicts/eo-en: Makefile textproc/apertium-dicts/eo-es: Makefile textproc/apertium-dicts/eo-fr: Makefile textproc/apertium-dicts/es-gl: Makefile textproc/apertium-dicts/es-pt: Makefile textproc/apertium-dicts/es-ro: Makefile textproc/apertium-dicts/eu-en: Makefile textproc/apertium-dicts/eu-es: Makefile textproc/apertium-dicts/fr-es: Makefile textproc/apertium-dicts/fra: Makefile textproc/apertium-dicts/fra-cat: Makefile textproc/apertium-dicts/hbs: Makefile textproc/apertium-dicts/hbs-eng: Makefile textproc/apertium-dicts/hbs-slv: Makefile textproc/apertium-dicts/hin: Makefile textproc/apertium-dicts/ind: Makefile textproc/apertium-dicts/ind-zlm: Makefile textproc/apertium-dicts/isl: Makefile textproc/apertium-dicts/isl-eng: Makefile textproc/apertium-dicts/isl-swe: Makefile textproc/apertium-dicts/ita: Makefile distinfo textproc/apertium-dicts/mkd-bul: Makefile textproc/apertium-dicts/mkd-eng: Makefile textproc/apertium-dicts/mlt-ara: Makefile textproc/apertium-dicts/nld: Makefile textproc/apertium-dicts/nno: Makefile textproc/apertium-dicts/nno-nob: Makefile textproc/apertium-dicts/nob: Makefile textproc/apertium-dicts/oc-ca: Makefile textproc/apertium-dicts/oc-es: Makefile textproc/apertium-dicts/oci: Makefile textproc/apertium-dicts/oci-fra: Makefile textproc/apertium-dicts/pol: Makefile textproc/apertium-dicts/pol-szl: Makefile textproc/apertium-dicts/por: Makefile textproc/apertium-dicts/por-cat: Makefile textproc/apertium-dicts/pt-gl: Makefile textproc/apertium-dicts/rus: Makefile textproc/apertium-dicts/rus-ukr: Makefile textproc/apertium-dicts/spa: Makefile textproc/apertium-dicts/spa-arg: Makefile textproc/apertium-dicts/spa-ast: Makefile textproc/apertium-dicts/spa-cat: Makefile textproc/apertium-dicts/spa-ita: Makefile textproc/apertium-dicts/srd: Makefile distinfo textproc/apertium-dicts/srd-ita: Makefile distinfo textproc/apertium-dicts/srd-ita/pkg: PLIST textproc/apertium-dicts/swe: Makefile textproc/apertium-dicts/swe-dan: Makefile textproc/apertium-dicts/swe-nor: Makefile textproc/apertium-dicts/szl: Makefile textproc/apertium-dicts/tur: Makefile textproc/apertium-dicts/ukr: Makefile textproc/apertium-dicts/urd: Makefile textproc/apertium-dicts/urd-hin: Makefile textproc/apertium-dicts/zlm: Makefile textproc/apertium-recursive: Makefile distinfo textproc/apertium-recursive/patches: patch-src_rtx_decomp_cc textproc/apertium-separable: Makefile textproc/lttoolbox: Makefile distinfo textproc/lttoolbox/patches: patch-lttoolbox_sorted_vector_hpp textproc/lttoolbox/pkg: PLIST Added files:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/15 10:08:18 Modified files: infrastructure/mk: font.port.mk fonts/abyssinica: Makefile fonts/andika : Makefile fonts/arabeyes-ttf: Makefile fonts/aref-ruqaa: Makefile fonts/atkinson-hyperlegible: Makefile fonts/blockzone: Makefile fonts/charis : Makefile fonts/clearsans: Makefile fonts/comic-neue: Makefile fonts/doulos : Makefile fonts/ecoliercourt-fonts: Makefile fonts/farsi-bfonts-ttf: Makefile fonts/farsifonts-ttf: Makefile fonts/font-awesome: Makefile fonts/gentium : Makefile fonts/hermit-font: Makefile fonts/inconsolata-font: Makefile fonts/jaldi: Makefile fonts/jetbrains-mono: Makefile fonts/junicode : Makefile fonts/mononoki : Makefile fonts/nerd-fonts: Makefile.inc fonts/nerd-fonts/codenewroman: Makefile fonts/recursive: Makefile fonts/spranq-ecofont-ttf: Makefile fonts/sunscreen: Makefile fonts/vazirmatn: Makefile fonts/victor-mono: Makefile fonts/zh-wqy-bitmapfont: Makefile fonts/zh-wqy-zenhei-ttf: Makefile Log message: Properly namespace font module variables. Update individual ports to cope. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/15 08:59:50 Modified files: textproc/apertium: Makefile distinfo textproc/apertium/patches: patch-apertium_adapt_docx_cc patch-apertium_apertium-postlatex-raw_l patch-apertium_apertium-postlatex_l patch-apertium_apertium-prelatex_l patch-apertium_apertium_cleanstream_cc patch-apertium_apertium_filter_ambiguity_cc patch-apertium_apertium_interchunk_cc patch-apertium_apertium_perceptron_trace_cc patch-apertium_apertium_postchunk_cc patch-apertium_apertium_posttransfer_cc patch-apertium_apertium_tagger_apply_new_rules_cc patch-apertium_apertium_tagger_cc patch-apertium_apertium_tagger_readwords_cc patch-apertium_apertium_tmxbuild_cc patch-apertium_apertium_transfer_cc patch-apertium_deformat_xsl patch-apertium_gen_modes_cc patch-apertium_perceptron_spec_cc patch-apertium_perceptron_spec_h patch-apertium_reformat_xsl patch-apertium_transferpp_cc textproc/apertium/pkg: PLIST textproc/apertium-anaphora: Makefile distinfo textproc/apertium-dicts/afr: Makefile textproc/apertium-dicts/afr/pkg: PLIST textproc/apertium-dicts/afr-nld: Makefile textproc/apertium-dicts/afr-nld/pkg: PLIST textproc/apertium-dicts/arg: Makefile distinfo textproc/apertium-dicts/arg/pkg: PLIST textproc/apertium-dicts/arg-cat: Makefile distinfo textproc/apertium-dicts/arg-cat/pkg: PLIST textproc/apertium-dicts/bel: Makefile textproc/apertium-dicts/bel/pkg: PLIST textproc/apertium-dicts/bel-rus: Makefile textproc/apertium-dicts/bel-rus/pkg: PLIST textproc/apertium-dicts/br-fr: Makefile textproc/apertium-dicts/br-fr/pkg: PLIST textproc/apertium-dicts/cat: Makefile distinfo textproc/apertium-dicts/cat/pkg: PLIST textproc/apertium-dicts/cat-ita: Makefile distinfo textproc/apertium-dicts/cat-ita/pkg: PLIST textproc/apertium-dicts/cat-srd: Makefile textproc/apertium-dicts/cat-srd/pkg: PLIST textproc/apertium-dicts/crh: Makefile textproc/apertium-dicts/crh-tur: Makefile textproc/apertium-dicts/cy-en: Makefile textproc/apertium-dicts/dan: Makefile distinfo textproc/apertium-dicts/dan/pkg: PLIST textproc/apertium-dicts/dan-nor: Makefile distinfo textproc/apertium-dicts/dan-nor/pkg: PLIST textproc/apertium-dicts/en-es: Makefile textproc/apertium-dicts/en-gl: Makefile distinfo textproc/apertium-dicts/en-gl/pkg: PLIST textproc/apertium-dicts/eng: Makefile textproc/apertium-dicts/eng/pkg: PLIST textproc/apertium-dicts/eng-cat: Makefile textproc/apertium-dicts/eng-cat/pkg: PLIST textproc/apertium-dicts/eo-ca: Makefile textproc/apertium-dicts/eo-ca/pkg: PLIST textproc/apertium-dicts/eo-en: Makefile distinfo textproc/apertium-dicts/eo-en/pkg: PLIST textproc/apertium-dicts/eo-es: Makefile textproc/apertium-dicts/eo-fr: Makefile textproc/apertium-dicts/eo-fr/pkg: PLIST textproc/apertium-dicts/es-gl: Makefile textproc/apertium-dicts/es-gl/pkg: PLIST textproc/apertium-dicts/es-pt: Makefile textproc/apertium-dicts/es-pt/pkg: PLIST textproc/apertium-dicts/es-ro: Makefile distinfo textproc/apertium-dicts/es-ro/pkg: PLIST textproc/apertium-dicts/eu-en: Makefile distinfo textproc/apertium-dicts/eu-en/pkg: PLIST textproc/apertium-dicts/eu-es: Makefile textproc/apertium-dicts/eu-es/pkg: PLIST textproc/apertium-dicts/fr-es: Makefile distinfo textproc/apertium-dicts/fr-es/pkg: PLIST textproc/apertium-dicts/fra: Makefile distinfo textproc/apertium-dicts/fra/pkg: PLIST textproc/apertium-dicts/fra-cat: Makefile distinfo textproc/apertium-dicts/fra-cat/pkg: PLIST textproc/apertium-dicts/hbs: Makefile textproc/apertium-dicts/hbs/pkg: PLIST textproc/apertium-dicts/hbs-eng: Makefile textproc/apertium-dicts/hbs-eng/pkg: PLIST textproc/apertium-dicts/hbs-slv: Makefile
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/15 08:47:20 ports/textproc/apertium-dicts/eng-cat/patches Update of /cvs/ports/textproc/apertium-dicts/eng-cat/patches In directory cvs.openbsd.org:/tmp/cvs-serv52316/patches Log Message: Directory /cvs/ports/textproc/apertium-dicts/eng-cat/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/15 08:46:16 ports/textproc/apertium-dicts/isl/patches Update of /cvs/ports/textproc/apertium-dicts/isl/patches In directory cvs.openbsd.org:/tmp/cvs-serv66296/patches Log Message: Directory /cvs/ports/textproc/apertium-dicts/isl/patches added to the repository
Re: BUG: math/pari - broken gphelp (docs search paths need adjustement)
Hi, Dima Pasechnik writes: > However, gphelp installed by the latest (pari 2.15.4) port is broken: > > $ gphelp -k "elliptic curves" > Could not find translation file, docdir='/usr/local/bin' at /usr/local/bin/gp > help line 151. It's been quite some time, but I've fixed this in our package. Thanks for the report. > Needless to say, this has to be fixed in port, either by > directly adjusting the paths get_docdir is using, or, less hackily, > use install-doctex and other similar Makefile targets of pari/gp. > These targets do "the right thing" to gphelp if one specifies > DOCDIR env. var., as > > gmake DOCDIR=/usr/local/share/doc/pari install I made the hacky choice to hardcode docdir in the script. When I tried setting DOCDIR during make, it seemed to have weird effects like not installing the documentation files at all. After struggling for a bit, I went with the simple solution.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/15 05:38:53 Modified files: math/pari : Makefile math/pari/patches: patch-doc_gphelp_in Log message: Fix docdir detection in the gphelp script. Reported by Dima Pasechnik; thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/15 05:07:05 Modified files: www/kiwix/kiwix-tools: Makefile distinfo Log message: Update to kiwix-tools-3.7.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/15 05:06:33 Modified files: www/kiwix/libkiwix: Makefile distinfo www/kiwix/libkiwix/pkg: PLIST Removed files: www/kiwix/libkiwix/patches: patch-meson_build Log message: Update to libkiwix-13.1.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/15 04:35:20 Modified files: archivers/libzim: Makefile distinfo Log message: Update to libzim-9.1.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/15 03:50:57 Modified files: math/pari : Makefile Log message: Enable debug packages.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/15 03:12:53 Added files: games/widelands/patches: patch-src_io_filesystem_zip_filesystem_h Log message: Missed cvs add; noticed by brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/14 13:03:07 Modified files: emulators/sameboy: Makefile distinfo emulators/sameboy/patches: patch-Makefile patch-libretro_Makefile Log message: Update to sameboy-0.16.3. Release notes: https://sameboy.github.io/changelog/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/14 12:43:42 Modified files: emulators/mgba : Makefile distinfo Log message: Update to mgba-0.10.3. Release notes: https://mgba.io/2024/01/07/mgba-0.10.3/
Re: Namespace font module vars
Anthony J. Bentley writes: > So, this diff makes the following straightforward changes: > > - replace all TYPEFACE with MODFONT_FAMILY > - replace all FONTTYPES with MODFONT_TYPES > - replace V/VERSION with MODFONT_VERSION (only if the module uses it, > i.e., if TYPEFACE is set) > - replace FONTDIR with MODFONT_DIR (only if the module's FONTDIR or the > module's do-install is used) And here's the corresponding manpage diff. Index: port-modules.5 === RCS file: /cvs/src/share/man/man5/port-modules.5,v diff -u -p -r1.267 port-modules.5 --- port-modules.5 1 Jan 2024 14:16:59 - 1.267 +++ port-modules.5 14 Apr 2024 17:36:20 - @@ -689,18 +689,16 @@ and Appends to .Ev CATEGORIES . When -.Ev TYPEFACE +.Ev MODFONT_FAMILY is set in combination with -.Ev V -or -.Ev VERSION , +.Ev MODFONT_VERSION , it sets .Ev PKGNAME . -.Ev TYPEFACE -should be set to the name of the typeface. +.Ev MODFONT_FAMILY +should be set to the name of the font family. This sets -.Ev FONTDIR -using said typeface name. +.Ev MODFONT_DIR +using said family name. A .Cm do-install target is provided if the port itself does not provide it. @@ -708,7 +706,7 @@ This installs fonts from .Ev WRKSRC in the distribution. If one or more file extensions are listed in -.Ev FONTTYPES , +.Ev MODFONT_TYPES , files of those types will be used. Otherwise, otf files are preferred, with a fallback to ttf. .It fortran
Namespace font module vars
The font module has very unorthodox use of variables.
- Other modules are namespaced, but this one looks for weirdly named
variables like FONTDIR, FONTTYPES, and TYPEFACE.
- Even worse, the font module sets PKGNAME from the extremely generic
variables V and VERSION. As far as I know, no other module makes use
of widely used generically named variables like this. It's incredibly
confusing if you aren't familiar with this behavior.
- Technically, a typical font port represents a font *family*, not a
font *face*.
So, this diff makes the following straightforward changes:
- replace all TYPEFACE with MODFONT_FAMILY
- replace all FONTTYPES with MODFONT_TYPES
- replace V/VERSION with MODFONT_VERSION (only if the module uses it,
i.e., if TYPEFACE is set)
- replace FONTDIR with MODFONT_DIR (only if the module's FONTDIR or the
module's do-install is used)
Refetching all distfiles under fonts/ succeeds; rerunning 'make package'
under fonts/ succeeds.
ok?
Index: infrastructure/mk/font.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/font.port.mk,v
diff -u -p -r1.6 font.port.mk
--- infrastructure/mk/font.port.mk 14 Sep 2023 03:51:43 - 1.6
+++ infrastructure/mk/font.port.mk 14 Apr 2024 17:30:15 -
@@ -6,25 +6,23 @@ PKG_ARCH ?= *
EXTRACT_SUFX ?=.zip
-.if defined(TYPEFACE)
-. if defined(V)
-PKGNAME ?= ${TYPEFACE}-$V
-. elif defined(VERSION)
-PKGNAME ?= ${TYPEFACE}-${VERSION}
+.if defined(MODFONT_FAMILY)
+. if defined(MODFONT_VERSION)
+PKGNAME ?= ${MODFONT_FAMILY}-${MODFONT_VERSION}
. endif
-FONTDIR ?= ${PREFIX}/share/fonts/${TYPEFACE}
+MODFONT_DIR ?= ${PREFIX}/share/fonts/${MODFONT_FAMILY}
-FONTTYPES ?=
+MODFONT_TYPES ?=
-MODFONT_do-install = ${INSTALL_DATA_DIR} ${FONTDIR};
+MODFONT_do-install = ${INSTALL_DATA_DIR} ${MODFONT_DIR};
-# if FONTTYPES is not set, install .otf files if present (and break,
+# if MODFONT_TYPES is not set, install .otf files if present (and break,
# to skip ttf) otherwise fallback to ttf.
-.if empty(FONTTYPES)
-MODFONT_do-install += for t in otf ttf; do ${INSTALL_DATA} ${WRKSRC}/*.$$t
${FONTDIR} && break; done
+.if empty(MODFONT_TYPES)
+MODFONT_do-install += for t in otf ttf; do ${INSTALL_DATA} ${WRKSRC}/*.$$t
${MODFONT_DIR} && break; done
.else
-MODFONT_do-install += for t in ${FONTTYPES}; do ${INSTALL_DATA}
${WRKSRC}/*.$$t ${FONTDIR}; done
+MODFONT_do-install += for t in ${MODFONT_TYPES}; do ${INSTALL_DATA}
${WRKSRC}/*.$$t ${MODFONT_DIR}; done
.endif
. if !target(do-install)
Index: fonts/abyssinica/Makefile
===
RCS file: /cvs/ports/fonts/abyssinica/Makefile,v
diff -u -p -r1.13 Makefile
--- fonts/abyssinica/Makefile 21 Sep 2023 15:28:01 - 1.13
+++ fonts/abyssinica/Makefile 14 Apr 2024 17:30:15 -
@@ -1,8 +1,8 @@
COMMENT = Ethiopic Unicode script
-TYPEFACE = abyssinica
-V =2.100
-DISTNAME = AbyssinicaSIL-$V
+MODFONT_FAMILY = abyssinica
+MODFONT_VERSION = 2.100
+DISTNAME = AbyssinicaSIL-${MODFONT_VERSION}
CATEGORIES = fonts
HOMEPAGE = https://software.sil.org/abyssinica/
Index: fonts/andika/Makefile
===
RCS file: /cvs/ports/fonts/andika/Makefile,v
diff -u -p -r1.11 Makefile
--- fonts/andika/Makefile 21 Sep 2023 15:28:01 - 1.11
+++ fonts/andika/Makefile 14 Apr 2024 17:30:15 -
@@ -1,7 +1,7 @@
-TYPEFACE = andika
-V =6.101
+MODFONT_FAMILY = andika
+MODFONT_VERSION = 6.101
COMMENT = clear sans serif, Unicode-compliant font
-DISTNAME = Andika-$V
+DISTNAME = Andika-${MODFONT_VERSION}
CATEGORIES = fonts
HOMEPAGE = https://software.sil.org/andika/
Index: fonts/arabeyes-ttf/Makefile
===
RCS file: /cvs/ports/fonts/arabeyes-ttf/Makefile,v
diff -u -p -r1.13 Makefile
--- fonts/arabeyes-ttf/Makefile 21 Sep 2023 15:28:01 - 1.13
+++ fonts/arabeyes-ttf/Makefile 14 Apr 2024 17:30:15 -
@@ -1,9 +1,9 @@
COMMENT= Arabeyes TrueType Arabic fonts
-TYPEFACE = arabeyes
-V= 2.0
-DISTNAME= ttf-arabeyes_$V.orig
-PKGNAME= ${TYPEFACE}-ttf-$V
+MODFONT_FAMILY =arabeyes
+MODFONT_VERSION=2.0
+DISTNAME= ttf-arabeyes_${MODFONT_VERSION}.orig
+PKGNAME= ${MODFONT_FAMILY}-ttf-${MODFONT_VERSION}
REVISION= 3
CATEGORIES=fonts x11
@@ -20,6 +20,6 @@ NO_BUILD= Yes
NO_TEST= Yes
WRKSRC=${WRKDIST}/fonts
-WRKDIST= ${WRKDIR}/ttf-arabeyes-$V
+WRKDIST= ${WRKDIR}/ttf-arabeyes-${MODFONT_VERSION}
.include
Index: fonts/aref-ruqaa/Makefile
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/13 15:45:55 Modified files: textproc/apertium-dicts: Makefile.inc textproc/apertium-dicts/dan: Makefile textproc/apertium-dicts/eo-en: Makefile textproc/apertium-dicts/nno: Makefile textproc/apertium-dicts/nob: Makefile textproc/apertium-dicts/swe: Makefile Removed files: textproc/apertium-dicts/dan/patches: patch-test-scandivoc textproc/apertium-dicts/eo-en/patches: patch-multi-gen_sh textproc/apertium-dicts/nno/patches: patch-test-scandivoc textproc/apertium-dicts/nob/patches: patch-test-scandivoc textproc/apertium-dicts/swe/patches: patch-test-scandivoc Log message: Replace patch+SUBST_CMD with a single sed -i.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/13 10:38:39 Modified files: textproc/apertium-dicts: Makefile.inc textproc/apertium-dicts/afr: Makefile textproc/apertium-dicts/afr-nld: Makefile textproc/apertium-dicts/arg: Makefile textproc/apertium-dicts/arg-cat: Makefile textproc/apertium-dicts/bel: Makefile textproc/apertium-dicts/bel-rus: Makefile textproc/apertium-dicts/br-fr: Makefile textproc/apertium-dicts/cat: Makefile textproc/apertium-dicts/cat-ita: Makefile textproc/apertium-dicts/cat-srd: Makefile textproc/apertium-dicts/crh: Makefile textproc/apertium-dicts/crh-tur: Makefile textproc/apertium-dicts/cy-en: Makefile textproc/apertium-dicts/dan: Makefile textproc/apertium-dicts/dan-nor: Makefile textproc/apertium-dicts/en-es: Makefile textproc/apertium-dicts/en-gl: Makefile textproc/apertium-dicts/eng: Makefile textproc/apertium-dicts/eng-cat: Makefile textproc/apertium-dicts/eo-ca: Makefile textproc/apertium-dicts/eo-en: Makefile textproc/apertium-dicts/eo-es: Makefile textproc/apertium-dicts/eo-fr: Makefile textproc/apertium-dicts/es-gl: Makefile textproc/apertium-dicts/es-pt: Makefile textproc/apertium-dicts/es-ro: Makefile textproc/apertium-dicts/eu-en: Makefile textproc/apertium-dicts/eu-es: Makefile textproc/apertium-dicts/fr-es: Makefile textproc/apertium-dicts/fra: Makefile textproc/apertium-dicts/fra-cat: Makefile textproc/apertium-dicts/hbs: Makefile textproc/apertium-dicts/hbs-eng: Makefile textproc/apertium-dicts/hbs-slv: Makefile textproc/apertium-dicts/hin: Makefile textproc/apertium-dicts/ind: Makefile textproc/apertium-dicts/ind-zlm: Makefile textproc/apertium-dicts/isl: Makefile textproc/apertium-dicts/isl-eng: Makefile textproc/apertium-dicts/isl-swe: Makefile textproc/apertium-dicts/ita: Makefile textproc/apertium-dicts/mkd-bul: Makefile textproc/apertium-dicts/mkd-eng: Makefile textproc/apertium-dicts/mlt-ara: Makefile textproc/apertium-dicts/nld: Makefile textproc/apertium-dicts/nno: Makefile textproc/apertium-dicts/nno-nob: Makefile textproc/apertium-dicts/nob: Makefile textproc/apertium-dicts/oc-ca: Makefile textproc/apertium-dicts/oc-es: Makefile textproc/apertium-dicts/oci: Makefile textproc/apertium-dicts/oci-fra: Makefile textproc/apertium-dicts/pol: Makefile textproc/apertium-dicts/pol-szl: Makefile textproc/apertium-dicts/por: Makefile textproc/apertium-dicts/por-cat: Makefile textproc/apertium-dicts/pt-gl: Makefile textproc/apertium-dicts/rus: Makefile textproc/apertium-dicts/rus-ukr: Makefile textproc/apertium-dicts/spa: Makefile textproc/apertium-dicts/spa-arg: Makefile textproc/apertium-dicts/spa-ast: Makefile textproc/apertium-dicts/spa-cat: Makefile textproc/apertium-dicts/spa-ita: Makefile textproc/apertium-dicts/srd: Makefile textproc/apertium-dicts/srd-ita: Makefile textproc/apertium-dicts/swe: Makefile textproc/apertium-dicts/swe-dan: Makefile textproc/apertium-dicts/swe-nor: Makefile textproc/apertium-dicts/szl: Makefile textproc/apertium-dicts/tur: Makefile textproc/apertium-dicts/ukr: Makefile textproc/apertium-dicts/urd: Makefile textproc/apertium-dicts/urd-hin: Makefile textproc/apertium-dicts/zlm: Makefile Log message: Remove pointless rundep on apertium.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/13 09:35:51 Modified files: fonts/freefonts: Makefile fonts/freefonts/pkg: PLIST Log message: Tiny cleanup. - switch SITES to https - remove @comment .orig (pre-.orig.port), delete file during build instead - delete dead homepage, 404 for 10+ years
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/13 08:41:55 Modified files: games/widelands: Makefile distinfo games/widelands/patches: patch-CMakeLists_txt games/widelands/pkg: PLIST Removed files: games/widelands/patches: patch-cmake_WlFunctions_cmake patch-src_graphic_texture_cc Log message: Update to widelands-1.2. >From brad
UPDATE: www/netsurf
Hi,
This updates netsurf and netsurf-fb and their dependencies to the latest
versions.
As always, tests on additional architectures appreciated.
ok?
Index: browser/Makefile
===
RCS file: /cvs/ports/www/netsurf/browser/Makefile,v
diff -u -p -r1.45 Makefile
--- browser/Makefile27 Sep 2023 19:13:03 - 1.45
+++ browser/Makefile12 Apr 2024 21:40:55 -
@@ -1,8 +1,7 @@
COMMENT = lightweight web browser, with GTK interface
NETSURF_PROJECT = netsurf
-NETSURF_VERSION = 3.10
-REVISION = 3
+NETSURF_VERSION = 3.11
HOMEPAGE = https://www.netsurf-browser.org/
SITES =
https://download.netsurf-browser.org/netsurf/releases/source/
@@ -45,14 +44,14 @@ MAKE_FLAGS += NETSURF_USE_HARU_PDF=NO \
post-patch:
#https://bugs.netsurf-browser.org/mantis/view.php?id=2045
- cp ${WRKSRC}/frontends/gtk/res/options.gtk3.ui{,.unfixed}
- cd ${WRKSRC} && egrep translatable.*preferences
frontends/gtk/res/options.gtk3.ui | \
+ cp ${WRKSRC}/frontends/gtk/res/gtk3/options.ui{,.unfixed}
+ cd ${WRKSRC} && egrep translatable.*preferences
frontends/gtk/res/gtk3/options.ui | \
sed -e 's/.*>\(.*\)<.*/\1/' | while read c ; do \
v=$$(egrep ^en\..*$$c: ${WRKSRC}/resources/FatMessages | cut -d
: -f2 | sed -e 's/$$c<#>$$v<#"
${WRKSRC}/frontends/gtk/res/options.gtk3.ui ; done
+ perl -pi -e "s#>$$c<#>$$v<#"
${WRKSRC}/frontends/gtk/res/gtk3/options.ui ; done
post-install:
${INSTALL_MAN} ${WRKSRC}/docs/netsurf-gtk.1 \
- ${PREFIX}/man/man1/netsurf-gtk.1
+ ${PREFIX}/man/man1/netsurf-gtk3.1
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/netsurf-gtk.desktop \
${PREFIX}/share/applications/netsurf.desktop
Index: browser/distinfo
===
RCS file: /cvs/ports/www/netsurf/browser/distinfo,v
diff -u -p -r1.16 distinfo
--- browser/distinfo27 May 2020 11:38:18 - 1.16
+++ browser/distinfo12 Apr 2024 21:40:55 -
@@ -1,2 +1,2 @@
-SHA256 (netsurf-3.10-src.tar.gz) = NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4=
-SIZE (netsurf-3.10-src.tar.gz) = 4084480
+SHA256 (netsurf-3.11-src.tar.gz) = wopiau/uQo0FOxP4i1xECSIkWXZSLRLq8TfP0y0gHLI=
+SIZE (netsurf-3.11-src.tar.gz) = 4311767
Index: browser/patches/patch-content_fetchers_about_certificate_c
===
RCS file: browser/patches/patch-content_fetchers_about_certificate_c
diff -N browser/patches/patch-content_fetchers_about_certificate_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ browser/patches/patch-content_fetchers_about_certificate_c 12 Apr 2024
21:40:55 -
@@ -0,0 +1,369 @@
+Sync with upstream 3be91870a4d9094ef2955a10a05cb5674ea2f387:
+"fetchers: drop support for ancient OpenSSL"
+
+Index: content/fetchers/about/certificate.c
+--- content/fetchers/about/certificate.c.orig
content/fetchers/about/certificate.c
+@@ -134,26 +134,29 @@ static nserror free_ns_cert_info(struct ns_cert_info *
+ #include
+ #include
+
+-/* OpenSSL 1.0.x, 1.0.2, 1.1.0 and 1.1.1 API all changed
+- * LibreSSL declares its OpenSSL version as 2.1 but only supports 1.0.x API
+- */
+-#if (defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER <
0x101fL))
+-/* 1.0.x */
++#if (OPENSSL_VERSION_NUMBER < 0x3000L)
++/* OpenSSL 1.1.1 or LibreSSL */
+
+-#if (defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER <
0x1000200fL))
+-/* pre 1.0.2 */
++# if defined(LIBRESSL_VERSION_NUMBER)
++ /* LibreSSL */
++# if (LIBRESSL_VERSION_NUMBER < 0x305fL)
++ /* LibreSSL <3.5.0 */
++
++# if (LIBRESSL_VERSION_NUMBER < 0x207fL)
++/* LibreSSL <2.7.0 */
+ static int ns_X509_get_signature_nid(X509 *cert)
+ {
+ return OBJ_obj2nid(cert->cert_info->key->algor->algorithm);
+ }
+-#else
+-#define ns_X509_get_signature_nid X509_get_signature_nid
+-#endif
+
+ static const unsigned char *ns_ASN1_STRING_get0_data(ASN1_STRING *asn1str)
+ {
+ return (const unsigned char *)ASN1_STRING_data(asn1str);
+ }
++# else
++#define ns_X509_get_signature_nid X509_get_signature_nid
++#define ns_ASN1_STRING_get0_data ASN1_STRING_get0_data
++# endif
+
+ static const BIGNUM *ns_RSA_get0_n(const RSA *d)
+ {
+@@ -164,6 +167,20 @@ static const BIGNUM *ns_RSA_get0_e(const RSA *d)
+ {
+ return d->e;
+ }
++# else
++ /* LibreSSL >= 3.5.0 */
++# define ns_X509_get_signature_nid X509_get_signature_nid
++# define ns_ASN1_STRING_get0_data ASN1_STRING_get0_data
++# define ns_RSA_get0_n RSA_get0_n
++# define ns_RSA_get0_e RSA_get0_e
++# endif
++# else
++ /* OpenSSL 1.1.1 */
++# define ns_X509_get_signature_nid X509_get_signature_nid
++# define ns_ASN1_STRING_get0_data ASN1_STRING_get0_data
++# define ns_RSA_get0_n
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/12 11:24:53 Modified files: graphics : Makefile Log message: +recoil
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/12 11:24:07 Log message: RECOIL is a library to view pictures in native formats of 20th century computers: Amiga, Amstrad CPC, Apple II, Atari 8-bit, Atari Portfolio, Atari ST/TT/Falcon, BBC Micro, Commodore VIC-20, Commodore 64, Commodore 16/116/Plus4, Commodore 128, Electronika BK, FM Towns, HP 48, Macintosh 128K, MSX, NEC PC-80, NEC PC-88, NEC PC-98, Oric, Psion Series 3, SAM Coupe, Sharp X68000, Tandy 1000, Timex 2048, TRS-80, TRS-80 Color Computer, Vector-06C, ZX81 and ZX Spectrum. This package contains the converter program recoil2png, as well as desktop thumbnailer support. ok fcambus@ Status: Vendor Tag: bentley Release Tags: bentley_20240412 N ports/graphics/recoil/Makefile N ports/graphics/recoil/distinfo N ports/graphics/recoil/pkg/DESCR N ports/graphics/recoil/pkg/PLIST N ports/graphics/recoil/patches/patch-Makefile No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/12 08:12:30 Modified files: net/synapse: Makefile Log message: Update license marker. synapse switched from MIT to AGPL in November.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/04/12 08:06:26 Modified files: emulators/es-de: Makefile Log message: Add explicit dependency on graphics/glm (a header-only library). Noticed by tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/02/25 14:11:24 Modified files: emulators/melonds: Makefile Added files: emulators/melonds/patches: patch-src_teakra_src_CMakeLists_txt Log message: Leave out some test files from the build. Fixes build on i386. ok sthen@
Re: NEW: emulators/melonds
Anthony J. Bentley writes:
> > I have no opinion whether it's worth fixing or just mark with some
> > NOT_FOR_ARCHS or ONLY_FOR_ARCHS (perhaps ONLY_FOR_ARCHS=${LP64_ARCHS}
> > if it's only really expected to work on 64-bit)
>
> I've reported it upstream:
> https://github.com/melonDS-emu/melonDS/issues/1984
>
> Seems like a simple issue likely to be fixed, IMO BROKEN-i386 would be
> the right choice for now.
Upstream says these files aren't supposed to be built. Does this fix the
build on i386?
Index: Makefile
===
RCS file: /cvs/ports/emulators/melonds/Makefile,v
diff -u -p -r1.1.1.1 Makefile
--- Makefile19 Feb 2024 08:19:16 - 1.1.1.1
+++ Makefile25 Feb 2024 09:07:31 -
@@ -2,6 +2,7 @@ COMMENT = Nintendo DS emulator
PKGNAME = melonds-$V
V =0.9.5
+REVISION = 0
DIST_TUPLE += github melonDS-emu melonDS $V .
Index: patches/patch-src_teakra_src_CMakeLists_txt
===
RCS file: patches/patch-src_teakra_src_CMakeLists_txt
diff -N patches/patch-src_teakra_src_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_teakra_src_CMakeLists_txt 25 Feb 2024 09:07:31 -
@@ -0,0 +1,22 @@
+Index: src/teakra/src/CMakeLists.txt
+--- src/teakra/src/CMakeLists.txt.orig
src/teakra/src/CMakeLists.txt
+@@ -32,10 +32,15 @@ add_library(teakra
+ register.h
+ shared_memory.h
+ teakra.cpp
+-test.h
+-test_generator.cpp
+-test_generator.h
+ )
++
++if (TEAKRA_BUILD_UNIT_TESTS)
++target_sources(teakra PUBLIC
++test.h
++test_generator.cpp
++test_generator.h
++)
++endif()
+
+ create_target_directory_groups(teakra)
+
Re: CVS: cvs.openbsd.org: ports
Daniel Dickman writes:
> Surprisingly I think this might now need an explicit:
>
> TEST_DEPENDS = lang/python/${MODPY_VERSION}
>
> Without Python already installed and without a TDEP on py-test, there's
> nothing to force python to be installed.
>
> And the latest commit now hides the fact that gambatte is a consumer of
> python2 from show-reverse-deps.
>
> Maybe something that should be fixed in python.port.mk? I haven't looked
> too closely what the python module does for tests. On the other hand there
> are probably very few ports left with TDEPs on python 2 so might not be
> worth fixing centrally...
python-module(5) says:
The module also appends to
- RUN_DEPENDS unless MODPY_RUNDEP is set to No,
- BUILD_DEPENDS unless MODPY_BUILDDEP is set to No or NO_BUILD is set
to Yes,
- TEST_DEPENDS if MODPY_PYTEST is set to Yes unless MODPY_TESTDEP is
set to No.
I misinterpreted that as saying that setting MODPY_TESTDEP to Yes would
also append Python to TEST_DEPENDS. The actual behavior seems pretty
unintuitive to me. It's not limited to Python 2 either.
Re: NEW: emulators/melonds
Stuart Henderson writes:
> this one fails on i386:
>
> FAILED: src/teakra/src/CMakeFiles/teakra.dir/test_generator.cpp.o
> /pobj/melonds-0.9.5/bin/c++ -DARCHITECTURE_x86=1 -DMELONDS_VERSION=\"0.9.5\"
> -I/pobj/melonds-0.9.5/melonDS-0.9.5/src/teakra/src/../include -I/pobj/melonds
> -0.9.5/melonDS-0.9.5/src/teakra/src/. -O2 -pipe -DNDEBUG -std=c++17 -flto=thi
> n -fPIC -Wall -Wextra -Wcast-qual -pedantic -pedantic-errors -Wfatal-errors -
> Wno-missing-braces -Wno-unused-parameter -pthread -MD -MT src/teakra/src/CMak
> eFiles/teakra.dir/test_generator.cpp.o -MF src/teakra/src/CMakeFiles/teakra.d
> ir/test_generator.cpp.o.d -o src/teakra/src/CMakeFiles/teakra.dir/test_genera
> tor.cpp.o -c /pobj/melonds-0.9.5/melonDS-0.9.5/src/teakra/src/test_generator.
> cpp
> In file included from /pobj/melonds-0.9.5/melonDS-0.9.5/src/teakra/src/test_g
> enerator.cpp:10:
> /pobj/melonds-0.9.5/melonDS-0.9.5/src/teakra/src/./test.h:37:1: fatal error:
> static assertion failed due to requirement 'sizeo
> f(TestCase) == 4312'
> static_assert(sizeof(TestCase) == 4312);
> ^
> /pobj/melonds-0.9.5/melonDS-0.9.5/src/teakra/src/./test.h:37:32: note: expres
> sion evaluates to '4308 == 4312'
> static_assert(sizeof(TestCase) == 4312);
> ~^~~
> 1 error generated.
>
>
> I have no opinion whether it's worth fixing or just mark with some
> NOT_FOR_ARCHS or ONLY_FOR_ARCHS (perhaps ONLY_FOR_ARCHS=${LP64_ARCHS}
> if it's only really expected to work on 64-bit)
I've reported it upstream:
https://github.com/melonDS-emu/melonDS/issues/1984
Seems like a simple issue likely to be fixed, IMO BROKEN-i386 would be
the right choice for now.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2024/02/21 22:44:26
Modified files:
emulators/gambatte: Makefile
Log message:
Python 2 is only used for tests; fix {BUILD,RUN}_DEPENDS.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/02/19 21:18:39 Modified files: emulators : Makefile Log message: +es-de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/02/19 21:17:30 Log message: Import es-de-3.0.0. EmulationStation Desktop Edition is a frontend for browsing and launching games from your multi-platform game collection. ok stsp@ Status: Vendor Tag: bentley Release Tags: bentley_20240219 N ports/emulators/es-de/Makefile N ports/emulators/es-de/distinfo N ports/emulators/es-de/pkg/DESCR N ports/emulators/es-de/pkg/PLIST N ports/emulators/es-de/patches/patch-CMakeLists_txt No conflicts created by this import
Re: NEW: emulators/es-de
Stefan Sperling writes: > Generally, do you think it would make sense to pre-configure de-cs, and > add appropriate run-depends, such that it will spawn a working emulator > for a given system out of the box? I would prefer not to change the defaults from what they would be on other platforms. It's easy enough for users to change (Other Settings -> Alternative Emulators). And since it's so configurable, I'd rather not add dependencies on a bunch of specific emulators either.
NEW: emulators/es-de
Hi, EmulationStation Desktop Edition is a frontend for browsing and launching games from your multi-platform game collection. Note: this is a fork of emulators/emulationstation, which has not been updated upstream in ten years. ok? -- Anthony J. Bentley es-de.tar.gz Description: GNU Zip compressed data
Re: NEW: emulators/melonds
Thanks again; I've imported this. izder456 writes: > > Use or remove commented out > > CMAKE_BUILD_TYPE=Release? > > I say re-enable it, I usually hard-force Release builds when I build > cmake projects locally. cmake.port.mk already sets it.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/02/19 01:20:04 Modified files: emulators : Makefile Log message: +melonds
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/02/19 01:19:16 Log message: Import melonds-0.9.5. melonDS is a Nintendo DS emulator, aiming for speed and accuracy. From izzy Meyer; thanks! ok thfr@ Status: Vendor Tag: bentley Release Tags: bentley_20240219 N ports/emulators/melonds/Makefile N ports/emulators/melonds/distinfo N ports/emulators/melonds/patches/patch-src_CMakeLists_txt N ports/emulators/melonds/patches/patch-src_frontend_duckstation_duckstation_compat_h N ports/emulators/melonds/patches/patch-src_frontend_duckstation_gl_context_cpp N ports/emulators/melonds/patches/patch-src_frontend_qt_sdl_LAN_PCap_cpp N ports/emulators/melonds/patches/patch-CMakeLists_txt N ports/emulators/melonds/pkg/DESCR N ports/emulators/melonds/pkg/PLIST No conflicts created by this import
Re: NEW: emulators/melonds
izder456 writes: > I want to import melonDS. It is a Nintendo DS emulator that boasts > better performance, and emulated networking support, and other things. Thanks, this will be a good port to have. > I had to disable JIT unfortunately, it refused to build with it on. It's trying to grab the pc register from context structs... possibly there's a way to get this to build, but I'm happy without the JIT. > Otherwise- performance is mostly alright for me (Only tested Real dumps > of my Animal Crossing Wild World and Mario Kart DS cartridges). > > other testing before merge would be appreciated. I have a big list of mostly minor revisions. - Missing dep on extra-cmake-modules. - make port-lib-depends-check reveals several missing libs, and BUILD_DEPENDS that should be LIB_DEPENDS. - make update-patches gives different names to the patch files. - Lowercase package name. - HOMEPAGE can be switched to https. - Indentation is a bit wide, looks like 4-space tabs instead of 8-space? - Readme can be removed. The JIT note is not really important, and since 0.9.4 melonDS hasn't required firmware dumps. - DESCR also mentions the outdated firmware requirement. - No need to set NO_TESTS, because 'make test' doesn't error out. That malloc patch is correct; please push it upstream. I went ahead and reformatted the port to fix the issues listed above. Update is attached. ok to import? -- Anthony J. Bentley melonds.tar.gz Description: melonds.tar.gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/02/10 17:02:25 Modified files: games/dhewm3 : Makefile Log message: Enable debug packages. >From Jag Talon; thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2024/01/07 02:40:37 Modified files: textproc/apertium: Makefile Added files: textproc/apertium/patches: patch-apertium_perceptron_spec_h Log message: Backport upstream commit to fix build with libcxx update. ok tb@
Re: amd64: llvm 16 fallout (2023-11-14)
Klemens Nanni writes: > On Fri, Nov 17, 2023 at 12:26:08AM +0100, Christian Weisgerber wrote: > > games/mars C++ std::random_shuffle > > Same as xprobe, can add yet another patch to this dead horse or bring > it behind the barn, I prefer getting rid of maintanence burdens like these. > > Unmaintained, No update after import in 2014, broke 2016 due to SMFL update, > broke 2022 due to SMFL and/or base LLVM update, old 2013 SourceForge HOMEAGE, > www.marsshooter.org yields 503, linked from a github repo w/o tags/releases, > last commit 2021: https://github.com/thelaui/M.A.R.S./ > > OK to remove? Old/dead, yes, but not actually a big maintenance burden, so I'd rather keep it for now. It's a neat little game.
Re: [Update] www/gallery-dl 1.26.2
grodzio writes: > Works correctly now. I ought to learn how to use regex myself.. > > Ok to import now? ok bentley@
NEW: graphics/recoil
Hi, RECOIL is a library to view pictures in native formats of 20th century computers: Amiga, Amstrad CPC, Apple II, Atari 8-bit, Atari Portfolio, Atari ST/TT/Falcon, BBC Micro, Commodore VIC-20, Commodore 64, Commodore 16/116/Plus4, Commodore 128, Electronika BK, FM Towns, HP 48, Macintosh 128K, MSX, NEC PC-80, NEC PC-88, NEC PC-98, Oric, Psion Series 3, SAM Coupe, Sharp X68000, Tandy 1000, Timex 2048, TRS-80, TRS-80 Color Computer, Vector-06C, ZX81 and ZX Spectrum. This package contains the converter program recoil2png, as well as desktop thumbnailer support. There's an option to build a GIMP plugin. I left that out because it would add a dependency on graphics/gimp/stable. Some sample images are provided on the website (of questionable license?): https://recoil.sourceforge.net/examples.zip ok? -- Anthony J. Bentley recoil.tar.gz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/10/16 04:29:43 Modified files: textproc : Makefile Log message: +apertium-regtest, +apertium-recursive
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/10/16 04:28:30 Log message: Import apertium-regtest-0.9.1. Apertium-regtest is a program for managing regression tests and corpora for Apertium language data and translators. ok jeremy@ Status: Vendor Tag: bentley Release Tags: bentley_20231016 N ports/textproc/apertium-regtest/Makefile N ports/textproc/apertium-regtest/distinfo N ports/textproc/apertium-regtest/pkg/DESCR N ports/textproc/apertium-regtest/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/10/16 04:27:15 Log message: Import apertium-recursive-1.0.1. Apertium-recursive is an alternative to apertium-transfer, apertium-interchunk, and apertium-postchunk. It uses a GLR parser rather than chunking and so can apply rules recursively. Rules can be written in a format almost identical to that of apertium-transfer or in a somewhat Yacc-like format created for this purpose. ok jeremy@ Status: Vendor Tag: bentley Release Tags: bentley_20231016 N ports/textproc/apertium-recursive/Makefile N ports/textproc/apertium-recursive/distinfo N ports/textproc/apertium-recursive/pkg/DESCR N ports/textproc/apertium-recursive/pkg/PLIST N ports/textproc/apertium-recursive/patches/patch-src_randpath_cc N ports/textproc/apertium-recursive/patches/patch-src_rtx_comp_cc N ports/textproc/apertium-recursive/patches/patch-src_rtx_decomp_cc N ports/textproc/apertium-recursive/patches/patch-src_rtx_proc_cc No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/10/16 04:23:45 Modified files: emulators/ppsspp: Makefile distinfo emulators/ppsspp/patches: patch-CMakeLists_txt Log message: Update to ppsspp-1.16.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/10/15 01:31:06 Modified files: archivers/snappy: Makefile Log message: Switch homepage to https.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/10/14 00:37:55 Modified files: emulators/libretro-genesis-plus-gx: Makefile Log message: Enable debug packages.
Re: NEW: textproc/apertium-recursive, textproc/apertium-regtest
> Apertium-recursive is an alternative to apertium-transfer, > apertium-interchunk, and apertium-postchunk. It uses a GLR parser rather > than chunking and so can apply rules recursively. Rules can be written in a= > > format almost identical to that of apertium-transfer or in a somewhat > Yacc-like format created for this purpose. > > > Apertium-regtest is a program for managing regression tests and corpora > for Apertium language data and translators. > > > ok? Ping. apertium-recursive.tar.gz Description: GNU Zip compressed data apertium-regtest.tar.gz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/29 23:32:24 Modified files: editors/nvi: Makefile distinfo editors/nvi/patches: patch-CMakeLists_txt Log message: Update to nvi-2.2.1. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/29 23:29:00 Modified files: games/widelands: Makefile Added files: games/widelands/patches: patch-src_graphic_texture_cc Log message: Fix a crash by backporting an upstream commit. ok sthen@ volker@ thfr@
Widelands crash fix
volker's recent commit to widelands didn't fix the crash I'm seeing.
That makes sense, because we compared backtraces and the crash he saw
was totally different.
Backporting this patch (labeled as "for Mesa 23.x") fixes my crash.
ok?
Index: Makefile
===
RCS file: /cvs/ports/games/widelands/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile28 Sep 2023 20:50:51 - 1.38
+++ Makefile29 Sep 2023 09:51:01 -
@@ -3,7 +3,7 @@ COMMENT = economic and military simulati
GH_ACCOUNT = widelands
GH_PROJECT = widelands
GH_TAGNAME = v1.0
-REVISION = 2
+REVISION = 3
CATEGORIES = games
Index: patches/patch-src_graphic_texture_cc
===
RCS file: patches/patch-src_graphic_texture_cc
diff -N patches/patch-src_graphic_texture_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_graphic_texture_cc29 Sep 2023 09:51:01 -
@@ -0,0 +1,39 @@
+Backport Mesa 23.x fix from upstream.
+https://github.com/widelands/widelands/commit/48e5fd48c3f6418ebb53a145177d0417dc96451b
+
+Index: src/graphic/texture.cc
+--- src/graphic/texture.cc.orig
src/graphic/texture.cc
+@@ -116,9 +116,11 @@ Texture::Texture(SDL_Surface* surface, bool intensity)
+ uint8_t bpp = surface->format->BytesPerPixel;
+
+ if (surface->format->palette || width() != surface->w || height() !=
surface->h ||
+- (bpp != 3 && bpp != 4) || is_bgr_surface(*surface->format)) {
++ (bpp != 4) || is_bgr_surface(*surface->format)) {
+ SDL_Surface* converted = empty_sdl_surface(width(), height());
+- assert(converted);
++ if (converted == nullptr) {
++ throw wexception("Failed to create SDL_Surface");
++ }
+ SDL_SetSurfaceAlphaMod(converted, SDL_ALPHA_OPAQUE);
+ SDL_SetSurfaceBlendMode(converted, SDL_BLENDMODE_NONE);
+ SDL_SetSurfaceAlphaMod(surface, SDL_ALPHA_OPAQUE);
+@@ -127,16 +129,15 @@ Texture::Texture(SDL_Surface* surface, bool intensity)
+ SDL_FreeSurface(surface);
+ surface = converted;
+ bpp = surface->format->BytesPerPixel;
++ assert(bpp == 4);
+ }
+
+- const GLenum pixels_format = bpp == 4 ? GL_RGBA : GL_RGB;
+-
+ SDL_LockSurface(surface);
+
+ Gl::swap_rows(width(), height(), surface->pitch, bpp,
static_cast(surface->pixels));
+
+ glTexImage2D(GL_TEXTURE_2D, 0, static_cast(intensity ?
GL_INTENSITY : GL_RGBA), width(),
+- height(), 0, pixels_format, GL_UNSIGNED_BYTE,
surface->pixels);
++ height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, surface->pixels);
+
+ SDL_UnlockSurface(surface);
+ SDL_FreeSurface(surface);
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/27 21:17:48 Modified files: games/widelands: Makefile Log message: Enable debug packages.
UPDATE: editors/nvi
Hi,
Here's a diff to update to the latest release of nvi2, released a few
hours ago. It has a number of crash fixes as well as the paragraph
movement change that was recently added to base.
I would like to get this in before release, but I want to see some
positive test reports first.
ok?
Index: Makefile
===
RCS file: /cvs/ports/editors/nvi/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile11 Mar 2022 18:58:33 - 1.20
+++ Makefile25 Sep 2023 18:16:31 -
@@ -1,6 +1,6 @@
COMMENT= ex/vi text editor with wide character support
-V =2.2.0
+V =2.2.1
GH_ACCOUNT = lichray
GH_PROJECT = nvi2
GH_TAGNAME = v$V
Index: distinfo
===
RCS file: /cvs/ports/editors/nvi/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo10 Aug 2020 18:20:21 - 1.6
+++ distinfo25 Sep 2023 18:16:31 -
@@ -1,2 +1,2 @@
-SHA256 (nvi-2.2.0.tar.gz) = zWaCh/Va8eLM1k5sDttQSuxB0lqe/i5QWrqpDDxVFFU=
-SIZE (nvi-2.2.0.tar.gz) = 439545
+SHA256 (nvi-2.2.1.tar.gz) = n3ya7zkkwOOe+W4arbj105aCW4JRrdqxKQqoZs89WvQ=
+SIZE (nvi-2.2.1.tar.gz) = 443376
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/editors/nvi/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt11 Mar 2022 18:58:33 - 1.2
+++ patches/patch-CMakeLists_txt25 Sep 2023 18:16:31 -
@@ -3,21 +3,13 @@ Avoid using flags not supported by in-tr
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -20,14 +20,15 @@ mark_as_advanced(CMAKE_INSTALL_PREFIX)
- option(USE_WIDECHAR "Enable wide character support" ON)
- option(USE_ICONV "Enable iconv support" ON)
-
--add_compile_options(-fcolor-diagnostics)
- add_compile_options($<$:-Wall>)
- add_compile_options($<$:-Wno-parentheses>)
- add_compile_options($<$:-Wno-uninitialized>)
- add_compile_options($<$:-Wmissing-prototypes>)
- add_compile_options($<$:-Wsystem-headers>)
+@@ -36,7 +36,9 @@ if (NOT APPLE)
+ add_compile_options($<$:-Wsystem-headers>)
+ endif()
add_compile_options($<$:-Wuninitialized>)
--add_compile_options($<$:-Wno-dangling-else>)
+if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-+add_compile_options($<$:-Wno-dangling-else>)
+ add_compile_options($<$:-Wno-dangling-else>)
+endif()
+ add_compile_options(-Wno-string-compare)
add_compile_options(-Wstack-protector -fstack-protector)
add_compile_options(-Wstrict-aliasing -fstrict-aliasing)
-
NEW: textproc/apertium-recursive, textproc/apertium-regtest
Hi, I'm about 80% through updating all our apertium ports. The update is unlikely to make release. However, these two ports are new dependencies of some of the updated dictionaries. I'd like to get them in now, because it will make it easier for me to work on this update. The two ports are very simple leaf ports that aren't used by anything currently in tree. Apertium-recursive is an alternative to apertium-transfer, apertium-interchunk, and apertium-postchunk. It uses a GLR parser rather than chunking and so can apply rules recursively. Rules can be written in a format almost identical to that of apertium-transfer or in a somewhat Yacc-like format created for this purpose. Apertium-regtest is a program for managing regression tests and corpora for Apertium language data and translators. ok? -- Anthony J. Bentley apertium-recursive.tar.gz Description: GNU Zip compressed data apertium-regtest.tar.gz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/24 05:00:03 Modified files: games/vcmi : distinfo Log message: Fix distinfo I fouled up.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/23 17:14:51 Modified files: games/vcmi : Makefile distinfo Log message: Switch from self-hosted distfile to GitHub DIST_TUPLE. The previous self-hosted distfile was mistakenly made from a newer upstream commit than the latest release tag. That means that using the release tag for DIST_TUPLE now would be incompatible with existing game saves, so until a new release is made, we'll use that slightly newer upstream commit for the OpenBSD package. ok kirby@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/19 02:05:15 Modified files: emulators/ppsspp: Makefile emulators/ppsspp/patches: patch-CMakeLists_txt Log message: Forcibly disable hidden dep on Wayland. The upstream knob to turn it off doesn't work, so Wayland is used unconditionally if installed, necessitating patching the knob. Even if it weren't junked during the build, making Wayland a dependency of this port is not an option right now, as it requires SDL2 to have been built with Wayland support. Build breakage reported by ajacoutot@
Re: [NEW] games/vcmi
Kirill Bychkov writes: > All the above was checked to work. Updated port attached. ok bentley@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/17 11:14:14 Modified files: textproc/apertium-dicts: Makefile textproc/apertium-dicts/eng-cat: Makefile Log message: Hook up apertium-eng-cat now that apertium-anaphora is in.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/17 11:12:33 Modified files: textproc : Makefile Log message: +apertium-anaphora
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/17 11:11:39 Log message: Import apertium-anaphora-1.0.2. Anaphora Resolution is the process of resolving references (anaphora) to earlier items (antecedents) in discourse. The most common form of this is Pronominal Anaphora, where the anaphor is a pronoun and the antecedent is a noun. The apertium-anaphora module adds this capability to the Apertium machine translation toolkit. ok jeremy@ Status: Vendor Tag: bentley Release Tags: bentley_20230917 N ports/textproc/apertium-anaphora/Makefile N ports/textproc/apertium-anaphora/distinfo N ports/textproc/apertium-anaphora/pkg/DESCR N ports/textproc/apertium-anaphora/pkg/PLIST N ports/textproc/apertium-anaphora/patches/patch-src_anaphora_cc No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/17 03:04:50 Modified files: audio : Makefile Log message: +vgmstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/17 03:03:27 Log message: Import vgmstream-1866. vgmstream is a library for playback of hundreds of streamed (prerecorded) audio formats used in video games. This package contains two components: vgmstream-cli, which decodes music files to .wav, and vgmstream123, which plays music files. ok thfr@ Status: Vendor Tag: bentley Release Tags: bentley_20230917 N ports/audio/vgmstream/Makefile N ports/audio/vgmstream/distinfo N ports/audio/vgmstream/patches/patch-Makefile N ports/audio/vgmstream/patches/patch-cli_vgmstream123_c N ports/audio/vgmstream/patches/patch-cli_vgmstream_cli_c N ports/audio/vgmstream/pkg/DESCR N ports/audio/vgmstream/pkg/PLIST No conflicts created by this import
NEW: textproc/apertium-anaphora
Hi, Anaphora Resolution is the process of resolving references (anaphora) to earlier items (antecedents) in discourse. The most common form of this is Pronominal Anaphora, where the anaphor is a pronoun and the antecedent is a noun. The apertium-anaphora module adds this capability to the Apertium machine translation toolkit. I intend to update our apertium ports soon, and need this to do so as it's heavily used in current apertium dictionaries. This is a slightly old release, compatible with what we have in tree, because apertium is a complex web of deps that is easiest to update all at once. Once this port is in, I'll update it along with all the others. There's a port (unhooked) in the tree that can be built as a test for this, textproc/apertium-dicts/eng-cat. ok? -- Anthony J. Bentley apertium-anaphora.tar.gz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/17 02:40:29 Modified files: emulators/ppsspp/patches: patch-UI_NativeApp_cpp Log message: Restore patch variable that mistakenly got SUBST_CMDed. Caught by brad
Re: [NEW] games/vcmi
Kirill Bychkov writes:
> The port doesn't respect default CXXFLAGS (-O2 -pipe). Dropping this
> line and moving -I${X11BASE}/include to CMAKE_CXX_FLAGS leads to
> missing -O2 and -pipe in compiler flags.
> Do we have any other knobs to pass this flags?
CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} -pthread
-I${X11BASE}/include"
This preserved CXXFLAGS when I tried it.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/16 15:02:04 Modified files: emulators/ppsspp: Makefile distinfo emulators/ppsspp/patches: patch-CMakeLists_txt patch-UI_NativeApp_cpp emulators/ppsspp/pkg: PLIST Log message: Update to ppsspp-1.16.1. Release notes: https://www.ppsspp.org/news/release-1.16 Some bits from brad: remove non-BE arch restrictions (based on an old bug that's apparently fixed upstream); use system zstd.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/16 11:47:12 Modified files: devel/sdl2-ttf : Makefile Added files: devel/sdl2-ttf/patches: patch-sdl2_ttf-config_cmake_in Log message: In cmake, include library version in shared library absolute pathname. ok thfr@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/16 00:52:42 Modified files: emulators/retroarch: Makefile Log message: Disable IBT CFI enforcement on amd64. When recording video, retroarch crashes in libx264, presumably getting there via ffmpeg, which is still marked NOBTCFI.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/15 20:11:14 Modified files: emulators/ppsspp: Makefile Log message: Disable IBT CFI. The CFI violations appear to be in PPSSPP's JIT used for MIPS CPU emulation.
Re: [NEW] games/vcmi
Kirill Bychkov writes:
> Attached is a port of VCMI-1.3.1, an open source Heroes
> of Might and Magic III engine.
> Played some campaigns and scenarios.
Cool, this works with my GOG copy. Some comments:
- The patches against included minizip are unnecessary since the port
uses system minizip.
- The second hunk of patch-lib_Interprocess.h seems unintentional. The
first hunk also doesn't appear to be needed either?
- Is -DUSE_FILE32API another leftover that can be removed?
- CXXFLAGS=-I${X11BASE}/include can be rolled into CMAKE_CXX_FLAGS.
- It takes a long time to compile, so debug packages should be enabled,
imo.
- Can this use GH_* instead of a self-hosted distfile, so portroach can
catch updates?
- Looks like 1.3.2 was released this morning.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/15 01:08:40 Modified files: fonts/atkinson-hyperlegible: Makefile fonts/atkinson-hyperlegible/pkg: PLIST Log message: Switch from MASTER_SITES0 to new SITES* with suffix. While here, use module variables in a way more consistent with other font ports.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/14 23:37:51 Modified files: games : Makefile Log message: +orthorobot
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/14 23:37:00 Log message: Import orthorobot-1.1.1. Literally bridging the gap between 2D and 3D games, Ortho Robot is a perspective based puzzle game, where you flatten the view to move across gaps. Your objective is to reach the ending green block (either by standing directly on it or standing on it in relative space). For some extra challenge, try to collect all coins and perfect your time, steps and number of warps. ok fcambus@ Status: Vendor Tag: bentley Release Tags: bentley_20230914 N ports/games/orthorobot/Makefile N ports/games/orthorobot/distinfo N ports/games/orthorobot/files/orthorobot N ports/games/orthorobot/pkg/PLIST N ports/games/orthorobot/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/14 23:34:39 Modified files: emulators : Makefile Log message: +mednaffe
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/14 23:33:51 Log message: Import mednaffe-0.9.2. Mednaffe is a front-end (GUI) for the mednafen emulator, depending only on GTK 3. ok stsp@ Status: Vendor Tag: bentley Release Tags: bentley_20230914 N ports/emulators/mednaffe/Makefile N ports/emulators/mednaffe/distinfo N ports/emulators/mednaffe/pkg/DESCR N ports/emulators/mednaffe/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/14 03:19:33 Modified files: emulators/mednafen: Makefile Log message: Disable IBT CFI. Like other software derived from bsnes, mednafen's snes core uses a custom context switching library called "libco", which is incompatible with IBT enforcement. Until some soul rewrites it, we have to turn that off. ok stsp@
NEW: emulators/mednaffe
Hi, Mednaffe is a front-end (GUI) for the mednafen emulator, depending only on GTK 3. Pretty simple port. ok? -- Anthony J. Bentley mednaffe.tar.gz Description: GNU Zip compressed data
NEW: games/orthorobot
Hi, Literally bridging the gap between 2D and 3D games, Ortho Robot is a perspective based puzzle game, where you flatten the view to move across gaps. Your objective is to reach the ending green block (either by standing directly on it or standing on it in relative space). For some extra challenge, try to collect all coins and perfect your time, steps and number of warps. ok? -- Anthony J. Bentley orthorobot.tar.gz Description: GNU Zip compressed data
