CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2024/03/05 00:57:27 Modified files: www/honk : Makefile distinfo www/honk/pkg : MESSAGE PLIST README Log message: Update for Honk to 1.3.1 OK horia (Maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2024/03/05 00:15:12 Modified files: mail/mozilla-thunderbird: Tag: OPENBSD_7_4 Makefile distinfo Log message: mail/mozilla-thunderbird: MFC update to 115.8.1 see https://www.thunderbird.net/en-US/thunderbird/115.8.1/releasenotes/ fixes https://www.mozilla.org/en-US/security/advisories/mfsa2024-11/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2024/03/05 00:14:58 Modified files: mail/mozilla-thunderbird: Makefile distinfo mail/thunderbird-i18n: Makefile.inc distinfo Log message: mail/mozilla-thunderbird: update to 115.8.1 see https://www.thunderbird.net/en-US/thunderbird/115.8.1/releasenotes/ fixes https://www.mozilla.org/en-US/security/advisories/mfsa2024-11/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2024/03/05 00:13:16 Modified files: www/seamonkey : Makefile Log message: www/seamonkey: add BDEP on devel/autoconf/2.13 the build system predates autoconf vendoring and still checks for it
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2024/03/05 00:12:34 Modified files: www/mozilla: mozilla.port.mk Log message: www/mozilla/mozilla.port.mk: drop BDEP on devel/autoconf/2.13 bug #1663863 vendored autoconf 2.13 4 years ago..
Re: x11/gnustep/libobjc2 failed to build
Le Mon, Mar 04, 2024 at 10:48:46PM +0100, Jeremie Courreges-Anglas a écrit :
> Le Mon, Mar 04, 2024 at 10:26:02PM +0100, Sebastian Reitenbach a écrit :
> > On Sunday, March 03, 2024 21:56 CET, Stuart Henderson
> > wrote:
> >
> > > On 2024/03/03 20:52, Stuart Henderson wrote:
> > > > On 2024/03/03 20:31, Sebastian Reitenbach wrote:
> > > > > If I understand removing the @pkgpath fixed the bigger part of the
> > > > > issue?
> > >
> > > PS "bigger part of the issue" = "bulk builds were breaking because the
> > > dependency loop resulted in too much disk space being eatern" but the
> > > remaining problem is still fairly important.
> > >
> >
> >
> > The conflicting file is the include/Block.h
> >
> > Nothing that depends on libobjc2, really needs it. gnustep-base is
> > configured to
> > not search for Blocks runtime.
>
> I'm testing something similar, slightly more conservative: move
> Block.h and Block_private.h to /usr/local/include/gnustep/; the idea
> is that directory is prepended to C(PP)FLAGS during the build of the
> gnustep ports/consumers, thus ports that really need to include
> Block.h can find it out of the box. This partial build is still
> ongoing:
>
> I=515 B=21 Q=2 T=25 F=0 !=0
No error.
> and so far ''stat /usr/local/include/gnustep/Block.h'' says no port
> has tried to include the file.
No port has tried to include that file, as you expected.
> So you're definitely on the right
> track. The build should complete later this night.
>
> > This, with another bump of libdispatch, and removed @conflict in PLIST
> > should do the trick.
> >
> > OK?
>
> You're just moving a header, so why the shared lib major bump?
> (You've already bumped the major in the last update.)
>
> Depending on my ongoing build it could be better to move both Block*.h
> headers to /usr/local/include/gnustep where they can be used, or to
> just zap both of them if they're really not useful.
I think moving both files under /usr/local/include/gnustep makes most
sense but you get the last word.
ok jca@
> > Sebastian
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/x11/gnustep/libobjc2/Makefile,v
> > diff -u -r1.35 Makefile
> > --- Makefile3 Mar 2024 12:28:24 - 1.35
> > +++ Makefile4 Mar 2024 20:02:11 -
> > @@ -4,15 +4,15 @@
> >
> > # note: this port does not use the gnustep module
> > VERSION = 2.2
> > -REVISION = 1
> > +REVISION = 2
> > GH_ACCOUNT = gnustep
> > GH_PROJECT = libobjc2
> > GH_TAGNAME = v${VERSION}
> > DISTNAME = libobjc2-${VERSION:S/_//}
> > PKGNAME = gnustep-${DISTNAME}
> >
> > -SHARED_LIBS += objc2 2.0
> > -SHARED_LIBS += objcxx 1.0
> > +SHARED_LIBS += objc2 3.0
> > +SHARED_LIBS += objcxx 2.0
> >
> > CATEGORIES = x11/gnustep devel
> >
> > @@ -45,5 +45,8 @@
> >
> > MAKE_FLAGS += LIBOBJCLIBNAME=objc2 \
> > LIBOBJC=libobjc2
> > +
> > +post-install:
> > + mv ${PREFIX}/include/Block.h ${PREFIX}/include/Block-libobjc2.h
> >
> > .include
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/x11/gnustep/libobjc2/pkg/PLIST,v
> > diff -u -r1.6 PLIST
> > --- pkg/PLIST 3 Mar 2024 12:28:24 - 1.6
> > +++ pkg/PLIST 4 Mar 2024 20:02:11 -
> > @@ -1,5 +1,4 @@
> > -@conflict libdispatch-*
> > -include/Block.h
> > +include/Block-libobjc2.h
> > include/Block_private.h
> > include/gnustep/
> > include/gnustep/objc/
> >
>
> --
> jca
>
--
jca
Re: [update] nextcloud 27.1.7
Le Mon, Mar 04, 2024 at 02:00:29PM +, Stuart Henderson a écrit : > On 2024/03/04 14:56, Landry Breuil wrote: > > hi, > > > > here's the latest from branch 27 > > https://nextcloud.com/changelog/#27-1-7 > > > > ok ? works for me with php 8.1 on 7.4 > > > > Landry > > > Index: Makefile > > === > > RCS file: /cvs/ports/www/nextcloud/27/Makefile,v > > retrieving revision 1.13 > > diff -u -r1.13 Makefile > > --- Makefile9 Feb 2024 14:22:26 - 1.13 > > +++ Makefile4 Mar 2024 13:53:07 - > > @@ -1,5 +1,4 @@ > > -NC_VERSION=27.1.6 > > -REVISION= 1 > > +NC_VERSION=27.1.7 > > # default PHP version changed, so keep REVISION in -current higher > > # than -stable until 7.5-release. > > assuming it will be backported too: see ^^^ :-) yup, will readd REVISION=0 to current
update devel/distcc to 3.4
Hi,
The following diff updates devel/distcc to 3.4.
Comments or OK ?
--
Sebastien Marie
diff /home/semarie/repos/openbsd/ports
commit - 828b7c82daa9518c6957ff79fe518bd9a3809417
path + /home/semarie/repos/openbsd/ports
blob - a847351e44ca761e6167dfa7dcb549ad3d28b52b
file + devel/distcc/Makefile
--- devel/distcc/Makefile
+++ devel/distcc/Makefile
@@ -2,13 +2,11 @@ COMMENT-main =distributed builds for C, C++
and Obje
COMMENT-gtk = GTK+ monitor for distcc
COMMENT-server = distcc server
-VERSION = 3.3.5
+VERSION = 3.4
DISTNAME = distcc-${VERSION}
EPOCH =0
CATEGORIES = devel net
-REVISION = 5
-
HOMEPAGE = https://distcc.github.io/
# GPLv2
@@ -37,13 +35,12 @@ WANTLIB-server =${WANTLIB}
LIB_DEPENDS-server = ${LIB_DEPENDS}
LIB_DEPENDS-gtk = ${LIB_DEPENDS} \
- x11/gtk+2
+ x11/gtk+3
RUN_DEPENDS-gtk = devel/desktop-file-utils
-WANTLIB-gtk += ${WANTLIB} X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB-gtk += Xinerama Xrandr Xrender atk-1.0 cairo fontconfig
freetype
-WANTLIB-gtk += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB-gtk += gtk-x11-2.0 harfbuzz intl pango-1.0 pangocairo-1.0
-WANTLIB-gtk += pangoft2-1.0 z
+WANTLIB-gtk += ${WANTLIB}
+WANTLIB-gtk += atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB-gtk += glib-2.0 gobject-2.0 gtk-3 harfbuzz intl pango-1.0
+WANTLIB-gtk += pangocairo-1.0
USE_GMAKE =Yes
blob - 245d7f4685575b9e8341591bbd6516b9a70c9ef8
file + devel/distcc/distinfo
--- devel/distcc/distinfo
+++ devel/distcc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (distcc-3.3.5.tar.gz) = eo5Fo6JgG31YBcfVskkY462EtrXMkVMTP0Mv3Mbc5Rg=
-SIZE (distcc-3.3.5.tar.gz) = 1204580
+SHA256 (distcc-3.4.tar.gz) = K5nt2p2tnb8oOTOgLqzm3nQj/lZQ2qSnKMlQ5c03vX0=
+SIZE (distcc-3.4.tar.gz) = 1239519
Re: [update] games/stone-soup to 0.31.0
committed, thanks!
On Mon, Mar 04, 2024 at 02:54:54PM -0500, Stefan Moran wrote:
> On Sun, 3 Mar 2024 22:41:56 -0500
> Thomas Frohwein wrote:
>
> > Two issues mentioned inline.
> >
> > On Sat, Mar 02, 2024 at 05:43:38PM -0500, Stefan Moran wrote:
> > > Update games/stone-soup from 0.30.1 to 0.31.0 "The Alchemy of
> > > Forms". I tried to simplify the Makefile patch a bit, and also
> > > installed the included .desktop file, which was not being installed
> > > for some reason.
> > >
> > > OK?
> > >
> > > Index: Makefile
> > > ===
> > > RCS file: /cvs/ports/games/stone-soup/Makefile,v
> > > retrieving revision 1.47
> > > diff -u -p -r1.47 Makefile
> > > --- Makefile 12 Nov 2023 14:03:31 - 1.47
> > > +++ Makefile 2 Mar 2024 22:30:23 -
> > > @@ -2,7 +2,8 @@ BROKEN-hppa = ICE on dgn-shoals.cc:638
> > >
> > > COMMENT =dungeon crawl stone soup
> > >
> > > -VERSION =0.30.1
> > > +VERSION =0.31.0
> > > +TAGNAME =The Alchemy of Forms
> > >
> > > DISTNAME=stone_soup-${VERSION}-nodeps
> > > PKGNAME= stone-soup-${VERSION}
> > > @@ -18,6 +19,7 @@ PERMIT_PACKAGE= Yes
> > >
> > > WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c m sqlite3
> > >
> > > +# Failover to github, devs are on and off about providing source
> > > on develz.org. SITES =
> > > https://crawl.develz.org/release/${VERSION:R}/ \
> > > https://github.com/crawl/crawl/releases/download/${VERSION}/
> >
> > The DISTNAME would be different at crawl.develz.org, meaning it can't
> > download anything from there. I don't know if we have a mechnism for
> > multiple SITES with different distfiles, but cleanest solution I see
> > is using just github distfiles for now.
>
> Removed, just have SITES pointing at github now.
>
> > > >patches/patch-source_debian_crawl-tiles_desktop
> > > >===
> > > >RCS file: patches/patch-source_debian_crawl-tiles_desktop diff -N
> > > >patches/patch-source_debian_crawl-tiles_desktop
> > > --- patches/patch-source_debian_crawl-tiles_desktop 12 Nov
> > > 2023 14:03:31 - 1.3 +++ /dev/null 1 Jan 1970
> > > 00:00:00 - @@ -1,11 +0,0 @@
> > > source/debian/crawl-tiles.desktop.orig Thu Sep 29
> > > 01:29:00 2016 -+++ source/debian/crawl-tiles.desktop Thu Sep
> > > 29 01:38:51 2016 -@@ -2,6 +2,6 @@
> > > - Type=Application
> > > -
> > > - Name=Dungeon Crawl (tiles)
> > > --Exec=/usr/games/crawl-tiles
> > > --Icon=crawl
> > > -+Exec=/usr/local/bin/crawl-ss
> > > -+Icon=stone-soup
> > > - Categories=Game;AdventureGame;
> >
> > Is this reversed? Here your diff tries to remove the
> > patches/patch-source_debian_crawl-tiles_desktop, but it looks to me
> > like you are trying to add a file here for the .desktop file
>
> I did something weird with my cvs diff (ran diff -rHEAD from the wrong
> tag I think), I regenerated and tested a new diff on HEAD without
> issues. Removing the patch in favor of a locally installed file was
> intended, but I ended up patching out the wrong file it seems.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/stone-soup/Makefile,v
> retrieving revision 1.47
> diff -u -p -r1.47 Makefile
> --- Makefile 12 Nov 2023 14:03:31 - 1.47
> +++ Makefile 4 Mar 2024 19:45:12 -
> @@ -2,7 +2,8 @@ BROKEN-hppa = ICE on dgn-shoals.cc:638
>
> COMMENT =dungeon crawl stone soup
>
> -VERSION =0.30.1
> +VERSION =0.31.0
> +TAGNAME =The Alchemy of Forms
>
> DISTNAME=stone_soup-${VERSION}-nodeps
> PKGNAME= stone-soup-${VERSION}
> @@ -18,8 +19,7 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c m sqlite3
>
> -SITES = https://crawl.develz.org/release/${VERSION:R}/ \
> - https://github.com/crawl/crawl/releases/download/${VERSION}/
> +SITES =
> https://github.com/crawl/crawl/releases/download/${VERSION}/
> EXTRACT_SUFX=.tar.xz
>
> COMPILER = base-clang ports-gcc
> @@ -41,13 +41,15 @@ MAKE_FLAGS = CC="${CC}" GCC="${GCC}" GX
> INSTALL_UGRP=root:wheel \
> prefix=${PREFIX} \
> SAVEDIR="~/.crawl" \
> - NO_YACC=1 V=1
> + NO_YACC=1 V=1 \
> + SRC_VERSION=${VERSION} RECENT_TAG="${TAGNAME}"
>
> USE_GMAKE = Yes
> CONFIGURE_STYLE = none
>
> MODPY_RUN_DEPENDS = No
> -MODPY_ADJ_FILES = util/species-gen.py
> +MODPY_ADJ_FILES =util/species-gen.py \
> + util/tag-35-upgrade.py
>
> FLAVORS =no_x11
> FLAVOR ?=
> @@ -62,7 +64,7 @@ CXXFLAGS += -DUSE_TILE
>
> MAKE_FLAGS +=TILES=y \
> LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib \
> - -lSDL2 -lSDL2_image -lpng -pthread"
> + -lSDL2 -lSDL2_image -lpng -pthread"
> WANTLIB += GL GLU SDL2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2024/03/04 20:10:19 Modified files: games/stone-soup: Makefile distinfo games/stone-soup/patches: patch-source_Makefile games/stone-soup/pkg: PFRAG.no-no_x11 PLIST Removed files: games/stone-soup/patches: patch-source_xdg-data_org_develz_Crawl_tiles_desktop Log message: update to stone-soup 0.31.0, from maintainer Stefan Moran - thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gkoeh...@cvs.openbsd.org2024/03/04 18:52:34 Modified files: infrastructure/mk: arch-defines.mk Log message: bump _SYSTEM_VERISON-powerpc for clang fix: CFI for cr2, cr3, cr4 The macppc snap with the Mar 4 kernel has a fixed base-clang. The bump affects only powerpc packages, and will cause pkg_add -u to update to fixed packages, where the CFI might unbreak a C++ exception.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: i...@cvs.openbsd.org2024/03/04 17:58:29 Modified files: devel/libbgcode: Makefile distinfo Log message: Minor maintenance release, from Renato Aguiar, maintainer of only consumer (prusaslicer).
Re: UPDATE: openjp2 2.5.2
Oh. Ya. That could have been removed as part of.. revision 1.11 date: 2019/01/16 22:29:54; author: sthen; state: Exp; lines: +19 -18; commitid: zHTzCDYhKbi3xgJr; use upstream default include/cmake path, avoids patches needed in some portsLooks like it was originally passing in a variable to override the directory name in the path. I was wondering what it was for, but had not looked into it, until now. Oh. Ya. That could have been removed as part of.. revision 1.11 date: 2019/01/16 22:29:54; author: sthen; state: Exp; lines: +19 -18; commitid: zHTzCDYhKbi3xgJr; use upstream default include/cmake path, avoids patches needed in some portsLooks like it was originally passing in a variable to override the directory name in the path. I was wondering what it was for, but had not looked into it, until now. And the patch was commited. https://github.com/uclouvain/openjpeg/commit/995d8c96b51f3e510457cf71b5b5902de11dc08c
Re: Foliate not working
Cc'ing MAINTAINER. On Mon, Mar 04, 2024 at 01:42:08AM +, Chris Narkiewicz wrote: > I'm trying to open ebook using foliate, but it fails to open it. > > Here is the stdout/stderr output: > > foliate > dict: unknown option -- formatted > dict 1.9.15/rf on OpenBSD 7.4 > Copyright 1997-2002 Rickard E. Faith (fa...@dict.org) > > Usage: dict [options] [word] > Query a dictd server for the definition of a word > > -h --host specify server > -p --portspecify port > -d --database select a database to search > -m --matchmatch instead of define > -s --strategy strategy for matching or defining > -c --config specify configuration file > -C --nocorrectdisable attempted spelling correction > -D --dbs show available databases > -S --strats show available search strategies > -H --serverhelp show server help > -i --info show information about a database > -I --serverinfo show information about the server > -a --noauth disable authentication > -u --user username for authentication > -k --key shared secret for authentication > -V --version display version information > -L --license display copyright and license information >--help display this help > -v --verbose be verbose > -r --raw trace raw transaction > -P --pager programspecify program to use as pager (- for none) >--debug set debugging flag >--pipesize specify buffer size for pipelining (256) >--client additional text for client command > WARNING: Kernel has no file descriptor comparison support: Resource > temporarily unavailable > WARNING: Kernel has no file descriptor comparison support: Operation not > supported by device > > (com.github.johnfactotum.Foliate:33648): Gjs-WARNING **: 01:33:26.836: JS > ERROR: Error: Empty Response > _init/<@resource:///com/github/johnfactotum/Foliate/js/epubView.js:623:57 > _handleAction@resource:///com/github/johnfactotum/Foliate/js/epubView.js:886:22 > _init/<@resource:///com/github/johnfactotum/Foliate/js/epubView.js:617:18 > main@resource:///com/github/johnfactotum/Foliate/js/main.js:478:24 > run@resource:///org/gnome/gjs/modules/script/package.js:206:19 > @/usr/local/bin/foliate:9:17 > > > I can see 2 issues here. > 1. it calls dict with some long option and fails with goofy stdout output. > 2. there is some JS issue when loading a book > 3. some kernel warning messages, not sure what to think about it > > I'm wondering if this is a known issue? Related to epub content? Haven't used foliate before, but using textproc/dictd seemed interesting, but there seems to be no "dict" or "formatted" invocation in WRKSRC... > The book in question is ADP 6-0 > https://armypubs.army.mil/ProductMaps/PubForm/Details.aspx?PUB_ID=1007502 > in epub format. Works for me on -current, just like other free Gutenberg .epub files. > I'd be grateful for any advise. > > Cheers, > Chris
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/03/04 16:15:05 Modified files: devel/github-cli: Makefile distinfo modules.inc devel/github-cli/pkg: PLIST Log message: update to github-cli 2.45.0
Re: [new] Nickel configuration language
On Mon, Mar 04, 2024 at 02:32:18PM -0800, Evan Silberman wrote: > Bump, naddy's tapping his watch Port-wise OK kn if anyone thinks so as well and wants to import...
Re: [new] www/pipe-viewer
On Mon, Mar 04, 2024 at 05:21:52PM -0500, Stefan Moran wrote: > Attached is a port for www/pipe-viewer 0.5.0, a lightweight perl youtube > client, designed to be used without a Google API key. The port is a > multipackage with -gtk, a GTK3 frontend using x11/p5-Gtk3, and -main, > the standard cli interface. The port depends on either youtube-dl or > yt-dlp to fetch videos, and I chose to include www/yt-dlp as a rundep as > that seems to be the more heavily-maintained and functional ( and also > less legally-targeted ;) ) project at this point in time. I also chose > to include most of the optional dependencies, excluding > LWP::UserAgent::Cached (not currently ported). > > https://github.com/trizen/pipe-viewer Port-wise looks fine, although I'd capitalise youtube in COMMENT accordingly and distinguish DESCR-gtk from DESCR-main. Perhaps add multimedia, net and/or x11 to CATEGORIES? Starts, searches and plays fine in brief testing, seems like a handy alternative to the (heavy) Qt alternatives minitube and plasmatube.
Re: [new] Nickel configuration language
Evan Silberman wrote: > Klemens Nanni wrote: > > No idea about nickel, but port-wise this this looks fine and builds. > > > > Tests do not compile and thus don't run, though, is that a known issue? > > I think it's because dev/test dependencies are only in Cargo.toml in the > root of upstream's monorepo as workspace dependencies, e.g. for me just > now the test build failed due to an undeclared crate `tempfile`, which > is in the workspace dependencies but not declared as a dev-dependency by > nickel-lang-cli. Since we're building from the published crate artifact > and not a monorepo checkout we would have to resort to contrivances to > get any test dependencies in place and build the test. So, the issue is > known to us and probably is not a pressing issue for upstream. Seems > like an edge case as to whether NO_TEST=Yes is appropriate. > > Evan Bump, naddy's tapping his watch Evan nickel.tar.gz Description: GNU Zip compressed data
[new] www/pipe-viewer
Attached is a port for www/pipe-viewer 0.5.0, a lightweight perl youtube client, designed to be used without a Google API key. The port is a multipackage with -gtk, a GTK3 frontend using x11/p5-Gtk3, and -main, the standard cli interface. The port depends on either youtube-dl or yt-dlp to fetch videos, and I chose to include www/yt-dlp as a rundep as that seems to be the more heavily-maintained and functional ( and also less legally-targeted ;) ) project at this point in time. I also chose to include most of the optional dependencies, excluding LWP::UserAgent::Cached (not currently ported). https://github.com/trizen/pipe-viewer pipe-viewer.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2024/03/04 15:08:36 Modified files: www/py-adblock : Makefile Log message: Mark py-adblock BROKEN on riscv64 pip install fails with: ERROR: adblock-0.0.0-cp37-abi3-openbsd_7_5_riscv.whl is not a supported wheel on this platform.
Re: x11/gnustep/libobjc2 failed to build
Le Mon, Mar 04, 2024 at 10:26:02PM +0100, Sebastian Reitenbach a écrit :
> On Sunday, March 03, 2024 21:56 CET, Stuart Henderson
> wrote:
>
> > On 2024/03/03 20:52, Stuart Henderson wrote:
> > > On 2024/03/03 20:31, Sebastian Reitenbach wrote:
> > > > If I understand removing the @pkgpath fixed the bigger part of the
> > > > issue?
> >
> > PS "bigger part of the issue" = "bulk builds were breaking because the
> > dependency loop resulted in too much disk space being eatern" but the
> > remaining problem is still fairly important.
> >
>
>
> The conflicting file is the include/Block.h
>
> Nothing that depends on libobjc2, really needs it. gnustep-base is configured
> to
> not search for Blocks runtime.
I'm testing something similar, slightly more conservative: move
Block.h and Block_private.h to /usr/local/include/gnustep/; the idea
is that directory is prepended to C(PP)FLAGS during the build of the
gnustep ports/consumers, thus ports that really need to include
Block.h can find it out of the box. This partial build is still
ongoing:
I=515 B=21 Q=2 T=25 F=0 !=0
and so far ''stat /usr/local/include/gnustep/Block.h'' says no port
has tried to include the file. So you're definitely on the right
track. The build should complete later this night.
> This, with another bump of libdispatch, and removed @conflict in PLIST
> should do the trick.
>
> OK?
You're just moving a header, so why the shared lib major bump?
(You've already bumped the major in the last update.)
Depending on my ongoing build it could be better to move both Block*.h
headers to /usr/local/include/gnustep where they can be used, or to
just zap both of them if they're really not useful.
> Sebastian
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/gnustep/libobjc2/Makefile,v
> diff -u -r1.35 Makefile
> --- Makefile 3 Mar 2024 12:28:24 - 1.35
> +++ Makefile 4 Mar 2024 20:02:11 -
> @@ -4,15 +4,15 @@
>
> # note: this port does not use the gnustep module
> VERSION =2.2
> -REVISION = 1
> +REVISION = 2
> GH_ACCOUNT = gnustep
> GH_PROJECT = libobjc2
> GH_TAGNAME = v${VERSION}
> DISTNAME = libobjc2-${VERSION:S/_//}
> PKGNAME =gnustep-${DISTNAME}
>
> -SHARED_LIBS += objc2 2.0
> -SHARED_LIBS += objcxx 1.0
> +SHARED_LIBS += objc2 3.0
> +SHARED_LIBS += objcxx 2.0
>
> CATEGORIES = x11/gnustep devel
>
> @@ -45,5 +45,8 @@
>
> MAKE_FLAGS += LIBOBJCLIBNAME=objc2 \
> LIBOBJC=libobjc2
> +
> +post-install:
> + mv ${PREFIX}/include/Block.h ${PREFIX}/include/Block-libobjc2.h
>
> .include
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/gnustep/libobjc2/pkg/PLIST,v
> diff -u -r1.6 PLIST
> --- pkg/PLIST 3 Mar 2024 12:28:24 - 1.6
> +++ pkg/PLIST 4 Mar 2024 20:02:11 -
> @@ -1,5 +1,4 @@
> -@conflict libdispatch-*
> -include/Block.h
> +include/Block-libobjc2.h
> include/Block_private.h
> include/gnustep/
> include/gnustep/objc/
>
--
jca
Re: x11/gnustep/libobjc2 failed to build
On Sunday, March 03, 2024 21:56 CET, Stuart Henderson
wrote:
> On 2024/03/03 20:52, Stuart Henderson wrote:
> > On 2024/03/03 20:31, Sebastian Reitenbach wrote:
> > > If I understand removing the @pkgpath fixed the bigger part of the issue?
>
> PS "bigger part of the issue" = "bulk builds were breaking because the
> dependency loop resulted in too much disk space being eatern" but the
> remaining problem is still fairly important.
>
The conflicting file is the include/Block.h
Nothing that depends on libobjc2, really needs it. gnustep-base is configured to
not search for Blocks runtime.
This, with another bump of libdispatch, and removed @conflict in PLIST
should do the trick.
OK?
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/x11/gnustep/libobjc2/Makefile,v
diff -u -r1.35 Makefile
--- Makefile3 Mar 2024 12:28:24 - 1.35
+++ Makefile4 Mar 2024 20:02:11 -
@@ -4,15 +4,15 @@
# note: this port does not use the gnustep module
VERSION = 2.2
-REVISION = 1
+REVISION = 2
GH_ACCOUNT = gnustep
GH_PROJECT = libobjc2
GH_TAGNAME = v${VERSION}
DISTNAME = libobjc2-${VERSION:S/_//}
PKGNAME = gnustep-${DISTNAME}
-SHARED_LIBS += objc2 2.0
-SHARED_LIBS += objcxx 1.0
+SHARED_LIBS += objc2 3.0
+SHARED_LIBS += objcxx 2.0
CATEGORIES = x11/gnustep devel
@@ -45,5 +45,8 @@
MAKE_FLAGS += LIBOBJCLIBNAME=objc2 \
LIBOBJC=libobjc2
+
+post-install:
+ mv ${PREFIX}/include/Block.h ${PREFIX}/include/Block-libobjc2.h
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/gnustep/libobjc2/pkg/PLIST,v
diff -u -r1.6 PLIST
--- pkg/PLIST 3 Mar 2024 12:28:24 - 1.6
+++ pkg/PLIST 4 Mar 2024 20:02:11 -
@@ -1,5 +1,4 @@
-@conflict libdispatch-*
-include/Block.h
+include/Block-libobjc2.h
include/Block_private.h
include/gnustep/
include/gnustep/objc/
Re: UPDATE: games/minetest to 5.8.0
On Mon, 4 Mar 2024 17:08:09 +
Stuart Henderson wrote:
>
> Please send diffs not tarballs for updates.
>
Ok- sorry.
I use the git mirror (internet speed and familiarity concerns), so
hopefully this is close enough to the mirrored CVS tree.
here it is.
--
-iz (they/them)
> i like to say mundane things,
> there are too many uninteresting things
> that go unnoticed.
izder456 (dot) neocities (dot) org
diff --git games/minetest/Makefile games/minetest/Makefile
index c359bb848..aae6e051b 100644
--- games/minetest/Makefile
+++ games/minetest/Makefile
@@ -1,8 +1,8 @@
COMMENT = infinite-world block sandbox game
-V = 5.6.0
-GAME_V = 5.6.0
-IRRLICHTMT_V = 1.9.0mt7
+V = 5.8.0
+GAME_V = 5.8.0
+IRRLICHTMT_V = 1.9.0mt13
DISTNAME = minetest-${V}
CATEGORIES = games x11
@@ -63,12 +63,12 @@ TEST_ENV += HOME=${WRKBUILD}/test \
post-extract:
mv ${WRKDIR}/irrlicht-${IRRLICHTMT_V} \
${WRKSRC}/lib/irrlichtmt
-
-# Use system cmake modules
-post-patch:
- rm ${WRKSRC}/cmake/Modules/FindLua*
+# make sure no bundled gmp is used (took line from FreeBSD)
+ rm -Rf ${WRKSRC}/lib/gmp ${WRKSRC}/lib/jsoncpp
+# bundled lua is OK, there's no option to use system one
post-install:
+ mkdir -p ${PREFIX}/share/minetest/games
mv ${WRKDIR}/minetest_game-${GAME_V}/ \
${PREFIX}/share/minetest/games/minetest_game
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/games/minetest_game
diff --git games/minetest/distinfo games/minetest/distinfo
index 08f8f924f..bab65928f 100644
--- games/minetest/distinfo
+++ games/minetest/distinfo
@@ -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 (irrlichtmt-1.9.0mt13.tar.gz) = L96OJxRJiCELnA/x4gKQWDTZ0lqqY85FJ2P9cXEJatw=
+SHA256 (minetest-5.8.0.tar.gz) = YQyFok13rNwwQ6add3vtnmwAFpQGygnfIq1JD+DWjAw=
+SHA256 (minetest-game-5.8.0.tar.gz) = M6O7Q7CEl6C9svSfFAooKeWC1cFsCtUr4VlcgD9waRI=
+SIZE (irrlichtmt-1.9.0mt13.tar.gz) = 754056
+SIZE (minetest-5.8.0.tar.gz) = 10419348
+SIZE (minetest-game-5.8.0.tar.gz) = 2608281
diff --git games/minetest/pkg/PLIST games/minetest/pkg/PLIST
index 0993431cc..fe89834d9 100644
--- games/minetest/pkg/PLIST
+++ games/minetest/pkg/PLIST
@@ -5,18 +5,19 @@
share/applications/net.minetest.minetest.desktop
share/doc/minetest/
share/doc/minetest/README.md
-share/doc/minetest/client_lua_api.txt
-share/doc/minetest/lua_api.txt
-share/doc/minetest/menu_lua_api.txt
+share/doc/minetest/client_lua_api.md
+share/doc/minetest/lua_api.md
+share/doc/minetest/menu_lua_api.md
share/doc/minetest/minetest.conf.example
-share/doc/minetest/texture_packs.txt
-share/doc/minetest/world_format.txt
+share/doc/minetest/texture_packs.md
+share/doc/minetest/world_format.md
share/icons/hicolor/128x128/apps/minetest.png
share/icons/hicolor/scalable/apps/minetest.svg
share/locale/be/LC_MESSAGES/minetest.mo
share/locale/bg/LC_MESSAGES/minetest.mo
share/locale/ca/LC_MESSAGES/minetest.mo
share/locale/cs/LC_MESSAGES/minetest.mo
+share/locale/cy/LC_MESSAGES/minetest.mo
share/locale/da/LC_MESSAGES/minetest.mo
share/locale/de/LC_MESSAGES/minetest.mo
share/locale/el/LC_MESSAGES/minetest.mo
@@ -24,20 +25,26 @@ share/locale/eo/LC_MESSAGES/minetest.mo
share/locale/es/LC_MESSAGES/minetest.mo
share/locale/et/LC_MESSAGES/minetest.mo
share/locale/eu/LC_MESSAGES/minetest.mo
+share/locale/fa/LC_MESSAGES/minetest.mo
share/locale/fi/LC_MESSAGES/minetest.mo
share/locale/fil/
share/locale/fil/LC_MESSAGES/
share/locale/fil/LC_MESSAGES/minetest.mo
share/locale/fr/LC_MESSAGES/minetest.mo
+share/locale/ga/LC_MESSAGES/minetest.mo
share/locale/gd/LC_MESSAGES/minetest.mo
share/locale/gl/LC_MESSAGES/minetest.mo
share/locale/hu/LC_MESSAGES/minetest.mo
+share/locale/ia/LC_MESSAGES/minetest.mo
share/locale/id/LC_MESSAGES/minetest.mo
share/locale/it/LC_MESSAGES/minetest.mo
share/locale/ja/LC_MESSAGES/minetest.mo
share/locale/jbo/
share/locale/jbo/LC_MESSAGES/
share/locale/jbo/LC_MESSAGES/minetest.mo
+share/locale/jv/
+share/locale/jv/LC_MESSAGES/
+share/locale/jv/LC_MESSAGES/minetest.mo
share/locale/kk/LC_MESSAGES/minetest.mo
share/locale/ko/LC_MESSAGES/minetest.mo
share/locale/ky/LC_MESSAGES/minetest.mo
@@ -46,6 +53,8 @@ share/locale/lv/LC_MESSAGES/minetest.mo
share/locale/lzh/
share/locale/lzh/LC_MESSAGES/
share/locale/lzh/LC_MESSAGES/minetest.mo
+share/locale/mi/LC_MESSAGES/minetest.mo
+share/locale/mn/LC_MESSAGES/minetest.mo
share/locale/mr/LC_MESSAGES/minetest.mo
share/locale/ms/LC_MESSAGES/minetest.mo
share/locale/nb/LC_MESSAGES/minetest.mo
@@ -96,8 +105,10 @@ share/minetest/builtin/common/after.lua
share/minetest/builtin/common/chatcommands.lua
share/minetest/builtin/common/filterlist.lua
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gkoeh...@cvs.openbsd.org2024/03/04 13:31:16 Modified files: devel/llvm/13 : Makefile devel/llvm/13/patches: patch-llvm_lib_Target_PowerPC_PPCFrameLowering_cpp devel/llvm/16 : Makefile devel/llvm/16/patches: patch-llvm_lib_Target_PowerPC_PPCFrameLowering_cpp devel/llvm/17 : Makefile devel/llvm/17/patches: patch-llvm_lib_Target_PowerPC_PPCFrameLowering_cpp Log message: sync with base: For macppc, add missing CFI for cr2, cr3, cr4 clang -S was missing a line like ".cfi_offset cr2, -16" in functions that spill cr2 (or cr3, cr4) to the stack. This was breaking a few C++ exceptions. This fix adds the missing CFI. https://github.com/llvm/llvm-project/pull/83098 ok robert@ (maintainer)
[s...@spacehopper.org: Re: [NEW]: misc/openhab - open Home Automation Bus (openHAB)]
Hi Antoine, do you have any feedback on the rc.d parts please?
Do you think the variabke setting bits are alright for rc.d or would
they be better split off to a different script?
- Forwarded message from Stuart Henderson -
From: Stuart Henderson
Date: Mon, 26 Feb 2024 18:10:57 +
To: Chaz Kettleson
Cc: A Tammy , Kirill Bychkov ,
ports@openbsd.org
Subject: Re: [NEW]: misc/openhab - open Home Automation Bus (openHAB)
Mail-Followup-To: Chaz Kettleson , A Tammy
, Kirill Bychkov ,
ports@openbsd.org
Here are some tweaks on top (sent as a diff for commentary and a new
tar).
I'd like the opinion of someone with a hand in the rc.d system to
comment on that part. Maybe they'll be ok with it, but it's a bit
complicated and not something that I think we do in any other ports.
On the other hand I'm not sure I can think of a nice alternative..
: diff --git a/misc/openhab/Makefile b/misc/openhab/Makefile
: index 3ff4984..dc582de 100644
: --- a/misc/openhab/Makefile
: +++ b/misc/openhab/Makefile
: @@ -28,16 +28,12 @@ pre-extract:
: @mkdir ${WRKDIST}
:
: do-install:
: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGSTEM}/
: + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openhab/
the ${PKGSTEM} indirection isn't really useful imho and makes it harder
to read, I've replaced with openhab throughout
: - ${INSTALL_DATA} ${FILESDIR}/${PKGSTEM}.conf \
: - ${PREFIX}/share/examples/${PKGSTEM}/
: - ${INSTALL_DATA_DIR} ${PREFIX}/libexec/${PKGSTEM}/
: - @cd ${WRKDIST} && openrsync --rsync-path=openrsync -a \
: - --exclude={'./conf','./userdata'} .
${PREFIX}/libexec/${PKGSTEM}/
: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGSTEM}/etc/
: - @cd ${WRKDIST}/conf && pax -rw .
${PREFIX}/share/examples/${PKGSTEM}/etc/
: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGSTEM}/var/
: - @cd ${WRKDIST}/userdata && pax -rw . \
: - ${PREFIX}/share/examples/${PKGSTEM}/var/
: + ${INSTALL_DATA} ${FILESDIR}/openhab.conf \
: + ${PREFIX}/share/examples/openhab/
: + ${INSTALL_DATA_DIR} ${PREFIX}/libexec/openhab/
: + cd ${WRKDIST} && pax -rw . ${PREFIX}/libexec/openhab/
: + mv ${PREFIX}/libexec/openhab/conf ${PREFIX}/share/examples/openhab/
: + mv ${PREFIX}/libexec/openhab/userdata ${PREFIX}/share/examples/openhab/
not really a fan of using openrsync to copy files around, so I've
replaced it by copying all files with pax to libexec, then moving the
couple of dirs which should end up in examples. I kept the original
dir names and adjusted PLIST to match.
: diff --git a/misc/openhab/pkg/PLIST b/misc/openhab/pkg/PLIST
: index 1e76d42..8144a30 100644
: --- a/misc/openhab/pkg/PLIST
: +++ b/misc/openhab/pkg/PLIST
: @@ -1,6 +1,5 @@
: -@newgroup _openhab:896
: -@newuser _openhab:896:_openhab::openHAB user:/nonexistent:/sbin/nologin
: +@newgroup _openhab:897
: +@newuser _openhab:897:_openhab::openHAB user:/nonexistent:/sbin/nologin
896 is taken now, switch to 897
: -@exec-add usermod -G dialer _openhab
I don't think the package should auto-add itself to what in some
circumstances could be a sensitive group. Could maybe be suggested
in the readme (I haven't done so myself because I don't know which
circumstances need it and I think that should be explained).
: @rcscript ${RCDIR}/openhab
: libexec/openhab/
: libexec/openhab/LICENSE.TXT
: @@ -1225,203 +1224,203 @@ libexec/openhab/start_debug.sh
: share/doc/pkg-readmes/${PKGSTEM}
: share/examples/openhab/
: @sample ${SYSCONFDIR}/openhab/
: -share/examples/openhab/etc/
: +share/examples/openhab/conf/
...
: diff --git a/misc/openhab/pkg/openhab.rc b/misc/openhab/pkg/openhab.rc
: index ea7a859..4284a62 100644
: --- a/misc/openhab/pkg/openhab.rc
: +++ b/misc/openhab/pkg/openhab.rc
: @@ -1,7 +1,7 @@
: #!/bin/ksh
:
: -JAVA="$(${LOCALBASE}/bin/javaPathHelper -c ${PKGSTEM})"
: -JAVA_HOME="$(${LOCALBASE}/bin/javaPathHelper -h ${PKGSTEM})"
: +JAVA="$(${LOCALBASE}/bin/javaPathHelper -c openhab)"
: +JAVA_HOME="$(${LOCALBASE}/bin/javaPathHelper -h openhab)"
avoid indirection again
: # Read configuration variable file if it is present
: if [ -r /etc/openhab.conf ]; then
: @@ -13,12 +13,12 @@ if [ -z "${EXTRA_JAVA_OPTS}" ]; then
EXTRA_JAVA_OPTS="-Dsun.nio.fs.watchservice
: if [ -z "${OPENHAB_HTTP_ADDRESS}" ]; then OPENHAB_HTTP_ADDRESS="127.0.0.1";
fi
: if [ -z "${OPENHAB_HTTP_PORT}" ];then OPENHAB_HTTP_PORT=8080; fi
: if [ -z "${OPENHAB_HTTPS_PORT}" ]; then OPENHAB_HTTPS_PORT=8443; fi
: -if [ -z "${OPENHAB_HOME}" ]; then
OPENHAB_HOME="${PREFIX}/libexec/${PKGSTEM}"; fi
: -if [ -z "${OPENHAB_CONF}" ]; then
OPENHAB_CONF="${SYSCONFDIR}/${PKGSTEM}"; fi
: +if [ -z "${OPENHAB_HOME}" ]; then
OPENHAB_HOME="${PREFIX}/libexec/openhab"; fi
: +if [ -z "${OPENHAB_CONF}" ]; then
OPENHAB_CONF="${SYSCONFDIR}/openhab"; fi
: if [ -z "${OPENHAB_RUNTIME}" ]; then
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2024/03/04 13:00:02 Modified files: security/kc: Makefile distinfo Log message: Update to kc 2.5.3 >From Lévai, Dániel (maintainer/upstream)
Re: [update] games/stone-soup to 0.31.0
On Sun, 3 Mar 2024 22:41:56 -0500
Thomas Frohwein wrote:
> Two issues mentioned inline.
>
> On Sat, Mar 02, 2024 at 05:43:38PM -0500, Stefan Moran wrote:
> > Update games/stone-soup from 0.30.1 to 0.31.0 "The Alchemy of
> > Forms". I tried to simplify the Makefile patch a bit, and also
> > installed the included .desktop file, which was not being installed
> > for some reason.
> >
> > OK?
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/games/stone-soup/Makefile,v
> > retrieving revision 1.47
> > diff -u -p -r1.47 Makefile
> > --- Makefile12 Nov 2023 14:03:31 - 1.47
> > +++ Makefile2 Mar 2024 22:30:23 -
> > @@ -2,7 +2,8 @@ BROKEN-hppa = ICE on dgn-shoals.cc:638
> >
> > COMMENT = dungeon crawl stone soup
> >
> > -VERSION = 0.30.1
> > +VERSION = 0.31.0
> > +TAGNAME = The Alchemy of Forms
> >
> > DISTNAME= stone_soup-${VERSION}-nodeps
> > PKGNAME= stone-soup-${VERSION}
> > @@ -18,6 +19,7 @@ PERMIT_PACKAGE= Yes
> >
> > WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c m sqlite3
> >
> > +# Failover to github, devs are on and off about providing source
> > on develz.org. SITES =
> > https://crawl.develz.org/release/${VERSION:R}/ \
> > https://github.com/crawl/crawl/releases/download/${VERSION}/
>
> The DISTNAME would be different at crawl.develz.org, meaning it can't
> download anything from there. I don't know if we have a mechnism for
> multiple SITES with different distfiles, but cleanest solution I see
> is using just github distfiles for now.
Removed, just have SITES pointing at github now.
> > >patches/patch-source_debian_crawl-tiles_desktop
> > >===
> > >RCS file: patches/patch-source_debian_crawl-tiles_desktop diff -N
> > >patches/patch-source_debian_crawl-tiles_desktop
> > --- patches/patch-source_debian_crawl-tiles_desktop 12 Nov
> > 2023 14:03:31 - 1.3 +++ /dev/null 1 Jan 1970
> > 00:00:00 - @@ -1,11 +0,0 @@
> > source/debian/crawl-tiles.desktop.orig Thu Sep 29
> > 01:29:00 2016 -+++ source/debian/crawl-tiles.desktopThu Sep
> > 29 01:38:51 2016 -@@ -2,6 +2,6 @@
> > - Type=Application
> > -
> > - Name=Dungeon Crawl (tiles)
> > --Exec=/usr/games/crawl-tiles
> > --Icon=crawl
> > -+Exec=/usr/local/bin/crawl-ss
> > -+Icon=stone-soup
> > - Categories=Game;AdventureGame;
>
> Is this reversed? Here your diff tries to remove the
> patches/patch-source_debian_crawl-tiles_desktop, but it looks to me
> like you are trying to add a file here for the .desktop file
I did something weird with my cvs diff (ran diff -rHEAD from the wrong
tag I think), I regenerated and tested a new diff on HEAD without
issues. Removing the patch in favor of a locally installed file was
intended, but I ended up patching out the wrong file it seems.
Index: Makefile
===
RCS file: /cvs/ports/games/stone-soup/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile12 Nov 2023 14:03:31 - 1.47
+++ Makefile4 Mar 2024 19:45:12 -
@@ -2,7 +2,8 @@ BROKEN-hppa = ICE on dgn-shoals.cc:638
COMMENT = dungeon crawl stone soup
-VERSION = 0.30.1
+VERSION = 0.31.0
+TAGNAME = The Alchemy of Forms
DISTNAME= stone_soup-${VERSION}-nodeps
PKGNAME= stone-soup-${VERSION}
@@ -18,8 +19,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c m sqlite3
-SITES =https://crawl.develz.org/release/${VERSION:R}/ \
- https://github.com/crawl/crawl/releases/download/${VERSION}/
+SITES =
https://github.com/crawl/crawl/releases/download/${VERSION}/
EXTRACT_SUFX= .tar.xz
COMPILER = base-clang ports-gcc
@@ -41,13 +41,15 @@ MAKE_FLAGS =CC="${CC}" GCC="${GCC}" GX
INSTALL_UGRP=root:wheel \
prefix=${PREFIX} \
SAVEDIR="~/.crawl" \
- NO_YACC=1 V=1
+ NO_YACC=1 V=1 \
+ SRC_VERSION=${VERSION} RECENT_TAG="${TAGNAME}"
USE_GMAKE =Yes
CONFIGURE_STYLE = none
MODPY_RUN_DEPENDS =No
-MODPY_ADJ_FILES = util/species-gen.py
+MODPY_ADJ_FILES = util/species-gen.py \
+ util/tag-35-upgrade.py
FLAVORS = no_x11
FLAVOR ?=
@@ -62,7 +64,7 @@ CXXFLAGS += -DUSE_TILE
MAKE_FLAGS += TILES=y \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib \
- -lSDL2 -lSDL2_image -lpng -pthread"
+ -lSDL2 -lSDL2_image -lpng -pthread"
WANTLIB += GL GLU SDL2 SDL2_image freetype png pthread z
RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS += devel/sdl2 \
@@ -85,12 +87,11 @@ post-install:
${INSTALL_MAN} ${WRKDIST}/docs/crawl.6 ${PREFIX}/man/man6/crawl-ss.6
.if ! ${FLAVOR:Mno_x11}
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2024/03/04 12:48:51 Modified files: graphics/geeqie: Makefile distinfo graphics/geeqie/patches: patch-meson_build patch-src_window_cc graphics/geeqie/pkg: PLIST Added files: graphics/geeqie/patches: patch-src_layout_cc Log message: update to geeqie-2.2
[UPDATE]: security/kc
Hi all, Update kc to 2.5.3 Pretty straightforward diff, tests ran fine. Danieldiff --git a/security/kc/Makefile b/security/kc/Makefile index 9581e04cd2c..ac9e76e7e60 100644 --- a/security/kc/Makefile +++ b/security/kc/Makefile @@ -2,7 +2,7 @@ COMMENT = console based password storing application GH_ACCOUNT = levaidaniel GH_PROJECT = kc -GH_TAGNAME = 2.5.1 +GH_TAGNAME = 2.5.3 CATEGORIES = security diff --git a/security/kc/distinfo b/security/kc/distinfo index a77c2f56933..eb3f0afe9cf 100644 --- a/security/kc/distinfo +++ b/security/kc/distinfo @@ -1,2 +1,2 @@ -SHA256 (kc-2.5.1.tar.gz) = 0CZdohmGwmG9FQKzE1QL/pka+Ll+RKcpbYIv4OLgpjI= -SIZE (kc-2.5.1.tar.gz) = 100143 +SHA256 (kc-2.5.3.tar.gz) = WT2zS/U62Rl8OsH/w3Qt/AOnhIYvCl+t7aa20q0odTk= +SIZE (kc-2.5.3.tar.gz) = 101980
Re: [NEW]: misc/openhab - open Home Automation Bus (openHAB)
On Mon, Feb 26, 2024 at 09:21:39PM -0500, Chaz Kettleson wrote:
> On Mon, Feb 26, 2024 at 06:10:57PM +, Stuart Henderson wrote:
> > Here are some tweaks on top (sent as a diff for commentary and a new
> > tar).
> >
> > I'd like the opinion of someone with a hand in the rc.d system to
> > comment on that part. Maybe they'll be ok with it, but it's a bit
> > complicated and not something that I think we do in any other ports.
> > On the other hand I'm not sure I can think of a nice alternative..
> >
> > : diff --git a/misc/openhab/Makefile b/misc/openhab/Makefile
> > : index 3ff4984..dc582de 100644
> > : --- a/misc/openhab/Makefile
> > : +++ b/misc/openhab/Makefile
> > : @@ -28,16 +28,12 @@ pre-extract:
> > : @mkdir ${WRKDIST}
> > :
> > : do-install:
> > : - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGSTEM}/
> > : + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openhab/
> >
> > the ${PKGSTEM} indirection isn't really useful imho and makes it harder
> > to read, I've replaced with openhab throughout
>
> Makes sense, thank you.
>
> >
> > : - ${INSTALL_DATA} ${FILESDIR}/${PKGSTEM}.conf \
> > : - ${PREFIX}/share/examples/${PKGSTEM}/
> > : - ${INSTALL_DATA_DIR} ${PREFIX}/libexec/${PKGSTEM}/
> > : - @cd ${WRKDIST} && openrsync --rsync-path=openrsync -a \
> > : - --exclude={'./conf','./userdata'} .
> > ${PREFIX}/libexec/${PKGSTEM}/
> > : - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGSTEM}/etc/
> > : - @cd ${WRKDIST}/conf && pax -rw .
> > ${PREFIX}/share/examples/${PKGSTEM}/etc/
> > : - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGSTEM}/var/
> > : - @cd ${WRKDIST}/userdata && pax -rw . \
> > : - ${PREFIX}/share/examples/${PKGSTEM}/var/
> > : + ${INSTALL_DATA} ${FILESDIR}/openhab.conf \
> > : + ${PREFIX}/share/examples/openhab/
> > : + ${INSTALL_DATA_DIR} ${PREFIX}/libexec/openhab/
> > : + cd ${WRKDIST} && pax -rw . ${PREFIX}/libexec/openhab/
> > : + mv ${PREFIX}/libexec/openhab/conf ${PREFIX}/share/examples/openhab/
> > : + mv ${PREFIX}/libexec/openhab/userdata ${PREFIX}/share/examples/openhab/
> >
> > not really a fan of using openrsync to copy files around, so I've
> > replaced it by copying all files with pax to libexec, then moving the
> > couple of dirs which should end up in examples. I kept the original
> > dir names and adjusted PLIST to match.
>
> Perfect.
>
> >
> > : diff --git a/misc/openhab/pkg/PLIST b/misc/openhab/pkg/PLIST
> > : index 1e76d42..8144a30 100644
> > : --- a/misc/openhab/pkg/PLIST
> > : +++ b/misc/openhab/pkg/PLIST
> > : @@ -1,6 +1,5 @@
> > : -@newgroup _openhab:896
> > : -@newuser _openhab:896:_openhab::openHAB user:/nonexistent:/sbin/nologin
> > : +@newgroup _openhab:897
> > : +@newuser _openhab:897:_openhab::openHAB user:/nonexistent:/sbin/nologin
> >
> > 896 is taken now, switch to 897
> >
> > : -@exec-add usermod -G dialer _openhab
> >
> > I don't think the package should auto-add itself to what in some
> > circumstances could be a sensitive group. Could maybe be suggested
> > in the readme (I haven't done so myself because I don't know which
> > circumstances need it and I think that should be explained).
>
> I updated the README for access to serial ports. The use-case is when
> a USB dongle for Zigbee or Z-Wave is used and the _openhab user needs
> access. Unfortuantely, the rxtx wrapper for native serial port access
> does not currently support OpenBSD.
>
> https://github.com/rxtx/rxtx
>
> I'm currently looking for an alternative or will port that to OpenBSD.
>
> >
> > : @rcscript ${RCDIR}/openhab
> > : libexec/openhab/
> > : libexec/openhab/LICENSE.TXT
> > : @@ -1225,203 +1224,203 @@ libexec/openhab/start_debug.sh
> > : share/doc/pkg-readmes/${PKGSTEM}
> > : share/examples/openhab/
> > : @sample ${SYSCONFDIR}/openhab/
> > : -share/examples/openhab/etc/
> > : +share/examples/openhab/conf/
> > ...
> >
> >
> > : diff --git a/misc/openhab/pkg/openhab.rc b/misc/openhab/pkg/openhab.rc
> > : index ea7a859..4284a62 100644
> > : --- a/misc/openhab/pkg/openhab.rc
> > : +++ b/misc/openhab/pkg/openhab.rc
> > : @@ -1,7 +1,7 @@
> > : #!/bin/ksh
> > :
> > : -JAVA="$(${LOCALBASE}/bin/javaPathHelper -c ${PKGSTEM})"
> > : -JAVA_HOME="$(${LOCALBASE}/bin/javaPathHelper -h ${PKGSTEM})"
> > : +JAVA="$(${LOCALBASE}/bin/javaPathHelper -c openhab)"
> > : +JAVA_HOME="$(${LOCALBASE}/bin/javaPathHelper -h openhab)"
> >
> > avoid indirection again
> >
> > : # Read configuration variable file if it is present
> > : if [ -r /etc/openhab.conf ]; then
> > : @@ -13,12 +13,12 @@ if [ -z "${EXTRA_JAVA_OPTS}" ]; then
> > EXTRA_JAVA_OPTS="-Dsun.nio.fs.watchservice
> > : if [ -z "${OPENHAB_HTTP_ADDRESS}" ]; then
> > OPENHAB_HTTP_ADDRESS="127.0.0.1"; fi
> > : if [ -z "${OPENHAB_HTTP_PORT}" ];then OPENHAB_HTTP_PORT=8080; fi
> > : if [ -z "${OPENHAB_HTTPS_PORT}" ]; then OPENHAB_HTTPS_PORT=8443; fi
> > : -if [ -z "${OPENHAB_HOME}" ]; then
> >
Re: UPDATE: games/minetest to 5.8.0
On 2024/03/04 10:58, izder456 wrote: > Hello ports@, > > Attached is a tarball of the update. > > I took a line from FreeBSD's port system for gmp stuff, as we can also > use system gmp fine. I also patched a file so `getpid()` is properly > referenced from `unistd.h`. May be good to PR this patch upstream? > > This port seems rather-ish complex, so I didn't do the DIST_TUPLE stuff > as I am no expert. > > OK to merge? > > -- > -iz (they/them) > > > i like to say mundane things, > > there are too many uninteresting things > > that go unnoticed. > > izder456 (dot) neocities (dot) org Please send diffs not tarballs for updates.
UPDATE: games/minetest to 5.8.0
Hello ports@, Attached is a tarball of the update. I took a line from FreeBSD's port system for gmp stuff, as we can also use system gmp fine. I also patched a file so `getpid()` is properly referenced from `unistd.h`. May be good to PR this patch upstream? This port seems rather-ish complex, so I didn't do the DIST_TUPLE stuff as I am no expert. OK to merge? -- -iz (they/them) > i like to say mundane things, > there are too many uninteresting things > that go unnoticed. izder456 (dot) neocities (dot) org minetest-5.8.0p0.tgz Description: application/compressed-tar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/04 08:40:39 Modified files: textproc/aspell/dicts: Makefile.inc textproc/aspell/dicts/af: Makefile textproc/aspell/dicts/ar: Makefile textproc/aspell/dicts/bg: Makefile textproc/aspell/dicts/br: Makefile textproc/aspell/dicts/ca: Makefile textproc/aspell/dicts/cs: Makefile textproc/aspell/dicts/cy: Makefile textproc/aspell/dicts/da: Makefile textproc/aspell/dicts/de: Makefile textproc/aspell/dicts/el: Makefile textproc/aspell/dicts/es: Makefile textproc/aspell/dicts/fa: Makefile textproc/aspell/dicts/fo: Makefile textproc/aspell/dicts/fr: Makefile textproc/aspell/dicts/ga: Makefile textproc/aspell/dicts/gl: Makefile textproc/aspell/dicts/he: Makefile textproc/aspell/dicts/ia: Makefile textproc/aspell/dicts/id: Makefile textproc/aspell/dicts/is: Makefile textproc/aspell/dicts/it: Makefile textproc/aspell/dicts/lt: Makefile textproc/aspell/dicts/mi: Makefile textproc/aspell/dicts/ms: Makefile textproc/aspell/dicts/mt: Makefile textproc/aspell/dicts/nb: Makefile textproc/aspell/dicts/nl: Makefile textproc/aspell/dicts/nn: Makefile textproc/aspell/dicts/pl: Makefile textproc/aspell/dicts/pt: Makefile textproc/aspell/dicts/ro: Makefile textproc/aspell/dicts/sk: Makefile textproc/aspell/dicts/sl: Makefile textproc/aspell/dicts/sr: Makefile textproc/aspell/dicts/sv: Makefile textproc/aspell/dicts/sw: Makefile textproc/aspell/dicts/tn: Makefile textproc/aspell/dicts/tr: Makefile textproc/aspell/dicts/uk: Makefile textproc/aspell/dicts/wa: Makefile textproc/aspell/dicts/zu: Makefile Log message: move REVISION in aspell/dicts to subdirs so they can be removed in updates (if there ever are any..nothing changed recently and all the existing dirs are up to date) without extra work.
Re: education/freedict: PKG_ARCH=*
On Mon, Mar 04, 2024 at 01:18:58PM +, Stuart Henderson wrote:
> On 2024/03/04 13:00, Klemens Nanni wrote:
> > Reminded by mbuhl; these dictionaries have no dependencies and just
> > repackage unmodified upstream files.
> >
> > Feedback? OK?
>
> There's no real benefit to PKG_ARCH=*.
In that case I'll just leave it; my impression was, that this helps
bulk infrastructure in some way, perhaps because slow archs can avoid
building PKG_ARCH=* and use packages built by faster archs, or so...
> The last time we made use of
> it in official package builds was when I was building arm packages on
> Thecus N2100 (copying no-arch from amd64) which took several months to
> complete a build. Despite that, it was enough pain to work with that
> I stopped it before I stopped building on the machine (extra fun when
> a port was marked incorrectly). Plus, it's only usable in this way
> on builds where bulk build machines from multiple arches are using
> the same tree - i.e. for the official builds this was only the case
> for release builds.
Goes to show I'm not a bulker, thanks for the insight.
> > Index: Makefile.inc
> > ===
> > RCS file: /cvs/ports/education/freedict/Makefile.inc,v
> > diff -u -p -r1.2 Makefile.inc
> > --- Makefile.inc4 Mar 2024 12:46:55 - 1.2
> > +++ Makefile.inc4 Mar 2024 12:57:07 -
> > @@ -1,6 +1,7 @@
> > # see https://freedict.org/freedict-database.json for all dictionaries
> > DISTNAME = freedict-${DICT}-${V}.dictd
> > PKGNAME ?= ${DISTNAME:.dictd=}
> > +REVISION ?=0
>
> You are setting a trap for future updates here, there are independent
> version numbers in V in xxx-yyy/Makefile so if you do want to go ahead
> with this I would recommend putting the REVISION markers into the subdir
> Makefiles too (I know it's a lot of files, but trivial to automate the
> bumps and removals in this case)
Wasn't sure, but saw textproc/aspell/dicts/Makefile.inc do it, so preferred
the simple diff over a little scripting.
Re: [update] nextcloud 27.1.7
On 2024/03/04 14:56, Landry Breuil wrote: > hi, > > here's the latest from branch 27 > https://nextcloud.com/changelog/#27-1-7 > > ok ? works for me with php 8.1 on 7.4 > > Landry > Index: Makefile > === > RCS file: /cvs/ports/www/nextcloud/27/Makefile,v > retrieving revision 1.13 > diff -u -r1.13 Makefile > --- Makefile 9 Feb 2024 14:22:26 - 1.13 > +++ Makefile 4 Mar 2024 13:53:07 - > @@ -1,5 +1,4 @@ > -NC_VERSION= 27.1.6 > -REVISION=1 > +NC_VERSION= 27.1.7 > # default PHP version changed, so keep REVISION in -current higher > # than -stable until 7.5-release. assuming it will be backported too: see ^^^ :-)
[update] nextcloud 27.1.7
hi, here's the latest from branch 27 https://nextcloud.com/changelog/#27-1-7 ok ? works for me with php 8.1 on 7.4 Landry Index: Makefile === RCS file: /cvs/ports/www/nextcloud/27/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile9 Feb 2024 14:22:26 - 1.13 +++ Makefile4 Mar 2024 13:53:07 - @@ -1,5 +1,4 @@ -NC_VERSION=27.1.6 -REVISION= 1 +NC_VERSION=27.1.7 # default PHP version changed, so keep REVISION in -current higher # than -stable until 7.5-release. Index: distinfo === RCS file: /cvs/ports/www/nextcloud/27/distinfo,v retrieving revision 1.9 diff -u -r1.9 distinfo --- distinfo29 Jan 2024 07:54:56 - 1.9 +++ distinfo4 Mar 2024 13:53:07 - @@ -1,2 +1,2 @@ -SHA256 (nextcloud-27.1.6.tar.bz2) = rntyt/xSWsSXmMLeaml6TP8ls0ly1p1GmVmIXTNRvvo= -SIZE (nextcloud-27.1.6.tar.bz2) = 183633049 +SHA256 (nextcloud-27.1.7.tar.bz2) = hEPi0bsojcQU+q0Kb+/i41uznt0359pcXzTexsDdG+s= +SIZE (nextcloud-27.1.7.tar.bz2) = 187681611 Index: pkg/PLIST === RCS file: /cvs/ports/www/nextcloud/27/pkg/PLIST,v retrieving revision 1.9 diff -u -r1.9 PLIST --- pkg/PLIST 29 Jan 2024 07:54:57 - 1.9 +++ pkg/PLIST 4 Mar 2024 13:53:07 - @@ -10231,8 +10231,6 @@ nextcloud/apps/circles/l10n/ru.json nextcloud/apps/circles/l10n/sc.js nextcloud/apps/circles/l10n/sc.json -nextcloud/apps/circles/l10n/si.js -nextcloud/apps/circles/l10n/si.json nextcloud/apps/circles/l10n/sk.js nextcloud/apps/circles/l10n/sk.json nextcloud/apps/circles/l10n/sl.js @@ -10731,10 +10729,6 @@ nextcloud/apps/circles/lib/UnifiedSearch/ nextcloud/apps/circles/lib/UnifiedSearch/UnifiedSearchProvider.php nextcloud/apps/circles/lib/UnifiedSearch/UnifiedSearchResult.php -nextcloud/apps/circles/screenshots/ -nextcloud/apps/circles/screenshots/0.12.0.png -nextcloud/apps/circles/screenshots/1.png -nextcloud/apps/circles/screenshots/contacts_backend.png nextcloud/apps/circles/templates/ nextcloud/apps/circles/templates/files/ nextcloud/apps/circles/templates/files/list.php @@ -11635,6 +11629,8 @@ nextcloud/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php nextcloud/apps/dav/lib/CalDAV/Search/Xml/Request/ nextcloud/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php +nextcloud/apps/dav/lib/CalDAV/Security/ +nextcloud/apps/dav/lib/CalDAV/Security/RateLimitingPlugin.php nextcloud/apps/dav/lib/CalDAV/Trashbin/ nextcloud/apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObject.php nextcloud/apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php @@ -14118,6 +14114,8 @@ nextcloud/apps/files_rightclick/l10n/af.json nextcloud/apps/files_rightclick/l10n/ar.js nextcloud/apps/files_rightclick/l10n/ar.json +nextcloud/apps/files_rightclick/l10n/ast.js +nextcloud/apps/files_rightclick/l10n/ast.json nextcloud/apps/files_rightclick/l10n/az.js nextcloud/apps/files_rightclick/l10n/az.json nextcloud/apps/files_rightclick/l10n/be.js @@ -15382,6 +15380,8 @@ nextcloud/apps/logreader/l10n/af.json nextcloud/apps/logreader/l10n/ar.js nextcloud/apps/logreader/l10n/ar.json +nextcloud/apps/logreader/l10n/ast.js +nextcloud/apps/logreader/l10n/ast.json nextcloud/apps/logreader/l10n/az.js nextcloud/apps/logreader/l10n/az.json nextcloud/apps/logreader/l10n/be.js @@ -19249,52 +19249,6 @@ nextcloud/apps/suspicious_login/vendor/composer/installed.json nextcloud/apps/suspicious_login/vendor/composer/installed.php nextcloud/apps/suspicious_login/vendor/composer/platform_check.php -nextcloud/apps/suspicious_login/vendor/darsyn/ -nextcloud/apps/suspicious_login/vendor/darsyn/ip/ -nextcloud/apps/suspicious_login/vendor/darsyn/ip/.gitattributes -nextcloud/apps/suspicious_login/vendor/darsyn/ip/.gitignore -nextcloud/apps/suspicious_login/vendor/darsyn/ip/CHANGELOG.md -nextcloud/apps/suspicious_login/vendor/darsyn/ip/CODE_OF_CONDUCT.md -nextcloud/apps/suspicious_login/vendor/darsyn/ip/LICENSE.md -nextcloud/apps/suspicious_login/vendor/darsyn/ip/README.md -nextcloud/apps/suspicious_login/vendor/darsyn/ip/composer.json -nextcloud/apps/suspicious_login/vendor/darsyn/ip/src/ -nextcloud/apps/suspicious_login/vendor/darsyn/ip/src/AbstractIP.php -nextcloud/apps/suspicious_login/vendor/darsyn/ip/src/Doctrine/ -nextcloud/apps/suspicious_login/vendor/darsyn/ip/src/Doctrine/AbstractType.php -nextcloud/apps/suspicious_login/vendor/darsyn/ip/src/Doctrine/IPv4Type.php -nextcloud/apps/suspicious_login/vendor/darsyn/ip/src/Doctrine/IPv6Type.php -nextcloud/apps/suspicious_login/vendor/darsyn/ip/src/Doctrine/MultiType.php -nextcloud/apps/suspicious_login/vendor/darsyn/ip/src/Exception/ -nextcloud/apps/suspicious_login/vendor/darsyn/ip/src/Exception/Formatter/ -nextcloud/apps/suspicious_login/vendor/darsyn/ip/src/Exception/Formatter/FormatException.php
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org 2024/03/04 06:22:06
Modified files:
devel/py-jupyter_server: Makefile
Log message:
py-jupyter_server: install a dummy ${WRKDIR}/bin/npm, otherwise during build
it runs npm if node is installed, which tries to fetch from the network
(build works ok if node is not present either way). It should also be
possible to use JUPYTER_PACKAGING_SKIP_NPM=1 in env but that doesn't seem
to be working. Found by aja@, ok aja@ daniel@
Re: education/freedict: PKG_ARCH=*
On 2024/03/04 13:00, Klemens Nanni wrote:
> Reminded by mbuhl; these dictionaries have no dependencies and just
> repackage unmodified upstream files.
>
> Feedback? OK?
There's no real benefit to PKG_ARCH=*. The last time we made use of
it in official package builds was when I was building arm packages on
Thecus N2100 (copying no-arch from amd64) which took several months to
complete a build. Despite that, it was enough pain to work with that
I stopped it before I stopped building on the machine (extra fun when
a port was marked incorrectly). Plus, it's only usable in this way
on builds where bulk build machines from multiple arches are using
the same tree - i.e. for the official builds this was only the case
for release builds.
> Index: Makefile.inc
> ===
> RCS file: /cvs/ports/education/freedict/Makefile.inc,v
> diff -u -p -r1.2 Makefile.inc
> --- Makefile.inc 4 Mar 2024 12:46:55 - 1.2
> +++ Makefile.inc 4 Mar 2024 12:57:07 -
> @@ -1,6 +1,7 @@
> # see https://freedict.org/freedict-database.json for all dictionaries
> DISTNAME = freedict-${DICT}-${V}.dictd
> PKGNAME ?= ${DISTNAME:.dictd=}
> +REVISION ?= 0
You are setting a trap for future updates here, there are independent
version numbers in V in xxx-yyy/Makefile so if you do want to go ahead
with this I would recommend putting the REVISION markers into the subdir
Makefiles too (I know it's a lot of files, but trivial to automate the
bumps and removals in this case)
Re: pkg_info: fold Comment newline
On Sun, Mar 03, 2024 at 07:35:06PM +0100, Omar Polo wrote: > On 2024/03/02 17:39:10 +, Klemens Nanni wrote: > > As per Makefile.template and portcheck(1) COMMENT is <=60 chars, so it'd > > fit on the same Comment: line in pkg_info(1) output -- less scrolling! > > > > It just stands out, imho, compared to Maintainer: and WWW: where there's > > no such seemingly superfluous line break. > > > > Thoughts? > > I like it! it seems better to me to keep "Comment" and the comment text > in the same line; especially since we strive to have "short" comments. > > However, it seems to me that this has the chance of breaking other > tools. Reading this diff I've discovered the -l flag for pkg_info that > is meant to aid parsing the output of pkg_info. I have no clue if this > option is used anywhere, but I'd prefer not to discover it when we're > this close to the release :) Me neither, but especially in scripts, parsing Comment should be easier with a single space instead of a newline in between. Either way, if at all, this is stuff for after release. > In particular, pkg_info -lxxx quirks will change: > > @@ -1,7 +1,6 @@ > xxxInformation for inst:quirks-7.10 > > -xxxComment: > -exceptions to pkg_add rules > +Comment: exceptions to pkg_add rules
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2024/03/04 06:11:22 Modified files: x11/xfce4/xfce4-screensaver: Makefile distinfo Log message: x11/xfce4/xfce4-screensaver: update to 4.18.3. see https://mail.xfce.org/pipermail/xfce-announce/2024-March/001387.html
education/freedict: PKG_ARCH=*
Reminded by mbuhl; these dictionaries have no dependencies and just
repackage unmodified upstream files.
Feedback? OK?
Index: Makefile.inc
===
RCS file: /cvs/ports/education/freedict/Makefile.inc,v
diff -u -p -r1.2 Makefile.inc
--- Makefile.inc4 Mar 2024 12:46:55 - 1.2
+++ Makefile.inc4 Mar 2024 12:57:07 -
@@ -1,6 +1,7 @@
# see https://freedict.org/freedict-database.json for all dictionaries
DISTNAME = freedict-${DICT}-${V}.dictd
PKGNAME ?= ${DISTNAME:.dictd=}
+REVISION ?=0
CATEGORIES = education databases
@@ -15,6 +16,8 @@ EXTRACT_SUFX ?= .tar.xz
CONFIGURE_STYLE ?= none
NO_BUILD ?=Yes
NO_TEST ?= Yes
+
+PKG_ARCH = *
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/freedict/${DICT}
Re: [MAINTAINER UPDATE] www/honk 1.2.3 -> 1.3.0
On 3/4/24, Gonzalo L. Rodriguez wrote:
> On Sat, 02 Mar 2024 at 09:20:35 -0500, Horia Racoviceanu wrote:
>> Upgrade to v1.3.0
>>
>> changelog
>>
>> ### 1.3.0 Big Bonsai
>>
>> + Some performance tuning.
>>
>> + Follow .rss feeds for hashtags.
>>
>> + Easier to inline attached images.
>>
>> + Optional .json urls for activities.
>>
>> + cc, link, name, and tags fields for advanced metadata.
>>
>> + tag supported in html.
>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/www/honk/Makefile,v
>> diff -u -p -r1.29 Makefile
>> --- Makefile 27 Feb 2024 08:54:37 - 1.29
>> +++ Makefile 2 Mar 2024 14:13:08 -
>> @@ -1,6 +1,6 @@
>> COMMENT = federated status conveyance
>>
>> -DISTNAME = honk-1.2.3
>> +DISTNAME = honk-1.3.0
>> CATEGORIES =www
>>
>> HOMEPAGE = https://humungus.tedunangst.com/r/honk
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/www/honk/distinfo,v
>> diff -u -p -r1.18 distinfo
>> --- distinfo 27 Feb 2024 08:54:37 - 1.18
>> +++ distinfo 2 Mar 2024 14:13:08 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (honk-1.2.3.tgz) = fexremJlsTfvvEDzihNk6P92mtEOAhUGgydHtA+tHsM=
>> -SIZE (honk-1.2.3.tgz) = 920299
>> +SHA256 (honk-1.3.0.tgz) = N6NiFvhXLQ8/oLrGV7WkYxY//A4eR6eFBpmYtpEKZeg=
>> +SIZE (honk-1.3.0.tgz) = 1968345
>> Index: pkg/MESSAGE
>> ===
>> RCS file: /cvs/ports/www/honk/pkg/MESSAGE,v
>> diff -u -p -r1.5 MESSAGE
>> --- pkg/MESSAGE 25 Jan 2024 14:30:41 - 1.5
>> +++ pkg/MESSAGE 2 Mar 2024 14:13:08 -
>> @@ -1 +1 @@
>> -The database has changed since version 1.2.0. See the pkg-readme.
>> +The database has changed since version 1.2.3. See the pkg-readme.
>> Index: pkg/README
>> ===
>> RCS file: /cvs/ports/www/honk/pkg/README,v
>> diff -u -p -r1.10 README
>> --- pkg/README 25 Jan 2024 14:30:41 - 1.10
>> +++ pkg/README 2 Mar 2024 14:13:08 -
>> @@ -66,7 +66,7 @@ honk$ sqlite3 blob.db vacuum
>> Database Upgrade
>>
>>
>> -If you are upgrading from a version before 1.2.0, you will need to
>> upgrade
>> +If you are upgrading from a version before 1.2.3, you will need to
>> upgrade
>> the database format:
>>
>> Stop the old honk process.
>
> Update to 1.3.1
>
> OK?
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/honk/Makefile,v
> diff -u -p -r1.29 Makefile
> --- Makefile 27 Feb 2024 08:54:37 - 1.29
> +++ Makefile 4 Mar 2024 07:43:26 -
> @@ -1,6 +1,6 @@
> COMMENT =federated status conveyance
>
> -DISTNAME = honk-1.2.3
> +DISTNAME = honk-1.3.1
> CATEGORIES = www
>
> HOMEPAGE = https://humungus.tedunangst.com/r/honk
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/honk/distinfo,v
> diff -u -p -r1.18 distinfo
> --- distinfo 27 Feb 2024 08:54:37 - 1.18
> +++ distinfo 4 Mar 2024 07:43:26 -
> @@ -1,2 +1,2 @@
> -SHA256 (honk-1.2.3.tgz) = fexremJlsTfvvEDzihNk6P92mtEOAhUGgydHtA+tHsM=
> -SIZE (honk-1.2.3.tgz) = 920299
> +SHA256 (honk-1.3.1.tgz) = F4Hz36nvcZv8MTh7a9Zr73kEBTS0c16Xty3T6/EzJeI=
> +SIZE (honk-1.3.1.tgz) = 2383830
> Index: pkg/MESSAGE
> ===
> RCS file: /cvs/ports/www/honk/pkg/MESSAGE,v
> diff -u -p -r1.5 MESSAGE
> --- pkg/MESSAGE 25 Jan 2024 14:30:41 - 1.5
> +++ pkg/MESSAGE 4 Mar 2024 07:43:26 -
> @@ -1 +1 @@
> -The database has changed since version 1.2.0. See the pkg-readme.
> +The database has changed since version 1.2.3. See the pkg-readme.
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/www/honk/pkg/PLIST,v
> diff -u -p -r1.15 PLIST
> --- pkg/PLIST 27 Feb 2024 08:54:37 - 1.15
> +++ pkg/PLIST 4 Mar 2024 07:43:26 -
> @@ -27,6 +27,9 @@ share/doc/honk/activitypub.7.html
> @sample ${LOCALSTATEDIR}/honk/docs/activitypub.7.html
> share/doc/honk/changelog.txt
> share/doc/honk/encrypted-messages.txt
> +share/doc/honk/filter.png
> +share/doc/honk/filtermemes.png
> +share/doc/honk/followhonk.png
> share/doc/honk/hfcs.1.html
> @sample ${LOCALSTATEDIR}/honk/docs/hfcs.1.html
> share/doc/honk/honk.1.html
> @@ -48,6 +51,8 @@ share/doc/honk/screenshot-compose.png
> @sample ${LOCALSTATEDIR}/honk/docs/screenshot-compose.png
> share/doc/honk/screenshot-honk.png
> @sample ${LOCALSTATEDIR}/honk/docs/screenshot-honk.png
> +share/doc/honk/tagcombo.png
> +share/doc/honk/tagrss.png
> share/doc/honk/toys/
> share/doc/honk/toys/README
> share/doc/honk/vim.3.html
> Index: pkg/README
> ===
> RCS
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/03/04 05:47:56 Modified files: education/freedict/deu-spa: distinfo Log message: one slipped through
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/03/04 05:46:57 Modified files: education/freedict: Makefile.inc education/freedict/deu-ell: Makefile distinfo education/freedict/deu-fin: Makefile distinfo education/freedict/deu-fra: Makefile distinfo education/freedict/deu-ind: Makefile distinfo education/freedict/deu-pol: Makefile distinfo education/freedict/deu-rus: Makefile distinfo education/freedict/deu-spa: Makefile education/freedict/deu-swe: Makefile distinfo education/freedict/ell-bul: Makefile distinfo education/freedict/ell-eng: Makefile distinfo education/freedict/ell-fin: Makefile distinfo education/freedict/ell-fra: Makefile distinfo education/freedict/ell-ind: Makefile distinfo education/freedict/ell-ita: Makefile distinfo education/freedict/ell-jpn: Makefile distinfo education/freedict/ell-lit: Makefile distinfo education/freedict/ell-nld: Makefile distinfo education/freedict/ell-nor: Makefile distinfo education/freedict/ell-por: Makefile distinfo education/freedict/ell-rus: Makefile distinfo education/freedict/ell-spa: Makefile distinfo education/freedict/ell-swe: Makefile distinfo education/freedict/eng-bul: Makefile distinfo education/freedict/eng-fin: Makefile distinfo education/freedict/eng-ind: Makefile distinfo education/freedict/eng-jpn: Makefile distinfo education/freedict/eng-nor: Makefile distinfo education/freedict/eng-swe: Makefile distinfo education/freedict/fin-bul: Makefile distinfo education/freedict/fin-deu: Makefile distinfo education/freedict/fin-ell: Makefile distinfo education/freedict/fin-eng: Makefile distinfo education/freedict/fin-fra: Makefile distinfo education/freedict/fin-ind: Makefile distinfo education/freedict/fin-ita: Makefile distinfo education/freedict/fin-jpn: Makefile distinfo education/freedict/fin-lit: Makefile distinfo education/freedict/fin-nld: Makefile distinfo education/freedict/fin-nor: Makefile distinfo education/freedict/fin-pol: Makefile distinfo education/freedict/fin-por: Makefile distinfo education/freedict/fin-swe: Makefile distinfo education/freedict/fra-bul: Makefile distinfo education/freedict/fra-deu: Makefile distinfo education/freedict/fra-ell: Makefile distinfo education/freedict/fra-fin: Makefile distinfo education/freedict/fra-ita: Makefile distinfo education/freedict/fra-jpn: Makefile distinfo education/freedict/fra-lit: Makefile distinfo education/freedict/fra-pol: Makefile distinfo education/freedict/fra-por: Makefile distinfo education/freedict/fra-rus: Makefile distinfo education/freedict/fra-spa: Makefile distinfo education/freedict/fra-swe: Makefile distinfo education/freedict/ita-bul: Makefile distinfo education/freedict/ita-ell: Makefile distinfo education/freedict/ita-fin: Makefile distinfo education/freedict/ita-ind: Makefile distinfo education/freedict/ita-jpn: Makefile distinfo education/freedict/ita-lit: Makefile distinfo education/freedict/ita-nor: Makefile distinfo education/freedict/ita-pol: Makefile distinfo education/freedict/ita-por: Makefile distinfo education/freedict/ita-rus: Makefile distinfo education/freedict/ita-spa: Makefile distinfo education/freedict/ita-swe: Makefile distinfo education/freedict/ita-tur: Makefile distinfo education/freedict/nld-bul: Makefile distinfo education/freedict/nld-ell: Makefile distinfo education/freedict/nld-fin: Makefile distinfo education/freedict/nld-lat: Makefile distinfo education/freedict/nld-pol: Makefile distinfo education/freedict/nld-por: Makefile distinfo education/freedict/nld-rus: Makefile distinfo education/freedict/nld-spa: Makefile distinfo education/freedict/nld-swe: Makefile distinfo education/freedict/pol-bul: Makefile distinfo education/freedict/pol-deu: Makefile distinfo education/freedict/pol-ell: Makefile distinfo education/freedict/pol-eng: Makefile distinfo education/freedict/pol-fin: Makefile distinfo education/freedict/pol-fra: Makefile distinfo education/freedict/pol-ind: Makefile distinfo education/freedict/pol-ita: Makefile distinfo education/freedict/pol-jpn: Makefile distinfo education/freedict/pol-nld: Makefile distinfo education/freedict/pol-nor: Makefile distinfo education/freedict/pol-por: Makefile distinfo
databases/victoriametrics: update to v1.99.0
Here is a diff to update VictoriaMetrics to v1.99.0.
I also added VictoriaLogs in a separate package.
Denis
Index: Makefile
===
RCS file: /cvs/ports/databases/victoriametrics/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile21 Jan 2024 11:58:03 - 1.20
+++ Makefile4 Mar 2024 12:10:35 -
@@ -1,6 +1,7 @@
-COMMENT = fast, cost-effective and scalable time series database
+COMMENT-main = fast, cost-effective and scalable time series database
+COMMENT-victorialogs = fast, easy-to-use and efficient logs storage
-V =1.93.10
+V =1.99.0
DIST_TUPLE += github VictoriaMetrics VictoriaMetrics v${V} . # Apache
License 2.0
@@ -10,6 +11,8 @@ CATEGORIES = databases
HOMEPAGE = https://victoriametrics.com/
+MULTI_PACKAGES = -main -victorialogs
+
MAINTAINER = Lucas Gabriel Vuotto
# Apache License 2.0
@@ -21,6 +24,7 @@ USE_GMAKE = Yes
MODULES = lang/go
MODGO_GOPATH = ${MODGO_WORKSPACE}
+MODGO_GO111MODULE =auto
SUBST_VARS = LOCALSTATEDIR
NO_TEST = Yes
@@ -36,6 +40,7 @@ do-build:
cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmauth-pure
cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmalert-pure
cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmctl-pure
+ cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM}
victoria-logs-pure
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/victoria-metrics-pure
${PREFIX}/bin/vmetrics
@@ -45,6 +50,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/vmauth-pure ${PREFIX}/bin/vmetricsauth
${INSTALL_PROGRAM} ${WRKSRC}/bin/vmalert-pure
${PREFIX}/bin/vmetricsalert
${INSTALL_PROGRAM} ${WRKSRC}/bin/vmctl-pure ${PREFIX}/bin/vmetricsctl
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/victoria-logs-pure
${PREFIX}/bin/victoria-logs
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vmetrics/
${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/vmetrics/
${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/vmetrics/
Index: distinfo
===
RCS file: /cvs/ports/databases/victoriametrics/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo21 Jan 2024 11:58:03 - 1.18
+++ distinfo4 Mar 2024 12:10:35 -
@@ -1,2 +1,2 @@
-SHA256 (VictoriaMetrics-VictoriaMetrics-v1.93.10.tar.gz) =
cEdMu0IOYVelz0y/8NCS8fT7qIkGTXamWUuZksAM448=
-SIZE (VictoriaMetrics-VictoriaMetrics-v1.93.10.tar.gz) = 59976987
+SHA256 (VictoriaMetrics-VictoriaMetrics-v1.99.0.tar.gz) =
BpFWcwOcn+SVGtLjL3BPzHxK+ST/Vmv5XYdr77rEPX0=
+SIZE (VictoriaMetrics-VictoriaMetrics-v1.99.0.tar.gz) = 36952832
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile 4 Mar 2024 12:10:35 -
@@ -0,0 +1,11 @@
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -1,6 +1,6 @@
+ PKG_PREFIX := github.com/VictoriaMetrics/VictoriaMetrics
+
+-MAKE_CONCURRENCY ?= $(shell getconf _NPROCESSORS_ONLN)
++MAKE_CONCURRENCY ?= $(shell getconf NPROCESSORS_ONLN)
+ MAKE_PARALLEL := $(MAKE) -j $(MAKE_CONCURRENCY)
+ DATEINFO_TAG ?= $(shell date -u +'%Y%m%d-%H%M%S')
+ BUILDINFO_TAG ?= $(shell echo $$(git describe --long --all | tr '/' '-')$$( \
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- pkg/DESCR 27 Jan 2022 09:23:01 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-VictoriaMetrics is a fast, cost-effective and scalable time-series
-database.
Index: pkg/DESCR-main
===
RCS file: pkg/DESCR-main
diff -N pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/DESCR-main 4 Mar 2024 12:10:35 -
@@ -0,0 +1,2 @@
+VictoriaMetrics is a fast, cost-effective and scalable time-series
+database.
Index: pkg/DESCR-victorialogs
===
RCS file: pkg/DESCR-victorialogs
diff -N pkg/DESCR-victorialogs
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/DESCR-victorialogs 4 Mar 2024 12:10:35 -
@@ -0,0 +1,16 @@
+VictoriaLogs is a fast and easy-to-use, open source logs solution.
+
+VictoriaLogs provides the following key features:
+- accept logs from popular log collectors
+- much easier to set up and operate compared to Elasticsearch and
+ Grafana Loki
+- easy yet powerful query language with full-text search capabilities
+ across all the log fields
+- seamlessly combine with good old Unix tools for log analysis such
+ as grep, less, sort, jq, etc.
+- capacity and
Re: CVS: cvs.openbsd.org: ports
OK maybe with an XXX regarding JUPYTER_PACKAGING_SKIP_NPM=1 in the environment which is supposed to be the proper way but doesn’t work ? Thanks. — Antoine > On Mar 4, 2024, at 10:19, Stuart Henderson wrote: > > On 2024/03/04 08:43, Antoine Jacoutot wrote: >>> On Wed, Feb 28, 2024 at 04:58:35PM -0700, Daniel Dickman wrote: >>> CVSROOT:/cvs >>> Module name:ports >>> Changes by:dan...@cvs.openbsd.org2024/02/28 16:58:35 >>> >>> Log message: >>>import py-jupyter_server >>> >>>ok sthen@ >>> >>>Status: >>> >>>Vendor Tag:daniel >>>Release Tags:daniel_20240228 >>> >>>N ports/devel/py-jupyter_server/Makefile >>>N ports/devel/py-jupyter_server/distinfo >>>N ports/devel/py-jupyter_server/pkg/DESCR >>>N ports/devel/py-jupyter_server/pkg/PLIST >>> >>>No conflicts created by this import >> >> Failed to build in my last bulk. >> > Building on exopi-5 under devel/py-jupyter_server,python3 >>BDEPENDS = >> [lang/python/3.10;devel/py-installer,python3;devel/pre-commit,python3;devel/py-jupyter_packaging,python3;devel/py-build,python3] >>DIST = [devel/py-jupyter_server,python3:jupyter_server-1.24.0.tar.gz] >>FULLPKGNAME = py3-jupyter_server-1.24.0 >>RDEPENDS = >> [net/py-websocket-client,python3;sysutils/py-prometheus_client,python3;devel/py-jupyter_client,python3;www/py-tornado,python3;devel/py-nbformat,python3;security/py-argon2-cffi,python3;lang/python/3.10;devel/py-traitlets,python3;devel/py-nbconvert,python3;net/py-anyio,python3;devel/py-jupyter_core,python3;devel/py-send2trash,python3;www/py-terminado,python3;net/py-zmq,python3;sysutils/py-packaging,python3;www/py-jinja2,python3] >> (Junk lock obtained for exopi-5 at 1709511649.59) > Running depends in devel/py-jupyter_server,python3 at 1709511649.68 >> last junk was in x11/qt6/qtwebengine >> /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 >> py3-installer-0.7.0 py3-jupyter_packaging-0.12.3 >> was: /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 >> py3-installer-0.7.0 py3-jupyter_packaging-0.12.3 python-3.10.13p0 >> /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 >> py3-installer-0.7.0 py3-jupyter_packaging-0.12.3 >> The following new rcscripts were installed: /etc/rc.d/gitdaemon >> See rcctl(8) for details. >> New and changed readme(s): >>/usr/local/share/doc/pkg-readmes/git > Running show-prepare-results in devel/py-jupyter_server,python3 at > 1709511659.84 >> ===> devel/py-jupyter_server,python3 >> ===> Building from scratch py3-jupyter_server-1.24.0 >> ===> py3-jupyter_server-1.24.0 depends on: pre-commit-* -> pre-commit-3.6.2p0 >> ===> py3-jupyter_server-1.24.0 depends on: python->=3.10,<3.11 -> >> python-3.10.13p0 >> ===> py3-jupyter_server-1.24.0 depends on: py3-build-* -> py3-build-1.0.3 >> ===> py3-jupyter_server-1.24.0 depends on: py3-installer-* -> >> py3-installer-0.7.0 >> ===> py3-jupyter_server-1.24.0 depends on: py3-jupyter_packaging-* -> >> py3-jupyter_packaging-0.12.3 >> pre-commit-3.6.2p0 >> py3-build-1.0.3 >> py3-installer-0.7.0 >> py3-jupyter_packaging-0.12.3 >> python-3.10.13p0 >> Don't run junk because nojunk in x11/qt6/qtwebengine >> (Junk lock released for exopi-5 at 1709511661.00) >> distfiles size=456590 > Running build in devel/py-jupyter_server,python3 at 1709511661.04 >> ===> devel/py-jupyter_server,python3 >> ===> Checking files for py3-jupyter_server-1.24.0 >> `/exopi-cvs/ports/distfiles/jupyter_server-1.24.0.tar.gz' is up to date. (SHA256) jupyter_server-1.24.0.tar.gz: OK >> ===> Extracting for py3-jupyter_server-1.24.0 >> ===> Patching for py3-jupyter_server-1.24.0 >> ===> Compiler link: clang -> /usr/bin/clang >> ===> Compiler link: clang++ -> /usr/bin/clang++ >> ===> Compiler link: cc -> /usr/bin/cc >> ===> Compiler link: c++ -> /usr/bin/c++ >> ===> Generating configure for py3-jupyter_server-1.24.0 >> ===> Configuring for py3-jupyter_server-1.24.0 >> ===> Building for py3-jupyter_server-1.24.0 >> * Getting build dependencies for wheel... >> running egg_info >> writing jupyter_server.egg-info/PKG-INFO >> writing dependency_links to jupyter_server.egg-info/dependency_links.txt >> writing entry points to jupyter_server.egg-info/entry_points.txt >> writing requirements to jupyter_server.egg-info/requires.txt >> writing top-level names to jupyter_server.egg-info/top_level.txt >> reading manifest file 'jupyter_server.egg-info/SOURCES.txt' >> reading manifest template 'MANIFEST.in' >> warning: no previously-included files found matching 'docs/#*' >> no previously-included directories found matching 'docs/build' >> no previously-included directories found matching 'docs/gh-pages' >> no previously-included directories found matching 'docs/dist' >> warning: no previously-included files matching '*~' found anywhere in >> distribution >> warning: no previously-included files matching '*.pyo' found anywhere in >> distribution >>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2024/03/04 04:04:30 Modified files: devel/leiningen: Makefile distinfo Log message: update devel/leiningen to 2.11.2 portwise: use DIST_TUPLE and move to codeberg.
Re: [update] www/mycorrhiza: add cert symlink instructions
Hello, On 2024/02/27 09:14:59 -0500, "Jag Talon" wrote: > On Mon Feb 26, 2024 at 11:14 PM EST, la-ninpre wrote: > > On 26 February 2024 22:45:18 UTC, Jag Talon > > wrote: > > > Bumping REVISION as well. > > > > > > > Hello, > > thank you for suggesting this change, I haven't noticed this before, > > because in testing environment i wasn't using ssl and in 'production' I > > already had this symlink. The patch is fine by me, but i'm thinking that > > maybe it would be better to unify the two patches. What do you think? > > Thank you I'm glad you like the changes. I have the unified diff attached! > > ok? [...] > --- pkg/README8 Sep 2022 13:35:47 - 1.1.1.1 > +++ pkg/README27 Feb 2024 14:04:07 - > @@ -58,6 +58,11 @@ acme-client(1)) and start httpd(8) and r > # rcctl enable httpd relayd > # rcctl start httpd relayd > > +If you already have a certificate following the acme-client.conf > +default template, make sure to create the following symlink to prevent > +SEC_ERROR_UNKNOWN_ISSUER issues on some browsers: > + > +# ln -s /etc/ssl/example.com.fullchain.pem /etc/ssl/example.com.crt I'm not a relayd user, but this seems to me the wrong place to put this information. If I understand correctly relayd is not loading the fullchain cert, due to the (IMHO silly) rules of how it loads the certificates in /etc/. If this is the case, then I'd consider this "common relayd knowledge" and putting a workaround in a random port' README seems wrong.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/04 03:22:45 Modified files: misc/remind: Makefile distinfo misc/remind/pkg: PLIST Log message: update to remind-4.3.2, from Martin Ziemer (maintainer)
Re: [maintainer update] remind 4.2.9 -> 4.3.1 (now 4.3.2)
On 2024/03/04 08:52, Martin Ziemer wrote:
> Am Fri, Mar 01, 2024 at 01:56:48PM +0100 schrieb Martin Ziemer:
> > Am Fri, Mar 01, 2024 at 10:46:02AM + schrieb Stuart Henderson:
> > > On 2024/03/01 11:30, Martin Ziemer wrote:
> > > > @@ -1,9 +1,13 @@
> > > > +applications/
> > > > +applications/tkremind.desktop
> > > ..
> > > > +icons/
> > > > +icons/tkremind.png
> > >
> > > Wrong paths for those..
> There was a new release which fixed those paths upstream.
>
> Diff below ist tested on amd64.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/misc/remind/Makefile,v
> retrieving revision 1.70
> diff -u -p -r1.70 Makefile
> --- Makefile 5 Feb 2024 11:59:07 - 1.70
> +++ Makefile 1 Mar 2024 14:30:46 -
> @@ -1,7 +1,7 @@
> COMMENT= scripting language for reminders, with a Tk front end
>
> -DISTNAME=remind-04.02.09
> -PKGNAME= remind-4.2.9
> +DISTNAME=remind-04.03.02
> +PKGNAME= remind-4.3.2
>
> CATEGORIES= misc
>
> @@ -31,7 +31,9 @@ RUN_DEPENDS=${MODTK_RUN_DEPENDS} \
> devel/tcllib \
> converters/p5-JSON-MaybeXS \
> graphics/p5-Cairo \
> - devel/p5-Pango
> + devel/p5-Pango \
> + x11/gtk+4 \
Nearly right, that needs to be x11/gtk+4,-guic
> + devel/desktop-file-utils
Will commit.
>
> CONFIGURE_STYLE= gnu
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/misc/remind/distinfo,v
> retrieving revision 1.39
> diff -u -p -r1.39 distinfo
> --- distinfo 5 Feb 2024 11:59:07 - 1.39
> +++ distinfo 1 Mar 2024 14:30:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (remind-04.02.09.tar.gz) =
> ZEaEYLQFpwXfp7ONsUt4I/ENqPADruooFRfdtJhrhyo=
> -SIZE (remind-04.02.09.tar.gz) = 515231
> +SHA256 (remind-04.03.02.tar.gz) =
> tL5Ntb/RIoT9mKcdU1ndBo/pGwhtIsRnTV0lL6Sg1Vw=
> +SIZE (remind-04.03.02.tar.gz) = 523684
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/misc/remind/pkg/PLIST,v
> retrieving revision 1.15
> diff -u -p -r1.15 PLIST
> --- pkg/PLIST 13 Sep 2023 09:36:32 - 1.15
> +++ pkg/PLIST 1 Mar 2024 14:30:46 -
> @@ -16,12 +16,15 @@ libdata/perl5/site_perl/Remind/PDF/Entry
> @man man/man1/tkremind.1
> @man man/man3p/Remind::PDF.3p
> @man man/man3p/Remind::PDF::Entry.3p
> +share/applications/tkremind.desktop
> share/examples/remind/
> share/examples/remind/alignment.rem
> share/examples/remind/ansitext
> share/examples/remind/astro
> share/examples/remind/defs.rem
> share/examples/remind/remind.vim
> +share/pixmaps/
> +share/pixmaps/tkremind.png
> share/remind/
> share/remind/ansitext.rem
> share/remind/holidays/
> @@ -33,6 +36,7 @@ share/remind/holidays/jewish.rem
> share/remind/holidays/us.rem
> share/remind/lang/
> share/remind/lang/auto.rem
> +share/remind/lang/ca.rem
> share/remind/lang/da.rem
> share/remind/lang/de.rem
> share/remind/lang/en.rem
> @@ -50,3 +54,5 @@ share/remind/lang/ro.rem
> share/remind/seasons.rem
> share/remind/site/
> share/remind/site/README
> +@tag update-desktop-database
> +@tag gtk-update-icon-cache %D/share/icons/tkremind
>
Re: CVS: cvs.openbsd.org: ports
On 2024/03/04 08:43, Antoine Jacoutot wrote: > On Wed, Feb 28, 2024 at 04:58:35PM -0700, Daniel Dickman wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: dan...@cvs.openbsd.org 2024/02/28 16:58:35 > > > > Log message: > > import py-jupyter_server > > > > ok sthen@ > > > > Status: > > > > Vendor Tag: daniel > > Release Tags: daniel_20240228 > > > > N ports/devel/py-jupyter_server/Makefile > > N ports/devel/py-jupyter_server/distinfo > > N ports/devel/py-jupyter_server/pkg/DESCR > > N ports/devel/py-jupyter_server/pkg/PLIST > > > > No conflicts created by this import > > Failed to build in my last bulk. > > >>> Building on exopi-5 under devel/py-jupyter_server,python3 > BDEPENDS = > [lang/python/3.10;devel/py-installer,python3;devel/pre-commit,python3;devel/py-jupyter_packaging,python3;devel/py-build,python3] > DIST = [devel/py-jupyter_server,python3:jupyter_server-1.24.0.tar.gz] > FULLPKGNAME = py3-jupyter_server-1.24.0 > RDEPENDS = > [net/py-websocket-client,python3;sysutils/py-prometheus_client,python3;devel/py-jupyter_client,python3;www/py-tornado,python3;devel/py-nbformat,python3;security/py-argon2-cffi,python3;lang/python/3.10;devel/py-traitlets,python3;devel/py-nbconvert,python3;net/py-anyio,python3;devel/py-jupyter_core,python3;devel/py-send2trash,python3;www/py-terminado,python3;net/py-zmq,python3;sysutils/py-packaging,python3;www/py-jinja2,python3] > (Junk lock obtained for exopi-5 at 1709511649.59) > >>> Running depends in devel/py-jupyter_server,python3 at 1709511649.68 >last junk was in x11/qt6/qtwebengine > /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 > py3-installer-0.7.0 py3-jupyter_packaging-0.12.3 > was: /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 > py3-installer-0.7.0 py3-jupyter_packaging-0.12.3 python-3.10.13p0 > /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 > py3-installer-0.7.0 py3-jupyter_packaging-0.12.3 > The following new rcscripts were installed: /etc/rc.d/gitdaemon > See rcctl(8) for details. > New and changed readme(s): > /usr/local/share/doc/pkg-readmes/git > >>> Running show-prepare-results in devel/py-jupyter_server,python3 at > >>> 1709511659.84 > ===> devel/py-jupyter_server,python3 > ===> Building from scratch py3-jupyter_server-1.24.0 > ===> py3-jupyter_server-1.24.0 depends on: pre-commit-* -> pre-commit-3.6.2p0 > ===> py3-jupyter_server-1.24.0 depends on: python->=3.10,<3.11 -> > python-3.10.13p0 > ===> py3-jupyter_server-1.24.0 depends on: py3-build-* -> py3-build-1.0.3 > ===> py3-jupyter_server-1.24.0 depends on: py3-installer-* -> > py3-installer-0.7.0 > ===> py3-jupyter_server-1.24.0 depends on: py3-jupyter_packaging-* -> > py3-jupyter_packaging-0.12.3 > pre-commit-3.6.2p0 > py3-build-1.0.3 > py3-installer-0.7.0 > py3-jupyter_packaging-0.12.3 > python-3.10.13p0 > Don't run junk because nojunk in x11/qt6/qtwebengine > (Junk lock released for exopi-5 at 1709511661.00) > distfiles size=456590 > >>> Running build in devel/py-jupyter_server,python3 at 1709511661.04 > ===> devel/py-jupyter_server,python3 > ===> Checking files for py3-jupyter_server-1.24.0 > `/exopi-cvs/ports/distfiles/jupyter_server-1.24.0.tar.gz' is up to date. > >> (SHA256) jupyter_server-1.24.0.tar.gz: OK > ===> Extracting for py3-jupyter_server-1.24.0 > ===> Patching for py3-jupyter_server-1.24.0 > ===> Compiler link: clang -> /usr/bin/clang > ===> Compiler link: clang++ -> /usr/bin/clang++ > ===> Compiler link: cc -> /usr/bin/cc > ===> Compiler link: c++ -> /usr/bin/c++ > ===> Generating configure for py3-jupyter_server-1.24.0 > ===> Configuring for py3-jupyter_server-1.24.0 > ===> Building for py3-jupyter_server-1.24.0 > * Getting build dependencies for wheel... > running egg_info > writing jupyter_server.egg-info/PKG-INFO > writing dependency_links to jupyter_server.egg-info/dependency_links.txt > writing entry points to jupyter_server.egg-info/entry_points.txt > writing requirements to jupyter_server.egg-info/requires.txt > writing top-level names to jupyter_server.egg-info/top_level.txt > reading manifest file 'jupyter_server.egg-info/SOURCES.txt' > reading manifest template 'MANIFEST.in' > warning: no previously-included files found matching 'docs/#*' > no previously-included directories found matching 'docs/build' > no previously-included directories found matching 'docs/gh-pages' > no previously-included directories found matching 'docs/dist' > warning: no previously-included files matching '*~' found anywhere in > distribution > warning: no previously-included files matching '*.pyo' found anywhere in > distribution > no previously-included directories found matching '.git' > no previously-included directories found matching '**/.ipynb_checkpoints' > no previously-included directories found matching '**/.pytest_cache' > no previously-included directories found matching
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mar...@cvs.openbsd.org 2024/03/04 01:48:59 Modified files: math/py-netcdf4: Makefile distinfo Log message: Update py-netcdf4 to 1.6.5.
Re: UPDATE: openjp2 2.5.2
On 2024-03-04 2:56 a.m., Landry Breuil wrote: Le Sun, Mar 03, 2024 at 03:35:12PM -0500, Brad Smith a écrit : On 2024-03-03 7:22 a.m., Landry Breuil wrote: Le Sat, Mar 02, 2024 at 08:41:02PM -0500, Brad Smith a écrit : On Sat, Mar 02, 2024 at 06:04:23PM -0500, Brad Smith wrote: Here is an update to openjp2 2.5.2. CVE-2021-3575 ## OpenJPEG 2.5.2 (Feb 2024) * Make sure openjpeg.h includes opj_config.h [\#1514](https://github.com/uclouvain/openjpeg/issues/1514) ## OpenJPEG 2.5.1 (Feb 2024) * CMake: drop support for cmake < 3.5 * Several bugfixes, including [\#1509](https://github.com/uclouvain/openjpeg/pull/1509) for CVE-2021-3575 * Significant speed-up rate allocation by rate/distoratio ratio [\#1440](https://github.com/uclouvain/openjpeg/pull/1440) An updated diff fixing the big endian patch the way upstream recommended. thanks, i had a similar diff for 2.5.2 which is in a bulk, i'll integrate the updated BE patch. do you have a link for 'the way upstream recommended' ? https://github.com/uclouvain/openjpeg/pull/1520 thanks - fwiw in my diff (attached) ive been able to drop patch-CMakeLists.txt, i dont remember what it was for but it seems now unneeded. Oh. Ya. That could have been removed as part of.. revision 1.11 date: 2019/01/16 22:29:54; author: sthen; state: Exp; lines: +19 -18; commitid: zHTzCDYhKbi3xgJr; use upstream default include/cmake path, avoids patches needed in some portsLooks like it was originally passing in a variable to override the directory name in the path. I was wondering what it was for, but had not looked into it, until now.
