[NEW] lang/deno
Attached is a port for lang/deno. a runtime for JavaScript and TypeScript that uses V8 and is built in Rust. https://deno.com Builds and tests ok on amd64 and arm64, which are the only two architectures supported upstream. Running tests with PRIVSEP still shows two remaining test failures out of 459 tests run, which I believe are attributable to the PRIVSEP restrictions. Also the tests seem to be a little flaky - I sometimes need more than one attempt at 'make test' to make the test suite run completely. Normal operation seems fine, though. deno.tar.gz Description: application/gzip
Re: NEW: games/crispy-doom
On Mon, Sep 19, 2022 at 02:53:41PM -0700, Ryan Freeman wrote: > Hi, > > Attached is a new port for crispy-doom. > last thread here: https://marc.info/?l=openbsd-ports&m=163917053508968&w=2 > Hexen has the crispy treatment since the last preliminary port was posted. Follow-up on this with latest version 6.0. Since last email, Strife has also been added to the line-up of supported games. New tarball attached; someone should take maintainer. If Ryan isn't interested, I will take maintainer. The only hiccup I see is that `make package` leads to some complaints about several section 6 manpages not having a NAME section. Turns out they all just have an invocation of docgen in there. I sampled most of the other man pages and the remaining ones seem to be fine. ok? > > Crispy Doom is a friendly fork of Chocolate Doom that provides a higher > > display resolution, removes the static limits of the Doom engine and > > offers further optional visual, tactical and physical enhancements > > while remaining entirely config file, savegame, netplay and demo > > compatible with the original. > > Tthe Doom/Heretic/Hexen games all seem to work good here on amd64. > > -Ryan crispy-doom-6.0.tgz Description: application/tar-gz
Re: [Maintainer Update] lang/node v18.16.0
Friendly ping ... amd64, arm64 and i386 are fine, and as far as I could tell there are no changes that could negatively impact riscv64 nor powerpc64. On 4/22/23 10:01, Volker Schlecht wrote: Ping On 4/14/23 18:06, Volker Schlecht wrote: Time for an easy update of everyone's favorite port: Update node to v18.16.0 Adds initial support for compiling JavaScript into single executables. Didn't test that, and don't think it's a particularly good idea. Lots of smaller changes and fixes otherwise: https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V18.md#18.16.0 Built and tested on amd64, arm64 and i386.
Re: NEW: x11/qt6/{qtgrpc,qthttpserver,qtquick3dphysics,qtquickeffectmaker}
On Mon, May 01, 2023 at 01:37:46PM +0200, Rafael Sadowski wrote:
> On Mon May 01, 2023 at 09:16:12AM +, Klemens Nanni wrote:
> > On Mon, Apr 10, 2023 at 08:30:03AM +0200, Rafael Sadowski wrote:
> > > Hi ports hackers,
> > >
> > > here are some new Qt6 modules. OK to import?
> >
> > All build/package with complete WANTLIB, Makefiles look good.
>
> Thanks!
>
> >
> > I can't `cd $(make show=WRKSRC)' due to o=0 permissions.
> > Do we need qt(6?)-wide FIX_EXTRACT_PERMISSIONS=Yes?
x11/qt6/qt5compat and x11/qt5/qtvirtualkeyboard as random samples have the
same has the same issue:
$ stat -f%Sp `mk show=WRKSRC`
drwx--
I'd use FIX_EXTRACT_PERMISSIONS for them all, diff below.
Feedback? Objection? OK?
>
> I do not build with PORTS_PRIVSEP=yes.
Please do, otherwise ports may work for you (doing network, writing
outside of pobj, etc.), but fail for other porters and on bulk machines.
> > All but qtgrpc need update-plist to remove common directories.
>
> Hm, I have no changes here.
Do you have pkglocatedb package installed? update-plist(1) -f is the
default and checks against already registered files.
> > I see you define PX_OPENBSD in various places, but also define PX_LINUX,
> > why?
>
> PX_LINUX is default and enabled and we use it but for some cases we need
> PX_OPENBSD.
Shouldn't all PX_LINUX checks eventually honour PX_OPENBSD as well?
Or do you want to piggy back PX_LINUX and only maintain the bare minimum of
OpenBSD specific macro foo?
> > This port uses syscall(2), i.e. `syscall(getthrid)', which sohuld be direct.
>
> "which sohuld be direct"? Why?
*NOT*, sorry
Syscalls must come from libc, lots of ports have been patched and fixed
upstream to not use direct syscall(2) but instead call into libc functions.
> > What's the story with s/NULL/0/ in the patches?
>
> This fix (our?) clang build. C++ template magic.
Can you mention this in a comment? It saves time and effort for anyone not
intimitely familiar with the C++ ecosystem; I can't tell if this is a legit
fix (in our OpenBSD ports case) or just a workaround.
Index: x11/qt5/Makefile.inc
===
RCS file: /cvs/ports/x11/qt5/Makefile.inc,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile.inc
--- x11/qt5/Makefile.inc13 Jul 2022 15:48:56 - 1.20
+++ x11/qt5/Makefile.inc3 May 2023 17:15:20 -
@@ -1,5 +1,7 @@
ONLY_FOR_ARCHS ?= ${GCC4_ARCHS} ${CLANG_ARCHS}
+FIX_EXTRACT_PERMISSIONS ?= Yes
+
.include "Makefile.version"
# DIST_VERSION should be defined, e.g., when patch distfile gets issued,
Index: x11/qt6/Makefile.inc
===
RCS file: /cvs/ports/x11/qt6/Makefile.inc,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.inc
--- x11/qt6/Makefile.inc28 May 2022 06:20:04 - 1.5
+++ x11/qt6/Makefile.inc3 May 2023 17:15:27 -
@@ -1,5 +1,7 @@
ONLY_FOR_ARCHS ?= ${GCC4_ARCHS} ${CLANG_ARCHS}
+FIX_EXTRACT_PERMISSIONS ?= Yes
+
.include "Makefile.version"
VERSION ?= ${QT6_VERSION}
Re: [Maintainer Update] archivers/zpaqfranz-58.2
> An option would be to enable the HWSHA2 flag on amd64 only and leave up to
> the users to specify -hw or not, depending on the machine at hand.
Sounds good. I don’t have a i386 available anymore, so I could not test that -
sorry!
> On Mittwoch, Mai 03, 2023 at 6:12 PM, Omar Polo (mailto:o...@omarpolo.com)> wrote:
> On 2023/05/02 21:32:52 +0200, tux0r wrote:
> > zpaqfranz 58.2 fixes (among others) the HWSHA2 flag on OpenBSD/amd64.
>
> `zpaqfranz autotest -hw -all' crashes on i386 from SIGILL (illegal
> instruction) in sha256_transform_x86(). Glancing at the code hidden
> behind #ifdef HWSHA2 it seems like it tries to support x86 but not
> always.
>
> it's also confusing since it claims in some comments that there's no
> cpuid check "for performance" but in fact there is a cpuid check used
> in some parts... it's a bit of a mess.
>
> I guess that the rufus code (where it crashes on i386) is amd64 only
> since it has a leading
>
> RUFUS_ENABLE_GCC_ARCH("ssse3,sse4.1,sha")
> i.e.
> __attribute__((target ("ssse3,sse4.1,sha")))
>
> on the other hand, the cpuid check seems to work "somehow" and so only
> manually specifying -hw leads to a crash. `zpaqfranz autotest -all'
> on i386 works fine.
>
> An option would be to enable the HWSHA2 flag on amd64 only and leave
> up to the users to specify -hw or not, depending on the machine at
> hand.
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/archivers/zpaqfranz/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 26 Apr 2023 08:36:39 - 1.16
> +++ Makefile 3 May 2023 14:35:05 -
> @@ -4,7 +4,7 @@ COMMENT = journaling archiver for increm
>
> GH_ACCOUNT = fcorbelli
> GH_PROJECT = zpaqfranz
> -GH_TAGNAME = 58.1
> +GH_TAGNAME = 58.2
>
> CATEGORIES = archivers
> MAINTAINER = tux0r
> @@ -18,9 +18,14 @@ WANTLIB = ${COMPILER_LIBCXX} c m
>
> USE_WXNEEDED = Yes
>
> +CPPFLAGS += -Dunix
> +.if ${MACHINE_ARCH:Mamd64}
> +CPPFLAGS += -DHWSHA2
> +.endif
> +
> do-build:
> cd ${WRKSRC} && ${SET_ENV} ${MAKE_ENV} \
> - ${CXX} ${CXXFLAGS} -Dunix -o zpaqfranz zpaqfranz.cpp -lm -lpthread
> + ${CXX} ${CXXFLAGS} ${CPPFLAGS} -o zpaqfranz zpaqfranz.cpp -lm -lpthread
>
> do-install:
> ${INSTALL_PROGRAM} ${WRKSRC}/zpaqfranz ${PREFIX}/bin/
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/archivers/zpaqfranz/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 26 Apr 2023 08:36:39 - 1.13
> +++ distinfo 3 May 2023 10:29:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (zpaqfranz-58.1.tar.gz) = Gtg2hMIVZsDTmhKm5VfY+A0qGSdJxL/l5MOZ7hbR3hY=
> -SIZE (zpaqfranz-58.1.tar.gz) = 5274310
> +SHA256 (zpaqfranz-58.2.tar.gz) = e2bJS7Iv8DIFd3wL4OcHR6D3747/m5nisaw4SqSVl38=
> +SIZE (zpaqfranz-58.2.tar.gz) = 5284676
Re: [Maintainer Update] archivers/zpaqfranz-58.2
On 2023/05/02 21:32:52 +0200, tux0r wrote:
> zpaqfranz 58.2 fixes (among others) the HWSHA2 flag on OpenBSD/amd64.
`zpaqfranz autotest -hw -all' crashes on i386 from SIGILL (illegal
instruction) in sha256_transform_x86(). Glancing at the code hidden
behind #ifdef HWSHA2 it seems like it tries to support x86 but not
always.
it's also confusing since it claims in some comments that there's no
cpuid check "for performance" but in fact there is a cpuid check used
in some parts... it's a bit of a mess.
I guess that the rufus code (where it crashes on i386) is amd64 only
since it has a leading
RUFUS_ENABLE_GCC_ARCH("ssse3,sse4.1,sha")
i.e.
__attribute__((target ("ssse3,sse4.1,sha")))
on the other hand, the cpuid check seems to work "somehow" and so only
manually specifying -hw leads to a crash. `zpaqfranz autotest -all'
on i386 works fine.
An option would be to enable the HWSHA2 flag on amd64 only and leave
up to the users to specify -hw or not, depending on the machine at
hand.
Index: Makefile
===
RCS file: /home/cvs/ports/archivers/zpaqfranz/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile26 Apr 2023 08:36:39 - 1.16
+++ Makefile3 May 2023 14:35:05 -
@@ -4,7 +4,7 @@ COMMENT = journaling archiver for increm
GH_ACCOUNT = fcorbelli
GH_PROJECT = zpaqfranz
-GH_TAGNAME = 58.1
+GH_TAGNAME = 58.2
CATEGORIES = archivers
MAINTAINER = tux0r
@@ -18,9 +18,14 @@ WANTLIB =${COMPILER_LIBCXX} c m
USE_WXNEEDED = Yes
+CPPFLAGS +=-Dunix
+.if ${MACHINE_ARCH:Mamd64}
+CPPFLAGS +=-DHWSHA2
+.endif
+
do-build:
cd ${WRKSRC} && ${SET_ENV} ${MAKE_ENV} \
- ${CXX} ${CXXFLAGS} -Dunix -o zpaqfranz zpaqfranz.cpp -lm -lpthread
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} -o zpaqfranz zpaqfranz.cpp -lm
-lpthread
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/zpaqfranz ${PREFIX}/bin/
Index: distinfo
===
RCS file: /home/cvs/ports/archivers/zpaqfranz/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo26 Apr 2023 08:36:39 - 1.13
+++ distinfo3 May 2023 10:29:41 -
@@ -1,2 +1,2 @@
-SHA256 (zpaqfranz-58.1.tar.gz) = Gtg2hMIVZsDTmhKm5VfY+A0qGSdJxL/l5MOZ7hbR3hY=
-SIZE (zpaqfranz-58.1.tar.gz) = 5274310
+SHA256 (zpaqfranz-58.2.tar.gz) = e2bJS7Iv8DIFd3wL4OcHR6D3747/m5nisaw4SqSVl38=
+SIZE (zpaqfranz-58.2.tar.gz) = 5284676
Re: update net/megatools 1.11.1
Omar Polo writes:
> sorry for chiming in but I used it often and the diff seemed a bit
> off.
>> +MODULE =devel/meson
>^^
>
> typo, this should be MODULES.
>
> Then the various custom target do-*, the explicit BDEP on ninja and
> SEPARATE_BUILD become redundant, as they're set by meson.port.mk
> (except for the installing of README)
>
> upstream install targets also takes care of adding symlink for the old
> commands.
>
> I haven't used anything other than megadl, but that continues to work
> for me so ok once this is adjusted.
Thanks. I was wondering why I had to do so much work for meson. I have
incorporated all your feedback in this fresh diff.
Index: Makefile
===
RCS file: /cvs/ports/net/megatools/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile11 Mar 2022 19:46:20 - 1.22
+++ Makefile3 May 2023 15:44:22 -
@@ -2,8 +2,10 @@ PORTROACH =limit:[0-9]\.tar\.gz
COMMENT = command line client application for Mega
-DISTNAME = megatools-1.10.3
-REVISION = 0
+V =1.11.1
+DATE = 20230212
+DISTNAME = megatools-${V}.${DATE}
+PKGNAME = ${DISTNAME:S/.${DATE}//}
CATEGORIES = net
@@ -14,23 +16,20 @@ MAINTAINER =Anthony J. Bentley https://megatools.megous.com/builds/
COMPILER = base-clang ports-gcc
BUILD_DEPENDS =devel/gobject-introspection \
- textproc/asciidoc
+ textproc/asciidoc \
+ textproc/docbook2x
LIB_DEPENDS = devel/glib2 \
net/curl
-USE_GMAKE =Yes
-CONFIGURE_STYLE = gnu
-MAKE_FLAGS = VERBOSE=1
+MODULES = devel/meson
-CONFIGURE_ARGS = --disable-introspection
-
-SEPARATE_BUILD = Yes
+# tests require network access
+NO_TEST = Yes
.include
Index: distinfo
===
RCS file: /cvs/ports/net/megatools/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo19 May 2020 06:22:48 - 1.7
+++ distinfo3 May 2023 15:44:22 -
@@ -1,2 +1,2 @@
-SHA256 (megatools-1.10.3.tar.gz) = jcHKNIYz/UnefrgysyPo3ClfHFWu+0hNMOZHUhhVi9s=
-SIZE (megatools-1.10.3.tar.gz) = 196361
+SHA256 (megatools-1.11.1.20230212.tar.gz) =
7Pou5LJ3xgHrrmSChzEQMKpMpz6mHucwvGa+8k7xmjQ=
+SIZE (megatools-1.11.1.20230212.tar.gz) = 105339
Index: patches/patch-lib_mega_c
===
RCS file: /cvs/ports/net/megatools/patches/patch-lib_mega_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-lib_mega_c
--- patches/patch-lib_mega_c11 Mar 2022 19:46:20 - 1.4
+++ patches/patch-lib_mega_c3 May 2023 15:44:22 -
@@ -3,7 +3,7 @@ Fix build with opaque RSA in LibreSSL 3.
Index: lib/mega.c
--- lib/mega.c.orig
+++ lib/mega.c
-@@ -785,7 +785,7 @@ static gboolean rsa_key_gen(struct rsa_key *k)
+@@ -787,7 +787,7 @@ static gboolean rsa_key_gen(struct rsa_key *k)
return FALSE;
}
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/megatools/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 11 Mar 2022 19:46:20 - 1.5
+++ pkg/PLIST 3 May 2023 15:44:22 -
@@ -1,26 +1,29 @@
-@bin bin/megacopy
-@bin bin/megadf
-@bin bin/megadl
-@bin bin/megaget
-@bin bin/megals
-@bin bin/megamkdir
-@bin bin/megaput
-@bin bin/megareg
-@bin bin/megarm
-@man man/man1/megacopy.1
-@man man/man1/megadf.1
-@man man/man1/megadl.1
-@man man/man1/megaget.1
-@man man/man1/megals.1
-@man man/man1/megamkdir.1
-@man man/man1/megaput.1
-@man man/man1/megareg.1
-@man man/man1/megarm.1
+bin/megacopy
+bin/megadf
+bin/megadl
+bin/megaexport
+bin/megaget
+bin/megals
+bin/megamkdir
+bin/megaput
+bin/megareg
+bin/megarm
+bin/megatest
+@bin bin/megatools
+@man man/man1/megatools-copy.1
+@man man/man1/megatools-df.1
+@man man/man1/megatools-dl.1
+@man man/man1/megatools-export.1
+@man man/man1/megatools-get.1
+@man man/man1/megatools-ls.1
+@man man/man1/megatools-mkdir.1
+@man man/man1/megatools-put.1
+@man man/man1/megatools-reg.1
+@man man/man1/megatools-rm.1
+@man man/man1/megatools-test.1
+@man man/man1/megatools.1
@man man/man5/megarc.5
-@man man/man7/megatools.7
share/doc/megatools/
-share/doc/megatools/HACKING
-share/doc/megatools/INSTALL
share/doc/megatools/LICENSE
share/doc/megatools/NEWS
share/doc/megatools/README
Re: [new] sysutils/efivar
On Wed, May 03, 2023 at 01:37:14PM +, Klemens Nanni wrote: > Snapshots from 28.04. and 03.05. no longer panic on my Intel T14g3, > --list and --print work as expected. Note quite :/ now I hit a kernel protection fault again on 'efivar -l' right after reboot. Can't tell if this is the port, /dev/efi, just my machine or something else... it locks up/DDB is unusable, so it'll take me some time to pin this down further.
Re: [new] sysutils/efivar
On Thu, Apr 27, 2023 at 04:00:51PM +0300, Sergii Dmytruk wrote: > On Thu, Apr 27, 2023 at 11:34:11AM +, Klemens Nanni wrote: > > As normal user, I'd expect EACCES or EPERM, the current warning misleads: > > $ efivar -l > > efivar: error listing variables: Function not implemented > > The code supports multiple backends and without root none of them is > applicable. This leads to ENOSYS on calling any function that deals > with efivars. Changing this can cause differences in behaviour of the > library. > > > We point GH_* at the BSD fork and HOMEPAGE at Linux upstream. > > Would it be better to drop HOMEAGE, i.e. stick with the fork and adjust > > its description on GitHub so that actually becomes obvious from reading > > the "homepage"? > > Updated HOMEPAGE. Also updated the repo to show `bsd` branch by default > and mentioned the purpose of the fork in the description. > > > Are the spaces in SHARED_LIBS intended? > > Changed to tabs. Snapshots from 28.04. and 03.05. no longer panic on my Intel T14g3, --list and --print work as expected. OK to import?
Re: [update] sysutils/direnv to 2.32.2
On 2023/05/03 11:48, Omar Polo wrote:
On 2023/05/03 09:10:31 +0200, Laurent Cheylus wrote:
[...]
+USE_GMAKE =Yes
It's useless to specify USE_GMAKE. When using the go module, it takes
over the do-build target and so gmake is not used. (you'd need to
change CONFIGURE_STYLE to avoid go.port.mk taking over those targets,
or provide your own custom targets.)
You're right. My bad, I removed it.
I'm not using direnv, but it seems that using only go.port.mk suffice.
Then, I'd change this
do-install:
into a post-install and leave only the man installation.
${INSTALL_MAN} ${WRKSRC}/man/*.1 $(PREFIX)/man/man1/
Replace do-install by post-install to install manpages.
A new version of my patch with your fixes. Build and tests OK on
current/amd64.
Laurent
Index: Makefile
===
RCS file: /cvs/ports/sysutils/direnv/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 11 Mar 2022 19:57:21 - 1.7
+++ Makefile 3 May 2023 09:57:38 -
@@ -1,38 +1,29 @@
-COMMENT = tool for managing environment based on current directory
+COMMENT = tool for managing environment based on current directory
-GH_ACCOUNT = direnv
-GH_PROJECT = direnv
-GH_TAGNAME = v2.26.0
-REVISION = 0
-
-MAINTAINER= Ashton Fagg
-CATEGORIES = sysutils devel
-HOMEPAGE = https://direnv.net
+MODGO_MODNAME = github.com/direnv/direnv/v2
+MODGO_VERSION = v2.32.2
+
+DISTNAME = direnv-${MODGO_VERSION}
+
+MAINTAINER = Ashton Fagg
+CATEGORIES = sysutils devel
+HOMEPAGE = https://direnv.net
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB = c pthread
+WANTLIB = c pthread
-MODULES = lang/go
+MODULES = lang/go
# Unfortunately, this needs bash at runtime because all the shell
# stuff that happens underneath gets spawned in a bash subprocess
# (even if the shell you're hooking isn't bash...go figure).
-RUN_DEPENDS = shells/bash
-
-# Remove some unneeded stuff. These are just Github CI hooks.
-pre-build:
- rm -rf ${WRKSRC}/script
-
-do-build:
- ${MODGO_BUILD_CMD} github.com/direnv/direnv/...
+RUN_DEPENDS = shells/bash
-do-install:
- $(INSTALL_PROGRAM) $(MODGO_WORKSPACE)/bin/direnv $(PREFIX)/bin
+post-install:
${INSTALL_MAN} ${WRKSRC}/man/*.1 $(PREFIX)/man/man1/
-do-test:
- ${MODGO_CMD} test github.com/direnv/direnv/...
+.include "modules.inc"
.include
Index: distinfo
===
RCS file: /cvs/ports/sysutils/direnv/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 30 Dec 2020 22:29:24 - 1.5
+++ distinfo 3 May 2023 09:57:38 -
@@ -1,2 +1,54 @@
-SHA256 (direnv-2.26.0.tar.gz) = s9u5f00mJ+xYiJTwhL/cdttH/1477CEFC7gYYIx4Nbk=
-SIZE (direnv-2.26.0.tar.gz) = 1378688
+SHA256 (direnv-v2.32.2.zip) = ++hNvWCRIhFnzleUtQEaSEmSrqtZRka8WIsSrhc6/eU=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.0.mod) = JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.0.zip) = Owa0u+HB4TUyiUGU6ctTrwBoaQIwApvuXqn1J92DhBU=
+SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.mod) = 6SmRM81yQ+wmZ6oloEstrGAJI0rkwc2k7bRXSZcNrp8=
+SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.zip) = a48BdljZAN6HP8VnI3VI7yBUCCrtZGaWVeUb7u/ug8c=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = M+0HClpm4JYGhaxThkQOG1mJnnTYo4oRgGhecqIZXe0=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod) = OrnwH0YQ/ns5vYXWjo2XglNR5+KCw5zaQUV8KidvO+M=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.zip) = iOR6oF6yXGq9rXOHzMz8OedFQYlth7exJp6d0voAEA0=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.5.1.mod) = uVQhGJtkdk7en2hHL039Id48lyso3LjrKqkp0Qa8aQs=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.5.1.zip) = i+0UiRIOlCimSsqXw6DRMGWjPRVkWTquReXHMcSI+XU=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod) = 9wRnadqsAr61fLzEgSgN9Z+0A8lv6CYigquoWMf3+k0=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip) = i0N7iOzmjmEzYVD73SpMDo2A8UO83IbOTvBHxMk/PKo=
+SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
+SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip) = 3BBcK01serSOVJRs4vYk6NH11HJw7/Hoj+0GzGX5H7Q=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod) = iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod) = GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/n
Re: Maintainer Reaction: [update patch] ledger v3.2.1 -> v3.3.2
I'll commit it. Sergey, do you want to stay listed as maintainer?
On 2023/05/03 12:09, Martin Ziemer wrote:
> Got reaction from maintainer:
> > Date: Tue, 02 May 2023 13:34:32 +0300
> > From s...@brnkv.ru Tue May 2 12:36:35 2023
> > To: Martin Ziemer , "ports@openbsd.org"
> >
> > Subject: Re: [update patch] ledger v3.2.1 -> v3.3.2
> >
> > Hi, Martin!
> >
> >
> >
> > looks good for me. However, I didn't test it.
> >
> > --
> >
> > Sergey
>
> Am Thu, Apr 13, 2023 at 10:33:49AM +0200 schrieb Martin Ziemer:
> > This patch updates ledger from v3.2.1 to v3.3.2.
> >
> > Patched test cases with random output order to succeed every time instead of
> > only sometimes by adding sort by date.
> >
> > Tested on amd64
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/productivity/ledger/Makefile,v
> > retrieving revision 1.34
> > diff -u -p -r1.34 Makefile
> > --- Makefile13 Nov 2022 15:29:11 - 1.34
> > +++ Makefile30 Mar 2023 13:49:19 -
> > @@ -1,9 +1,8 @@
> > COMMENT = command line double-entry accounting ledger
> >
> > -GH_TAGNAME = v3.2.1
> > +GH_TAGNAME = v3.3.2
> > GH_ACCOUNT = ledger
> > GH_PROJECT = ledger
> > -REVISION = 1
> >
> > SHARED_LIBS += ledger1.0 # 3.0
> >
> > @@ -24,7 +23,9 @@ MODULES = devel/cmake \
> > lang/python
> > COMPILER = base-clang ports-gcc
> >
> > -BUILD_DEPENDS =devel/utfcpp
> > +BUILD_DEPENDS =devel/utfcpp \
> > + print/texinfo
> > +
> > LIB_DEPENDS = devel/boost \
> > devel/gmp \
> > devel/mpfr
> > @@ -43,7 +44,7 @@ post-install:
> > .for i in ledger3
> > cd ${WRKBUILD}/doc/ && \
> > cp ${WRKSRC}/doc/$i.texi . && \
> > - makeinfo --force --no-split -o ${PREFIX}/info/$i.info $i.texi
> > + gmakeinfo --force --no-split -o ${PREFIX}/info/$i.info $i.texi
> > .endfor
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ledger/
> > .for d in LICENSE.md doc/GLOSSARY.md
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/productivity/ledger/distinfo,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 distinfo
> > --- distinfo2 Oct 2020 19:14:58 - 1.8
> > +++ distinfo30 Mar 2023 13:49:19 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (ledger-3.2.1.tar.gz) = kr8JvDhbFxmH9Fb+Pun6mY7V5AuXs6zdVitmOqNkOEo=
> > -SIZE (ledger-3.2.1.tar.gz) = 790959
> > +SHA256 (ledger-3.3.2.tar.gz) = VVKW7h6HD/BOI1ZnaXfc9V66ta15EmZnvFZGTLEUIDU=
> > +SIZE (ledger-3.3.2.tar.gz) = 825274
> > Index: patches/patch-doc_CMakeLists_txt
> > ===
> > RCS file: /cvs/ports/productivity/ledger/patches/patch-doc_CMakeLists_txt,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 patch-doc_CMakeLists_txt
> > --- patches/patch-doc_CMakeLists_txt11 Mar 2022 19:51:43 -
> > 1.2
> > +++ patches/patch-doc_CMakeLists_txt30 Mar 2023 13:49:19 -
> > @@ -1,8 +1,9 @@
> > Don't install .info files for they haven't been generated by the time
> > they're installed (see comment in Makefile).
> >
> > doc/CMakeLists.txt.origThu Aug 11 23:12:09 2016
> > -+++ doc/CMakeLists.txt Thu Aug 11 23:13:41 2016
> > +Index: doc/CMakeLists.txt
> > +--- doc/CMakeLists.txt.orig
> > doc/CMakeLists.txt
> > @@ -122,17 +122,3 @@ if (CMAKE_INSTALL_MANDIR)
> > install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ledger.1
> > DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
> > @@ -11,8 +12,8 @@ they're installed (see comment in Makefi
> > -foreach(file ${ledger_doc_files})
> > - get_filename_component(file_ext ${file} EXT)
> > -
> > -- if(file_ext STREQUAL ".info")
> > --if(CMAKE_INSTALL_INFODIR)
> > +- if (file_ext STREQUAL ".info")
> > +-if (CMAKE_INSTALL_INFODIR)
> > - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}
> > -DESTINATION ${CMAKE_INSTALL_INFODIR} COMPONENT doc)
> > -endif()
> > Index: patches/patch-src_expr_cc
> > ===
> > RCS file: patches/patch-src_expr_cc
> > diff -N patches/patch-src_expr_cc
> > --- patches/patch-src_expr_cc 11 Mar 2022 19:51:43 - 1.2
> > +++ /dev/null 1 Jan 1970 00:00:00 -
> > @@ -1,16 +0,0 @@
> > -Fix compilation with Boost 1.76
> > -https://github.com/ledger/ledger/commit/69e6b89cf8d2820d28174e7ffaea1c59a0f84d3f
> > -
> > -Index: src/expr.cc
> > src/expr.cc.orig
>
Maintainer Reaction: [update patch] ledger v3.2.1 -> v3.3.2
Got reaction from maintainer:
> Date: Tue, 02 May 2023 13:34:32 +0300
> From s...@brnkv.ru Tue May 2 12:36:35 2023
> To: Martin Ziemer , "ports@openbsd.org"
> Subject: Re: [update patch] ledger v3.2.1 -> v3.3.2
>
> Hi, Martin!
>
>
>
> looks good for me. However, I didn't test it.
>
> --
>
> Sergey
Am Thu, Apr 13, 2023 at 10:33:49AM +0200 schrieb Martin Ziemer:
> This patch updates ledger from v3.2.1 to v3.3.2.
>
> Patched test cases with random output order to succeed every time instead of
> only sometimes by adding sort by date.
>
> Tested on amd64
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/ledger/Makefile,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile
> --- Makefile 13 Nov 2022 15:29:11 - 1.34
> +++ Makefile 30 Mar 2023 13:49:19 -
> @@ -1,9 +1,8 @@
> COMMENT =command line double-entry accounting ledger
>
> -GH_TAGNAME = v3.2.1
> +GH_TAGNAME = v3.3.2
> GH_ACCOUNT = ledger
> GH_PROJECT = ledger
> -REVISION = 1
>
> SHARED_LIBS += ledger1.0 # 3.0
>
> @@ -24,7 +23,9 @@ MODULES = devel/cmake \
> lang/python
> COMPILER = base-clang ports-gcc
>
> -BUILD_DEPENDS = devel/utfcpp
> +BUILD_DEPENDS = devel/utfcpp \
> + print/texinfo
> +
> LIB_DEPENDS =devel/boost \
> devel/gmp \
> devel/mpfr
> @@ -43,7 +44,7 @@ post-install:
> .for i in ledger3
> cd ${WRKBUILD}/doc/ && \
> cp ${WRKSRC}/doc/$i.texi . && \
> - makeinfo --force --no-split -o ${PREFIX}/info/$i.info $i.texi
> + gmakeinfo --force --no-split -o ${PREFIX}/info/$i.info $i.texi
> .endfor
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ledger/
> .for d in LICENSE.md doc/GLOSSARY.md
> Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/ledger/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo 2 Oct 2020 19:14:58 - 1.8
> +++ distinfo 30 Mar 2023 13:49:19 -
> @@ -1,2 +1,2 @@
> -SHA256 (ledger-3.2.1.tar.gz) = kr8JvDhbFxmH9Fb+Pun6mY7V5AuXs6zdVitmOqNkOEo=
> -SIZE (ledger-3.2.1.tar.gz) = 790959
> +SHA256 (ledger-3.3.2.tar.gz) = VVKW7h6HD/BOI1ZnaXfc9V66ta15EmZnvFZGTLEUIDU=
> +SIZE (ledger-3.3.2.tar.gz) = 825274
> Index: patches/patch-doc_CMakeLists_txt
> ===
> RCS file: /cvs/ports/productivity/ledger/patches/patch-doc_CMakeLists_txt,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-doc_CMakeLists_txt
> --- patches/patch-doc_CMakeLists_txt 11 Mar 2022 19:51:43 - 1.2
> +++ patches/patch-doc_CMakeLists_txt 30 Mar 2023 13:49:19 -
> @@ -1,8 +1,9 @@
> Don't install .info files for they haven't been generated by the time
> they're installed (see comment in Makefile).
>
> doc/CMakeLists.txt.orig Thu Aug 11 23:12:09 2016
> -+++ doc/CMakeLists.txt Thu Aug 11 23:13:41 2016
> +Index: doc/CMakeLists.txt
> +--- doc/CMakeLists.txt.orig
> doc/CMakeLists.txt
> @@ -122,17 +122,3 @@ if (CMAKE_INSTALL_MANDIR)
> install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ledger.1
> DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
> @@ -11,8 +12,8 @@ they're installed (see comment in Makefi
> -foreach(file ${ledger_doc_files})
> - get_filename_component(file_ext ${file} EXT)
> -
> -- if(file_ext STREQUAL ".info")
> --if(CMAKE_INSTALL_INFODIR)
> +- if (file_ext STREQUAL ".info")
> +-if (CMAKE_INSTALL_INFODIR)
> - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}
> -DESTINATION ${CMAKE_INSTALL_INFODIR} COMPONENT doc)
> -endif()
> Index: patches/patch-src_expr_cc
> ===
> RCS file: patches/patch-src_expr_cc
> diff -N patches/patch-src_expr_cc
> --- patches/patch-src_expr_cc 11 Mar 2022 19:51:43 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -Fix compilation with Boost 1.76
> -https://github.com/ledger/ledger/commit/69e6b89cf8d2820d28174e7ffaea1c59a0f84d3f
> -
> -Index: src/expr.cc
> src/expr.cc.orig
> -+++ src/expr.cc
> -@@ -35,6 +35,9 @@
> - #include "parser.h"
> - #include "scope.h"
> -
> -+#include
> -+
> -+
> - namespace ledger {
> -
> - expr_t::expr_t() : base_type()
> Index: patches/patch-src_format_h
> ===
> RCS file: patches/patch-src_format_h
> diff -N patches/patch-src_format_h
> --- patches/patch-src_format_h
Re: [update] sysutils/direnv to 2.32.2
On 2023/05/03 09:10:31 +0200, Laurent Cheylus wrote:
> [...]
> +USE_GMAKE = Yes
It's useless to specify USE_GMAKE. When using the go module, it takes
over the do-build target and so gmake is not used. (you'd need to
change CONFIGURE_STYLE to avoid go.port.mk taking over those targets,
or provide your own custom targets.)
I'm not using direnv, but it seems that using only go.port.mk suffice.
Then, I'd change this
> do-install:
into a post-install and leave only the man installation.
> ${INSTALL_MAN} ${WRKSRC}/man/*.1 $(PREFIX)/man/man1/
Also, although I agree with the stylistic changes, I'd refrain from
changing too many things in a port at once, especially when the real
changes are more than a simple version bump. It makes harder to see
what's actually being changed.
Index: Makefile
===
RCS file: /home/cvs/ports/sysutils/direnv/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile11 Mar 2022 19:57:21 - 1.7
+++ Makefile3 May 2023 09:42:25 -
@@ -1,9 +1,9 @@
-COMMENT = tool for managing environment based on current directory
+COMMENT = tool for managing environment based on current directory
-GH_ACCOUNT = direnv
-GH_PROJECT = direnv
-GH_TAGNAME = v2.26.0
-REVISION = 0
+MODGO_MODNAME =github.com/direnv/direnv/v2
+MODGO_VERSION =v2.32.2
+
+DISTNAME = direnv-${MODGO_VERSION}
MAINTAINER=Ashton Fagg
CATEGORIES = sysutils devel
@@ -21,18 +21,9 @@ MODULES =lang/go
# (even if the shell you're hooking isn't bash...go figure).
RUN_DEPENDS = shells/bash
-# Remove some unneeded stuff. These are just Github CI hooks.
-pre-build:
- rm -rf ${WRKSRC}/script
-
-do-build:
- ${MODGO_BUILD_CMD} github.com/direnv/direnv/...
-
-do-install:
- $(INSTALL_PROGRAM) $(MODGO_WORKSPACE)/bin/direnv $(PREFIX)/bin
+post-install:
${INSTALL_MAN} ${WRKSRC}/man/*.1 $(PREFIX)/man/man1/
-do-test:
- ${MODGO_CMD} test github.com/direnv/direnv/...
+.include "modules.inc"
.include
Index: distinfo
===
RCS file: /home/cvs/ports/sysutils/direnv/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo30 Dec 2020 22:29:24 - 1.5
+++ distinfo3 May 2023 09:27:35 -
@@ -1,2 +1,54 @@
-SHA256 (direnv-2.26.0.tar.gz) = s9u5f00mJ+xYiJTwhL/cdttH/1477CEFC7gYYIx4Nbk=
-SIZE (direnv-2.26.0.tar.gz) = 1378688
+SHA256 (direnv-v2.32.2.zip) = ++hNvWCRIhFnzleUtQEaSEmSrqtZRka8WIsSrhc6/eU=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.0.mod) =
JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.0.zip) =
Owa0u+HB4TUyiUGU6ctTrwBoaQIwApvuXqn1J92DhBU=
+SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.mod) =
6SmRM81yQ+wmZ6oloEstrGAJI0rkwc2k7bRXSZcNrp8=
+SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.zip) =
a48BdljZAN6HP8VnI3VI7yBUCCrtZGaWVeUb7u/ug8c=
+SHA256
(go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) =
M+0HClpm4JYGhaxThkQOG1mJnnTYo4oRgGhecqIZXe0=
+SHA256
(go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod) =
OrnwH0YQ/ns5vYXWjo2XglNR5+KCw5zaQUV8KidvO+M=
+SHA256
(go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.zip) =
iOR6oF6yXGq9rXOHzMz8OedFQYlth7exJp6d0voAEA0=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.5.1.mod) =
uVQhGJtkdk7en2hHL039Id48lyso3LjrKqkp0Qa8aQs=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.5.1.zip) =
i+0UiRIOlCimSsqXw6DRMGWjPRVkWTquReXHMcSI+XU=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod)
= 9wRnadqsAr61fLzEgSgN9Z+0A8lv6CYigquoWMf3+k0=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod)
= 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip)
= i0N7iOzmjmEzYVD73SpMDo2A8UO83IbOTvBHxMk/PKo=
+SHA256
(go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) =
Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
+SHA256
(go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip) =
3BBcK01serSOVJRs4vYk6NH11HJw7/Hoj+0GzGX5H7Q=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod)
= iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod)
= GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod)
= 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod)
= 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.zip)
= c0yvGJVJ6puF3ZP1jofj87zq7HIilEn1h5w8Bnoq1g4=
+SHA256 (go_modu
Re: update net/vnstat 2.10
On 2023/05/02 17:44, Nam Nguyen wrote:
> 3. new patch for expr syntax errors in configure.
> see:
> https://github.com/vergoh/vnstat/commit/7e3795ebe3e6c31ff09aa967954a51f6d9e19d35
>
> It uses gexpr syntax with the match keyword, so convert it to an
> equivalent form for expr.
>
> according to gexpr(1): "match STRING REGEXP same as STRING : REGEXP"
>
> This only serves to print full install paths in configure output
> (changing vnstat: ${exec_prefix}/bin/vnstat to vnstat:
> /usr/local/bin/vnstat).
>
> The port functions without this configure patch. Should we add or remove
> it for maintainability?
I think I would skip this patch. If the BSD expr syntax from the patch
also works with GNU expr, consider submitting it upstream instead.
> +* "UseLogging" in ${SYSCONFDIR}/vnstat.conf enables logging.
> + "UseLogging 1" uses ${LOCALSTATEDIR}/log/vnstat/vnstat.log
> + "UseLogging 2" uses ${LOCALSTATEDIR}/log/messages
It's not necessarily /var/log/messages depending on config (and syslogd
would be writing to /var not ${LOCALSTATEDIR} in the extremely unlikely
case somebody rebuilt this with a different LOCALSTATEDIR).
I would simply go with this:
"UseLogging 2" uses syslog.
Rest looks ok with me.
Re: update net/megatools 1.11.1
On 2023/05/02 16:29:41 -0700, Nam Nguyen wrote:
>
> Here is an update to megatools 1.11.1, released on February 12,
> 2023. Upstream has switched to meson.
>
> changelog for 1.11.1 and 1.11.0:
> https://megatools.megous.com/builds/NEWS
>
> This port update does the following:
>
> - copes with the suffix date by removing it for PKGNAME
> - regens WANTLIB. ssl is pulled in by curl and intl and pthread are
> pulled in by glib-2.0 according to `env LD_DEBUG= megatools'
> - adds textproc/docbook2x since meson.build checks for asciidoc and
> docbook2x in order to build man pages
> - moves to meson and adds devel/ninja
> - sets NO_TEST because the tests just use the tools and require network
> access
> - There is now one binary megatools. Install all associated man pages
> and docs. I chose not to install symlinks (e.g., megadl --> megatools
> dl).
>
> I tested `megatools dl', which worked, but `megatools reg' failed, as
> with the current version.
>
> Feedback and tests are welcome. OK?
sorry for chiming in but I used it often and the diff seemed a bit
off.
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/megatools/Makefile,v
> retrieving revision 1.22
> diff -u -p -u -p -r1.22 Makefile
> --- Makefile 11 Mar 2022 19:46:20 - 1.22
> +++ Makefile 2 May 2023 23:08:35 -
> @@ -2,8 +2,10 @@ PORTROACH = limit:[0-9]\.tar\.gz
>
> COMMENT =command line client application for Mega
>
> -DISTNAME = megatools-1.10.3
> -REVISION = 0
> +V = 1.11.1
> +DATE = 20230212
> +DISTNAME = megatools-${V}.${DATE}
> +PKGNAME =${DISTNAME:S/.${DATE}//}
>
> CATEGORIES = net
>
> @@ -14,23 +16,39 @@ MAINTAINER = Anthony J. Bentley # GPLv2+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB = c crypto curl gio-2.0 glib-2.0 gobject-2.0 intl pthread
> -WANTLIB += ssl
> +WANTLIB += c crypto curl gio-2.0 glib-2.0 gobject-2.0
>
> MASTER_SITES = https://megatools.megous.com/builds/
>
> COMPILER = base-clang ports-gcc
> BUILD_DEPENDS = devel/gobject-introspection \
> - textproc/asciidoc
> + devel/ninja \
> + textproc/asciidoc \
> + textproc/docbook2x
> LIB_DEPENDS =devel/glib2 \
> net/curl
>
> -USE_GMAKE = Yes
> -CONFIGURE_STYLE =gnu
> -MAKE_FLAGS = VERBOSE=1
> +MODULE = devel/meson
^^
typo, this should be MODULES.
Then the various custom target do-*, the explicit BDEP on ninja and
SEPARATE_BUILD become redundant, as they're set by meson.port.mk
(except for the installing of README)
upstream install targets also takes care of adding symlink for the old
commands.
I haven't used anything other than megadl, but that continues to work
for me so ok once this is adjusted.
> -CONFIGURE_ARGS = --disable-introspection
> +do-configure:
> + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} meson setup ${WRKBUILD}
> +
> +do-build:
> + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -C ${WRKBUILD}
> +
> +do-install:
> + ${INSTALL_PROGRAM} ${WRKBUILD}/${PKGSTEM} ${PREFIX}/bin
> +.for M in 1 5
> + ${INSTALL_DATA} ${WRKBUILD}/*.${M} ${PREFIX}/man/man${M}
> +.endfor
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGSTEM}
> +.for F in README NEWS TODO LICENSE
> + ${INSTALL_DATA} ${WRKSRC}/${F} ${PREFIX}/share/doc/${PKGSTEM}
> +.endfor
>
> SEPARATE_BUILD = Yes
> +
> +# tests require network access
> +NO_TEST =Yes
>
> .include
[update] sysutils/direnv to 2.32.2
Hi,
an update for sysutils/direnv to the latest version 2.32.2. Patch
already sent to the maintener several months ago but no reply since.
- update Makefile and add modules.inc to use MODGO_xxx instead of GH_xxx
- use GNU make with GNUMakefile to build direnv binary
- remove unnecessary pre-build and do-test sections
Build and tests OK on current/amd64 with Go 1.20.1
Tests/comments welcome and please commit if OK.
Laurent
Index: Makefile
===
RCS file: /cvs/ports/sysutils/direnv/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 11 Mar 2022 19:57:21 - 1.7
+++ Makefile 3 May 2023 06:49:11 -
@@ -1,38 +1,32 @@
-COMMENT = tool for managing environment based on current directory
+COMMENT = tool for managing environment based on current directory
-GH_ACCOUNT = direnv
-GH_PROJECT = direnv
-GH_TAGNAME = v2.26.0
-REVISION = 0
-
-MAINTAINER= Ashton Fagg
-CATEGORIES = sysutils devel
-HOMEPAGE = https://direnv.net
+MODGO_MODNAME = github.com/direnv/direnv/v2
+MODGO_VERSION = v2.32.2
+
+DISTNAME = direnv-${MODGO_VERSION}
+
+MAINTAINER = Ashton Fagg
+CATEGORIES = sysutils devel
+HOMEPAGE = https://direnv.net
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB = c pthread
+WANTLIB = c pthread
-MODULES = lang/go
+MODULES = lang/go
# Unfortunately, this needs bash at runtime because all the shell
# stuff that happens underneath gets spawned in a bash subprocess
# (even if the shell you're hooking isn't bash...go figure).
-RUN_DEPENDS = shells/bash
-
-# Remove some unneeded stuff. These are just Github CI hooks.
-pre-build:
- rm -rf ${WRKSRC}/script
+RUN_DEPENDS = shells/bash
-do-build:
- ${MODGO_BUILD_CMD} github.com/direnv/direnv/...
+USE_GMAKE = Yes
do-install:
$(INSTALL_PROGRAM) $(MODGO_WORKSPACE)/bin/direnv $(PREFIX)/bin
${INSTALL_MAN} ${WRKSRC}/man/*.1 $(PREFIX)/man/man1/
-do-test:
- ${MODGO_CMD} test github.com/direnv/direnv/...
+.include "modules.inc"
.include
Index: distinfo
===
RCS file: /cvs/ports/sysutils/direnv/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 30 Dec 2020 22:29:24 - 1.5
+++ distinfo 3 May 2023 06:49:11 -
@@ -1,2 +1,54 @@
-SHA256 (direnv-2.26.0.tar.gz) = s9u5f00mJ+xYiJTwhL/cdttH/1477CEFC7gYYIx4Nbk=
-SIZE (direnv-2.26.0.tar.gz) = 1378688
+SHA256 (direnv-v2.32.2.zip) = ++hNvWCRIhFnzleUtQEaSEmSrqtZRka8WIsSrhc6/eU=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.0.mod) = JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.0.zip) = Owa0u+HB4TUyiUGU6ctTrwBoaQIwApvuXqn1J92DhBU=
+SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.mod) = 6SmRM81yQ+wmZ6oloEstrGAJI0rkwc2k7bRXSZcNrp8=
+SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.zip) = a48BdljZAN6HP8VnI3VI7yBUCCrtZGaWVeUb7u/ug8c=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = M+0HClpm4JYGhaxThkQOG1mJnnTYo4oRgGhecqIZXe0=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod) = OrnwH0YQ/ns5vYXWjo2XglNR5+KCw5zaQUV8KidvO+M=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.zip) = iOR6oF6yXGq9rXOHzMz8OedFQYlth7exJp6d0voAEA0=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.5.1.mod) = uVQhGJtkdk7en2hHL039Id48lyso3LjrKqkp0Qa8aQs=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.5.1.zip) = i+0UiRIOlCimSsqXw6DRMGWjPRVkWTquReXHMcSI+XU=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod) = 9wRnadqsAr61fLzEgSgN9Z+0A8lv6CYigquoWMf3+k0=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip) = i0N7iOzmjmEzYVD73SpMDo2A8UO83IbOTvBHxMk/PKo=
+SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
+SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip) = 3BBcK01serSOVJRs4vYk6NH11HJw7/Hoj+0GzGX5H7Q=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod) = iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod) = GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.zip) = c0yvGJVJ6puF3ZP1jofj87zq7HIilEn1h5w8Bnoq1g4=
+SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.mod) = NoedWG/YAB6E2oeHGQoR5PeHSeKoHf6Lm2kxiZ//Mc8=
+SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.zip) = 6jBoOVUD08fvjOFqKG91yMk4gsJaZsKqbI4q1Np6muA=
+SHA256 (
