Re: [new] games/shapezio (factorio like)
On Mon, Sep 21, 2020 at 11:17:21AM +0200, Solene Rapenne wrote: > Please find a port for the commercial and opensource game > https://github.com/tobspr/shapez.io/ > > I made a desktop file running electron on the game assets, it displays > an error about performance issue and that you should use a faster > browser, but I didn't manage to find performance difference than in > Chromium. > > Upstream doesn't seem packaging friendly. There are no documentation > for building the game except "run yarn and yarn gulp". The whole > upstream sources including the 1400 nodejs dependencies is more than > 3GB and this is required to build the game files that only are 30MB > and arch independant. > > I'll regularly keep the game tarball updated by building the files > myself. The building process is insane and can't be done in ports > (one of the fix is to link /usr/local/bin/node into /tmp/node !!!) > > Note that you can host the game files anywhere on a http server and > play the game within a web browser. > > AFAIK, this is the first devel/electron consumer! > Anyone ok for import? Hm, doesn't run here. electron either segfaults when running with /usr/local/bin/electron /usr/local/share/shapez.io/index.html or just displays a white window with no activity. That's on -current with a fresh download of electron from the packages. Machine is an i7-10700 with 8G RAM, integrated Intel UHD Graphics 630. I don't get a usable backtrace with egdb: Program terminated with signal SIGSEGV, Segmentation fault. #0 0x0fe3c4c3f821 in ?? () [Current thread is 1 (process 514016)] (gdb) bt full #0 0x0fe3c4c3f821 in ?? () No symbol table info available. Backtrace stopped: Cannot access memory at address 0xfe64cec0f40 > V = 202009192141 I think following the versioning by upstream would avoid EPOCH or other problems in the future. Latest releast was 1.1.18 from June 27th. If you start with 202009192141, you will need EPOCH if you ever want to switch to the upstream versioning. In my opinion it would be best to either use the 1.1.18 release, or if the commits between then and 2020-09-19 are desirable, maybe version it as 1.1.18pl20200919 ?
Add missing dependency for audio/rgain
I think audio/rgain is missing a runtime dependency. Running it after
install, I get:
/usr/local/bin/replaygain -h
Traceback (most recent call last):
File "/usr/local/bin/replaygain", line 3, in
from rgain3.script.replaygain import replaygain
File "/usr/local/lib/python3.8/site-packages/rgain3/script/__init__.py", line
29, in
import rgain3.rgio # noqa isort:skip
File "/usr/local/lib/python3.8/site-packages/rgain3/rgio.py", line 23, in
import mutagen
ModuleNotFoundError: No module named 'mutagen'
Patch below fixes it. OKs?
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/audio/rgain/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile3 Oct 2020 15:39:58 - 1.8
+++ Makefile4 Oct 2020 05:21:00 -
@@ -5,7 +5,7 @@ COMMENT=multi-format tools and Python m
MODPY_EGG_VERSION= 1.0.0
DISTNAME= rgain3-${MODPY_EGG_VERSION}
EPOCH= 0
-REVISION= 0
+REVISION= 1
#WRKDIST= ${WRKDIR}/fk-rgain-8df1a846a12c
@@ -23,6 +23,7 @@ MODPY_VERSION=${MODPY_DEFAULT_VERSION_3
BUILD_DEPENDS= textproc/py-docutils${MODPY_FLAVOR}
RUN_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} \
+ audio/py-mutagen${MODPY_FLAVOR} \
multimedia/gstreamer1/core \
multimedia/gstreamer1/plugins-libav \
multimedia/gstreamer1/plugins-base \
Re: [macppc] Don't build x11/kitty
On Wed, Sep 30, 2020 at 05:51:05PM +0200, Charlene Wendling wrote: > Hi, > > (This can wait post-release, the wasted time is low) > > Kitty is broken in the current macppc bulk: > > > cc -MMD -DNDEBUG -Wextra -Wfloat-conversion > > -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11 > > -pedantic-errors -Werror -fwrapv -fstack-protector-strong -pipe > > -fvisibility=hidden -D_FORTIFY_SOURCE=2 -fPIC -O2 -pipe -flto > > -pthread -Ikitty -I/usr/local/include/python3.8 -c > > kittens/choose/score.c -o > > build/subseq_matcher-score.c.obuild/fast_data_types-charsets.c.o: > > file not recognized: File format not recognized > > My first guess was to disable LTO by doing a debug build (see > setup.py:289 for rationale), and i managed to package kitty like that. > > At runtime i'm greeted with: > > > [274 17:24:38.489771] [glfw error 65543]: GLX: Failed to create > > context: GLXBadFBConfig > > [274 17:24:38.496529] Failed to create GLFW temp window! This > > usually happens because of old/broken OpenGL drivers. kitty requires > > working OpenGL 3.3 drivers. > > And it quits. No macppc machine should be OpenGL 3.3 capable using > hardware acceleration. With software rendering it leads to floating > point exceptions or system lockups, and would be very slow anyway. > > I'm proposing to not build it on macppc. ok thfr@ > > Comments/feedback are welcome, > > Charlène. > > > Index: Makefile > === > RCS file: /cvs/ports/x11/kitty/Makefile,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 Makefile > --- Makefile 7 Sep 2020 12:53:00 - 1.2 > +++ Makefile 30 Sep 2020 15:37:32 - > @@ -1,5 +1,8 @@ > # $OpenBSD: Makefile,v 1.2 2020/09/07 12:53:00 sthen Exp $ > > +# Requires OpenGL>=3.3 > +NOT_FOR_ARCHS = powerpc > + > COMMENT =fast, feature full, GPU-based terminal emulator > > MODPY_EGG_VERSION = 0.18.3 > >
[patch] ocaml-camlp5 7.11 -> 7.13
Update ocaml-camlp5 which will allow an update of ocaml to 4.11.1.
ok?
diff -x CVS -Nur ocaml-camlp5/Makefile ocaml-camlp5.wip/Makefile
--- ocaml-camlp5/Makefile Tue Jun 9 13:34:14 2020
+++ ocaml-camlp5.wip/Makefile Sat Oct 3 22:27:42 2020
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.9 2020/06/09 17:34:14 chrisz Exp $
-V =7.11
-REVISION = 0
+V =7.13
COMMENT = OCaml Preprocessor and Pretty-Printer
DISTFILES =camlp5-rel${V}{rel${V:S/.//}}${EXTRACT_SUFX}
PKGNAME = ocaml-camlp5-${V}
diff -x CVS -Nur ocaml-camlp5/distinfo ocaml-camlp5.wip/distinfo
--- ocaml-camlp5/distinfo Tue Feb 18 17:45:52 2020
+++ ocaml-camlp5.wip/distinfo Sat Oct 3 22:27:46 2020
@@ -1,2 +1,2 @@
-SHA256 (camlp5-rel7.11.tar.gz) = oEi44P6yoQWBh4JPyctrVfLFt4jEPBXW2wkNeJxxIbo=
-SIZE (camlp5-rel7.11.tar.gz) = 878224
+SHA256 (camlp5-rel7.13.tar.gz) = vHOogQVS+9DJBTZKujTbpG48ra5IP4nn45+n99O+cgw=
+SIZE (camlp5-rel7.13.tar.gz) = 1031832
diff -x CVS -Nur ocaml-camlp5/patches/patch-Makefile
ocaml-camlp5.wip/patches/patch-Makefile
--- ocaml-camlp5/patches/patch-Makefile Wed Dec 31 19:00:00 1969
+++ ocaml-camlp5.wip/patches/patch-Makefile Sat Oct 3 22:46:51 2020
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -57,7 +57,7 @@ install:
+ for i in $(DIRS) compile; do \
+ (cd $$i; $(MAKE) install DESTDIR=$(DESTDIR); cd ..); \
+ done
+- cp etc/topfind.camlp5 `ocamlc -where`/. || true
++ cp etc/topfind.camlp5 $(DESTDIR)/`ocamlc -where`/. || true
+
+ uninstall:
+ @if test -z "$(LIBDIR)"; then \
diff -x CVS -Nur ocaml-camlp5/pkg/PLIST ocaml-camlp5.wip/pkg/PLIST
--- ocaml-camlp5/pkg/PLIST Tue Feb 18 17:45:52 2020
+++ ocaml-camlp5.wip/pkg/PLIST Sat Oct 3 22:49:23 2020
@@ -102,6 +102,7 @@
lib/ocaml/camlp5/token.cmi
lib/ocaml/camlp5/token.mli
lib/ocaml/camlp5/versdep.cmi
+lib/ocaml/topfind.camlp5
@man man/man1/camlp5.1
@man man/man1/camlp5o.1
@man man/man1/camlp5o.opt.1
update games/barony - looking for help with cmake
This diff updates barony to version 3.3.7 which
matches the version available on GOG for download
and should bring support for latest DLC that I don't
own so I didn't test.
I had to patch the thread library detection and rework the patch
on the CMake because the original file changed too much.
Rapidjson is now required, I added a new DISTFILE and an environment
variable to cmake to gives the path to the files.
I have one issue though that I made a really ugly fix to be able
to continue and check if the engine was working with the assets.
It seems cmake doesn't copy the "lang" directory at the build time
and fails during fake-target
===> Faking installation for barony-3.3.7
[0/1] cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &&
/usr/local/bin/cmake -P cmake_install.cmake
-- Install configuration: "Release"
-- Installing:
/home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/usr/local/bin/barony-bin
-- Installing:
/home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/usr/local/bin/barony-editor
CMake Error at cmake_install.cmake:89 (file):
file INSTALL cannot find
"/home/build/usr/ports/pobj/barony-3.3.7/build-amd64/lang": No such file or
directory.
FAILED: CMakeFiles/install.util
cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 && /usr/local/bin/cmake
-P cmake_install.cmake
ninja: build stopped: subcommand failed.
*** Error 1 in . (/home/build/usr/ports/devel/cmake/cmake.port.mk:39
'do-install': @cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &...)
*** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:3005
'/home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/.fake_done')
*** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2116
'/home/build/usr/ports/packages/amd64/all/barony-3.3.7.tgz': @cd ...)
*** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2605
'_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CAC...)
*** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2584
'package': @:; cd /usr/ports/games/barony && PKGPATH=games/barony...)
*** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2137
'/var/db/pkg/barony-3.3.7/+CONTENTS': @cd /usr/ports/games/barony...)
*** Error 2 in /usr/ports/games/barony
(/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2584 'install':
@lock=barony-3.3.7; export _LOC...)
My fix is the following, I don't know how to fix this in Cmake or
if it's okay enough to commit with this:
pre-install:
cp -fr ${WRKSRC}/lang ${WRKDIR}/build-${ARCH}/
Index: Makefile
===
RCS file: /home/reposync/ports/games/barony/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 18 Jun 2020 21:37:44 - 1.6
+++ Makefile 3 Oct 2020 20:11:13 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.6 2020/06/18 21:37:44 solene Exp $
-V = 3.2.3
+V = 3.3.7
COMMENT = 3D, first person roguelike
PKGNAME = ${DISTNAME:L}
CATEGORIES = games x11
@@ -15,6 +15,11 @@ MAINTAINER = David Carlier https://github.com/Tencent/rapidjson/archive/
+DISTFILES += Barony-${V}.tar.gz \
+ rapidjson-{}v${RAPIDJSON_V}.tar.gz:0
+
WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 SDL2_image SDL2_net
WANTLIB += SDL2_ttf c execinfo m ogg openal png vorbisfile physfs
@@ -33,6 +38,7 @@ LIB_DEPENDS = audio/libvorbis \
devel/sdl2-ttf \
graphics/png
+CONFIGURE_ENV = RAPID_JSONROOT="${WRKDIR}/rapidjson-${RAPIDJSON_V}/"
CONFIGURE_ARGS = -DCMAKE_C_FLAGS="${CFLAGS}" \
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-DOPENAL_ENABLED=ON \
@@ -41,6 +47,9 @@ CONFIGURE_ARGS = -DCMAKE_C_FLAGS="${CFLA
-DCMAKE_INSTALL_BINDIR="${LOCALBASE}/bin"
NO_TEST = Yes
+
+pre-install:
+ cp -fr ${WRKSRC}/lang ${WRKDIR}/build-${ARCH}/
post-install:
${SUBST_CMD} -m 555 -c ${FILESDIR}/barony.sh ${PREFIX}/bin/barony
Index: distinfo
===
RCS file: /home/reposync/ports/games/barony/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 18 Jun 2020 21:37:44 - 1.3
+++ distinfo 3 Oct 2020 19:20:36 -
@@ -1,2 +1,4 @@
-SHA256 (Barony-3.2.3.tar.gz) = M0tAqqGtVXFQaBWqYBpw1B5L1EqnBqp52MIeChIlwm8=
-SIZE (Barony-3.2.3.tar.gz) = 53508615
+SHA256 (Barony-3.3.7.tar.gz) = oLiULiaeja/MQhcykryxvUrNHC3TXVtIOgpgWe8ne7M=
+SHA256 (rapidjson-v1.1.0.tar.gz) = v3ztKXBKHmlvvM8qK06gaOd3T6N/bX3UA50Hh/i+2Y4=
+SIZE (Barony-3.3.7.tar.gz) = 53830405
+SIZE (rapidjson-v1.1.0.tar.gz) = 1019402
Index: patches/patch-CMakeLists_txt
===
RCS file: /home/reposync/ports/games/barony/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 1 Oct 2018 12:00:12 - 1.2
+++ patches/patch-CMakeLists_txt 3 Oct 2020 20:18:22 -
@@ -7,112 +7,101 @@ game via a wrapper script, which is name
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++
UPDATE: ircd-hybrid 8.2.33
Here is an update to ircd-hybrid 8.2.33.
Index: Makefile
===
RCS file: /home/cvs/ports/net/ircd-hybrid/Makefile,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 Makefile
--- Makefile15 May 2020 06:34:13 - 1.54
+++ Makefile30 Sep 2020 04:22:58 -
@@ -2,7 +2,7 @@
COMMENT = Internet Relay Chat server
-DISTNAME = ircd-hybrid-8.2.31
+DISTNAME = ircd-hybrid-8.2.33
CATEGORIES = net
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
EXTRACT_SUFX = .tgz
Index: distinfo
===
RCS file: /home/cvs/ports/net/ircd-hybrid/distinfo,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 distinfo
--- distinfo15 May 2020 06:34:13 - 1.31
+++ distinfo30 Sep 2020 04:23:06 -
@@ -1,2 +1,2 @@
-SHA256 (ircd-hybrid-8.2.31.tgz) = q429IVLLnH8ijR76n58cHj/FRZWcmp3w3D67Hgh9cI8=
-SIZE (ircd-hybrid-8.2.31.tgz) = 1245448
+SHA256 (ircd-hybrid-8.2.33.tgz) = GEcPpLU2GAn4ZDWZ+s0xVBxEspwOY7G0RkDWyAhFagE=
+SIZE (ircd-hybrid-8.2.33.tgz) = 1250775
Index: patches/patch-doc_reference_conf
===
RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-doc_reference_conf,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 patch-doc_reference_conf
--- patches/patch-doc_reference_conf15 May 2020 06:34:13 - 1.18
+++ patches/patch-doc_reference_conf30 Sep 2020 04:23:16 -
@@ -36,7 +36,7 @@ Index: doc/reference.conf
};
/*
-@@ -989,7 +989,7 @@ serverhide {
+@@ -991,7 +991,7 @@ serverhide {
/*
* flatten_links_file: path to the flatten links cache file.
*/
@@ -45,7 +45,7 @@ Index: doc/reference.conf
/*
* hidden: hide this server from a /links output on servers that
-@@ -1298,9 +1298,9 @@ modules {
+@@ -1300,9 +1300,9 @@ modules {
* path: other paths to search for modules specified below
* and in "/module load".
*/
@@ -58,7 +58,7 @@ Index: doc/reference.conf
/* module: the name of a module to load on startup/rehash. */
# module = "some_module.la";
-@@ -1315,49 +1315,49 @@ log {
+@@ -1317,49 +1317,49 @@ log {
file {
type = oper;
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/net/ircd-hybrid/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 PLIST
--- pkg/PLIST 15 May 2020 06:34:13 - 1.21
+++ pkg/PLIST 23 Aug 2020 14:51:45 -
@@ -68,6 +68,8 @@ lib/ircd-hybrid/modules/autoload/m_luser
@so lib/ircd-hybrid/modules/autoload/m_lusers.so
lib/ircd-hybrid/modules/autoload/m_map.la
@so lib/ircd-hybrid/modules/autoload/m_map.so
+lib/ircd-hybrid/modules/autoload/m_metadata.la
+@so lib/ircd-hybrid/modules/autoload/m_metadata.so
lib/ircd-hybrid/modules/autoload/m_module.la
@so lib/ircd-hybrid/modules/autoload/m_module.so
lib/ircd-hybrid/modules/autoload/m_motd.la
Re: UPDATE: Nextcloud-20
ok ricardo On 10/3/20 5:26 PM, Gonzalo L. Rodriguez wrote: Hello, Update for Nextcloud to 20: https://nextcloud.com/changelog/ OK? Comments? Cheers.-
Re: update games/barony - looking for help with cmake
On Sat, Oct 03, 2020 at 11:09:51PM +0200, Rafael Sadowski wrote:
> On Sat Oct 03, 2020 at 10:19:12PM +0200, Solene Rapenne wrote:
> > This diff updates barony to version 3.3.7 which
> > matches the version available on GOG for download
> > and should bring support for latest DLC that I don't
> > own so I didn't test.
> >
> > I had to patch the thread library detection and rework the patch
> > on the CMake because the original file changed too much.
> >
> > Rapidjson is now required, I added a new DISTFILE and an environment
> > variable to cmake to gives the path to the files.
> >
> > I have one issue though that I made a really ugly fix to be able
> > to continue and check if the engine was working with the assets.
> >
> > It seems cmake doesn't copy the "lang" directory at the build time
> > and fails during fake-target
> >
> > ===> Faking installation for barony-3.3.7
> > [0/1] cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &&
> > /usr/local/bin/cmake -P cmake_install.cmake
> > -- Install configuration: "Release"
> > -- Installing:
> > /home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/usr/local/bin/barony-bin
> > -- Installing:
> > /home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/usr/local/bin/barony-editor
> > CMake Error at cmake_install.cmake:89 (file):
> > file INSTALL cannot find
> > "/home/build/usr/ports/pobj/barony-3.3.7/build-amd64/lang": No such file
> > or
> > directory.
> >
> > FAILED: CMakeFiles/install.util
> > cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &&
> > /usr/local/bin/cmake -P cmake_install.cmake
> > ninja: build stopped: subcommand failed.
> > *** Error 1 in . (/home/build/usr/ports/devel/cmake/cmake.port.mk:39
> > 'do-install': @cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:3005
> > '/home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/.fake_done')
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2116
> > '/home/build/usr/ports/packages/amd64/all/barony-3.3.7.tgz': @cd ...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2605
> > '_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CAC...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2584
> > 'package': @:; cd /usr/ports/games/barony && PKGPATH=games/barony...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2137
> > '/var/db/pkg/barony-3.3.7/+CONTENTS': @cd /usr/ports/games/barony...)
> > *** Error 2 in /usr/ports/games/barony
> > (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2584 'install':
> > @lock=barony-3.3.7; export _LOC...)
> >
> >
> > My fix is the following, I don't know how to fix this in Cmake or
> > if it's okay enough to commit with this:
>
> You can change "${CMAKE_CURRENT_BINARY_DIR}/lang" to
> ${CMAKE_CURRENT_SOURCE_DIR}/lang or simply lang (without
> ${CMAKE_CURRENT_BINARY_DIR}/"). Full diff below.
Tested this builds and works with the latest game data
from the Epic store version, thanks!
-Bryan.
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/barony/Makefile,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 Makefile
> --- Makefile 18 Jun 2020 21:37:44 - 1.6
> +++ Makefile 3 Oct 2020 21:08:18 -
> @@ -1,6 +1,6 @@
> # $OpenBSD: Makefile,v 1.6 2020/06/18 21:37:44 solene Exp $
>
> -V = 3.2.3
> +V = 3.3.7
> COMMENT =3D, first person roguelike
> PKGNAME =${DISTNAME:L}
> CATEGORIES = games x11
> @@ -15,6 +15,11 @@ MAINTAINER = David Carlier # GPLv3 only
> PERMIT_PACKAGE = Yes
>
> +RAPIDJSON_V =1.1.0
> +MASTER_SITES0 = https://github.com/Tencent/rapidjson/archive/
> +DISTFILES += Barony-${V}.tar.gz \
> + rapidjson-{}v${RAPIDJSON_V}.tar.gz:0
> +
> WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 SDL2_image SDL2_net
> WANTLIB += SDL2_ttf c execinfo m ogg openal png vorbisfile physfs
>
> @@ -33,6 +38,7 @@ LIB_DEPENDS = audio/libvorbis \
> devel/sdl2-ttf \
> graphics/png
>
> +CONFIGURE_ENV =
> RAPID_JSONROOT="${WRKDIR}/rapidjson-${RAPIDJSON_V}/"
> CONFIGURE_ARGS = -DCMAKE_C_FLAGS="${CFLAGS}" \
> -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
> -DOPENAL_ENABLED=ON \
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/barony/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo 18 Jun 2020 21:37:44 - 1.3
> +++ distinfo 3 Oct 2020 21:08:18 -
> @@ -1,2 +1,4 @@
> -SHA256 (Barony-3.2.3.tar.gz) = M0tAqqGtVXFQaBWqYBpw1B5L1EqnBqp52MIeChIlwm8=
> -SIZE (Barony-3.2.3.tar.gz) = 53508615
> +SHA256 (Barony-3.3.7.tar.gz) = oLiULiaeja/MQhcykryxvUrNHC3TXVtIOgpgWe8ne7M=
> +SHA256
Re: CVS: cvs.openbsd.org: ports
On 2020/09/22 05:47, Robert Nagy wrote: > Log message: > update to 85.0.4183.121 I guess it's going to be random, but I ran into this: In file included from gen/third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink-forward.h:90: ../../third_party/blink/renderer/platform/loader/fetch/resource_request.h:49:10: fatal error: 'third_party/blink/renderer/platform/network/http_names.h' file not found
Re: update games/barony - looking for help with cmake
On Sat Oct 03, 2020 at 11:17:51PM +0200, Solene Rapenne wrote:
> >
> > You can change "${CMAKE_CURRENT_BINARY_DIR}/lang" to
> > ${CMAKE_CURRENT_SOURCE_DIR}/lang or simply lang (without
> > ${CMAKE_CURRENT_BINARY_DIR}/"). Full diff below.
> >
> > :
>
> Thank you very much, it builds fine with your changes.
>
> Is this issue OpenBSD related or should I report it upstream?
This is not OpenBSD related. CMAKE_CURRENT_BINARY_DIR is simply wrong,
unless someone creates the build directory inside the src directory
which is really messy.
Rafael
Re: update games/barony - looking for help with cmake
On Sat, 3 Oct 2020 23:09:51 +0200
Rafael Sadowski :
> On Sat Oct 03, 2020 at 10:19:12PM +0200, Solene Rapenne wrote:
> > This diff updates barony to version 3.3.7 which
> > matches the version available on GOG for download
> > and should bring support for latest DLC that I don't
> > own so I didn't test.
> >
> > I had to patch the thread library detection and rework the patch
> > on the CMake because the original file changed too much.
> >
> > Rapidjson is now required, I added a new DISTFILE and an environment
> > variable to cmake to gives the path to the files.
> >
> > I have one issue though that I made a really ugly fix to be able
> > to continue and check if the engine was working with the assets.
> >
> > It seems cmake doesn't copy the "lang" directory at the build time
> > and fails during fake-target
> >
> > ===> Faking installation for barony-3.3.7
> > [0/1] cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &&
> > /usr/local/bin/cmake -P cmake_install.cmake
> > -- Install configuration: "Release"
> > -- Installing:
> > /home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/usr/local/bin/barony-bin
> > -- Installing:
> > /home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/usr/local/bin/barony-editor
> > CMake Error at cmake_install.cmake:89 (file):
> > file INSTALL cannot find
> > "/home/build/usr/ports/pobj/barony-3.3.7/build-amd64/lang": No such file
> > or
> > directory.
> >
> > FAILED: CMakeFiles/install.util
> > cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &&
> > /usr/local/bin/cmake -P cmake_install.cmake
> > ninja: build stopped: subcommand failed.
> > *** Error 1 in . (/home/build/usr/ports/devel/cmake/cmake.port.mk:39
> > 'do-install': @cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:3005
> > '/home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/.fake_done')
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2116
> > '/home/build/usr/ports/packages/amd64/all/barony-3.3.7.tgz': @cd ...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2605
> > '_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CAC...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2584
> > 'package': @:; cd /usr/ports/games/barony && PKGPATH=games/barony...)
> > *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2137
> > '/var/db/pkg/barony-3.3.7/+CONTENTS': @cd /usr/ports/games/barony...)
> > *** Error 2 in /usr/ports/games/barony
> > (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2584 'install':
> > @lock=barony-3.3.7; export _LOC...)
> >
> >
> > My fix is the following, I don't know how to fix this in Cmake or
> > if it's okay enough to commit with this:
>
> You can change "${CMAKE_CURRENT_BINARY_DIR}/lang" to
> ${CMAKE_CURRENT_SOURCE_DIR}/lang or simply lang (without
> ${CMAKE_CURRENT_BINARY_DIR}/"). Full diff below.
>
> :
Thank you very much, it builds fine with your changes.
Is this issue OpenBSD related or should I report it upstream?
Re: update games/barony - looking for help with cmake
On Sat Oct 03, 2020 at 10:19:12PM +0200, Solene Rapenne wrote:
> This diff updates barony to version 3.3.7 which
> matches the version available on GOG for download
> and should bring support for latest DLC that I don't
> own so I didn't test.
>
> I had to patch the thread library detection and rework the patch
> on the CMake because the original file changed too much.
>
> Rapidjson is now required, I added a new DISTFILE and an environment
> variable to cmake to gives the path to the files.
>
> I have one issue though that I made a really ugly fix to be able
> to continue and check if the engine was working with the assets.
>
> It seems cmake doesn't copy the "lang" directory at the build time
> and fails during fake-target
>
> ===> Faking installation for barony-3.3.7
> [0/1] cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &&
> /usr/local/bin/cmake -P cmake_install.cmake
> -- Install configuration: "Release"
> -- Installing:
> /home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/usr/local/bin/barony-bin
> -- Installing:
> /home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/usr/local/bin/barony-editor
> CMake Error at cmake_install.cmake:89 (file):
> file INSTALL cannot find
> "/home/build/usr/ports/pobj/barony-3.3.7/build-amd64/lang": No such file or
> directory.
>
> FAILED: CMakeFiles/install.util
> cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &&
> /usr/local/bin/cmake -P cmake_install.cmake
> ninja: build stopped: subcommand failed.
> *** Error 1 in . (/home/build/usr/ports/devel/cmake/cmake.port.mk:39
> 'do-install': @cd /home/build/usr/ports/pobj/barony-3.3.7/build-amd64 &...)
> *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:3005
> '/home/build/usr/ports/pobj/barony-3.3.7/fake-amd64/.fake_done')
> *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2116
> '/home/build/usr/ports/packages/amd64/all/barony-3.3.7.tgz': @cd ...)
> *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2605
> '_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CAC...)
> *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2584
> 'package': @:; cd /usr/ports/games/barony && PKGPATH=games/barony...)
> *** Error 2 in . (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2137
> '/var/db/pkg/barony-3.3.7/+CONTENTS': @cd /usr/ports/games/barony...)
> *** Error 2 in /usr/ports/games/barony
> (/home/build/usr/ports/infrastructure/mk/bsd.port.mk:2584 'install':
> @lock=barony-3.3.7; export _LOC...)
>
>
> My fix is the following, I don't know how to fix this in Cmake or
> if it's okay enough to commit with this:
You can change "${CMAKE_CURRENT_BINARY_DIR}/lang" to
${CMAKE_CURRENT_SOURCE_DIR}/lang or simply lang (without
${CMAKE_CURRENT_BINARY_DIR}/"). Full diff below.
:
Index: Makefile
===
RCS file: /cvs/ports/games/barony/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile18 Jun 2020 21:37:44 - 1.6
+++ Makefile3 Oct 2020 21:08:18 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.6 2020/06/18 21:37:44 solene Exp $
-V =3.2.3
+V =3.3.7
COMMENT = 3D, first person roguelike
PKGNAME = ${DISTNAME:L}
CATEGORIES = games x11
@@ -15,6 +15,11 @@ MAINTAINER = David Carlier https://github.com/Tencent/rapidjson/archive/
+DISTFILES += Barony-${V}.tar.gz \
+ rapidjson-{}v${RAPIDJSON_V}.tar.gz:0
+
WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 SDL2_image SDL2_net
WANTLIB += SDL2_ttf c execinfo m ogg openal png vorbisfile physfs
@@ -33,6 +38,7 @@ LIB_DEPENDS = audio/libvorbis \
devel/sdl2-ttf \
graphics/png
+CONFIGURE_ENV =
RAPID_JSONROOT="${WRKDIR}/rapidjson-${RAPIDJSON_V}/"
CONFIGURE_ARGS = -DCMAKE_C_FLAGS="${CFLAGS}" \
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-DOPENAL_ENABLED=ON \
Index: distinfo
===
RCS file: /cvs/ports/games/barony/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo18 Jun 2020 21:37:44 - 1.3
+++ distinfo3 Oct 2020 21:08:18 -
@@ -1,2 +1,4 @@
-SHA256 (Barony-3.2.3.tar.gz) = M0tAqqGtVXFQaBWqYBpw1B5L1EqnBqp52MIeChIlwm8=
-SIZE (Barony-3.2.3.tar.gz) = 53508615
+SHA256 (Barony-3.3.7.tar.gz) = oLiULiaeja/MQhcykryxvUrNHC3TXVtIOgpgWe8ne7M=
+SHA256 (rapidjson-v1.1.0.tar.gz) = v3ztKXBKHmlvvM8qK06gaOd3T6N/bX3UA50Hh/i+2Y4=
+SIZE (Barony-3.3.7.tar.gz) = 53830405
+SIZE (rapidjson-v1.1.0.tar.gz) = 1019402
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/games/barony/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt1 Oct 2018 12:00:12 - 1.2
+++
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/10/03 14:39:18 Modified files: sysutils : Makefile Log message: + docker-cli
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/10/03 14:38:46 Log message: Import docker-cli-19.03.13 ok paco@ Inputs from sthen@ Port submitted by Muhammad Kaisar Arkhan The Docker command-line tool allows you to control Docker hosts. You can use it to build docker images, start docker containers, execute commands inside containers, see running containers, and view logs. Status: Vendor Tag: solene Release Tags: solene_20201003 N ports/sysutils/docker-cli/Makefile N ports/sysutils/docker-cli/distinfo N ports/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_devices_devices_unix_go N ports/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_driver_driver_unix_go N ports/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_driver_lchmod_unix_go N ports/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_fs_copy_unix_go N ports/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_sysx_nodata_unix_go N ports/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go N ports/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_snapshotter_default_unix_go N ports/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_containerd_sys_stat_unix_go N ports/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_fs_stat_openbsd_go N ports/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_hardlinks_unix_go N ports/sysutils/docker-cli/patches/patch-vendor_github_com_containerd_continuity_resource_unix_go N ports/sysutils/docker-cli/pkg/PLIST N ports/sysutils/docker-cli/pkg/DESCR No conflicts created by this import
Re: UPDATE: Tor Browser 10.0
Hi, On Sat, Sep 26, 2020 at 06:48:07PM -, Dimitri Karamazov wrote: > Works fine on amd64. > > The results on panopticlick are little inconsistent on different security > settings > across different operating systems, to be specific the WebGL fingerprint is > not > randomized in OpenBSD at all but it is in Windows on "Standard". The same > value > is not randomized in Windows on the "Safer" and "Safest" setting. > > Also the HTTP_ACCEPT headers are different across the security settings, but > it is not > a OpenBSD specific issue. What do you make of all this? Apologies for my late response. The issues that are not OpenBSD-specific are best reported to upstream directly. As for the OpenBSD-specific behaviors, someone (me or someone else) should take a look at those. Right now, I don't have the time to do that myself. Maybe later. Some day, I still plan to take a look at the diff between Firefox ESR and Tor Browser. With that, I expect to find some more code paths which are #ifdef LINUX'ed which we also want to take on OpenBSD, for example. Perhaps the issues you are running into are such issues. Best regards, Caspar
Re: [NEW] sysutils/docker 19.03.13
On Sat, 03 Oct 2020, Muhammad Kaisar Arkhan wrote: > > Hello, > > Thanks for the helpful feedback! > > Here's an updated port with the cosmetic changes as requested by > Solene and the name is now sysutils/docker-cli to avoid confusion. > Builds and works ok for me on amd64. Tested against Debian and Alpine hosts running recent docker versions. I used `-H ssh://...`, which is supported since 18.09. Not tested with tcp and TLS config. ok paco@ Solene, will you import it ? -- Paco Esteban. 0x5818130B8A6DBC03
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/10/03 11:09:00 Modified files: net/dbip : Makefile.inc net/dbip/asn : distinfo net/dbip/city : distinfo net/dbip/country: distinfo Log message: Update dbip to 2020-10.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/10/03 11:07:44 Modified files: graphics/libansilove: Makefile distinfo Log message: Update libansilove to 1.2.6.
Re: [NEW] sysutils/docker 19.03.13
On Sat, 3 Oct 2020 13:58:17 +0100
Stuart Henderson :
> On 2020/10/03 14:01, Solene Rapenne wrote:
> > On Sat, 3 Oct 2020 13:59:33 +0200
> > Solene Rapenne :
> >
> > > On Tue, 22 Sep 2020 22:41:26 +0200
> > > Muhammad Kaisar Arkhan :
> > >
> > > > Hello,
> > > >
> > > > Attached is a port of the command line utility for Docker, specifically
> > > > version v19.03.13.
> > > >
> > > > This is created in the same spirit as sysutils/kubectl, allowing OpenBSD
> > > > users to interact with Docker servers from their OpenBSD systems.
> > > >
> > > > OK?
> > > >
> > >
> > > I'm fine for importing it. I made a few aesthetics changes to the
> > > Makefile but the port looks good to me and works well.
> > >
> > > anyone else ok?
> > >
> >
> > forgot to include the patch about my small changes
> > Only an additional tab and variable reordering.
>
> > --- sysutils/docker/MakefileTue Sep 22 22:26:58 2020
> > +++ MakefileSat Oct 3 13:44:49 2020
> > @@ -1,16 +1,15 @@
> > # $OpenBSD$
> >
> > -COMMENT = command-line tool for controlling Docker
> > +COMMENT = command-line tool for controlling Docker
> >
> > +V =19.03.13
> > +PKGNAME = docker-${V}
> > +
> > GH_ACCOUNT = docker
> > GH_PROJECT = cli
> > -V =19.03.13
> > GH_TAGNAME = v${V}
> > -PKGNAME = docker-${V}
>
> To avoid confusion I think this port and package should be named
> docker-cli not docker, this would work:
>
> V = 19.03.13
> GH_ACCOUNT =docker
> GH_PROJECT =cli
> GH_TAGNAME =v${V}
> PKGNAME = docker-${DISTNAME}
>
> > -HOMEPAGE =
> > https://docs.docker.com/engine/reference/commandline/cli/
>
> That seems a better homepage than https://github.com/docker/cli which
> is what you'll get by removing it.
>
I agree with what you said. I thought having the github HOMEPAGE
would be better but I don't have a strong opinion about this.
Re: NEW: net/i2p
On Tue, 15 Sep 2020 13:16:37 - "Dimitri Karamazov" : > Can't seem to get any response on this, is there nobody that has > time to verify this? Hello, the ports looks fine and work on amd64. Although, at the end of the build process there is this message, could you look at the build script to disable this check producing the following error? Please set the environment variable $I2P to run tests. I2P installation not found We looked in Not running tests against I2P installation without knowing where it is. Please set the environment variable I2P to the location of your I2P installation (so that $I2P/lib/i2p.jar works). If you do so, this script will run two tests to compare your installed jbigi with the one here you just compiled to see if there is a marked improvement. /home/build/usr/ports/pobj/i2p-0.9.47/i2p-0.9.47/core/c/build.sh[12]: jar: not found
Re: NEW: net/i2p
I2P software bundle, includes the standard I2P implementation. https://geti2p.net/ Updated to 0.9.47 *Enables our new end-to-end encryption protocol by default for some services. The Sybil analysis and blocking tool is now enabled by default. About: *I2P is an anonymous overlay network - a network within a network. *It is intended to protect communication from dragnet surveillance and monitoring by third parties such as ISPs. *Is decentralised completely unlike tor. Each client routes anonymous and encrypted traffic from other clients by default. No central directory for routing. *I2P incorporates applications in the form of webapps. *Webapps plugins (*.su3) can be loaded easily through the console. *Includes a ready mail(smtp pop3) client, i2psnark (bittorrent) client, and Jetty (webserver). Or host with your own webserver. *Allows anonymous chats through IRC tunnel service. *Plugins for blogging, chatting, file sharing have already been written. *Every service(plugin) works within the i2p network itself(Except mail). *Not supposed to be used as an outproxy, still an outproxy is included. *I2P source code includes a java-service-wrapper compiled for specific targets but is not compatible with OpenBSD. So I've included a new port tanukiwrapper, and configured I2P to use it. *Very exhaustive(functionality) but easy to use router console. Testing: *Run the rc service, browser based console at localhost:7657. *Set HTTP proxy to localhost: to view eepsites. https://geti2p.net/en/about/browser-config *Been running the router for months now, with no problems. *Personally tested the default and external plugins(e.g muwire). *Test dependencies not present in ports, will add to it. *Mount separate partition for /var/i2p if you do heavy transfers. Index: infrastructure/db/user.list === RCS file: /cvs/ports/infrastructure/db/user.list,v retrieving revision 1.374 diff -u -p -r1.374 user.list --- infrastructure/db/user.list 8 Sep 2020 22:35:04 - 1.374 +++ infrastructure/db/user.list 15 Sep 2020 12:14:17 - @@ -368,3 +368,4 @@ id usergroup port 857 _web2ldap _web2ldap sysutils/web2ldap 858 _purritobin_purritobin www/purritobin 859 _miniflux _miniflux net/miniflux +860 _i2p _i2pnet/i2p Any comments/OK's? tanukiwrapper.tar.gz Description: application/gzip i2p.tar.gz Description: application/gzip diff Description: Binary data
minimally adapt misc/tkman to OpenBSD
Hi,
while the misc/tkman port isn't totally broken on OpenBSD, nobody
did even minimal porting work on it, either. In many respects, it
disregards even the most basic aspects of how OpenBSD documentation
works.
So, i decided to put some of my fingers where my mouth is and do a
few initial, minimal steps of actually porting this thing. There
can't be the slightest doubt that much more can be done before this
can be called an adequate port. Even with these minimal patches,
it is still doing lots of stuff that is rather absurd on OpenBSD,
so much more work would be useful.
But these initial patches already make it more useful in so far as
they repair some of the most blatant misconfigurations and delete
some of the most misleading warnings.
With this patch, try this:
a) type tkman and press ENTER;
this now actually shows the tkman welcome page without warnings
b) then type "any=MAP_STACK" into the input box,
press the "man" button and hold it down until the menu appears,
select "apropos" from the menu, and relese the mouse button:
mandoc-style semantic searching works
c) then typ "erf" into the input box and hit enter:
look at the formula in the DESCRIPTION: UTF-8 works
My reasons for non deleting this port are that
1. the tkman program contains a number of interesting
ideas and concepts;
2. even though personally, i dislike GUIs, many users like them,
and this is the most interesting man(1) GUI i have seen so far;
3. at least for simple tasks, it is already fit for practical
use, even though i still expect *lots* of rough edges
The patch below
* uses mandoc for formatting rather than having a hidden
dependency on groff;
* produces UTF-8 for output rather than LATIN-1, which we don't even support
* reorders the manual search path ("mastermen") in our default order;
* deletes a bogus warning about stray cats
* deletes bogus warnings about the absense of whatis files
* no longer errors out when MANPATH is unset
* regenerates the gui.tcl patch without Windows CR gore
OK?
Ingo
P.S.
I do not promise that i'll do all the additional cleanup that should
be done all by myself, but at least i wanted to get this started.
Index: Makefile
===
RCS file: /cvs/ports/misc/tkman/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile3 Oct 2020 13:30:11 - 1.27
+++ Makefile3 Oct 2020 15:45:43 -
@@ -3,7 +3,7 @@
COMMENT = Tcl/Tk-based manual browser
DISTNAME = tkman-2.2
-REVISION = 1
+REVISION = 2
CATEGORIES = misc
HOMEPAGE = http://www.sourceforge.net/projects/tkman
MAINTAINER = Stuart Cassoff
@@ -20,7 +20,8 @@
NO_TEST = Yes
pre-patch:
- perl -pi -e 's!\r\n$$!\n!g;' ${WRKSRC}/Makefile
+ perl -pi -e 's!\r\n$$!\n!g;' ${WRKSRC}/Makefile \
+ ${WRKSRC}/{database,gui,manpath,tkmandesc}.tcl
do-install:
@${MODTCL_WISH_ADJ} ${WRKSRC}/tkman ${WRKSRC}/retkman
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/misc/tkman/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -r1.5 patch-Makefile
--- patches/patch-Makefile 3 Oct 2020 13:30:12 - 1.5
+++ patches/patch-Makefile 3 Oct 2020 15:45:43 -
@@ -16,37 +16,28 @@
# for a man pages and displaying its associated binaries (if any).
# Use this feature carefully as a large number of directories can slow down
startup.
-mastermen = "/usr/man /usr/local/man"
-+mastermen = "${PREFIX}/man /usr/share/man ${X11BASE}/man"
++mastermen = "/usr/share/man ${X11BASE}/man ${PREFIX}/man"
#mastermen = "/usr/man /usr/local/man /usr/sww/man /usr/share/man
/usr/kerberos/man"
-masterbin = "/usr/bin /usr/local/bin"
+masterbin = "/usr/bin ${PREFIX}/bin ${X11BASE}/bin"
#masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin
/usr/sww/share/X11R5/bin"
-@@ -113,7 +113,7 @@ dpis = "75 100"
+@@ -113,7 +113,8 @@ dpis = "75 100"
# Lines are cached in .../man/cat@;
# that is, the line length is appended to the usual cache directory names
#manformat = {groff -te -Tascii -man /tmp/ll -}
-manformat = {groff -te -Tlatin1 -man /tmp/ll -}
+#manformat = {groff -te -Tlatin1 -man /tmp/ll -}
++manformat = {mandoc}
# Ultrix users should uncomment the following line (you don't have eqn)
#manformat = {tbl | nroff -man }
# HP-UX uses a number of macros that groff doesn't define, so use the builtin
nroff
-@@ -121,7 +121,7 @@ manformat = {groff -te -Tlatin1 -man /tmp/ll -}
- # space between the .de and the macro name, and groff doesn't like this.)
- #manformat = {tbl | neqn | nroff -man }
- # BSD macros (.Sh, .Ss, .PP, ...) need -mandoc
--#manformat = {groff -Tascii -te -mandoc}
-+manformat = {groff -Tascii -te -mandoc}
- # BSDI
- #manformat = {tbl | eqn -Tascii | nroff -man }
- # It's actually legal to leave this empty if all the pages you'll ever
-@@
Re: [NEW] sysutils/docker 19.03.13
On Sat, 3 Oct 2020 13:59:33 +0200
Solene Rapenne :
> On Tue, 22 Sep 2020 22:41:26 +0200
> Muhammad Kaisar Arkhan :
>
> > Hello,
> >
> > Attached is a port of the command line utility for Docker, specifically
> > version v19.03.13.
> >
> > This is created in the same spirit as sysutils/kubectl, allowing OpenBSD
> > users to interact with Docker servers from their OpenBSD systems.
> >
> > OK?
> >
>
> I'm fine for importing it. I made a few aesthetics changes to the
> Makefile but the port looks good to me and works well.
>
> anyone else ok?
>
forgot to include the patch about my small changes
Only an additional tab and variable reordering.
--- sysutils/docker/MakefileTue Sep 22 22:26:58 2020
+++ MakefileSat Oct 3 13:44:49 2020
@@ -1,16 +1,15 @@
# $OpenBSD$
-COMMENT = command-line tool for controlling Docker
+COMMENT = command-line tool for controlling Docker
+V =19.03.13
+PKGNAME = docker-${V}
+
GH_ACCOUNT = docker
GH_PROJECT = cli
-V =19.03.13
GH_TAGNAME = v${V}
-PKGNAME = docker-${V}
CATEGORIES = sysutils
-
-HOMEPAGE =
https://docs.docker.com/engine/reference/commandline/cli/
MAINTAINER = Muhammad Kaisar Arkhan
Re: [NEW] sysutils/docker 19.03.13
On Tue, 22 Sep 2020 22:41:26 +0200 Muhammad Kaisar Arkhan : > Hello, > > Attached is a port of the command line utility for Docker, specifically > version v19.03.13. > > This is created in the same spirit as sysutils/kubectl, allowing OpenBSD > users to interact with Docker servers from their OpenBSD systems. > > OK? > I'm fine for importing it. I made a few aesthetics changes to the Makefile but the port looks good to me and works well. anyone else ok?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 09:40:01 Modified files: audio/pithos : Makefile audio/quodlibet: Makefile audio/rgain: Makefile audio/rhythmbox: Makefile audio/sonata : Makefile comms/sigrok/libsigrok: Makefile devel/glade: Makefile devel/libgit2/libgit2-glib: Makefile devel/libpeas : Makefile devel/py-liblarch: Makefile devel/py-urwid : Makefile editors/abiword: Makefile graphics/libgexiv2: Makefile graphics/mypaint: Makefile graphics/py-matplotlib: Makefile graphics/xdot : Makefile inputmethods/ibus: Makefile misc/gpsd : Makefile misc/gramps: Makefile misc/redshift : Makefile multimedia/devede: Makefile multimedia/gstreamer1/py-gstreamer: Makefile net/avahi : Makefile net/deluge : Makefile net/gpodder: Makefile print/system-config-printer: Makefile productivity/gtg: Makefile productivity/rednotebook: Makefile productivity/tryton/5.0/tryton: Makefile productivity/tryton/5.2/tryton: Makefile security/py-keyring: Makefile security/py-secretstorage: Makefile sysutils/d-feet: Makefile sysutils/menulibre: Makefile sysutils/virt-manager: Makefile textproc/catfish: Makefile textproc/meld : Makefile textproc/nfoview: Makefile x11/arandr : Makefile x11/dbus-python: Makefile x11/gnome/accerciser: Makefile x11/gnome/caribou: Makefile x11/gnome/chrome-gnome-shell: Makefile x11/gnome/eog-plugins: Makefile x11/gnome/gedit: Makefile x11/gnome/gedit-plugins: Makefile x11/gnome/gvfs : Makefile x11/gnome/libgnome-keyring: Makefile x11/gnome/libsecret: Makefile x11/gnome/music: Makefile x11/gnome/orca : Makefile x11/gnome/py-atspi: Makefile x11/gnome/shell: Makefile x11/gnome/totem: Makefile x11/gnome/tracker: Makefile x11/gnome/tracker-miners: Makefile x11/gnome/tweaks: Makefile x11/mate/menu-advanced: Makefile x11/screenkey : Makefile x11/terminator : Makefile Log message: Bump after py-gobject3 merge.
Re: [NEW] sysutils/docker 19.03.13
Hello, Thanks for the helpful feedback! Here's an updated port with the cosmetic changes as requested by Solene and the name is now sysutils/docker-cli to avoid confusion. docker-cli-19.03.13.tar.gz Description: Binary data Have a good one! -- Muhammad Kaisar Arkhan h...@yukiisbo.red - kai...@arkhan.io https://yukiisbo.red - https://arkhan.io
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/10/03 08:58:48 Modified files: games/ezquake : Makefile distinfo Log message: Update to ezquake-3.2.2 >From maintainer Tom Murphy
Re: Remove textproc/glimpse?
On Sat, Sep 19, 2020 at 08:04:28PM +0200, Stefan Hagen wrote: > Hello, > > I noticed, that there is textproc/glimpse. Glimpse is functional, but > upstream is dead for years. Glimpse (the indexer) is completely gone > and can only be found on mirrors and archive.org. Webglimpse originally > was the webfrontend for glimpse, but is mentioned as homepage in the > port (which is not correct, the port does not contain the web part). > > Anyway, webglimpse.net is also gone. There is a backup version on > github (last commit 2014). https://github.com/gvelez17/webglimpse > > The gimpse version we're installing is from 1998. There is no more > recent one. > > Good source code indexers are rare, but this one might just be > too old by now. > > Also: > $ make 2>&1 | grep -i warning | wc -l > 970 misc/tkman no longer depends on glimpse, thus making it unused and ready for removal. Feedback? Objections? OK?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/10/03 08:41:23 Modified files: math/bc-gh : Makefile distinfo Log message: Update to bc-gh-3.1.6 Changelog: https://github.com/gavinhoward/bc/releases/tag/3.1.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/10/03 08:40:05 Modified files: www/mozilla-firefox: Makefile distinfo www/firefox-i18n: Makefile.inc distinfo Log message: Bugfix update to firefox 81.0.1. See https://www.mozilla.org/en-US/firefox/81.0.1/releasenotes/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/03 08:39:19 Modified files: lang/vala : Makefile distinfo Log message: update to vala-0.48.11
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/10/03 08:39:16 Modified files: www/firefox-esr: Makefile distinfo www/firefox-esr-i18n: Makefile.inc distinfo Log message: Bugfix update to firefox-esr 78.3.1. See https://www.mozilla.org/en-US/firefox/78.3.1/releasenotes/
Re: [new] games/shapezio (factorio like)
On Mon, 21 Sep 2020 11:17:21 +0200 Solene Rapenne : > Please find a port for the commercial and opensource game > https://github.com/tobspr/shapez.io/ > ping it's a simple port without compilation required
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/03 08:37:38 Modified files: net/xl2tpd : Makefile distinfo net/xl2tpd/pkg : README Log message: - update to xl2tpd-1.3.15 - various portcheck fixes from new maintainer Alex Naumov
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/03 08:25:47 Modified files: sysutils/py-pynetbox: Makefile distinfo Log message: update to pynetbox-5.1.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/03 08:24:17 Modified files: graphics/birdfont: Makefile distinfo Log message: update to birdfont-2.29.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 08:01:17 Modified files: productivity/gnucash: Makefile distinfo productivity/gnucash/patches: patch-gnucash_gnome-utils_gnc-main-window_c productivity/gnucash/pkg: PLIST Log message: Update to gnucash-4.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 08:00:53 Modified files: net/coredns: Makefile Log message: Add a small comment as to why we cannot update yet.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 07:40:45 Modified files: x11/yaru : Makefile distinfo x11/yaru/pkg : PLIST Log message: Update to yaru-20.10.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 07:39:32 Modified files: print/hplip: Makefile distinfo print/hplip/patches: patch-Makefile_in patch-installer_core_install_py patch-prnt_cupsext_cupsext_c patch-scan_sane_hpaio_c print/hplip/pkg: PLIST-hpijs Removed files: print/hplip/patches: patch-protocol_discovery_mdns_c Log message: Update to hplip-3.20.9.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/10/03 07:30:12 Modified files: misc/tkman : Makefile misc/tkman/patches: patch-Makefile Log message: Remove dependency on glimpse textproc/glimpse is outdated, dead and many alternatives are around; this old tkman port is the only user and can be used without glimpse. Maintainer timeout OK kmos on complete removal of the port OK schwarze who prodded removing the dependency
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 07:27:51 Modified files: graphics : Makefile Log message: +cairomm16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 07:27:21 Log message: Import cairomm16-1.16.0. This library provides a C++ interface to cairo. ok robert@ Status: Vendor Tag: ajacoutot Release Tags: ajacoutot_20201003 N ports/graphics/cairomm16/distinfo N ports/graphics/cairomm16/Makefile N ports/graphics/cairomm16/pkg/DESCR N ports/graphics/cairomm16/pkg/PLIST No conflicts created by this import
Re: [MAINTAINER UPDATE] math/cddlib 0.94j -> 0.94l
On Sun, Sep 27, 2020 at 06:52:24PM +0200, Dima Pasechnik wrote:
> if it helps, upstream follows the GNU libtool versioning guidelines, in
> https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
> - at least it tries.
> I think it missed a version bump before (in the version 0.94k, which OpenBSD
> skipped),
> but not this time.
Pulled your diff from upstream. OKs? Comments?
-m
Index: Makefile
===
RCS file: /cvs/ports/math/cddlib/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile16 Jul 2020 04:46:18 - 1.1.1.1
+++ Makefile3 Oct 2020 13:18:17 -
@@ -4,10 +4,10 @@ COMMENT = C library for double descripti
GH_ACCOUNT = cddlib
GH_PROJECT = cddlib
-GH_TAGNAME = 0.94j
+GH_TAGNAME = 0.94l
-SHARED_LIBS += cdd 0.0 # 0.0
-SHARED_LIBS += cddgmp 0.0 # 0.0
+SHARED_LIBS += cdd 0.1 # 1.1
+SHARED_LIBS += cddgmp 0.1 # 1.1
CATEGORIES = math
@@ -20,7 +20,6 @@ PERMIT_PACKAGE = Yes
WANTLIB += c gmp
-BUILD_DEPENDS =print/texlive/base
LIB_DEPENDS = devel/gmp
USE_GMAKE =Yes
Index: distinfo
===
RCS file: /cvs/ports/math/cddlib/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo16 Jul 2020 04:46:18 - 1.1.1.1
+++ distinfo3 Oct 2020 13:18:17 -
@@ -1,2 +1,2 @@
-SHA256 (cddlib-0.94j.tar.gz) = 9Uu6eFufaBS+XPbXaGHdYQgpl8e0jgJE/DzOpxlYktQ=
-SIZE (cddlib-0.94j.tar.gz) = 496651
+SHA256 (cddlib-0.94l.tar.gz) = 0TyOj7Pm6P/9A0bgo5b833zq4oyjxPe//68Pr4Novb0=
+SIZE (cddlib-0.94l.tar.gz) = 493895
Index: patches/patch-Makefile_am
===
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_am 3 Oct 2020 13:18:17 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Avoid building documentation
+
+--- Makefile.am.orig Sun Sep 20 20:38:23 2020
Makefile.amSun Sep 20 20:38:36 2020
+@@ -1,5 +1,5 @@
+ # Directories where we can build something.
+-SUBDIRS = doc lib-src src
++SUBDIRS = lib-src src
+
+ # Install the examples into /usr/share/doc/cddlib/examples*
+ nobase_doc_DATA = $(srcdir)/examples/* $(srcdir)/examples-ine/*
$(srcdir)/examples-ine3d/* $(srcdir)/examples-ext/*
Index: patches/patch-lib-src_Makefile_gmp_am
===
RCS file: patches/patch-lib-src_Makefile_gmp_am
diff -N patches/patch-lib-src_Makefile_gmp_am
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib-src_Makefile_gmp_am 3 Oct 2020 13:18:17 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: lib-src/Makefile.gmp.am
+--- lib-src/Makefile.gmp.am.orig
lib-src/Makefile.gmp.am
+@@ -9,7 +9,7 @@ cddtypes_f.h
+
+ libcddgmp_la_SOURCES = $(libcdd_la_SOURCES)
+ libcddgmp_la_CPPFLAGS = -DGMPRATIONAL
+-libcddgmp_la_LDFLAGS = -lgmp
++libcddgmp_la_LDFLAGS = $(AM_LDFLAGS) -lgmp
+ # do not ship generated source files
+ nodist_libcddgmp_la_SOURCES = \
+ cddcore_f.c \
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/cddlib/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 16 Jul 2020 04:46:18 - 1.1.1.1
+++ pkg/PLIST 3 Oct 2020 13:18:17 -
@@ -27,24 +27,23 @@
@bin bin/testlp3_gmp
@bin bin/testshoot
@bin bin/testshoot_gmp
-include/cdd.h
-include/cdd_f.h
-include/cddmp.h
-include/cddmp_f.h
-include/cddtypes.h
-include/cddtypes_f.h
-include/setoper.h
-include/splitmix64.h
+include/cddlib/
+include/cddlib/cdd.h
+include/cddlib/cdd_f.h
+include/cddlib/cddmp.h
+include/cddlib/cddmp_f.h
+include/cddlib/cddtypes.h
+include/cddlib/cddtypes_f.h
+include/cddlib/setoper.h
+include/cddlib/splitmix64.h
@static-lib lib/libcdd.a
lib/libcdd.la
@lib lib/libcdd.so.${LIBcdd_VERSION}
@static-lib lib/libcddgmp.a
lib/libcddgmp.la
@lib lib/libcddgmp.so.${LIBcddgmp_VERSION}
+lib/pkgconfig/cddlib.pc
share/doc/cddlib/
-share/doc/cddlib/cddlibman.dvi
-share/doc/cddlib/cddlibman.pdf
-share/doc/cddlib/cddlibman.ps
share/doc/cddlib/examples/
share/doc/cddlib/examples-ext/
share/doc/cddlib/examples-ext/ccc4.ext
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 07:20:27 Modified files: graphics/cairomm: Makefile Log message: Fix PORTROACH.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/03 07:19:37 Modified files: multimedia/libvpx: Makefile distinfo multimedia/libvpx/patches: patch-configure patch-examples_mk patch-libs_mk Log message: update to libvpx-1.9.0, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/03 07:18:39 Modified files: graphics/libavif: Makefile distinfo graphics/libavif/patches: patch-src_codec_aom_c Log message: update to libavif 0.8.1, from Brad.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/03 07:17:04 Modified files: devel/boost: Makefile devel/boost/patches: patch-boost_config_compiler_clang_hpp Removed files: devel/boost/patches: patch-boost_config_compiler_gcc_hpp Log message: devel/boost: remove patches that are no long necessary now that some archs have moved to Clang and we no longer mix and match old and new GCC on non-Clang archs. From Brad, has gone through bulks on sparc64 i386.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 07:13:07 Modified files: graphics/cairomm: Makefile distinfo graphics/cairomm/pkg: PLIST Log message: Update to cairomm-1.14.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/03 07:12:35 Modified files: databases/mariadb: Makefile databases/mariadb/pkg: PLIST-main PLIST-server Log message: move mariadb-waitpid to -main, from Mikolaj Kucharski/brad/me
Re: NEW: net/i2p
On 2020/10/03 15:00, Solene Rapenne wrote: > On Tue, 15 Sep 2020 13:16:37 - > "Dimitri Karamazov" : > > > Can't seem to get any response on this, is there nobody that has > > time to verify this? > > Hello, > > the ports looks fine and work on amd64. No interest in the port itself, I'm not going to do runtime tests, but from reading: - The ports are using JAVA_HOME directly in installed files (rather than doing a runtime lookup using javaPathHelper) - this can't work correctly with MODJAVA_VER set to 1.8+, it must be set to an exact version - Might as well retain the old java-tanukiwrapper name for the java/tanukiwrapper package rather than patching. (And remove the entry from quirks). > Although, at the end of the build process there is this message, > could you look at the build script to disable this check producing > the following error? > > Please set the environment variable $I2P to run tests. > I2P installation not found > We looked in > Not running tests against I2P installation without knowing where it is. > > Please set the environment variable I2P to the location of your > I2P installation (so that $I2P/lib/i2p.jar works). > If you do so, this script will run two tests to compare your > installed jbigi with the one here you just compiled to see if > there is a marked improvement. > /home/build/usr/ports/pobj/i2p-0.9.47/i2p-0.9.47/core/c/build.sh[12]: jar: > not found that sounds like it wants JAVAHOME/bin adding to path
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 07:03:00 Modified files: x11/gnome/aisleriot: Makefile distinfo x11/gnome/aisleriot/pkg: PLIST Log message: Update to aisleriot-3.22.12.
Re: NEW: jpeginfo-1.6.1
On 2020/10/03 00:14, Mikolaj Kucharski wrote: > Kind reminder. > > On Wed, Aug 19, 2020 at 09:08:06AM +, Mikolaj Kucharski wrote: > > Hi, > > > > Simple new port attached. I wanted something to check JPEG files > > integrity (-c option to the tool). > > > > $ jpeginfo -c DSC00470.JPG > > DSC00470.JPG 6000 x 4000 24bit Exif N 10715136 [OK] > > > > Comment: > > prints information and tests integrity of JPEG files > > > > Description: > > Jpeginfo is an utility to generate informative listings from JPEG files, > > and to check JPEG files for errors. Program also supports automagic > > deletion of broken JPEGs. > > > > WWW: https://www.kokkonen.net/tjko/projects.html > > > > Comments? > > > > -- > Regards, > Mikolaj OK sthen@
Re: [NEW] sysutils/docker 19.03.13
On 2020/10/03 14:01, Solene Rapenne wrote:
> On Sat, 3 Oct 2020 13:59:33 +0200
> Solene Rapenne :
>
> > On Tue, 22 Sep 2020 22:41:26 +0200
> > Muhammad Kaisar Arkhan :
> >
> > > Hello,
> > >
> > > Attached is a port of the command line utility for Docker, specifically
> > > version v19.03.13.
> > >
> > > This is created in the same spirit as sysutils/kubectl, allowing OpenBSD
> > > users to interact with Docker servers from their OpenBSD systems.
> > >
> > > OK?
> > >
> >
> > I'm fine for importing it. I made a few aesthetics changes to the
> > Makefile but the port looks good to me and works well.
> >
> > anyone else ok?
> >
>
> forgot to include the patch about my small changes
> Only an additional tab and variable reordering.
> --- sysutils/docker/Makefile Tue Sep 22 22:26:58 2020
> +++ Makefile Sat Oct 3 13:44:49 2020
> @@ -1,16 +1,15 @@
> # $OpenBSD$
>
> -COMMENT =command-line tool for controlling Docker
> +COMMENT =command-line tool for controlling Docker
>
> +V = 19.03.13
> +PKGNAME =docker-${V}
> +
> GH_ACCOUNT = docker
> GH_PROJECT = cli
> -V = 19.03.13
> GH_TAGNAME = v${V}
> -PKGNAME =docker-${V}
To avoid confusion I think this port and package should be named
docker-cli not docker, this would work:
V = 19.03.13
GH_ACCOUNT =docker
GH_PROJECT =cli
GH_TAGNAME =v${V}
PKGNAME = docker-${DISTNAME}
> -HOMEPAGE =
> https://docs.docker.com/engine/reference/commandline/cli/
That seems a better homepage than https://github.com/docker/cli which
is what you'll get by removing it.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 06:40:56 Modified files: sysutils/awscli: Makefile distinfo sysutils/awscli/pkg: PLIST Log message: Update to awscli-1.18.152.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 06:40:28 Modified files: net/py-botocore: Makefile distinfo net/py-botocore/pkg: PLIST Log message: Update to py3-botocore-1.18.11.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 06:40:38 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.15.11.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 06:36:40 Modified files: multimedia/py-chromecast: Makefile distinfo Log message: Update to py3-chromecast-7.5.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 06:35:33 Modified files: sysutils/exoscale-cli: Makefile distinfo Log message: Update to exoscale-cli-1.18.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 06:34:15 Modified files: sysutils/terragrunt: Makefile distinfo Log message: Update to terragrunt-0.25.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 06:30:51 Modified files: sysutils/amazon-ssm-agent: Makefile distinfo Log message: Update to amazon-ssm-agent-3.0.196.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 06:24:55 Modified files: astro/stellarium: Makefile distinfo astro/stellarium/pkg: PLIST Log message: Update to stellarium-0.20.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 06:25:18 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-312.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 05:51:50 Modified files: x11/gnome/dconf-editor: Makefile distinfo Log message: Update to dconf-editor-3.36.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 05:35:24 Modified files: print/cups-filters: Makefile distinfo Log message: update to cups-filters-1.28.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 05:21:17 Modified files: sysutils/terraform: Makefile distinfo Removed files: sysutils/terraform/patches: patch-vendor_github_com_apparentlymart_go-userdirs_userdirs_app_stub_go patch-vendor_github_com_apparentlymart_go-userdirs_userdirs_app_unix_go Log message: Update to terraform-0.13.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 05:15:20 Modified files: sysutils/packer: Makefile distinfo Log message: Update to packer-1.6.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 04:54:27 Modified files: textproc/gtk-doc: Makefile distinfo textproc/gtk-doc/pkg: PLIST Log message: Update to gtk-doc-1.33.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 04:52:36 Modified files: x11/gnome/librsvg: Makefile distinfo Log message: Update to librsvg-2.50.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/10/03 04:42:49 Modified files: games/scummvm : Makefile distinfo games/scummvm/patches: patch-Makefile_common patch-configure games/scummvm/pkg: PLIST Log message: update to scummvm 2.2.0 from Donovan Watteau includes changes from kmos@ to depend on liba52 for zvision and adds a few more deps.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 04:36:43 Modified files: textproc/libxml++3: Makefile distinfo textproc/libxml++3/pkg: PLIST Log message: Update to libxml++3-3.2.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 04:30:20 Modified files: textproc/libxml++: Makefile distinfo textproc/libxml++/pkg: PLIST Log message: Update to libxml++-2.42.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 04:25:36 Modified files: devel/mm-common: Makefile distinfo Log message: Update to mm-common-1.0.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 04:22:12 Modified files: devel/libsigc++30: Makefile distinfo devel/libsigc++30/pkg: PLIST Log message: Update to libsigc++30-3.0.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 04:16:19 Modified files: devel/libsigc++-2: Makefile distinfo devel/libsigc++-2/pkg: PLIST Log message: Update to libsigc++-2.10.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 04:11:41 Modified files: devel/glib2: Makefile distinfo devel/glib2/pkg: PLIST Log message: Update to glib2-2.64.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 04:02:23 Modified files: devel/py-gobject3: Makefile Added files: devel/py-gobject3/pkg: DESCR PLIST Removed files: devel/py-gobject3/pkg: DESCR-common DESCR-main PFRAG.no-python3-main PFRAG.python3-main PLIST-common PLIST-main Log message: Make this python3 only. Merge -main and -common.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/03 04:02:44 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: 'py-gobject3' => 'py3-gobject3'
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/10/03 02:40:11 Modified files: www/hugo : Makefile distinfo Log message: update www/hugo to 0.75.1 bugfix release Changelog: * resources/image: Fix nilpointer for images with no Exif [#7688] * modules/npm: Preserve the original package.json if it exists [#7690] * tpl: Fix grammar in the new 'requires non-zero' error message [cd830bb0] ok solene@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/10/03 02:37:39 Modified files: www/ephemetoot : Makefile distinfo www/ephemetoot/pkg: PLIST Removed files: www/ephemetoot/patches: patch-bin_ephemetoot Log message: update www/ephemetoot to 3.1.0 port switches from GH to pypi distribution. ok solene@
Re: [update] deve/py-llvmlite to 0.34.0
On 9/29/20 1:03 AM, Aisha Tammy wrote: Hi, Attached diff for py-llvmlite update to latest It has been broken for a bit and am not sure if maintainer is too busy for this. If needed I can take this port, I am generally in touch with upstream to bug them about their JIT compiler numba. Would be nice to see it in 6.8 as its working now. All tests are passing as well. (also attaching the patch just in case thunderbird still messes up) Aisha Hi, thank you for the diff. I think miasm will not work with your update, I will verify if recent version is compatible with Python 3. Best regards, Remi.
Re: [PATCH] Fix valgrind abort
On Thu, Sep 24, 2020 at 05:30:51PM +0900, Masato Asou wrote:
> The Valgrind is aborted in OpenBSD current as follows:
>
> $ sysctl -n kern.version
> OpenBSD 6.8-beta (GENERIC.MP) #77: Wed Sep 23 15:36:00 MDT 2020
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
>
> $ valgrind /bin/ls
> Abort trap
> $
>
> I made fix this abort.
>
> comment? ok?
This fixes the bug for me. ok tobhe@
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/valgrind/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 22 May 2020 08:51:24 - 1.24
> +++ Makefile 24 Sep 2020 07:21:20 -
> @@ -7,7 +7,7 @@ CATEGORIES = devel
>
> V = 3.10.1
> PV = 20160331
> -REVISION = 17
> +REVISION = 18
> DISTNAME = valgrind-${V}
> EXTRACT_SUFX = .tar.bz2
>
> Index: patches/patch-coregrind_link_tool_exe_openbsd_in
> ===
> RCS file:
> /cvs/ports/devel/valgrind/patches/patch-coregrind_link_tool_exe_openbsd_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-coregrind_link_tool_exe_openbsd_in
> --- patches/patch-coregrind_link_tool_exe_openbsd_in 6 Nov 2019 05:25:13
> - 1.4
> +++ patches/patch-coregrind_link_tool_exe_openbsd_in 24 Sep 2020 07:21:20
> -
> @@ -1,16 +1,40 @@
> --- coregrind/link_tool_exe_openbsd.in.orig Fri Sep 27 10:40:06 2019
> -+++ coregrind/link_tool_exe_openbsd.in Fri Sep 27 10:45:59 2019
> -@@ -77,7 +77,12 @@
> - my $origbase = 0x40;
> - system(sprintf "sed -e 's|%x|%x|g' < $ldscript > $temp", $origbase,
> $notebase);
> coregrind/link_tool_exe_openbsd.in Fri Sep 25 00:50:44 2020
> +@@ -63,22 +63,13 @@
> + # The cc invokation to do the final link
> + my $cc = $ARGV[1];
>
> --my $cmd = sprintf "$cc -static -nopie -Wl,-Ttext=0x%x -Wl,-T,$temp",
> $textbase;
> +-# and the 'restargs' are argv[2 ..]
> +# XXX The '-s' option was not specified when executing the install command.
> +# Instead '--strip-all' is now executed at link time.
> +# strip command rewrite offset and align in ELF file. Therefor, when
> valgrind
> +# launch memcheck-amd64-openbsd, an Abort trap occurs in the execvp() system
> +# call.
> -+my $cmd = sprintf "$cc -static -nopie -Wl,--strip-all -Wl,-Ttext=0x%x
> -Wl,-T,$temp", $textbase;
> ++my $cmd = sprintf "$cc -static -nopie -Wl,--strip-all -Wl,-Ttext=0x%x",
> "$ala + 0x1000";
>
> +-# so, build up the complete command here:
> +-# 'cc' -static -Ttext='ala' 'restargs'
> +-
> +-my $textbase = eval("$ala + 0x1000");
> +-my $notebase = eval("$ala");
> +-
> +-my $ldscript = "/usr/libdata/ldscripts/elf_x86_64_obsd.x";
> +-my $temp = `mktemp /tmp/XX`;
> +-chomp($temp);
> +-my $origbase = 0x40;
> +-system(sprintf "sed -e 's|%x|%x|g' < $ldscript > $temp", $origbase,
> $notebase);
> +-
> +-my $cmd = sprintf "$cc -static -nopie -Wl,-Ttext=0x%x -Wl,-T,$temp",
> $textbase;
> +-
> # Add the rest of the parameters
> foreach my $n (2 .. $#ARGV) {
> +$cmd = "$cmd $ARGV[$n]";
> +@@ -89,8 +80,6 @@
> +
> + # Execute the command:
> + my $r = system("$cmd");
> +-
> +-unlink $temp;
> +
> + if ($r == 0) {
> + exit 0;
> --
> ASOU Masato
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/10/03 01:37:45 Modified files: security/py-tlsfuzzer: distinfo Log message: fix typo in previous
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/10/03 01:36:08 Modified files: security/py-tlsfuzzer: Makefile distinfo Log message: update to tlsfuzzer 20201002
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/10/03 01:21:50 Modified files: audio/cantata : Makefile distinfo Log message: Update to cantata 2.4.2
UPDATE: sysutils/grive2
Update grive2 to the latest stable version from GitHub. Not tested
because I have been Google free for a long time. A new MAINTAINER is
welcome.
Cheers,
Rafael Sadowski
Index: Makefile
===
RCS file: /cvs/ports/sysutils/grive2/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile12 Jul 2019 20:49:43 - 1.11
+++ Makefile3 Oct 2020 06:18:01 -
@@ -2,33 +2,28 @@
COMMENT = third-party client for Google Drive
-VERSION = 0.5.0
-DISTNAME = grive2-${VERSION}
-REVISION = 2
-
-CATEGORIES = sysutils
+GH_ACCOUNT = vitalif
+GH_PROJECT = grive2
+GH_COMMIT =548ea362f319cd1f7fcbad0344fde8449fa14255
-MAINTAINER = Rafael Sadowski
+DISTNAME = grive2-0.5.1
-HOMEPAGE = http://yourcmc.ru/wiki/Grive2
+CATEGORIES = sysutils
-GH_ACCOUNT = vitalif
-GH_PROJECT = grive2
-GH_COMMIT =ae06eccb38b2fe250c9ddeac3e3973f80b8a0aa9
+HOMEPAGE = http://yourcmc.ru/wiki/Grive2
# GPLv2 only
PERMIT_PACKAGE = Yes
-WANTLIB += boost_filesystem-mt boost_program_options-mt boost_regex-mt
-WANTLIB += boost_system-mt boost_unit_test_framework-mt c curl
-WANTLIB += expat gcrypt gpg-error iberty m pthread yajl z ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} boost_filesystem-mt boost_program_options-mt
+WANTLIB += boost_regex-mt boost_system-mt c curl gcrypt gpg-error
+WANTLIB += iberty m yajl
MODULES = devel/cmake
COMPILER = base-clang ports-gcc
CXXFLAGS +=-I${LOCALBASE}/include
-
LIB_DEPENDS = devel/boost \
devel/libyajl \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/grive2/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo6 May 2017 15:10:18 - 1.3
+++ distinfo3 Oct 2020 06:18:01 -
@@ -1,2 +1,2 @@
-SHA256 (grive2-0.5.0-ae06eccb.tar.gz) =
oEWgC62rbFEVn9gwnghNQmr0AN69NXXlIgstcph7Zck=
-SIZE (grive2-0.5.0-ae06eccb.tar.gz) = 162870
+SHA256 (grive2-0.5.1-548ea362.tar.gz) =
wJIn9bDA483dfmpHEYa3sRNtOMb6DGC3hYgpiNzUd0A=
+SIZE (grive2-0.5.1-548ea362.tar.gz) = 169931
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt3 Oct 2020 06:18:01 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -1,5 +1,7 @@
+ cmake_minimum_required(VERSION 2.8)
+
++project(grive2)
++
+ include(GNUInstallDirs)
+
+ # Grive version. remember to update it for every new release!
+@@ -12,4 +14,4 @@ add_definitions( -D_FILE_OFFSET_BITS=64 -std=c++0x )
+ add_subdirectory( systemd )
+ add_subdirectory( libgrive )
+ add_subdirectory( grive )
+-
+\ No newline at end of file
++
Index: patches/patch-grive_CMakeLists_txt
===
RCS file: /cvs/ports/sysutils/grive2/patches/patch-grive_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-grive_CMakeLists_txt
--- patches/patch-grive_CMakeLists_txt 30 Nov 2015 11:56:15 - 1.1.1.1
+++ patches/patch-grive_CMakeLists_txt 3 Oct 2020 06:18:01 -
@@ -1,9 +1,13 @@
$OpenBSD: patch-grive_CMakeLists_txt,v 1.1.1.1 2015/11/30 11:56:15 sthen Exp $
grive/CMakeLists.txt.orig Sun Oct 11 17:59:25 2015
-+++ grive/CMakeLists.txt Wed Nov 4 09:30:32 2015
-@@ -26,4 +26,4 @@ set_target_properties( grive_executable
+Index: grive/CMakeLists.txt
+--- grive/CMakeLists.txt.orig
grive/CMakeLists.txt
+@@ -25,7 +25,7 @@ set_target_properties( grive_executable
)
install(TARGETS grive_executable RUNTIME DESTINATION bin)
--install(FILES doc/grive.1 DESTINATION share/man/man1 )
+-
+install(FILES doc/grive.1 DESTINATION man/man1 )
+ if ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES
"OpenBSD" )
+ install(FILES doc/grive.1 DESTINATION man/man1 )
+ else ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES
"OpenBSD" )
Index: patches/patch-libgrive_CMakeLists_txt
===
RCS file: /cvs/ports/sysutils/grive2/patches/patch-libgrive_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-libgrive_CMakeLists_txt
--- patches/patch-libgrive_CMakeLists_txt 30 Nov 2015 11:56:15 -
1.1.1.1
+++ patches/patch-libgrive_CMakeLists_txt 3 Oct 2020 06:18:01 -
@@ -1,11 +1,12 @@
$OpenBSD: patch-libgrive_CMakeLists_txt,v 1.1.1.1 2015/11/30 11:56:15 sthen
Exp $
libgrive/CMakeLists.txt.orig Sun Oct 11 17:59:25 2015
-+++ libgrive/CMakeLists.txtWed Nov 4 09:30:32 2015
-@@ -7,7 +7,6 @@ find_package(CURL REQUIRED)
- find_package(EXPAT REQUIRED)
+Index: libgrive/CMakeLists.txt
+---
Re: Remove: games/instead-launcher OR help to update to InsteadMan3
On Tue Sep 08, 2020 at 07:23:05AM +0200, Rafael Sadowski wrote: > I would like to remove the next Qt4 consumer. Upsteam says it was > dropped and replaced by InsteadMan 3 (GTK). > https://github.com/instead-hub/instead-launcher/issues/2#issuecomment-688618824 > > Does anyone want to update this port to InsteadMan 3? If not, I am in > favour of deleting it. > https://github.com/jhekasoft/insteadman3 > > Rafael Sadowski > ping
Re: profanity segfaults and dumps core in recent snapshots
On Sat, Oct 03, 2020 at 07:54:10AM +0200, Rafael Sadowski wrote: > Could you test your use-case with the following libmesode update, please? > Upstream committed some "LibreSSL support" changes. The problem was addressed before release: https://cvsweb.openbsd.org/src/lib/libcrypto/x509/x509_verify.c#rev1.13 This "support change" is just adopting the nginx way of modifying the version numbers. If they did this right, it should make no difference in the code actually run.
