Re: [UPDATE] fonts/noto/cjk
SASANO Takayoshi writes: > Hi, > > update Noto Serif CJK 2.002 -> 2.003. > (Noto Sans CJK still 2.004) > > update details: > https://github.com/notofonts/noto-cjk/blob/main/Serif/NEWS.md > > ok? ok bentley@ > Index: Makefile > === > RCS file: /cvs/ports/fonts/noto/cjk/Makefile,v > diff -u -p -r1.9 Makefile > --- Makefile 6 May 2024 12:10:12 - 1.9 > +++ Makefile 26 Oct 2024 02:46:30 - > @@ -2,10 +2,10 @@ COMMENT = east asian fonts for the noto > > NOTO_PROJECT = cjk > > -V = 20230817 > +V = 20240730 > > SITES.a =https://github.com/googlefonts/noto-cjk/releases/downlo > ad/Sans2.004/ > -SITES.b =https://github.com/googlefonts/noto-cjk/releases/downlo > ad/Serif2.002/ > +SITES.b =https://github.com/googlefonts/noto-cjk/releases/downlo > ad/Serif2.003/ > DISTFILES.a =01_NotoSansCJK-OTF-VF.zip > DISTFILES.b =02_NotoSerifCJK-OTF-VF.zip > DIST_SUBDIR =noto-cjk-$V > Index: distinfo > === > RCS file: /cvs/ports/fonts/noto/cjk/distinfo,v > diff -u -p -r1.4 distinfo > --- distinfo 6 May 2024 12:10:12 - 1.4 > +++ distinfo 26 Oct 2024 02:46:30 - > @@ -1,4 +1,4 @@ > -SHA256 (noto-cjk-20230817/01_NotoSansCJK-OTF-VF.zip) = 1eM6662figwIlqSikZnvh > cqWYTTbFkQmx06D5vE8Q80= > -SHA256 (noto-cjk-20230817/02_NotoSerifCJK-OTF-VF.zip) = J5wntjFNEDwGj5D6RFG6 > ZNz7Cg0tRUnwL/gqV/OZ8gA= > -SIZE (noto-cjk-20230817/01_NotoSansCJK-OTF-VF.zip) = 259440949 > -SIZE (noto-cjk-20230817/02_NotoSerifCJK-OTF-VF.zip) = 222807580 > +SHA256 (noto-cjk-20240730/01_NotoSansCJK-OTF-VF.zip) = 1eM6662figwIlqSikZnvh > cqWYTTbFkQmx06D5vE8Q80= > +SHA256 (noto-cjk-20240730/02_NotoSerifCJK-OTF-VF.zip) = eJjPtUFWzA2KLywA1WRc > Vz/zZ9A9KQhbtJWWbZnSUp4= > +SIZE (noto-cjk-20240730/01_NotoSansCJK-OTF-VF.zip) = 259440949 > +SIZE (noto-cjk-20240730/02_NotoSerifCJK-OTF-VF.zip) = 224945129 > > -- > SASANO Takayoshi (JG1UAA) >
Re: [UPDATE] fonts/noto/emoji
SASANO Takayoshi writes: > --- pkg/PLIST 11 Mar 2022 19:00:25 - 1.3 > +++ pkg/PLIST 26 Oct 2024 03:24:30 - > @@ -1,4 +1,9 @@ > share/fonts/ > @fontdir share/fonts/noto/ > +share/fonts/noto/Noto-COLRv1-emojicompat.ttf > +share/fonts/noto/Noto-COLRv1-noflags.ttf > +share/fonts/noto/Noto-COLRv1.ttf > +share/fonts/noto/NotoColorEmoji-emojicompat.ttf > +share/fonts/noto/NotoColorEmoji-flagsonly.ttf > +share/fonts/noto/NotoColorEmoji-noflags.ttf > share/fonts/noto/NotoColorEmoji.ttf > -share/fonts/noto/NotoEmoji-Regular.ttf An update without this piece got committed. It doesn't look like these are useful to have installed at the same time, and COLR appears to be an experimental spec, so let's stick with just NotoColorEmoji.ttf for now.
Re: [UPDATE] fonts/noto/fonts
SASANO Takayoshi writes:
> update Noto fonts 20201206-phase3 -> 24.9.1 release.
Thanks, this new repo and tag are a good find.
> following fonts are no longer supported (maybe create new package for them):
> ---
> Arimo
> Cousine
> NotoSansDisplay
> NotoSansKhmerUI
> NotoSansLaoUI
> NotoSansMyanmarUI
> NotoSansOriyaUI
> NotoSansThaiLooped
> NotoSansThaiUI
> NotoSerifNyiakengPuachueHmong
> NotoSerifTamilSlanted
> Tinos
> ---
I don't think we need to package these once they've been removed.
> ok?
No, the version number goes backwards (24.9.1 < 20201206), so the port
must now set EPOCH = 0. With EPOCH added it is ok bentley@
> Index: Makefile
> ===
> RCS file: /cvs/ports/fonts/noto/fonts/Makefile,v
> diff -u -p -r1.9 Makefile
> --- Makefile 21 Mar 2022 13:20:38 - 1.9
> +++ Makefile 26 Oct 2024 04:43:45 -
> @@ -2,13 +2,15 @@ COMMENT = pan-unicode font family
>
> NOTO_PROJECT = fonts
>
> -V = 20201206
> -GH_TAGNAME = v$V-phase3
> +V = 24.9.1
> +GH_ACCOUNT = notofonts
> +GH_PROJECT = notofonts.github.io
> +GH_TAGNAME = noto-monthly-release-$V
>
> RUN_DEPENDS =fonts/noto/emoji
>
> do-install:
> ${INSTALL_DATA_DIR} ${NOTO_INSTALLDIR}
> - ${INSTALL_DATA} ${WRKDIST}/hinted/ttf/*/*.ttf ${NOTO_INSTALLDIR}
> + ${INSTALL_DATA} ${WRKDIST}/fonts/*/hinted/ttf/*.ttf ${NOTO_INSTALLDIR}
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/fonts/noto/fonts/distinfo,v
> diff -u -p -r1.3 distinfo
> --- distinfo 21 Mar 2022 13:20:38 - 1.3
> +++ distinfo 26 Oct 2024 04:43:45 -
> @@ -1,2 +1,2 @@
> -SHA256 (noto-fonts-20201206.tar.gz) = GKUTts+5kgnZ/+iPMWWaUUhF407o56C1NON6oZ
> 4sQnA=
> -SIZE (noto-fonts-20201206.tar.gz) = 860621581
> +SHA256 (noto-fonts-24.9.1.tar.gz) = c/wlY1bk7WbFSqMApxw5BpVgNUfhJ/J81u7965Qn
> JrA=
> +SIZE (noto-fonts-24.9.1.tar.gz) = 1086944636
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/fonts/noto/fonts/pkg/PLIST,v
> diff -u -p -r1.5 PLIST
> --- pkg/PLIST 21 Mar 2022 13:20:38 - 1.5
> +++ pkg/PLIST 26 Oct 2024 04:43:46 -
> @@ -1,17 +1,14 @@
> @pkgpath fonts/droid-fonts
> -share/fonts/noto/Arimo-Bold.ttf
> -share/fonts/noto/Arimo-BoldItalic.ttf
> -share/fonts/noto/Arimo-Italic.ttf
> -share/fonts/noto/Arimo-Regular.ttf
> -share/fonts/noto/Cousine-Bold.ttf
> -share/fonts/noto/Cousine-BoldItalic.ttf
> -share/fonts/noto/Cousine-Italic.ttf
> -share/fonts/noto/Cousine-Regular.ttf
> +share/fonts/noto/NotoFangsongKSSRotated-Regular.ttf
> +share/fonts/noto/NotoFangsongKSSVertical-Regular.ttf
> share/fonts/noto/NotoKufiArabic-Black.ttf
> share/fonts/noto/NotoKufiArabic-Bold.ttf
> +share/fonts/noto/NotoKufiArabic-ExtraBold.ttf
> +share/fonts/noto/NotoKufiArabic-ExtraLight.ttf
> share/fonts/noto/NotoKufiArabic-Light.ttf
> share/fonts/noto/NotoKufiArabic-Medium.ttf
> share/fonts/noto/NotoKufiArabic-Regular.ttf
> +share/fonts/noto/NotoKufiArabic-SemiBold.ttf
> share/fonts/noto/NotoKufiArabic-Thin.ttf
> share/fonts/noto/NotoMusic-Regular.ttf
> share/fonts/noto/NotoNaskhArabic-Bold.ttf
> @@ -227,7 +224,10 @@ share/fonts/noto/NotoSansBamum-Bold.ttf
> share/fonts/noto/NotoSansBamum-Medium.ttf
> share/fonts/noto/NotoSansBamum-Regular.ttf
> share/fonts/noto/NotoSansBamum-SemiBold.ttf
> +share/fonts/noto/NotoSansBassaVah-Bold.ttf
> +share/fonts/noto/NotoSansBassaVah-Medium.ttf
> share/fonts/noto/NotoSansBassaVah-Regular.ttf
> +share/fonts/noto/NotoSansBassaVah-SemiBold.ttf
> share/fonts/noto/NotoSansBatak-Regular.ttf
> share/fonts/noto/NotoSansBengali-Black.ttf
> share/fonts/noto/NotoSansBengali-Bold.ttf
> @@ -287,9 +287,11 @@ share/fonts/noto/NotoSansCherokee-Medium
> share/fonts/noto/NotoSansCherokee-Regular.ttf
> share/fonts/noto/NotoSansCherokee-SemiBold.ttf
> share/fonts/noto/NotoSansCherokee-Thin.ttf
> +share/fonts/noto/NotoSansChorasmian-Regular.ttf
> share/fonts/noto/NotoSansCoptic-Regular.ttf
> share/fonts/noto/NotoSansCuneiform-Regular.ttf
> share/fonts/noto/NotoSansCypriot-Regular.ttf
> +share/fonts/noto/NotoSansCyproMinoan-Regular.ttf
> share/fonts/noto/NotoSansDeseret-Regular.ttf
> share/fonts/noto/NotoSansDevanagari-Black.ttf
> share/fonts/noto/NotoSansDevanagari-Bold.ttf
> @@ -363,78 +365,7 @@ share/fonts/noto/NotoSansDevanagariUI-Se
> share/fonts/noto/NotoSansDevanagariUI-SemiCondensedSemiBold.ttf
> share/fonts/noto/NotoSansDevanagariUI-SemiCondensedThin.ttf
> share
(unfinished) UPDATE: net/rtorrent, net/libtorrent
Hi,
I noticed recently that rtorrent in -current now segfaults on exit.
rtorrent and libtorrent haven't changed in some time, so it must be
some dependency that changed. There's a lot of curl in the backtrace,
so that's probably it.
Both rtorrent and libtorrent were updated in September. Unfortunately,
these have some weird issues (I count three).
Problem one: rtorrent no longer starts up, instead giving this error:
"Could not allocate socket for listening."
This is because SocketFd::open_stream() in libtorrent:src/net/socket_fd.cc
now fails. Between 0.13.6 (what we have) and 0.14.0 (the new one), it
changed from:
bool
SocketFd::open_stream() {
return (m_fd = socket(rak::socket_address::pf_inet, SOCK_STREAM,
IPPROTO_TCP)) != -1;
}
to:
bool
SocketFd::open_stream() {
m_fd = socket(rak::socket_address::pf_inet6, SOCK_STREAM, IPPROTO_TCP);
if (m_fd == -1) {
m_ipv6_socket = false;
return (m_fd = socket(rak::socket_address::pf_inet, SOCK_STREAM,
IPPROTO_TCP)) != -1;
}
m_ipv6_socket = true;
if (!set_ipv6_v6only(false)) {
close();
return false;
}
return true;
}
Reverting to the older function gets past the error, but maybe that's
papering over something important, I don't know.
Problem two: the curl segfault still exists. This can be reproduced by
starting rtorrent, loading a torrent (waiting for hashing to finish if
necessary), then exiting with Ctrl-Q.
#0 thrkill () at /tmp/-:2
#1 0x1735af21d5d40e18 in ?? ()
#2 0x02cf9684afeb in _libc_abort () at /usr/src/lib/libc/stdlib/abort.c:51
#3 0x02ccdcd830a0 in do_panic (signum=11) at main.cc:634
#4
#5 torrent::thread_base::poll (this=0x80)
at /usr/local/include/torrent/utils/thread_base.h:56
#6 core::CurlSocket::close (this=0x2cf145ff360) at core/curl_socket.cc:103
#7 core::CurlSocket::receive_socket (easy_handle=,
fd=, what=, userp=,
socketp=0x2cf145ff360) at core/curl_socket.cc:62
#8 0x02cf4770ebac in Curl_multi_closed (data=0x2cef06cd000, s=15)
at multi.c:3035
#9 0x02cf476c66fe in socket_close (data=0x2cef06cd000,
conn=0x2cf4d283000, sock=15, use_callback=)
at cf-socket.c:424
#10 cf_socket_close (cf=0x2cf6ebe9d80, data=0x2cef06cd000) at cf-socket.c:1005
#11 0x02cf476cee12 in cf_he_close (cf=, data=0x2cef06cd000)
at connect.c:1004
#12 0x02cf4774598e in ssl_cf_close (cf=0x2cf145f8cf0, data=0x2cef06cd000)
at vtls/vtls.c:1666
#13 0x02cf476cf816 in cf_setup_close (cf=,
data=0x2cef06cd000) at connect.c:1359
--Type for more, q to quit, c to continue without paging--
#14 0x02cf476c5280 in cf_hc_close (cf=, data=0x2cef06cd000)
at cf-https-connect.c:496
#15 0x02cf476c90df in Curl_conn_close (data=0x2cef06cd000, index=0)
at cfilters.c:180
#16 0x02cf476cc762 in cpool_close_and_destroy (cpool=,
conn=0x2cf4d283000, data=0x2cef06cd000, do_shutdown=)
at conncache.c:1063
#17 0x02cf476cb5e2 in cpool_shutdown_discard_all (cpool=0x2cf45b95b70)
at conncache.c:641
#18 cpool_shutdown_all (cpool=0x2cf45b95b70, data=,
timeout_ms=0) at conncache.c:1195
#19 cpool_close_and_destroy_all (cpool=0x2cf45b95b70) at conncache.c:679
#20 Curl_cpool_destroy (cpool=0x2cf45b95b70) at conncache.c:189
#21 0x02cf4770b57b in curl_multi_cleanup (multi=0x2cf45b95a00)
at multi.c:2758
#22 0x02ccdcda49c5 in core::CurlStack::~CurlStack (this=0x2cf12c3e640)
at core/curl_stack.cc:72
#23 0x02ccdcd9dfec in core::Manager::cleanup (this=)
at core/manager.cc:199
#24 0x02ccdce5e284 in Control::cleanup (this=0x2cf45b93600)
at control.cc:140
#25 0x02ccdcd825d6 in main (argc=2, argv=0x73be2ad77d38) at main.cc:500
The last problem is that once a torrent has been loaded, it doesn't seem
to actually download (or, presumably, upload). Maybe this is a result of
patching out problem #1. But right now, I'm feeling stuck and not making
more progress, so here's the diff I have so far.
--- net/libtorrent/Makefile
+++ net/libtorrent/Makefile
@@ -6,9 +6,8 @@ BROKEN-sh = undefined references to __sync atomic
ops
# requires C++ tr1 headers
NOT_FOR_ARCHS= ${GCC3_ARCHS}
-DISTNAME= libtorrent-0.13.6
+DISTNAME= libtorrent-0.14.0
EPOCH= 0
-REVISION= 9
SHARED_LIBS += torrent 22.1# .18.0
CATEGORIES=net devel
@@ -17,16 +16,16 @@ HOMEPAGE= https://rakshasa.github.io/rtorrent/
# GPLv2
PERMIT_PACKAGE=Yes
-SITES= https://rtorrent.net/downloads/
+SITES= https://github.com/rakshasa/rtorrent-archive/raw/master/
-WANTLIB= crypto m pthread ${COMPILER_LIBCXX} z
+WANTLIB= crypto cppunit m pthread ${COMPILER_LIBCXX} z
COMPILER = base-clang ports-gcc base-gcc
-BUILD_DEPENDS= devel/cppunit
+LIB_DEPENDS= devel/cppunit
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.69
+AUTOCONF_VERSION= 2.71
CONFIGURE_ARGS=
NEW: devel/docopt.cpp
Hi, docopt helps you create most beautiful command-line interfaces easily, where the option parser is generated based on the beautiful help message that you write yourself. This is a necessary dependency for an upcoming kiwix-tools update. ok? -- Anthony J. Bentley docopt.cpp.tar.gz Description: GNU Zip compressed data
NEW: sysutils/gextoolbox
Hi, Game Extraction Toolbox is a set of command-line tools for investigating game files and extracting known packages. As an artificial limitation: - This tool will not hold decryption keys. - This tool will not hold any 'whole' files, nor substantial parts of files. Also included in the tarball are two trivial Python dependencies, games/py-unitypy and textproc/py-texttable. In short, this tool allows extracting ROM files that have been directly embedded (i.e., not in any encrypted/copy-protected manner) into game executables. Once extracted, many of these games can be played on OpenBSD with appropriate emulators. It currently claims to support the following titles: $ gextoolbox tasks list acac: Arcade Classics Anniversary Collection ags_digdug: Namco Arcade Game Series: Dig Dug ags_galaga: Namco Arcade Game Series: Galaga ags_mspacman: Namco Arcade Game Series: Ms. Pac-Man ags_pacman: Namco Arcade Game Series: Pac-Man atarivault: Atari Vault blizzarcade: Blizzard Arcade Collection breakers: Breakers Collection bubsy: Bubsy Two-Fur cas1: Capcom Arcade Stadium 1 cas1_old: Capcom Arcade Stadium 1 (OLD) cas2: Capcom Arcade Stadium 2 cbeub: Capcom Beat 'em Up Bundle cfc: Capcom Fighting Collection ddragontrilogy: Double Dragon Trilogy disneyac: Disney Afternoon Collection disneyalkb: Disney Aladdin / Lion King Bundle (and DLC) genesis: Sega Genesis and Mega Drive Collection irem: Irem Arcade Hits mkak: Mortal Kombat Arcade Kollection mmbnlc1: Mega Man Battle Network Legacy Collection 1 mmbnlc2: Mega Man Battle Network Legacy Collection 2 mmlc1: Mega Man Legacy Collection 1 mmxlc1: Mega Man X Legacy Collection 1 neogeo_classics_humble: Neo Geo Classics by SNK Playmore on Humble Store pacmanmplus: Pac Man Museum Plus psikyo: Psikyo Shooter Collector's Bundle sadxgg: Sonic Adventure DX - Game Gear saga: Collection of SaGa Final Fantasy Legend sf30ac: Street Fighter 30th Anniversary Collection snk40: SNK 40th Anniversary Collection spp_columnsiii: Sega Puzzle Pack Columns III spp_drmbm: Sega Puzzle Pack Dr. Robotnik's Mean Bean Machine ssp1: Sega Smash Pack 1 ssp2: Sega Smash Pack 2 wonderboy3: Wonder Boy The Dragon's Trap zamn: Zombies Ate My Neighbors and Ghoul Patrol I've tested with my DRM-free copy of Double Dragon Trilogy from GOG.com. ok? -- Anthony J. Bentley gextoolbox-with-deps.tar.gz Description: GNU Zip compressed data
Re: UPDATE: games/minetest to 5.9.1
izzy Meyer writes: > On Fri, 25 Oct 2024 12:20:36 -0700 > Bryan Vyhmeister wrote: > > > On Fri, Oct 25, 2024 at 12:10:06PM -0500, izzy Meyer wrote: > > > I am considering disabling building the server altogether as its > > > not a default option. It might be good to make a separate port for > > > running minetest servers if someone wanted that. > > > > I would like to see the server still built if it works, personally, > > but a separate port could work if that is what works better. I was > > just talking to my kids about setting up their own minetest server > > yesterday and was going to check the port when I saw this message. Of > > course I would prefer to run a minetest server on OpenBSD. > > > > Bryan > > I didn't see this message until after I had sent the one where I > propose a FLAVOR option. > > Please see my other message, might be more elegant to handle this > with a flavor IMHO. Thoughts? If BUILD_SERVER=TRUE only builds additional things without changing the client, I would either use MULTI_PACKAGES (not a flavor) or just leave it as-is, a single package containing both server and client. Either way, minetest (now being renamed luanti apparently??) would benefit from an rc script that runs the server as an unprivileged user.
Re: [new] games/trackballs
Landry Breuil writes: > here's a new port for a marble madness clone, trackballs 1.3.4, from the > previous attempt 10 years ago > https://marc.info/?l=openbsd-ports&m=137011105211205&w=2 - upstream > moved to github and updated for sdl2/guile3, and it seems to start/run > fine here in basic testing. Nice! I can no longer reproduce the crash that kept me from importing that old version ten years ago. Two comments: - It tries and fails to write high scores to /usr/local/share. That's annoying, but we definitely don't want to make that writeable. Looking at CMakeLists.txt, we might want to try setting -DTRACKBALLS_HIGHSCORES_DIR=~ in CONFIGURE_ARGS: set(TRACKBALLS_HIGHSCORES_DIR "" CACHE STRING "Folder to install highscores file to. Empty means to TRACKBALLS_SHARE_DIR/. ~ will install per user") - You can drop the first hunk of the patch by setting TRACKBALLS_MAN_DIR in CONFIGURE_ARGS. ok bentley@ with those changes.
Re: roadmap for more privsep in pkgland
Marc Espie writes: > Here's the basic pkg_add change, very lightly tested for now. > Not that many lines, considering :) The manpage changes make sense to me. Typo: > + my $o = $class->new_owned_objet($args); "pkg_add docbook" (with its @tag libxml2/rebuild) has problems: Running tags|*|100%C an't exec "CODE(0xb87b7be2958)": No such file or directory at /usr/libdata/perl5/OpenBSD/Log.pm line 107. system(CODE(0xb87b7be2958), /bin/sh, -c, /usr/local/share/libxml2/rebuild) was not run: No such file or directory exit(0) Running tags: ok
Re: [new/wip] games/openxray (S.T.A.L.K.E.R.)
Benjamin Stürz writes: > On 8/26/24 2:56 AM, Jonathan Gray wrote: > > The licensing/legality of this has not changed since > > last time: > > > > https://marc.info/?l=openbsd-ports&m=161442903129677&w=2 > > Can't we then just set PERMIT_PACKAGE=no? PERMIT_PACKAGE=no makes sense where a user building a port would be in compliance with an explicit or implicit license. For example, a freeware program that implicitly grants the right to download it, but no right to redistribute, meaning a binary package would be off the table but a port might be okay. I (speaking personally, not for the project) would not be comfortable importing something where a user who builds the port is likely to be violating the license. I don't know if that is the case here.
Re: roadmap for more privsep in pkgland
Marc Espie writes: > Plan for deployment: > - @extraglob is already recognized and won't cause any issue > - pkg_add changes first, so that rm -> extraglob can happen later in packages > - extraglob in packages... if the tools are not there yet, you may end with > remnant files on your installation after deleting stuff > - ownership for remaining tags/exec/unexec/extraglobs > > - assessing the few @exec/@unexec that remain. I spent some time thinking about this and couldn't come up with any obvious problems. Really like the direction; thanks for looking into it.
Re: archivers/libzim: Update to 9.2.2
wen heping writes: > Here is a patch for archivers/libzim to update to 9.2.2. > It build well on amd64-current system, but there are 5 tests failed, > same as current version 9.1.0. > Three ports depend on it: www/kiwix/libkiwix and www/kiwix/kiwix-tools > build well and pass all tests, textproc/goldendict-ng build failed but > not caused by this patch. I couldn't reproduce the goldendict failure, all three built for me. Committed, thanks.
Re: [Maintainer update] Add FLAVOR to emulator/minivmac
Jag Talon writes: > By default, Mini vMac emulates a Macintosh Plus. Another popular model > that Mini vMac emulates is a Macintosh II because it offers more memory > (8MB instead of 4MB), a larger screen, and color. So /usr/local/bin/minivmac will emulate only one machine or the other depending on which flavor is installed. Can you convince the build system to generate emulators for multiple machines as separate executables that could be installed side by side? Because if someone is interested in emulating both types of machines, it would be a real pain to have to run pkg_delete and pkg_add every time to switch between them.
Re: [new] emulators/minivmac
Jag Talon writes:
> Ah thank you for catching that! I modified the README and DESCR files
> and also deleted PKGNAME=${DISTNAME}.
>
> Attaching the tarball. Thank you for reviewing!
ok bentley@
Re: [new] graphics/coin
Johannes Thyssen Tishman writes: > Ping > > 2024-06-02T17:41:30Z Johannes Thyssen Tishman > : > > > 2024-06-02T08:59:01Z "Rafael Sadowski" : > >> Looks good. There is already 4.0.2 released, but if anyone wants to > >> import it, ok rsadowski. > > > > Thanks for reviewing this forgotten port Rafael. Attached is version > > 4.0.2 which has the following changes: > > > > - Use preferred DISTNAME and SITES over GH_* (release instead of tag) > > - Drop all patches as they were all backports Thanks, I've imported this.
Re: NEW: devel/py-jsonpath-ng
Theo Buehler writes:
> On Sat, Jul 13, 2024 at 07:56:15PM +0200, Tobias Heider wrote:
> > I'd like to update codechecker to the newest version.
> > This is a dependency of sarif-tools which is now needed for codechecker.
> > Please review because I have no idea what I am doing.
>
> Needs ply at runtime (look at ${WRKSRC}/setup.py)
And at test time, so set TEST_DEPENDS=${RUN_DEPENDS}.
Re: Remove net/p5-Net-ICQ2000 and net/vicq?
Frederic Cambus writes: > Hi ports@, > > The ICQ network has been decomissioned on June 26th [1], so I would like > to propose net/p5-Net-ICQ2000 and net/vicq for deletion. > > For info, we are the only ones to still package these programs: > > https://repology.org/project/perl:net-icq2000/versions > https://repology.org/project/vicq/versions > > Comments? OK to remove? ok bentley@
sdl2-mixer: give cmake full shlib filename
Seen while updating cdogs-sdl:
CMake Error at src/cdogs/CMakeLists.txt:242 (target_link_libraries):
Target "cdogs" links to:
SDL2_mixer::SDL2_mixer
but the target was not found. Possible reasons include:
* There is a typo in the target name.
* A find_package call is missing for an IMPORTED target.
* An ALIAS target is missing.
I recognized this error: we've encountered it before with sdl2, sdl2-ttf
and sdl2-image. The fix was to patch the cmake files to include the .so
version in the shared library filename. I've duplicated their patch for
this port as well.
The other sdl2 ports use autotools, so we can't preemptively apply this
to them.
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/sdl2-mixer/Makefile,v
diff -u -p -r1.18 Makefile
--- Makefile25 Feb 2024 13:47:52 - 1.18
+++ Makefile12 Jul 2024 19:14:37 -
@@ -2,7 +2,7 @@ V = 2.8.0
COMMENT = SDL2 multi-channel audio mixer library
DISTNAME = SDL2_mixer-${V}
PKGNAME = sdl2-mixer-${V}
-REVISION = 0
+REVISION = 1
CATEGORIES = devel audio
SHARED_LIBS += SDL2_mixer 1.1 # 2.8.0
@@ -35,6 +35,9 @@ CONFIGURE_ARGS += --disable-music-midi-f
USE_GMAKE =Yes
NO_TEST = Yes
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/sdl2_mixer-config.cmake.in
post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/build/.libs/playmus
${PREFIX}/bin/play2mus
Index: patches/patch-sdl2_mixer-config_cmake_in
===
RCS file: patches/patch-sdl2_mixer-config_cmake_in
diff -N patches/patch-sdl2_mixer-config_cmake_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sdl2_mixer-config_cmake_in12 Jul 2024 19:14:37 -
@@ -0,0 +1,12 @@
+Index: sdl2_mixer-config.cmake.in
+--- sdl2_mixer-config.cmake.in.orig
sdl2_mixer-config.cmake.in
+@@ -111,7 +111,7 @@ if(NOT TARGET SDL2_mixer::SDL2_mixer)
+ unset(_sdl2mixer_dll)
+ unset(_sdl2mixer_imp)
+ else()
+-set(_sdl2mixer_shl
"${_sdl2mixer_libdir}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2_mixer${CMAKE_SHARED_LIBRARY_SUFFIX}")
++set(_sdl2mixer_shl
"${_sdl2mixer_libdir}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2_mixer${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBSDL2_mixer_VERSION}")
+ if(EXISTS "${_sdl2mixer_shl}")
+ add_library(SDL2_mixer::SDL2_mixer SHARED IMPORTED)
+ set_target_properties(SDL2_mixer::SDL2_mixer
Re: [new] emulators/minivmac
> On 7/3/24 11:41 PM, Jag Talon wrote:
> > Apologies for the noise, but I have more consistent spacing in this
> > tarball now.
> >
> > OK?
- PKGNAME=${DISTNAME} can be deleted
- The flavors were removed (good idea), but DESCR still lists them all
- pkg/README also mentions nonexistent flavors
The rest of the port is ok bentley@
Re: UPDATE emulators/snes9x 1.63 from MAINTAINER
Lucas Gabriel Vuotto writes: > Freshly out of the oven, here is an update for snes9x to its latest > version. I've committed this. Thanks for the detailed email.
Re: font module: simplify font file installation
Anthony J. Bentley writes: > The diff below replaces MODFONT_TYPES with a mechanism similar to > MODFONT_DOCFILES: the port sets MODFONT_FONTFILES to a list of paths > (which may contain wildcards) relative to WRKSRC to install to the font > directory. This means 12 of the 14 custom install targets in ports using > the font module can be eliminated. (The other two were not trivial > conversions.) And many of the 50+ other font ports that don't use the > font module yet can now start using it, although I haven't converted any > in this diff. And the manpage diff: Index: port-modules.5 === RCS file: /cvs/src/share/man/man5/port-modules.5,v retrieving revision 1.269 diff -u -p -r1.269 port-modules.5 --- port-modules.5 9 Jul 2024 13:05:15 - 1.269 +++ port-modules.5 11 Jul 2024 10:09:11 - @@ -697,7 +697,7 @@ it sets .Ev MODFONT_FAMILY should be set to the name of the font family. This sets -.Ev MODFONT_DIR +.Ev MODFONT_FONTDIR and .Ev MODFONT_DOCDIR using said family name. @@ -707,10 +707,15 @@ target is provided if the port itself do This installs fonts from .Ev WRKSRC in the distribution. -If one or more file extensions are listed in -.Ev MODFONT_TYPES , -files of those types will be used. -Otherwise, otf files are preferred, with a fallback to ttf. +If one or more filenames (relative to +.Ev WRKSRC ) +are listed in +.Ev MODFONT_FONTFILES , +they will be installed to +.Ev MODFONT_FONTDIR . +Otherwise, otf files in +.Ev WRKSRC +will be installed, with a fallback to ttf. If filenames (relative to .Ev WRKSRC ) are listed in
font module: simplify font file installation
Currently, the font module defines a default install target based on
file extension. A port sets MODFONT_TYPES to "ttf otf", and the module
installs ${WRKSRC}/*.ttf and ${WRKSRC}/*.otf to MODFONT_DIR.
This misses two fairly common cases:
- the port needs to install font files from multiple subdirectories
- the port wants to install only a subset of font files present
The diff below replaces MODFONT_TYPES with a mechanism similar to
MODFONT_DOCFILES: the port sets MODFONT_FONTFILES to a list of paths
(which may contain wildcards) relative to WRKSRC to install to the font
directory. This means 12 of the 14 custom install targets in ports using
the font module can be eliminated. (The other two were not trivial
conversions.) And many of the 50+ other font ports that don't use the
font module yet can now start using it, although I haven't converted any
in this diff.
The diff also renames MODFONT_DIR (which is only used in two ports) to
MODFONT_FONTDIR for consistency with MODFONT_DOCDIR. I plan to introduce
more MODFONT_*DIR types in the future.
All of fonts/ still fetches and packages, no bumps necessary.
ok?
Index: infrastructure/mk/font.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/font.port.mk,v
retrieving revision 1.8
diff -u -p -r1.8 font.port.mk
--- infrastructure/mk/font.port.mk 9 Jul 2024 13:03:39 - 1.8
+++ infrastructure/mk/font.port.mk 11 Jul 2024 09:19:15 -
@@ -11,20 +11,20 @@ EXTRACT_SUFX ?= .zip
PKGNAME ?= ${MODFONT_FAMILY}-${MODFONT_VERSION}
. endif
-MODFONT_DIR ?= ${PREFIX}/share/fonts/${MODFONT_FAMILY}
+MODFONT_FONTDIR ?= ${PREFIX}/share/fonts/${MODFONT_FAMILY}
MODFONT_DOCDIR ?= ${PREFIX}/share/doc/${MODFONT_FAMILY}
-MODFONT_TYPES ?=
+MODFONT_FONTFILES ?=
MODFONT_DOCFILES ?=
-MODFONT_do-install = ${INSTALL_DATA_DIR} ${MODFONT_DIR};
+MODFONT_do-install = ${INSTALL_DATA_DIR} ${MODFONT_FONTDIR};
-# if MODFONT_TYPES is not set, install .otf files if present (and break,
+# if MODFONT_FONTFILES is not set, install .otf files if present (and break,
# to skip ttf) otherwise fallback to ttf.
-.if empty(MODFONT_TYPES)
-MODFONT_do-install += for t in otf ttf; do ${INSTALL_DATA} ${WRKSRC}/*.$$t
${MODFONT_DIR} && break; done
+.if empty(MODFONT_FONTFILES)
+MODFONT_do-install += for t in otf ttf; do ${INSTALL_DATA} ${WRKSRC}/*.$$t
${MODFONT_FONTDIR} && break; done
.else
-MODFONT_do-install += for t in ${MODFONT_TYPES}; do ${INSTALL_DATA}
${WRKSRC}/*.$$t ${MODFONT_DIR}; done
+MODFONT_do-install += for t in ${MODFONT_FONTFILES}; do ${INSTALL_DATA}
${WRKSRC}/$$t ${MODFONT_FONTDIR}; done
.endif
.if !empty(MODFONT_DOCFILES)
Index: fonts/alkalami/Makefile
===
RCS file: /cvs/ports/fonts/alkalami/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- fonts/alkalami/Makefile 9 Jul 2024 13:03:39 - 1.11
+++ fonts/alkalami/Makefile 11 Jul 2024 09:19:15 -
@@ -19,7 +19,7 @@ MODULES = font
NO_BUILD = Yes
NO_TEST = Yes
-MODFONT_TYPES =ttf
+MODFONT_FONTFILES =*.ttf
MODFONT_DOCFILES = FONTLOG.txt README.txt
.include
Index: fonts/atkinson-hyperlegible/Makefile
===
RCS file: /cvs/ports/fonts/atkinson-hyperlegible/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- fonts/atkinson-hyperlegible/Makefile9 Jul 2024 13:03:40 -
1.6
+++ fonts/atkinson-hyperlegible/Makefile11 Jul 2024 09:19:15 -
@@ -13,7 +13,7 @@ HOMEPAGE =https://brailleinstitute.org/
PERMIT_PACKAGE = Yes
MODULES = font
-MODFONT_TYPES =otf
+MODFONT_FONTFILES =*.otf
SITES =
https://brailleinstitute.org/wp-content/uploads/atkinson-hyperlegible-font/
SITES.doc =https://brailleinstitute.org/wp-content/uploads/2020/11/
Index: fonts/blockzone/Makefile
===
RCS file: /cvs/ports/fonts/blockzone/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- fonts/blockzone/Makefile18 Apr 2024 09:20:38 - 1.18
+++ fonts/blockzone/Makefile11 Jul 2024 09:19:15 -
@@ -20,10 +20,6 @@ MODULES =font
NO_BUILD = Yes
NO_TEST = Yes
-DOCDIR = ${PREFIX}/share/doc/blockzone
-
-post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR}
+MODFONT_DOCFILES = LICENSE
.include
Index: fonts/cascadia-code/Makefile
===
RCS file: /cvs/ports/fonts/cascadia-code/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- fonts/cascadia-code/Makefile21 Sep 2023 15:28:02 - 1.12
+++ fonts/cascadia-code/Makefile11 Jul 2024 09:19:15 -
@@ -5,6 +5,8 @@ PKGNAME = cascadia-code-${V}
EXTRACT_SUFX = .zi
Re: NEW: games/opentyrian-data
Fabien Romano writes: > The package install in /usr/local/share/tyrian instead of opentyrian so this > does not work with opentyrian script. Yes, this location changed when the package was updated to 2.1.20221123. The wrapper script is no longer necessary and I decided not to patch the location chosen by upstream. > No opinion on the port. If that's better for you then why not but I d'ont > think > casual users will setup a port tree to fetch, install those data. > > I like to have checksum and package stuff to keep track of those files, > otherwise the readme could be improved also. > > The readme need an update to talk about opentyrian-data, just as a reminder. The games/opentyrian readme has already been updated to reference the new data port. But true enough, some people won't use a port for this, so I'll add back the original instructions in addition to the opentyrian-data instructions.
NEW: devel/git-filter-repo
Hi, git filter-repo is a versatile tool for rewriting git repository history, which includes capabilities not found anywhere else. It roughly falls into the same space of tool as git filter-branch but without the capitulation- inducing poor performance, with far more capabilities, and with a design that scales usability-wise beyond trivial rewriting cases. git filter-repo is now recommended by the git project instead of git filter-branch. ok? -- Anthony J. Bentley git-filter-repo.tar.gz Description: GNU Zip compressed data
Re: NEW: games/classicube
izder456 writes:
> On Mon, 27 May 2024 17:49:31 -0500
> izder456 wrote:
>
> > On Sun, 26 May 2024 12:04:51 -0500
> > izder456 wrote:
> >
> > > On Fri, 24 May 2024 22:24:20 -0500
> > > izder456 wrote:
> > >
> > > > On Thu, 2 May 2024 12:39:10 -0400
> > > > Thomas Frohwein wrote:
> > > > > So what was the reason for your earlier Error 2 when starting
> > > > > game?
> > > >
> > > > Gonna go on a whim here, but I suspect it has something to do with
> > > > failed resource loading.
> > > >
> > > > Since this thread is stagnant and my README more than explains how
> > > > to deal with this, is it OK to merge at the current status?
> > > >
> > > > Thanks,
> > > >
> > >
> > > Decided it makes more sense to put classicube_run in
> > > ${TRUEPREFIX}/share/classicube to prevent accidental runs. (as a
> > > failsafe). I updated pkg/README and the do-install directive
> > > accordingly to incorporate this change.
> > >
> > > OK to merge?
> > >
> > > Attached is a diff with the above changes.
> > >
> >
> > Please commit... Thanks.
> >
> > Its appreciated.
> >
>
> Ping!
I've imported this, with a change to the license marker, as the license
file claims to be BSD.
NEW: games/opentyrian-data
Hi, To play games/opentyrian requires the data files from the freeware version of Tyrian. pkg/README currently suggests downloading the files (from a fixed, versioned URL) and manually copying them to /usr/local/share. I would rather have a port do this for me. ok? -- Anthony J. Bentley opentyrian-data.tar.gz Description: GNU Zip compressed data
Re: font module: add MODFONT_DOCFILES
Anthony J. Bentley writes:
> 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?
Ping.
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-hyper
Re: NEW: IndieRunner - launcher for independent games, supersedes games/fnaify
Thomas Frohwein writes: > On Mon, Jul 08, 2024 at 08:28:22PM +0100, Fabien Romano wrote: > > > > On 08/07/2024 16:18, Anthony J. Bentley wrote: > > > Thomas Frohwein writes: > > >> This is the port of IndieRunner, which aims to serve as a versatile laun > cher > > >> for commercial games released on other platforms with open-source engine > s/ > > >> libraries. It takes care of selecting a runtime, configuring it, and avo > iding > > >> to trip over bundled incompatible libraries. > > > > > > Doesn't build here. > > > > > > ===> Configuring for indierunner-0.1 > > > Can't locate File/ShareDir/Install.pm in @INC (you may need to install th > e File::ShareDir::Install module) (@INC entries checked: /usr/local/libdata/p > erl5/site_perl/amd64-openbsd /usr/local/libdata/perl5/site_perl /usr/libdata/ > perl5/amd64-openbsd /usr/libdata/perl5) at Makefile.PL line 5. > > > BEGIN failed--compilation aborted at Makefile.PL line 5. > > > > > > > p5-File-ShareDir-Install was already installed on my system. Not sure how t > o > > easily spot such issues in the future (proot/dpb is too much), any advise t > o > > test from scratch using only proot and including FETCH_PACKAGES to avoid > > building all dependencies ? (did not yet tried) > > > > BUILD_DEPENDS = devel/p5-File-ShareDir-Install > > > > Then it works for me. > > > > yes, I missed the BDEP on this. Attached tarball with that line added... > > ok? 'make test' gives a lot of failures like below. Another missing dep? Regardless, the port works for me. ok bentley@ # Testing IndieRunner v0.1, Perl 5.038002, /usr/bin/perl t/00-load.t ... ok t/01-Helpers.t ok t/02-Platform.t ... ok t/03-Cmdline.t ok t/boilerplate.t ... ok t/manifest.t .. skipped: Author tests not required for installation # Failed test 'Pod coverage on IndieRunner::Io' # at /usr/local/libdata/perl5/site_perl/Test/Pod/Coverage.pm line 133. # IndieRunner::Io: couldn't find pod # Failed test 'Pod coverage on IndieRunner::Mode::Run' # at /usr/local/libdata/perl5/site_perl/Test/Pod/Coverage.pm line 133. # IndieRunner::Mode::Run: couldn't find pod # Failed test 'Pod coverage on IndieRunner::Mode::Dryrun' # at /usr/local/libdata/perl5/site_perl/Test/Pod/Coverage.pm line 133. # IndieRunner::Mode::Dryrun: couldn't find pod ... # Looks like you failed 22 tests of 30.
Re: NEW: IndieRunner - launcher for independent games, supersedes games/fnaify
Thomas Frohwein writes: > This is the port of IndieRunner, which aims to serve as a versatile launcher > for commercial games released on other platforms with open-source engines/ > libraries. It takes care of selecting a runtime, configuring it, and avoiding > to trip over bundled incompatible libraries. Doesn't build here. ===> Configuring for indierunner-0.1 Can't locate File/ShareDir/Install.pm in @INC (you may need to install the File::ShareDir::Install module) (@INC entries checked: /usr/local/libdata/perl5/site_perl/amd64-openbsd /usr/local/libdata/perl5/site_perl /usr/libdata/perl5/amd64-openbsd /usr/libdata/perl5) at Makefile.PL line 5. BEGIN failed--compilation aborted at Makefile.PL line 5.
Re: [update] fonts/vlgothic-20230918
> On Tue, 07 May 2024 22:32:44 +0900, > SASANO Takayoshi wrote: > > > > here is vlgothic-20230918 diff. (fixed U+33C7 glyph) > > > > ok? ok bentley@
Re: NEW: games/vvvvvv - a retro platformer with gravity-reversal puzzle mechanics
Thomas Frohwein writes: > Attached the updated tarball; looking for an okay for this slightly > modified draft as it's been a few years[1]... ok bentley@
Re: ioquake3 BTCFI {t,}error
Thomas Frohwein writes:
> Hi,
>
> ioquake3 is another port that fails with BTCFI, and for now restored to
> running order with USE_NOBTCFI=Yes. While here, enable DEBUG_PACKAGES
> per bentley's suggestion.
>
> ok?
Please add an explanatory comment for USE_NOBTCFI (like: is it a
custom JIT? is it a library dependency? etc). Then it's ok bentley@
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/ioquake3/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 8 Nov 2022 11:14:47 - 1.30
> +++ Makefile 21 Jun 2024 22:19:59 -
> @@ -1,10 +1,12 @@
> BROKEN-i386= need to free up a register
> ONLY_FOR_ARCHS= amd64 i386 macppc
>
> +USE_NOBTCFI= Yes
> +
> COMMENT= clone of the original Quake III Arena
>
> DISTNAME=ioquake3-2020.09.29
> -REVISION=1
> +REVISION=2
>
> GH_ACCOUNT= ioquake
> GH_PROJECT= ioq3
> @@ -28,6 +30,9 @@ LIB_DEPENDS=audio/libogg \
> MAKE_ENV=V=1 USE_VOIP=0 USE_INTERNAL_OGG=0 CC="${CC}" TOOLS_CC="${CC}"
> ALL_TARGET= "release"
> USE_GMAKE= Yes
> +
> +DEBUG_PACKAGES= ${BUILD_PACKAGES}
> +
> NO_TEST= Yes
>
> QUAKE_ARCH-amd64 = x86_64
Re: UPDATE: games/minetest to 5.8.0
Anthony J. Bentley writes:
> Here's an updated diff, which I'll commit in a few days unless
> someone objects.
I've committed this. A few days? Eh...
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/minetest/Makefile,v
> diff -u -p -r1.39 Makefile
> --- Makefile 26 Sep 2023 09:41:38 - 1.39
> +++ Makefile 17 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}${EXTRAC
> T_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/minetes
> t_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
> --- distinfo 21 Aug 2022 08:58:35 - 1.13
> +++ distinfo 17 Apr 2024 09:43:24 -
> @@ -1,6 +1,6 @@
> -SHA256 (irrlichtmt-1.9.0mt7.tar.gz) = wSzb1KhS4ebr97oieJqgV6Gn8tWF3YGiQSpi9X
> oOJhk=
> -SHA256 (minetest-5.6.0.tar.gz) = P9vAyNn2oYwSlUugyu21SKIvNnUg9Z0HmASiHeA0epE
> =
> -SHA256 (minetest-game-5.6.0.tar.gz) = /ZkdQsJT2zgFWcWTorA18i4HqB+Ge1OAovBF6a
> TQTIc=
> -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.0m
Re: UPDATE: games/minetest to 5.8.0
Solene Rapenne writes: > using updated diff from > https://marc.info/?l=openbsd-ports&m=171334749408321&q=mbox > > I get a compilation error, here are the last 200 lines > ... > /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CI > rrDeviceLinux.cpp:335:31: error: use of undeclared identifier 'getpid' > long pid = static_cast(getpid()); Looks like you're missing patch-lib_irrlichtmt_source_Irrlicht_CIrrDeviceLinux_cpp which is in the message you linked to. Most likely you had no patches/ directory and patch(1) chose to create the new file in the parent (see https://marc.info/?l=openbsd-ports&m=171628004714049&w=2). > 4 warnings and 1 error generated. > ninja: build stopped: subcommand failed. That is the only error, the rest of the 200 lines were just warnings.
Re: UPDATE: games/minetest to 5.8.0
Fabien ROMANO writes: > This port is using a release, not a commit id, which is a fixed tarballs from > github, this is perfectly fine ? GitHub tarballs generated from tags have the same stability problems as GitHub tarballs generated from commit IDs. It's impractical to avoid them completely (because having porters generate their own static tarballs for every piece of software that doesn't provide a real static release tarball is a big ask, and also interferes with update checkers like portroach). But it's always better to convince GitHub upstreams to routinely generate a static tarball and add it as an attachment to the GitHub releases section.
Re: UPDATE: games/minetest to 5.8.0
Stuart Henderson writes:
> On 2024/05/29 20:11, Fabien ROMANO wrote:
> > By curiosity, lang/lua (5.1.5) doesn't USE_NOBTCFI, there is no JIT ?
> > Why its required for minetest (lua 5.1.4), some patches they bring ?
>
> This diff changes minetest from using lua (no jit, works on most
> archs) to luajit (restricted archs and doesn't do BTCFI landing pads
> yet). (It could alternatively pull in bsd.port.arch.mk and test
> ${PROPERTIES:Mluajit} to decide which to use).
Switching away from Lua is necessary because newer minetest decided to
stop supporting system installations of Lua. So the choice is to either
build the Lua embedded in minetest, or switch to system luajit.
Re: luajit, arm64, games/love/0.10
Stuart Henderson writes: > How useful is love/0.10, does it still make sense to keep it? games/orthorobot depends on it.
Re: NEW: www/internetarchive
Anthony J. Bentley writes: > 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. > > > > > > Updated RUN_DEPENDS. > > > > Added self-TEST_DEPENDS and removed PKG_ARCH. Ping. internetarchive.tar.gz Description: GNU Zip compressed data
Re: vbam: enable wxWidgets/visualboyadvance-m
Martijn van Duren writes: > Back in 2018 Jasper explicitly disabled wxWidgets on vbam so it wouldn't > accidentally get picked up. I reckon it would be worth it to enable it > explicitly, since it would build the visualboyadvance-m binary. > > Not only brings it some menu options which allows you to change things > at runtime, it also brings in some features I couldn't find in vbam: > most notably the link (network) option. Without it battling your > friends, or completing your pokedex will be impossible. :-) I agree, we should provide the wx frontend since it has extra features. > I placed visualboyadvance-m inside the vbam package for quick testing, > but considering it pulls in extra dependencies and is its own thing > it might be cleaner to put it in its own subpackage. I agree, we also provide separate packages in similar cases like mgba and mgba-qt. The hard part :) is what to name the wx package. We shouldn't call it "visualboyadvance-m" after the executable, because nobody looking at the package names will know the difference between the "vbam" and "visualboyadvance-m" packages. So maybe vbam-wxwidgets? > +@tag update-desktop-database > +@tag gtk-update-icon-cache %D/share/icons/hicolor Needs additional RUN_DEPENDS.
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...
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
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) =
M6O7Q7CEl6
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;
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 = ${PREFIX}/share/doc/${
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.
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
==
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 RSA_get0
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: 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.
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.
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
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
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
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);
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
Re: [NEW] games/vcmi
Kirill Bychkov writes: > All the above was checked to work. Updated port attached. ok bentley@
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
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.
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.
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
Re: Kill FONT_DISTDIR/FONT_DISTSUBDIR
A Tammy writes: > Presumably there are no packages which are ever going to install fonts > in addition to other things like a program or a library? Or something > that would need to build a font using python or a script? Cuz this > removes the ability to do builds and install fonts in the same Makefile. A port that needs this can simply define a custom build or install target.
NEW: audio/vgmstream
Hi, 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. I've tested this on the music files from a few Steam games and was able to convert and play some of the custom formats. ok? -- Anthony J. Bentley vgmstream.tar.gz Description: GNU Zip compressed data
Kill FONT_DISTDIR/FONT_DISTSUBDIR
Hi,
These variables seem redundant. FONT_DISTDIR/FONT_DISTSUBDIR are
specific to the font module and aren't widely used (only three ports
use each variable); they're functionally equivalent to WRKDIST/WRKSRC.
There's a port-modules(5) manpage diff, but I won't bother sending it
since it just replaces a single instance of FONT_DISTDIR with WRKSRC.
Everything under fonts/ still survives make package.
ok?
Index: infrastructure/mk/font.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/font.port.mk,v
retrieving revision 1.5
diff -u -p -r1.5 font.port.mk
--- infrastructure/mk/font.port.mk 9 May 2023 13:32:04 - 1.5
+++ infrastructure/mk/font.port.mk 13 Sep 2023 08:18:43 -
@@ -17,16 +17,14 @@ FONTDIR ?= ${PREFIX}/share/fonts/${TYPEF
FONTTYPES ?=
-FONT_DISTDIR ?=${WRKSRC}
-
MODFONT_do-install = ${INSTALL_DATA_DIR} ${FONTDIR};
# if FONTTYPES 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}
${FONT_DISTDIR}/${FONT_DISTSUBDIR}/*.$$t ${FONTDIR} && break; done
+MODFONT_do-install += for t in otf ttf; do ${INSTALL_DATA} ${WRKSRC}/*.$$t
${FONTDIR} && break; done
.else
-MODFONT_do-install += for t in ${FONTTYPES}; do ${INSTALL_DATA}
${FONT_DISTDIR}/${FONT_DISTSUBDIR}/*.$$t ${FONTDIR}; done
+MODFONT_do-install += for t in ${FONTTYPES}; do ${INSTALL_DATA}
${WRKSRC}/*.$$t ${FONTDIR}; done
.endif
. if !target(do-install)
Index: fonts/arabeyes-ttf/Makefile
===
RCS file: /cvs/ports/fonts/arabeyes-ttf/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- fonts/arabeyes-ttf/Makefile 11 Mar 2022 19:00:17 - 1.11
+++ fonts/arabeyes-ttf/Makefile 13 Sep 2023 08:18:44 -
@@ -19,7 +19,7 @@ MODULES = font
NO_BUILD= Yes
NO_TEST= Yes
-FONT_DISTSUBDIR= fonts
+WRKSRC=${WRKDIST}/fonts
WRKDIST= ${WRKDIR}/ttf-arabeyes-$V
.include
Index: fonts/atkinson-hyperlegible/Makefile
===
RCS file: /cvs/ports/fonts/atkinson-hyperlegible/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- fonts/atkinson-hyperlegible/Makefile7 May 2023 06:39:28 -
1.2
+++ fonts/atkinson-hyperlegible/Makefile13 Sep 2023 08:18:44 -
@@ -26,7 +26,7 @@ NO_BUILD =Yes
NO_TEST = Yes
SUBST_VARS += VPDF
-FONT_DISTDIR = ${WRKDIR}/${TYPEFACE}-Font-Print-and-Web-${V}/Print\ Fonts/
+WRKSRC = ${WRKDIR}/${TYPEFACE}-Font-Print-and-Web-${V}/Print\ Fonts
DOCDIR = ${PREFIX}/share/doc/hyperlegible
post-install:
Index: fonts/clearsans/Makefile
===
RCS file: /cvs/ports/fonts/clearsans/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- fonts/clearsans/Makefile11 Mar 2022 19:00:17 - 1.4
+++ fonts/clearsans/Makefile13 Sep 2023 08:18:44 -
@@ -18,7 +18,7 @@ NO_BUILD =Yes
NO_TEST = Yes
WRKDIST = ${WRKDIR}
-FONT_DISTDIR = ${WRKDIST}/TTF
+WRKSRC = ${WRKDIST}/TTF
DOCDIR = ${PREFIX}/share/doc/clearsans
post-install:
Index: fonts/hermit-font/Makefile
===
RCS file: /cvs/ports/fonts/hermit-font/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- fonts/hermit-font/Makefile 11 Mar 2022 19:00:20 - 1.12
+++ fonts/hermit-font/Makefile 13 Sep 2023 08:18:44 -
@@ -20,6 +20,6 @@ NO_BUILD= Yes
NO_TEST= Yes
FONTTYPES= otf
-FONT_DISTDIR= ${WRKDIR}
+WRKDIST= ${WRKDIR}
.include
Index: fonts/jetbrains-mono/Makefile
===
RCS file: /cvs/ports/fonts/jetbrains-mono/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- fonts/jetbrains-mono/Makefile 15 Mar 2023 09:09:12 - 1.5
+++ fonts/jetbrains-mono/Makefile 13 Sep 2023 08:18:44 -
@@ -15,7 +15,7 @@ MASTER_SITES =https://download.jetbrain
TYPEFACE = JetBrainsMono
-FONT_DISTSUBDIR = fonts/ttf
+WRKSRC = ${WRKDIST}/fonts/ttf
MODULES = font
WRKDIST = ${WRKDIR}
Index: fonts/victor-mono/Makefile
===
RCS file: /cvs/ports/fonts/victor-mono/Makefile,v
retrieving revision 1.1.1.2
diff -u -p -r1.1.1.2 Makefile
--- fonts/victor-mono/Makefile 19 May 2023 15:22:36 - 1.1.1.2
+++ fonts/victor-mono/Makefile 13 Sep 2023 08:18:45 -
@@ -12,7 +12,7 @@ DISTFILES=victor-mono-${V}{VictorMonoAl
PERMIT_PACKAGE=Yes
MODULES= font
-FONT_DISTSUBDIR= OTF
+WRKSRC=${WRKDIST}/OTF
N
Re: NEW: fonts/recursive 1.085
> > Renato Aguiar writes: > > > Recursive Sans & Mono is a variable type family built for better > > > code & UI. > > > > > > https://www.recursive.design/ > > > > > > https://github.com/arrowtype/recursive > > > > > > Port attached. Imported. Thanks!
Re: NEW: fonts/recursive 1.085
Renato Aguiar writes: > Recursive Sans & Mono is a variable type family built for better > code & UI. > > https://www.recursive.design/ > > https://github.com/arrowtype/recursive > > Port attached. EXTRACT_SUFX=.zip is already set by default in the font module. And I would wrap the do-install lines to 80 characters. Other than that, the port looks fine to me. Anyone else willing to ok?
Re: games/devilutionx - unbreak on arm64
Lucas Raab writes:
> Currently, devilutionx is broken on arm64 with an immediate crash. Setting
> USE_NOBTCFI=Yes allows it to run there and still compiles/runs on amd64 as
> well.
If amd64 works fine without it, maybe wrap the assignment in
.if ${MACHINE_ARCH} == "aarch64"
?
Re: Bug in nvi
Hi Walter, Walter Alejandro Iglesias writes: > I'm addressing you because, besides that none answered (summertime? > :-),) I applied my patch to nvi in ports also. I been using both vi and > nvi for a while and, as far as I can tell, with my patch nvi does > exactly what's expected, and I haven't notice any regressions. The behavior seems like an improvement to me, but I'm not likely to keep a local patch in the ports tree for something like this unless it's been committed upstream. My recommendation would be to submit it to Zhihao Yuan's upstream GitHub repo. Once it's been committed there, let me know and I'll either commit the patch to ports or update to a newer source code snapshot. As for the original patch from your bugs@ thread, it's only been three days, and sometimes it takes some time, or (unfortunately) a reminder or two, for a developer to review it. I encourage you to send the patch to tech@, where it's likely to draw more attention, and send a followup reminder if it hasn't received comments in over a week. -- Anthony J. Bentley
Re: NEW: IntelOne Mono font
Florian Obser writes: > On 2023-05-23 07:56 -06, "Anthony J. Bentley" wrote: > > Florian Obser writes: > >> They don't seem to be sure what to call the damn thing. > >> - Intel One Mono > >> - IntelOne Mono > >> - intel-one-mono > >> > >> I went with "IntelOne Mono" because that's how you configure the font. > >> > >> There is a sample here: https://github.com/intel/intel-one-mono > >> > >> Comments, OKs? > > > > Looks ok to me, and basically identical to one I made, except mine > > installed ttf.zip as well as otf.zip. Yes, this increases the package > > size, but not a whole lot in this case. Most font ports install both > > ttf and otf when available, and while it would be kind of cool to only > > package otf, some software still doesn't support it. Until we start > > stripping out ttf from all our packages, I think the package should > > have both ttf and otf when both are easily available. > > > > Sorry, I seem to have missed your port. Please go ahead with yours then > since I have no idea how I would shoehorn ttf.zip into the port ;) Someone reminded me I forgot to actually send this out. Here it is. I didn't bother adding the extra bits to fetch and install the license, because as with most fonts, the license information is embedded in both the OTF and TTF metadata, as can be verified with lcdf-typetools (otfinfo -V). ok? -- Anthony J. Bentley intel-one-mono.tar.gz Description: intel-one-mono.tar.gz
Re: NEW: IntelOne Mono font
Florian Obser writes: > They don't seem to be sure what to call the damn thing. > - Intel One Mono > - IntelOne Mono > - intel-one-mono > > I went with "IntelOne Mono" because that's how you configure the font. > > There is a sample here: https://github.com/intel/intel-one-mono > > Comments, OKs? Looks ok to me, and basically identical to one I made, except mine installed ttf.zip as well as otf.zip. Yes, this increases the package size, but not a whole lot in this case. Most font ports install both ttf and otf when available, and while it would be kind of cool to only package otf, some software still doesn't support it. Until we start stripping out ttf from all our packages, I think the package should have both ttf and otf when both are easily available.
Re: Update fonts/ibm-plex to version 6.3.0
Stuart Henderson writes: > On 2023/05/13 11:30, Josiah Frentsos wrote: > > +SIZE (ibm-plex-6.3.0/OpenType.zip) = 36523894 > > +SIZE (ibm-plex-6.3.0/TrueType.zip) = 47309206 > > I've committed this, but not sure we really need both ttf and otf, > can we drop ttf? It's been a few years since I did anything fancy with LaTeX, but doesn't pdflatex only support TTF (through fontspec), not OTF?
Re: UPDATE: thedarkmod
Thomas Frohwein writes: > On Fri, May 12, 2023 at 06:33:01PM -0400, Brad Smith wrote: > > Removing deprecated FFmpeg API and updating for newer versions. > > The port has been in trouble for a while, that's why I'd like to ask a > more fundamental question about the future of the port: > > - Unfortunately, the 2.07 game data isn't obtainable anymore, so new > installs of the port won't work unless someone has leftover data from > back then. > - The data can't be freely shared as thedarkmod-data because it includes > proprietary-license textures. > - Updating the port to the latest version has proven very challenging > because of many idiosyncracies and upstream attitude to only support > install their way, that is with the binary in a user-writable directory > where the data files will be downloaded to as well. > - I have made several attempts to update the port, but managing the > particularities of their minizip libraries has cost me a lot of nerve > without working to date. > > My suggestion therefore is to remove the port or at least mark it as > BROKEN. It can be restored if there is a workable update in the future > that should then take Brad's diff into account. > > If removal/BROKEN is not an option, then updating for newer ffmpeg API > would probably be wise, but I haven't checked Brad's diff for that so > far. > > ok to remove or mark BROKEN? or any protest? Really unfortunate. ok bentley@ to remove.
Re: NEW: www/kiwix
Anthony J. Bentley writes: > Anthony J. Bentley writes: > > Here's a port for the two packages that make up Kiwix: libkiwix, and > > kiwix-tools. Kiwix can be used to maintain a convenient local mirror > > of Wikipedia, Project Gutenberg, Stack Exchange, etc. Also needs a new user: Index: infrastructure/db/user.list === RCS file: /cvs/ports/infrastructure/db/user.list,v retrieving revision 1.426 diff -u -p -r1.426 user.list --- infrastructure/db/user.list 20 Apr 2023 18:31:34 - 1.426 +++ infrastructure/db/user.list 13 May 2023 01:54:17 - @@ -399,3 +399,4 @@ id usergroup port 888 _epmd _epmd lang/erlang/25 889 _gromox_gromox mail/grommunio/gromox 890 _grommunio _grommunio mail/grommunio/admin-api +891 _kiwix-serve _kiwix-servewww/kiwix/kiwix-tools
Re: NEW: www/kiwix
Hi, Anthony J. Bentley writes: > Here's a port for the two packages that make up Kiwix: libkiwix, and > kiwix-tools. Kiwix can be used to maintain a convenient local mirror > of Wikipedia, Project Gutenberg, Stack Exchange, etc. > > It's easy to test: > > 1. Download a zim file from https://library.kiwix.org/ > 2. rcctl enable kiwix_serve > 3. rcctl set kiwix_serve flags -p 1024 /path/to/file.zim > 4. Navigate to http://localhost:1024/ in a browser Anyone willing to ok this port (and dependencies, also attached)? -- Anthony J. Bentley kiwix.tar.gz Description: kiwix.tar.gz libzim.tar.gz Description: libzim.tar.gz kainjow-mustache.tar.gz Description: kainjow-mustache.tar.gz
Re: Retire games/residualvm
Thomas Frohwein writes: > Hi, > > ResidualVM is outdated and superfluous since the project was merged > with scummvm in October 2020 [1]. The upstream GitHub repo has been > archived and hasn't seen any commits since October 2020. Last update to > the port besides general ports maintenance was July 5th, 2018. > > ok to remove? ok.
NEW: www/kiwix
Hi, Here's a port for the two packages that make up Kiwix: libkiwix, and kiwix-tools. Kiwix can be used to maintain a convenient local mirror of Wikipedia, Project Gutenberg, Stack Exchange, etc. It's easy to test: 1. Download a zim file from https://library.kiwix.org/ 2. rcctl enable kiwix_serve 3. rcctl set kiwix_serve flags -p 1024 /path/to/file.zim 4. Navigate to http://localhost:1024/ in a browser ok? -- Anthony J. Bentley kiwix.tar.gz Description: kiwix.tar.gz
NEW: archivers/libzim
Hi, The libzim is the standard implementation of the ZIM archive specification. It is a library which implements the read and write method for ZIM files. This is a dependency of an upcoming Kiwix port. ok? -- Anthony J. Bentley libzim.tar.gz Description: libzim.tar.gz
NEW: devel/kainjow-mustache
Hi, Mustache is a header-only, zero-dependency templating library. This is a dependency of an upcoming Kiwix port. It seems there are multiple implementations of Mustache, even multiple C++ implementations, so I included the GitHub username in the port name. ok? -- Anthony J. Bentley kainjow-mustache.tar.gz Description: kainjow-mustache.tar.gz
Re: new emulators/libchdr
Stuart Henderson writes: > EPOCH isn't really a problem, the main thing (apart from ugly version > numbers in PKGNAME) is that it can give some surprises with version > specs in dependencies/@conflict lines/etc. Yes, EPOCH is a necessary thing sometimes and not a "problem." Besides its effect on version specs, it's also confusing to some people (who think it's like REVISION and gets removed on update, etc.). I try to avoid EPOCH generally, but I don't try too hard.
Re: new emulators/libchdr
Nam Nguyen writes: > Sorry about that. I imported it as is, so I will change to 0pl with > EPOCH. No need for that. The 0pl suggestion (only a suggestion) was to avoid hypothetical EPOCH in the future if upstream picks a version number less than 1.0; but rolling back from 1.0 now that it's been committed would mean a guaranteed EPOCH now. Stick with 1.0pl20230220 and no EPOCH. The rest of your diff is ok with me.
Re: new emulators/libchdr
Nam Nguyen writes: > Please find attached libchdr. libchdr is a dependency for > emulators/flycast, which I will send shortly. > > DESCR: > > libchdr is a standalone library for reading MAME's CHDv1-v5 formats. > > The code is based off of MAME's old C codebase which read up to CHDv4 > with OS-dependent features removed, and CHDv5 support backported from > MAME's current C++ codebase. > > OK to import? The commit history lists some changes we might want: null dereference fix, buffer overrun fix, additional codec. Any reason not to base the port on the latest commit? It would be better to use a lower version number than 1.0, in case they make a release with a version like 0.1 that would necessitate EPOCH. Maybe even just use "0pl20221022"...
UPDATE: emulators/ppsspp
Hi,
Here's an update to ppsspp-1.14.4. Upstream has started providing real
tarballs, so all the GitHub fetching/symlinking goes away.
Test reports appreciated. It seemed a bit slow when I tried it, but I
don't run PPSSPP very often, so maybe it's normal.
Index: Makefile
===
RCS file: /cvs/ports/emulators/ppsspp/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile28 May 2022 06:19:59 - 1.19
+++ Makefile25 Apr 2023 10:48:24 -
@@ -6,37 +6,19 @@ NOT_FOR_ARCHS = ${BE_ARCHS}
PPSSPP_JIT_ARCHS = arm aarch64 i386 amd64
ONLY_FOR_ARCHS = ${PPSSPP_JIT_ARCHS}
+V =1.14.4
+DISTNAME = ppsspp-$V
+
COMMENT = Sony PlayStation Portable emulator
-GH_ACCOUNT = hrydgard
-GH_PROJECT = ppsspp
-GH_TAGNAME = v1.11.3
-
-GLSLANG = d0850f875ec392a130ccf00018dab458b546f27c
-PPSSPP_LANG = 6bd5b4bc983917ea8402f73c726b46e36f3de0b4
-SPIRV_CROSS = a1f7c8dc8ea2f94443951ee27003bffa562c1f13
-ARMIPS = 7885552b208493a6a0f21663770c446c3ba65576
-MINIUPNP = 7e229ddd635933239583ab190d9b614bde018157
-
-MASTER_SITES0 =https://github.com/hrydgard/glslang/archive/
-MASTER_SITES1 =https://github.com/hrydgard/ppsspp-lang/archive/
-MASTER_SITES2 =https://github.com/hrydgard/SPIRV-Cross/archive/
-MASTER_SITES3 =https://github.com/Kingcom/armips/archive/
-MASTER_SITES4 =https://github.com/hrydgard/miniupnp/archive/
-
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
- ${GLSLANG}.tar.gz:0 \
- ${PPSSPP_LANG}.tar.gz:1 \
- ${SPIRV_CROSS}.tar.gz:2 \
- ${ARMIPS}.tar.gz:3 \
- ${MINIUPNP}.tar.gz:4
+EXTRACT_SUFX = .tar.xz
+
+MASTER_SITES = https://github.com/hrydgard/ppsspp/releases/download/v$V/
CATEGORIES = emulators
HOMEPAGE = https://www.ppsspp.org/
-MAINTAINER = Anthony J. Bentley
-
# GPLv2+
PERMIT_PACKAGE = Yes
@@ -67,18 +49,6 @@ CONFIGURE_ARGS = -DUSE_SYSTEM_FFMPEG=ON
CXXFLAGS +=-I${X11BASE}/include
NO_TEST = Yes
-
-post-extract:
- rmdir ${WRKSRC}/assets/lang \
- ${WRKSRC}/ext/armips \
- ${WRKSRC}/ext/glslang \
- ${WRKSRC}/ext/SPIRV-Cross \
- ${WRKSRC}/ext/miniupnp
- ln -s ${WRKDIR}/ppsspp-lang-${PPSSPP_LANG} ${WRKSRC}/assets/lang
- ln -s ${WRKDIR}/armips-${ARMIPS} ${WRKSRC}/ext/armips
- ln -s ${WRKDIR}/glslang-${GLSLANG} ${WRKSRC}/ext/glslang
- ln -s ${WRKDIR}/SPIRV-Cross-${SPIRV_CROSS} ${WRKSRC}/ext/SPIRV-Cross
- ln -s ${WRKDIR}/miniupnp-${MINIUPNP} ${WRKSRC}/ext/miniupnp
pre-configure:
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt ${WRKSRC}/UI/NativeApp.cpp
Index: distinfo
===
RCS file: /cvs/ports/emulators/ppsspp/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo19 Sep 2021 00:34:55 - 1.9
+++ distinfo25 Apr 2023 10:48:24 -
@@ -1,12 +1,2 @@
-SHA256 (ppsspp/6bd5b4bc983917ea8402f73c726b46e36f3de0b4.tar.gz) =
tun+Sn2qLdjU88x0y6/FOC99+QMDrzo8GNJexEktiJk=
-SHA256 (ppsspp/7885552b208493a6a0f21663770c446c3ba65576.tar.gz) =
+KA5BhNftvKTK4C371mR85zKxGs27DaQd2+zjGl3XD0=
-SHA256 (ppsspp/7e229ddd635933239583ab190d9b614bde018157.tar.gz) =
aBnwmE+mR/aadIMaIzOFmgcJn2QJjOWMNdhgTRlTLT0=
-SHA256 (ppsspp/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz) =
RWseKnWo6CmFziL0cHVwx6ofxQ1BGcuhpkHosjPs3iY=
-SHA256 (ppsspp/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz) =
aZ4XfgAi8XwgTjVCu/f8toQ5IwlZaO3B67xRJOhaK98=
-SHA256 (ppsspp/ppsspp-1.11.3.tar.gz) =
UD8Eb6aOS+JNCIIrCqIoDmU61RPZoSx3pZgJRnuVxRY=
-SIZE (ppsspp/6bd5b4bc983917ea8402f73c726b46e36f3de0b4.tar.gz) = 662203
-SIZE (ppsspp/7885552b208493a6a0f21663770c446c3ba65576.tar.gz) = 197263
-SIZE (ppsspp/7e229ddd635933239583ab190d9b614bde018157.tar.gz) = 438926
-SIZE (ppsspp/a1f7c8dc8ea2f94443951ee27003bffa562c1f13.tar.gz) = 814213
-SIZE (ppsspp/d0850f875ec392a130ccf00018dab458b546f27c.tar.gz) = 3138654
-SIZE (ppsspp/ppsspp-1.11.3.tar.gz) = 30067677
+SHA256 (ppsspp/ppsspp-1.14.4.tar.xz) =
VO3kGvVpEW2cKE97FX0USdzROURnXmDCh1vzo5lPXdo=
+SIZE (ppsspp/ppsspp-1.14.4.tar.xz) = 46405556
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/emulators/ppsspp/patches/patch-CMakeLists_txt,v
retrieving revision 1.7
diff -u -p -r1.7 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt11 Mar 2022 18:59:40 - 1.7
+++ patches/patch-CMakeLists_txt25 Apr 2023 10:48:24 -
@@ -5,7 +5,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -202,6 +202,8 @@ endif()
+@@ -252,6 +252,8 @@ endif()
if(NOT LIBRETRO AND NOT IOS)
find_package(SDL2)
endif()
@@ -14,7 +14,7 @@ Index: CMakeLists.txt
include(FindThreads)
if(APPLE)
-@@ -293,13 +295,13 @@ if(NOT MSVC)
+@@ -351,13 +3
Re: [NEW] fonts/konatu-ttf
SASANO Takayoshi writes: > here is Konatu, a Japanese TrueType font with embedded bitmap. > DESCR is same as NetBSD's konatu-ttf. > > ok? Please add this sentence to the start of DESCR: "Konatsu is a Gothic type Japanese font, free for commercial use." Also, I would name the port and package konatu, not konatu-ttf, because that's the name upstream uses. With those changes, it's ok bentley@
Re: UPDATE fonts/vlgothic-20220612
SASANO Takayoshi writes:
> ok?
ok bentley@
> Index: Makefile
> ===
> RCS file: /cvs/ports/fonts/vlgothic/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile 11 Mar 2022 19:00:28 - 1.5
> +++ Makefile 17 Apr 2023 12:25:32 -
> @@ -1,6 +1,6 @@
> COMMENT =Japanese gothic TrueType fonts from Vine Linux
>
> -V = 20200720
> +V = 20220612
> DISTNAME = VLGothic-$V
> PKGNAME =vlgothic-$V
>
> @@ -11,7 +11,7 @@ HOMEPAGE = http://vlgothic.dicey.org/
> #BSD
> PERMIT_PACKAGE= Yes
>
> -MASTER_SITES = ${MASTER_SITE_OSDN_JP:=vlgothic/73361/}
> +MASTER_SITES = ${MASTER_SITE_OSDN_JP:=vlgothic/77450/}
> EXTRACT_SUFX = .tar.bz2
>
> NO_BUILD = Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/fonts/vlgothic/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 5 May 2021 11:30:58 - 1.2
> +++ distinfo 17 Apr 2023 12:25:32 -
> @@ -1,2 +1,2 @@
> -SHA256 (VLGothic-20200720.tar.bz2) = yl+Tlkfhf3V4nhYtcSdPxjf/TEHNKMHU6Ufd9n/
> f6Q0=
> -SIZE (VLGothic-20200720.tar.bz2) = 4948096
> +SHA256 (VLGothic-20220612.tar.bz2) = JwOUprBMHKzQaZsxP8a4DZGl4G9H/aByRz9VrJl
> HZdo=
> +SIZE (VLGothic-20220612.tar.bz2) = 4955343
>
> --
> SASANO Takayoshi (JG1UAA)
>
Re: update devel/rgbds 0.6.1
Nam Nguyen writes: > - workaround in Makefile patch from [1] for vasprintf bug in openbsd > headers when POSIX_C_SOURCE=200809L is defined. This was discussed by > bentley@ in [1] and rsadowski@ in [2]. I propose having this as a > temporary workaround until openbsd's llvm headers can be fixed with a > more optimal solution[3]. > [1] https://github.com/gbdev/rgbds/issues/ > [2] https://marc.info/?l=openbsd-tech&m=161833545600505&w=2 > [3] https://marc.info/?l=openbsd-bugs&m=157758838031146&w=2 I did look at this recently. However, that patch is not actually relevant to this bug (vasprintf visibility issues), but to another bug (locale_t visibility issues). > Testing: > https://gbdev.io/gb-asm-tutorial/part1/hello_world.html > > I followed this hello world tutorial and loaded the rom in > emulators/sameboy. It successfully printed. sameboy actually has a build dependency on rgbds. Can you test that it still builds?
Re: [update] openttd to 13.0 and update openttd-data
Hi Florian,
Florian Viehweger writes:
> +post-extract:
> + cd ${WRKDIR} && tar xf ${DISTNAME:S/-all//}.tar
If all the data packages require this now, it should go into Makefile.inc.
And please use ${TAR} instead of "tar".
Other than that, it looks fine to me.
--
Anthony J. Bentley
Re: games/love: bring in multiple versions
Nice to see this. Omar Polo writes: > The idea then is to move the current port for the 0.8.0 (assuming we > want to keep it) as games/love/0.8.0 and add some other versions too, > for the time being 0.10.4 and 11.4 (the latest.) 11.1 doesn't compile > out of the box, and we can always add other versions later. My understanding is that LOVE keeps API compatibility between minor versions, so 11.1 is obviated by 11.2 and eventually 11.4. If that's the case, we should rename the packaged files and the port directories to 0.8, 0.10, and 11, and only package the latest of each. I would also like the version numbers in PLIST to use a SUFFIX variable (as autoconf, etc. do).
Re: desmume, any special reqs to run it?
Nam Nguyen writes: > Here is a diff unbreaking desmume. I am attaching it because it contains > ^M being removed from an existing patch. > > I came across this same issue with my WIP-port of flycast. It has to be > adapted for immutable userland mappings in 7.2 -current. > > Globals are in BSS and are immutable by default. They need to be marked > as mutable in order for mprotect RWX to work. Thanks! ok bentley@
Re: desmume, any special reqs to run it?
Mikolaj Kucharski writes: > I just wanted to see how Nintendo 3DS emulators work on OpenBSD. Never > played with them before. > > $ desmume some-game-decrypted.3ds > mprotect failed: Operation not permitted > Abort trap (core dumped) > > I tried with few 3DS files and one CIA file, always the same output > like above. Any tips? desmume is a DS emulator, not a 3DS emulator. It doesn't support 3DS files or CIA files. (citra is a 3DS emulator and should be able to handle those files.) That said, desmume shouldn't crash like that. I'll look into it.
