CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/11/26 00:59:42 Added files: security/py-cryptography/patches: patch-src__cffi_src_openssl_ct_py Log message: py-cryptography: unbreak build. The code assumes that if OPENSSL_NO_CT is defined then the SCT struct exists. Beck added OPENSSL_NO_CT to opensslfeatures.h but the struct will only exist after the next bump. Reported by & ok aja semarie
devel/quirks: missing # 7.1 marker
Hi,
Looking at devel/quirks file, it seems that the informative `# 7.1'
marker is missing.
The following diff just add it.
The base file is OPENBSD_7_0 (1.1316). I put the header just in top of
the changed parts.
$ cd /usr/ports/devel/quirks && cvs diff -r OPENBSD_7_0 files/Quirks.pm
Comments or OK ?
--
Sebastien Marie
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1345
diff -u -p -r1.1345 Quirks.pm
--- files/Quirks.pm 25 Nov 2021 15:47:32 - 1.1345
+++ files/Quirks.pm 26 Nov 2021 07:54:05 -
@@ -496,6 +496,7 @@ my $stem_extensions = {
'py-websocket-client' => 'py3-websocket-client',
'libmesode' => 'libstrophe',
'py-stem' => 'py3-stem',
+# 7.1
'py-jsonschema' => 'py3-jsonschema',
'py-CherryPy' => 'py3-CherryPy',
'py-IP' => 'py3-IP',
@@ -1455,6 +1456,7 @@ setup_obsolete_reason(
3 => 'bzr',
3 => 'bzr-svn',
6 => 'libvstr',
+# 7.1
0 => 'cue',
31 => 'py-SOAPpy',
31 => 'py-ao',
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/26 00:57:54 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.22.13.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/26 00:57:36 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.20.13.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/26 00:57:25 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py3-botocore-1.23.13.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/26 00:56:30 Modified files: sysutils/nomad : Makefile distinfo sysutils/nomad/pkg: PLIST Log message: Update to nomad-1.2.2.
Re: unbreak games/ufoai
On Fri, November 26, 2021 07:10, Thomas Frohwein wrote:
> Hi,
>
> Out of an itch for squad-based tactics games, I looked at the BROKEN
> port of games/ufoai and came up with the fix below that restores it to
> working order. The patch is taken from an unrelated project that also
> had to replace gdk_gl_font_use_pango_font().
>
> The patch unbreaks the build and I've played a few minutes each in
> campaign and skirmish modes. While here, added harfbuzz to WANTLIB
> for the editor after make port-lib-depends-check pointed that out.
> I also opened the editor (uforadiant) as the new patch affects the
> editor's code. No issues noticed there either.
>
> CC maintainer
> ok?
Hi!
Completely missed that it was marked broken.
Builds and runs fine for me. Thanks for fixing it.
OK kirby@ with the REVISION bump.
>
> [1]
> https://github.com/Garux/netradiant-custom/commit/a0a47640b0270d9377273f4fcb714a787300b7ac
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/ufoai/base/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile 9 Jun 2021 19:50:08 - 1.22
> +++ Makefile 26 Nov 2021 04:05:38 -
> @@ -1,7 +1,5 @@
> # $OpenBSD: Makefile,v 1.22 2021/06/09 19:50:08 sthen Exp $
>
> -BROKEN = does not build with pango >=1.44
> -
> COMMENT-main = squad-based tactical strategy game
> COMMENT-editor = UFO:AI map editor
>
> @@ -29,6 +27,7 @@ WANTLIB-editor += gio-2.0 glib-2.0 gmodu
> WANTLIB-editor += gtk-x11-2.0 gtkglext-x11-1.0 gtksourceview-2.0
> WANTLIB-editor += openal pango-1.0 pangocairo-1.0 pangoft2-1.0
> WANTLIB-editor += vorbisfile xml2 ${cWANTLIB}
> +WANTLIB-editor += harfbuzz
>
> COMPILER = base-clang ports-gcc
>
> Index: patches/patch-src_tools_radiant_libs_gtkutil_glfont_cpp
> ===
> RCS file: patches/patch-src_tools_radiant_libs_gtkutil_glfont_cpp
> diff -N patches/patch-src_tools_radiant_libs_gtkutil_glfont_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_tools_radiant_libs_gtkutil_glfont_cpp 26 Nov 2021
> 04:05:38 -
> @@ -0,0 +1,28 @@
> +$OpenBSD$
> +
> +replace retired gdk_gl_font_use_pango_font with pango_font_map_load_font
> +https://github.com/Garux/netradiant-custom/commit/a0a47640b0270d9377273f4fcb714a787300b7ac
> +
> +Index: src/tools/radiant/libs/gtkutil/glfont.cpp
> +--- src/tools/radiant/libs/gtkutil/glfont.cpp.orig
> src/tools/radiant/libs/gtkutil/glfont.cpp
> +@@ -23,6 +23,7 @@
> + #include
> + #include "debugging/debugging.h"
> + #include
> ++#include
> +
> + GLFont glfont_create (const std::string& font_string)
> + {
> +@@ -31,7 +32,10 @@ GLFont glfont_create (const std::string& font_string)
> +
> + PangoFontDescription* font_desc =
> pango_font_description_from_string(font_string.c_str());
> +
> +-PangoFont* font = gdk_gl_font_use_pango_font(font_desc, 0, 256,
> font_list_base);
> ++PangoFontMap *fontmap = pango_ft2_font_map_new();
> ++pango_ft2_font_map_set_resolution(PANGO_FT2_FONT_MAP(fontmap), 72, 72);
> ++PangoContext *ft2_context = pango_font_map_create_context(fontmap);
> ++PangoFont* font = pango_font_map_load_font(fontmap, ft2_context,
> font_desc);
> +
> + if (font != 0) {
> + PangoFontMetrics* font_metrics = pango_font_get_metrics(font,
> 0);
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/games/ufoai/base/pkg/PLIST-main,v
> retrieving revision 1.6
> diff -u -p -r1.6 PLIST-main
> --- pkg/PLIST-main27 Jun 2018 21:03:50 - 1.6
> +++ pkg/PLIST-main26 Nov 2021 04:05:38 -
> @@ -11,7 +11,7 @@ share/pixmaps/ufoai.xpm
> share/pixmaps/ufoded.xpm
> share/ufoai/COPYING
> share/ufoai/LICENSES
> -share/ufoai/base/game.so
> +@so share/ufoai/base/game.so
> share/ufoai/base/i18n/
> share/ufoai/base/i18n/bg_BG/
> share/ufoai/base/i18n/bg_BG/LC_MESSAGES/
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/26 00:24:01 Modified files: devel/meson: Makefile distinfo meson.port.mk devel/meson/patches: patch-mesonbuild_build_py Log message: Update to meson-0.60.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/26 00:06:15 Modified files: inputmethods/libkkc: Makefile Log message: Needs MODULES=lang/python; otherwise python2 gets picked up if present at configure time and the build breaks. checking for python2... /usr/local/bin/python2 checking for python version... 2.7 <...> /usr/local/bin/python2 -B ../data/templates/libkkc-data/tools/sortlm.py \ ./data/models/text2/data.arpa data/models/sorted2/data Traceback (most recent call last): File "../data/templates/libkkc-data/tools/sortlm.py", line 20, in import marisa ImportError: No module named marisa
Re: update graphics/libcaca-0.99.beta20
On Thu, Nov 25, 2021 at 07:49:08PM -0800, Nam Nguyen wrote:
> Nam Nguyen writes:
>
> > Here is an update for graphics/libcaca to 0.99.beta20.
> >
> > Changelog:
> > https://github.com/cacalabs/libcaca/releases/tag/v0.99.beta20
> >
> > There are some CVE fixes listed there (e.g., buffer overflow, illegal
> > WRITE access, illegal READ access). Here is one:
> > https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3410
> > https://github.com/cacalabs/libcaca/issues/52
> >
> > This diff:
> > - Moves MASTER_SITES to github
> > (http://caca.zoy.org/browser/libcaca/trunk/README)
> > - Defines V and V_BETA for use in MASTER_SITES
I don't see V_BETA anywhere. On the other hand, I don't think it's
needed.
> > - Bumps major because of removed symbols. libcaca is moving away from
> > using libcucul.
> > (https://namtsui.com/public/caca_check_sym.txt)
Agree.
> > - Disable building ruby subdirectory in Makefile.in patch to be
> > consistent with --disable-ruby.
> > - Remove bash-ism =~ in patch-configure bash-ism throws an error
> > otherwise. Reorder comments while here.
> >
> > I tested with misc/toilet, the only consumer.
Not sure how much misc/toilet uses it without '--export ', but
the bundled applications cacademo and cacafire work fine.
cacaclock complains about not finding a font, but that was already
there in the previous version and doesn't need to hold up the update in
my opinion.
> >
> > Feedback? OK?
>
> ping. This diff has a tweak for PKGNAME substitution for updating
> verison number in one place.
ok thfr@, but a few comments for maybe future update considerations:
1. version 0.99.beta20 => 0.99.20 is in line with what the previous
version did, but in the future after a major/minor update it might
be worth considering keeping the "beta": 0.99beta20. This is based
on packages-specs(7): "The last part may contain an extra suffix
matching rc[N], alpha[N], beta[N],..."
2. There are some stray compiler flags in configure, probably this:
19672:CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
I think the "-g -O2" could interfere with builder setting other flags.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/libcaca/Makefile,v
> retrieving revision 1.36
> diff -u -p -u -p -r1.36 Makefile
> --- Makefile 26 Jan 2020 11:14:32 - 1.36
> +++ Makefile 26 Nov 2021 03:43:57 -
> @@ -2,11 +2,11 @@
>
> COMMENT= color ascii art library
>
> -DISTNAME=libcaca-0.99.beta19
> -PKGNAME= libcaca-0.99.19
> -SHARED_LIBS += caca 1.2 # .0.99
> +V= 0.99.beta20
> +DISTNAME=libcaca-${V}
> +PKGNAME= ${DISTNAME:S/beta//}
> +SHARED_LIBS += caca2.0 # .0.99
> CATEGORIES= graphics
> -REVISION=2
>
> HOMEPAGE=http://caca.zoy.org/wiki/libcaca
>
> @@ -15,8 +15,7 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB= c curses m z
>
> -MASTER_SITES=http://caca.zoy.org/files/libcaca/ \
> - https://distfiles.sigtrap.nl/
> +MASTER_SITES=
> https://github.com/cacalabs/libcaca/releases/download/v${V}/
>
> FLAVORS= no_x11
> FLAVOR?=
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/libcaca/distinfo,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 distinfo
> --- distinfo 7 Jun 2014 20:29:32 - 1.10
> +++ distinfo 26 Nov 2021 03:43:57 -
> @@ -1,2 +1,2 @@
> -SHA256 (libcaca-0.99.beta19.tar.gz) =
> EotGfE7QMmTBh0BRcqToMEk0LMjML2VfU6LQ7p03cvQ=
> -SIZE (libcaca-0.99.beta19.tar.gz) = 1203495
> +SHA256 (libcaca-0.99.beta20.tar.gz) =
> itdLq8Y79mWwsjeNlbTaZbdJPBG9nzrGAFFwhbDErPI=
> +SIZE (libcaca-0.99.beta20.tar.gz) = 1099916
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/graphics/libcaca/patches/patch-Makefile_in,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 patch-Makefile_in
> --- patches/patch-Makefile_in 7 Jun 2014 20:29:32 - 1.5
> +++ patches/patch-Makefile_in 26 Nov 2021 03:43:57 -
> @@ -1,12 +1,13 @@
> $OpenBSD: patch-Makefile_in,v 1.5 2014/06/07 20:29:32 bcallah Exp $
> Makefile.in.orig Fri May 16 15:15:33 2014
> -+++ Makefile.in Sat Jun 7 14:03:02 2014
> -@@ -410,7 +410,7 @@ top_build_prefix = @top_build_prefix@
> - top_builddir = @top_builddir@
> +Index: Makefile.in
> +--- Makefile.in.orig
> Makefile.in
> +@@ -427,7 +427,7 @@ top_builddir = @top_builddir@
> top_srcdir = @top_srcdir@
> + AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I$(top_builddir)/caca
> SUBDIRS = kernel caca src examples tools \
> -- cxx caca-sharp python ruby java \
> -+ cxx ruby \
> - doc test
> +- cxx caca-sharp python ruby java doc
> ++ cxx doc
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2021/11/25 22:27:04 Added files: graphics/enblend-enfuse/patches: patch-src_minimizer_h Log message: unbreak build on sparc64 OK kmos@
unbreak games/ufoai
Hi,
Out of an itch for squad-based tactics games, I looked at the BROKEN
port of games/ufoai and came up with the fix below that restores it to
working order. The patch is taken from an unrelated project that also
had to replace gdk_gl_font_use_pango_font().
The patch unbreaks the build and I've played a few minutes each in
campaign and skirmish modes. While here, added harfbuzz to WANTLIB
for the editor after make port-lib-depends-check pointed that out.
I also opened the editor (uforadiant) as the new patch affects the
editor's code. No issues noticed there either.
CC maintainer
ok?
[1]
https://github.com/Garux/netradiant-custom/commit/a0a47640b0270d9377273f4fcb714a787300b7ac
Index: Makefile
===
RCS file: /cvs/ports/games/ufoai/base/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile9 Jun 2021 19:50:08 - 1.22
+++ Makefile26 Nov 2021 04:05:38 -
@@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.22 2021/06/09 19:50:08 sthen Exp $
-BROKEN = does not build with pango >=1.44
-
COMMENT-main = squad-based tactical strategy game
COMMENT-editor = UFO:AI map editor
@@ -29,6 +27,7 @@ WANTLIB-editor += gio-2.0 glib-2.0 gmodu
WANTLIB-editor += gtk-x11-2.0 gtkglext-x11-1.0 gtksourceview-2.0
WANTLIB-editor += openal pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB-editor += vorbisfile xml2 ${cWANTLIB}
+WANTLIB-editor += harfbuzz
COMPILER = base-clang ports-gcc
Index: patches/patch-src_tools_radiant_libs_gtkutil_glfont_cpp
===
RCS file: patches/patch-src_tools_radiant_libs_gtkutil_glfont_cpp
diff -N patches/patch-src_tools_radiant_libs_gtkutil_glfont_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_tools_radiant_libs_gtkutil_glfont_cpp 26 Nov 2021
04:05:38 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+replace retired gdk_gl_font_use_pango_font with pango_font_map_load_font
+https://github.com/Garux/netradiant-custom/commit/a0a47640b0270d9377273f4fcb714a787300b7ac
+
+Index: src/tools/radiant/libs/gtkutil/glfont.cpp
+--- src/tools/radiant/libs/gtkutil/glfont.cpp.orig
src/tools/radiant/libs/gtkutil/glfont.cpp
+@@ -23,6 +23,7 @@
+ #include
+ #include "debugging/debugging.h"
+ #include
++#include
+
+ GLFont glfont_create (const std::string& font_string)
+ {
+@@ -31,7 +32,10 @@ GLFont glfont_create (const std::string& font_string)
+
+ PangoFontDescription* font_desc =
pango_font_description_from_string(font_string.c_str());
+
+- PangoFont* font = gdk_gl_font_use_pango_font(font_desc, 0, 256,
font_list_base);
++ PangoFontMap *fontmap = pango_ft2_font_map_new();
++ pango_ft2_font_map_set_resolution(PANGO_FT2_FONT_MAP(fontmap), 72, 72);
++ PangoContext *ft2_context = pango_font_map_create_context(fontmap);
++ PangoFont* font = pango_font_map_load_font(fontmap, ft2_context,
font_desc);
+
+ if (font != 0) {
+ PangoFontMetrics* font_metrics = pango_font_get_metrics(font,
0);
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/games/ufoai/base/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 27 Jun 2018 21:03:50 - 1.6
+++ pkg/PLIST-main 26 Nov 2021 04:05:38 -
@@ -11,7 +11,7 @@ share/pixmaps/ufoai.xpm
share/pixmaps/ufoded.xpm
share/ufoai/COPYING
share/ufoai/LICENSES
-share/ufoai/base/game.so
+@so share/ufoai/base/game.so
share/ufoai/base/i18n/
share/ufoai/base/i18n/bg_BG/
share/ufoai/base/i18n/bg_BG/LC_MESSAGES/
Re: update editors/TeXmacs 2.1
Nam Nguyen writes:
> Here is an update to editors/TeXmacs 2.1 released on June 23, 2021.
>
> changelog:
> https://github.com/texmacs/texmacs/blob/v2.1/TeXmacs/doc/about/changes/change-log.en.tm
>
> Add -DUSE_STACK_TRACE=ON to CONFIGURE_ARGS so
> ${WRKSRC}/src/System/Misc/stack_trace.cpp will use libexecinfo. This
> resolves `make port-lib-depends-check' complaining about not using
> execinfo in WANTLIB.
>
> I tested all plugins, which continue to work.
>
> Feedback and tests are welcome. OK?
ping
Index: Makefile
===
RCS file: /cvs/ports/editors/TeXmacs/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile2 Nov 2021 00:01:12 - 1.23
+++ Makefile5 Nov 2021 01:36:44 -
@@ -2,9 +2,8 @@
COMMENT= wysiwyw (what you see is what you want) editing platform
-DISTNAME= TeXmacs-1.99.18-src
+DISTNAME= TeXmacs-2.1-src
PKGNAME= ${DISTNAME:S/-src//}
-REVISION= 1
CATEGORIES=editors print x11
@@ -38,6 +37,9 @@ LIB_DEPENDS= databases/sqlite3 \
lang/guile
CXXFLAGS+= -Wno-deprecated-register
+
+# needed for execinfo
+CONFIGURE_ARGS=-DUSE_STACK_TRACE=ON
post-extract:
rm -f ${WRKDIST}/plugins/mathematica/bin/realpath.py
Index: distinfo
===
RCS file: /cvs/ports/editors/TeXmacs/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo9 Feb 2021 17:36:58 - 1.5
+++ distinfo5 Nov 2021 01:36:44 -
@@ -1,2 +1,2 @@
-SHA256 (TeXmacs-1.99.18-src.tar.gz) =
sYgjPUiTFlgVLk+sNdZb1Ew+oZ/ocZCkCoIAwR93g0Y=
-SIZE (TeXmacs-1.99.18-src.tar.gz) = 37178348
+SHA256 (TeXmacs-2.1-src.tar.gz) = iERhjY1tWX+uyxxNvSWhmZVZN6a7E+olPD7MzFeYhr4=
+SIZE (TeXmacs-2.1-src.tar.gz) = 35851289
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/editors/TeXmacs/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt9 Feb 2021 17:36:58 - 1.4
+++ patches/patch-CMakeLists_txt5 Nov 2021 01:36:44 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.4 202
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -603,7 +603,7 @@ if (TEXMACS_GUI MATCHES "Qt.*")
+@@ -604,7 +604,7 @@ if (TEXMACS_GUI MATCHES "Qt.*")
set (TeXmacs_All_SRCS ${TeXmacs_All_SRCS} ${TeXmacs_Qt_SRCS}
${TeXmacs_Qt_Moc_HDRS})
set (TeXmacs_Include_Dirs ${TeXmacs_Include_Dirs} ${QT_INCLUDES})
Index: patches/patch-src_Plugins_Qt_qt_gui_cpp
===
RCS file: /cvs/ports/editors/TeXmacs/patches/patch-src_Plugins_Qt_qt_gui_cpp,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_Plugins_Qt_qt_gui_cpp
--- patches/patch-src_Plugins_Qt_qt_gui_cpp 9 Feb 2021 17:36:58 -
1.5
+++ patches/patch-src_Plugins_Qt_qt_gui_cpp 5 Nov 2021 01:36:44 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_Plugins_Qt_qt_gui_cp
Index: src/Plugins/Qt/qt_gui.cpp
--- src/Plugins/Qt/qt_gui.cpp.orig
+++ src/Plugins/Qt/qt_gui.cpp
-@@ -868,7 +868,7 @@ qt_gui_rep::update () {
+@@ -875,7 +875,7 @@ qt_gui_rep::update () {
time_t delay = delayed_commands.lapse - texmacs_time();
if (needing_update) delay = 0;
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/TeXmacs/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST 9 Feb 2021 17:36:58 - 1.9
+++ pkg/PLIST 5 Nov 2021 01:36:44 -
@@ -281,6 +281,7 @@ share/TeXmacs/doc/about/welcome/first.fr
share/TeXmacs/doc/about/welcome/first.it.tm
share/TeXmacs/doc/about/welcome/new-welcome.en.tm
share/TeXmacs/doc/about/welcome/new-welcome.fr.tm
+share/TeXmacs/doc/about/welcome/start.en.tm
share/TeXmacs/doc/about/welcome/welcome.de.tm
share/TeXmacs/doc/about/welcome/welcome.en.tm
share/TeXmacs/doc/about/welcome/welcome.es.tm
@@ -1456,36 +1457,30 @@ share/TeXmacs/examples/
share/TeXmacs/examples/plugins/
share/TeXmacs/examples/plugins/complete/
share/TeXmacs/examples/plugins/complete/Makefile
-share/TeXmacs/examples/plugins/complete/bin/
share/TeXmacs/examples/plugins/complete/progs/
share/TeXmacs/examples/plugins/complete/progs/init-complete.scm
share/TeXmacs/examples/plugins/complete/src/
share/TeXmacs/examples/plugins/complete/src/complete.cpp
share/TeXmacs/examples/plugins/dynlink/
share/TeXmacs/examples/plugins/dynlink/Makefile.in
-share/TeXmacs/examples/plugins/dynlink/bin/
-share/TeXmacs/examples/plugins/dynlink/lib/
share/TeXmacs/examples/plugins/dynlink/progs/
share/TeXmacs/examples/plugins/dynlink/progs/init-dynlink.scm
share/TeXmacs/examples/plugins/dynlink/src/
share/TeXmacs/examples/plugins/dynlink/src/dynlink.cpp
share/TeXmacs/examples/plugins/formula/
Re: update graphics/libcaca-0.99.beta20
Nam Nguyen writes:
> Here is an update for graphics/libcaca to 0.99.beta20.
>
> Changelog:
> https://github.com/cacalabs/libcaca/releases/tag/v0.99.beta20
>
> There are some CVE fixes listed there (e.g., buffer overflow, illegal
> WRITE access, illegal READ access). Here is one:
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3410
> https://github.com/cacalabs/libcaca/issues/52
>
> This diff:
> - Moves MASTER_SITES to github
> (http://caca.zoy.org/browser/libcaca/trunk/README)
> - Defines V and V_BETA for use in MASTER_SITES
> - Bumps major because of removed symbols. libcaca is moving away from
> using libcucul.
> (https://namtsui.com/public/caca_check_sym.txt)
> - Disable building ruby subdirectory in Makefile.in patch to be
> consistent with --disable-ruby.
> - Remove bash-ism =~ in patch-configure bash-ism throws an error
> otherwise. Reorder comments while here.
>
> I tested with misc/toilet, the only consumer.
>
> Feedback? OK?
ping. This diff has a tweak for PKGNAME substitution for updating
verison number in one place.
Index: Makefile
===
RCS file: /cvs/ports/graphics/libcaca/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile26 Jan 2020 11:14:32 - 1.36
+++ Makefile26 Nov 2021 03:43:57 -
@@ -2,11 +2,11 @@
COMMENT= color ascii art library
-DISTNAME= libcaca-0.99.beta19
-PKGNAME= libcaca-0.99.19
-SHARED_LIBS += caca 1.2 # .0.99
+V= 0.99.beta20
+DISTNAME= libcaca-${V}
+PKGNAME= ${DISTNAME:S/beta//}
+SHARED_LIBS += caca2.0 # .0.99
CATEGORIES=graphics
-REVISION= 2
HOMEPAGE= http://caca.zoy.org/wiki/libcaca
@@ -15,8 +15,7 @@ PERMIT_PACKAGE= Yes
WANTLIB= c curses m z
-MASTER_SITES= http://caca.zoy.org/files/libcaca/ \
- https://distfiles.sigtrap.nl/
+MASTER_SITES=
https://github.com/cacalabs/libcaca/releases/download/v${V}/
FLAVORS= no_x11
FLAVOR?=
Index: distinfo
===
RCS file: /cvs/ports/graphics/libcaca/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo7 Jun 2014 20:29:32 - 1.10
+++ distinfo26 Nov 2021 03:43:57 -
@@ -1,2 +1,2 @@
-SHA256 (libcaca-0.99.beta19.tar.gz) =
EotGfE7QMmTBh0BRcqToMEk0LMjML2VfU6LQ7p03cvQ=
-SIZE (libcaca-0.99.beta19.tar.gz) = 1203495
+SHA256 (libcaca-0.99.beta20.tar.gz) =
itdLq8Y79mWwsjeNlbTaZbdJPBG9nzrGAFFwhbDErPI=
+SIZE (libcaca-0.99.beta20.tar.gz) = 1099916
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/graphics/libcaca/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in 7 Jun 2014 20:29:32 - 1.5
+++ patches/patch-Makefile_in 26 Nov 2021 03:43:57 -
@@ -1,12 +1,13 @@
$OpenBSD: patch-Makefile_in,v 1.5 2014/06/07 20:29:32 bcallah Exp $
Makefile.in.orig Fri May 16 15:15:33 2014
-+++ Makefile.inSat Jun 7 14:03:02 2014
-@@ -410,7 +410,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+Index: Makefile.in
+--- Makefile.in.orig
Makefile.in
+@@ -427,7 +427,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I$(top_builddir)/caca
SUBDIRS = kernel caca src examples tools \
-- cxx caca-sharp python ruby java \
-+ cxx ruby \
- doc test
+- cxx caca-sharp python ruby java doc
++ cxx doc
- DIST_SUBDIRS = $(SUBDIRS) win32
+ DIST_SUBDIRS = $(SUBDIRS) build
+ EXTRA_DIST = NOTES COPYING.GPL COPYING.ISC COPYING.LGPL bootstrap
caca-config.in libcaca.spec libcaca.sln
Index: patches/patch-configure
===
RCS file: /cvs/ports/graphics/libcaca/patches/patch-configure,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-configure
--- patches/patch-configure 7 Jun 2014 20:29:32 - 1.5
+++ patches/patch-configure 26 Nov 2021 03:43:57 -
@@ -1,16 +1,17 @@
$OpenBSD: patch-configure,v 1.5 2014/06/07 20:29:32 bcallah Exp $
-1. Disable detection of pangoft2.
+1. Disable detection of ftgl. (no --disable-ftgl option.)
-2. Disable detection of cppunit. (--disable-cppunit is a NOP.)
+2. Remove bash-ism =~
-3. Disable detection of ftgl. (no --disable-ftgl option.)
+3. Disable detection of pangoft2.
configure.orig Fri May 16 15:15:32 2014
-+++ configure Sat Jun 7 14:03:02 2014
-@@ -17495,8 +17495,7 @@ if test -n "$FTGL_CFLAGS"; then
+Index: configure
+--- configure.orig
configure
+@@ -19339,8 +19339,7 @@ if test -n "$FTGL_CFLAGS"; then
ac_status=$?
- $as_echo
Re: hlsteam - first full-fat middleware for Steam
*ping* ... anyone in a position to review or test this one? On Fri, Oct 29, 2021 at 05:16:30PM -0600, Thomas Frohwein wrote: > Hi, > > The attached port is minimally modified version of the hlsteam > middleware for hashlink. This expands the games that can run by > allowing access to API in goldberg_emulator, like achievements, cloud > saves, etc (which are all emulated locally unlike the real Steam client > does). > > For a little context, until recently the approach to handle the > dependencies of some of the commercial FNA or hashlink games on Steam > API has been to use a collection of the stubbed middleware libraries in > games/steamworks-nosteam. Those serve usually as a middle layer between > the game and libsteam_api.so (on Linux). The stubs basically cut all > calls to libsteam_api.so short. This approach has its shortcomings, as > not all cases can be handled appropriately. In addition, this means > installing and maintaining multiple different library files - at the > moment there are 5 in steamworks-nosteam. > > With goldberg_emulator, the goal is to simplify the situation, that is > let libsteam_api.so from goldberg_emulator handle most (all?) API > emulation or stubs. At the same time, native middleware libraries can > be used largely unmodified from their source. > > With hlsteam, this allows running several games that couldn't run > previously: Northgard (newer versions now with most modes; even GOG > version), Darksburg, Evoland Legendary Edition, Nuclear Blaze, and the > demo of Wartales. If you have one of these games and want to try it, > just remove all *.so* and *.hdll files from the game's directory, then > use '$ hl' from the hashlink port to run. > > Going forward, my plan is to replace the other stubs in > steamworks-nosteam with functioning versions where possible, as well as > adding libCSteamworks.so which so far is mostly blocked by a stub of > Steamworks.NET.dll. This should eventually make steamworks-nosteam > unnecessary. > > I have tested the port with all the above mentioned games. It should > even be possible to play over LAN, as that is one of the main purposes > of goldberg emulator, but I haven't tested that part. > > ok? hlsteam.tgz Description: Binary data
Re: sparc64 bulk build report
On Thu, Nov 25, 2021 at 04:27:02PM +0300, Kirill Bychkov wrote: > On Sun, November 21, 2021 07:39, k...@openbsd.org wrote: > > Bulk build on sparc64-0a.ports.openbsd.org > > Started : Thu Nov 18 11:32:04 MST 2021 > > Finished: Sat Nov 20 21:39:18 MST 2021 > > Duration: 2 Days 10 hours 7 minutes > > > > Built using OpenBSD 7.0-current (GENERIC.MP) #1057: Wed Nov 17 16:51:35 MST > > 2021 > [...] > Hi! > The patch below fixes build on sparc64. > OK? ok kmos --Kurt > > http://build-failures.rhaalovely.net/sparc64/2021-11-18/graphics/enblend-enfuse.log > > Index: patches/patch-src_minimizer_h > === > RCS file: patches/patch-src_minimizer_h > diff -N patches/patch-src_minimizer_h > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-src_minimizer_h 25 Nov 2021 08:51:18 - > @@ -0,0 +1,13 @@ > +$OpenBSD$ > + > +Index: src/minimizer.h > +--- src/minimizer.h.orig > src/minimizer.h > +@@ -29,6 +29,7 @@ > + #include > + #include > + #include > ++#include > + > + #include > + > >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/11/25 14:04:58 Modified files: devel/git : Makefile distinfo Log message: Update to git 2.34.1 Mostly 2.34.0 regression fixes.
Re: bsd.port.mk: default HOMEPAGE to repo URL if MASTER_SITES is GitHub
Klemens Nanni writes:
> On Thu, Nov 25, 2021 at 04:45:06PM +0100, Omar Polo wrote:
>> I wanted to share gelatod with a friend but the package lacks a HOMEPAGE
>> and so `pkg_info gelatod' too. I think it's handy to have a link in the
>> description, even if the package in question it's not really useful
>> outside of OpenBSD :)
>
> OK kn
>
> This makes me think: Probably more ports use github.com as MASTER_SITES but
> don't have HOMEPAGE set... in bsd.port.mk(5) we could default to
> "https://github.com/author/repository; for such ports and fix all of them.
>
> What do you think?
>
> [...]
>
> Here is a diff that yields the same HOMEPAGE for gelatod.
>
> I would still have yet to grep the tree and REVISION bump effected ones,
> but let's gauge interest first.
Came up with the following query against sqlports
select p.fullpkgpath
from _paths p
join _ports pp on pp.fullpkgpath = p.id
join _mastersites ms on ms.fullpkgpath = p.id
where pp.homepage is null and ms.value like 'https://github.com%';
probably not the best one but works and finds 25 ports affected, it
should save some grepping eventually :)
(it's important to match against 'https://github.com%' and not only
'%github.com%' or '%github%' like I initially did because it otherwise
picks up for e.g. stuff like proxy.golang.org/github.com/...)
> Index: bsd.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1562
> diff -u -p -r1.1562 bsd.port.mk
> --- bsd.port.mk 22 Nov 2021 11:01:47 - 1.1562
> +++ bsd.port.mk 25 Nov 2021 20:25:59 -
> @@ -1254,6 +1254,13 @@ HOMEPAGE ?= https://github.com/${GH_ACCO
> .else
> # Empty declarations to avoid "variable XXX is recursive" errors
> MASTER_SITES ?=
> +
> +# default to the repository URL if MASTER_SITES points to GitHub
> +_GH_MASTER_URL = ${MASTER_SITES:Mhttps\://github.com/*}
> +. if !empty(_GH_MASTER_URL)
> +# cut down to /author/repository
> +HOMEPAGE ?= ${_GH_MASTER_URL:C,(https\://github.com(/[^/]+){2}).*,\1,1}
> +. endif
> .endif
>
> # I guess we're in the master distribution business! :) As we gain mirror
FWIW I like the result, having HOMEPAGE defined surely comes in handy :D
bsd.port.mk: default HOMEPAGE to repo URL if MASTER_SITES is GitHub
On Thu, Nov 25, 2021 at 04:45:06PM +0100, Omar Polo wrote:
> I wanted to share gelatod with a friend but the package lacks a HOMEPAGE
> and so `pkg_info gelatod' too. I think it's handy to have a link in the
> description, even if the package in question it's not really useful
> outside of OpenBSD :)
OK kn
This makes me think: Probably more ports use github.com as MASTER_SITES but
don't have HOMEPAGE set... in bsd.port.mk(5) we could default to
"https://github.com/author/repository; for such ports and fix all of them.
What do you think?
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/net/gelatod/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 23 Nov 2021 23:48:05 - 1.3
> +++ Makefile 25 Nov 2021 15:44:34 -
> @@ -3,12 +3,14 @@
> COMMENT =CLAT configuration daemon for OpenBSD
> V = 1.3
> DISTNAME = gelatod-${V}
> +REVISION = 0
> CATEGORIES = net
>
> # BSD 2-clause
> PERMIT_PACKAGE = Yes
>
> MASTER_SITES =
> https://github.com/fobser/gelatod/releases/download/v${V}/
> +HOMEPAGE = https://github.com/fobser/gelatod
>
> MAINTAINER = Klemens Nanni
Here is a diff that yields the same HOMEPAGE for gelatod.
I would still have yet to grep the tree and REVISION bump effected ones,
but let's gauge interest first.
Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1562
diff -u -p -r1.1562 bsd.port.mk
--- bsd.port.mk 22 Nov 2021 11:01:47 - 1.1562
+++ bsd.port.mk 25 Nov 2021 20:25:59 -
@@ -1254,6 +1254,13 @@ HOMEPAGE ?= https://github.com/${GH_ACCO
.else
# Empty declarations to avoid "variable XXX is recursive" errors
MASTER_SITES ?=
+
+# default to the repository URL if MASTER_SITES points to GitHub
+_GH_MASTER_URL = ${MASTER_SITES:Mhttps\://github.com/*}
+. if !empty(_GH_MASTER_URL)
+# cut down to /author/repository
+HOMEPAGE ?= ${_GH_MASTER_URL:C,(https\://github.com(/[^/]+){2}).*,\1,1}
+. endif
.endif
# I guess we're in the master distribution business! :) As we gain mirror
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/25 13:15:50 Modified files: x11/virt-viewer: Makefile distinfo Removed files: x11/virt-viewer/patches: patch-src_virt-viewer-app_c Log message: Update to virt-viewer-11.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/25 13:08:26 Modified files: multimedia/py-chromecast: Makefile distinfo Log message: Update to py3-chromecast-10.1.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/25 12:53:31 Modified files: devel/libsoup3 : Makefile distinfo Log message: Update to libsoup3-3.0.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/25 12:41:02 Modified files: devel/libsoup : Makefile distinfo Log message: Update to libsoup-2.74.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/11/25 12:05:27 Modified files: www/webkitgtk4 : Makefile distinfo Log message: Update to webkitgtk4-2.34.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2021/11/25 11:52:55 Modified files: sysutils/nnn : Makefile distinfo Added files: sysutils/nnn/patches: patch-src_nnn_c Log message: Update nnn to v4.4, by maintainer Martin Ziemer Software changes: * support macOS iterm2 in plugin preview-tui (#1196) * use selection at native command prompt with %j and %J (docs) * scroll strings longer than columns in rename/new prompts (#1213, #279) * batch rename symlink targets in listing mode (#1214) * option for recursive rename in plugin .nmv (#1186) * more frequent checks for cancellation during du (#1236) * picker mode: enable auto-proceed * picker mode: don't pick hovered file on Enter if selection exists * picker mode: fix issue in plugin fzopen when used to pick files * send file to explorer FIFO on double left click instead of opening it * new neovim plugin nnn.nvim featuring explorer mode * explorer mode for nnn.vim * remove option -w: always place HW cursor on current entry * accept link name when linking a single target (#1201) * option -i to show current file information in info bar * force GNU sed on *BSD and Solaris * add nsxiv support to nuke, preview-tabbed and imgview (#1230) * fix preview-tui without -a (#1208) * pass pts in env var for preview-tui to use in tput (#1235) * disable editing file in picker mode (#1183) * save session in picker mode (#1190) * use nerd icons for gitstatus patch (#1220) Port changes: * added run_dep gsed * cherry picked upstream patch to make use of gsed on BSDs Sijmen J. Mulder noticed that gsed is required now. op@ noticed that gsed is not used due a bug. ok sthen@ for the original update ok op@ and solene@ for the final version with gsed patch
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2021/11/25 11:28:15 Modified files: devel : Makefile Log message: Adding subdirectory fnc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2021/11/25 11:26:23 Log message: Import fnc 0.6, a terminal frontend for fossil A read-only ncurses browser for fossil repositories. Port created by me and I'm also taking MAINTAINER, with hints from sthen@. ok sthen@, solene@ Status: Vendor Tag: sdk Release Tags: sdk_20211125 N ports/devel/fnc/Makefile N ports/devel/fnc/distinfo N ports/devel/fnc/pkg/DESCR N ports/devel/fnc/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2021/11/25 11:10:28 Modified files: www/uget : Makefile Log message: Homepage http => https Forgot to commit it previously when rsadowski@ mentioned it
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2021/11/25 10:56:44 Modified files: shells/fish: Makefile Added files: shells/fish/patches: patch-src_history_cpp Log message: Backport a patch fixing a bug corrupting history file
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2021/11/25 10:19:32 Modified files: games/openttd : Makefile distinfo Log message: Update to openttd-12.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2021/11/25 10:19:19 Modified files: net/lagrange : Makefile distinfo Log message: Update to lagrange-1.8.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2021/11/25 10:13:27 Modified files: editors/kakoune: Makefile distinfo editors/kakoune/pkg: PLIST Log message: Update to kakoune-2021.11.08 Patch from maintainer Frederic Galusik
Re: [new] lebiniou 3.63 (+deps)
Le Sat, Nov 20, 2021 at 01:57:30PM +, Stuart Henderson a écrit : > On 2021/11/20 09:45, Landry Breuil wrote: > > hi, > > > > here's a port for lebiniou (https://biniou.net/) - and its deps: > > > > Le Biniou is open-source, user-friendly, powerful music visualization > > & VJing tool. > > > > Are you an artist, composer, or VJ ? Create live visuals based on your > > audio performances or existing tracks. > > > > As a music fan, watch an everlasting, mesmerizing and totally unseen > > creation reacting to the music. > > > > 99% of the port work has been done by semarie@, i've just nudged > > upstream in doing an sndio input in > > https://gitlab.com/lebiniou/lebiniou/-/issues/134 and done some testing > > with it. > > > > feedback on the 5 ports welcome - testing too :) > > > > Landry > > a few tweaks; > > - SEPARATE_BUILD is automatic with cmake.port.mk > > - drop cmake shlib version patches; cmake.port.mk handles shared lib > versions automatically _as long as you have SHARED_LIBS set_ > ... so on the first build it will use a plain .so extension with > no version, then you add SHARED_LIBS for the lib name and rebuild, then > it will set the version for you. > > - i guess these ports were written before autoreconf? thanks for the feedback, appreciated ! new version taking those into account, the last questionable thing is the unversioned libbiniou.so file in multimedia/lebiniou/pkg/PLIST, with or without SHARED_LIBS it stays unversioned, per patch-configure_ac & patch-src_Makefile_am the bits versioning it to .so.0 are patched out. Dunno what should be done there ... Landry biniou-3.63+deps_3.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2021/11/25 09:23:22 Modified files: editors/libreoffice: Makefile Log message: fix Makefile of 7.2.3.2 by using the correct version
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2021/11/25 09:21:07 Modified files: editors/libreoffice: Makefile distinfo editors/libreoffice/patches: patch-RepositoryExternal_mk patch-configure patch-sc_source_core_data_column3_cxx Log message: update to 7.2.3.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/11/25 08:47:32 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register databases/virtuoso removal
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/11/25 08:47:05 Modified files: databases : Makefile Log message: -virtuoso
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/11/25 08:46:46 Removed files: databases/virtuoso: Makefile distinfo databases/virtuoso/patches: patch-binsrc_maildrop_Makefile_in patch-binsrc_tests_Makefile_in patch-binsrc_tests_biftest_bif_sample_c patch-binsrc_vspx_vspx_sql patch-configure_in patch-libsrc_Thread_sched_pthread_c patch-libsrc_Thread_thread_int_h patch-libsrc_Wi_bif_crypto_c patch-libsrc_Wi_bif_file_c patch-libsrc_Wi_disk_c patch-libsrc_Wi_http_c patch-libsrc_Wi_openxml_sql patch-libsrc_Wi_recovery_c patch-libsrc_Wi_srvstat_c patch-libsrc_Wi_system_sql patch-libsrc_Wi_xmlenc_algos_c patch-libsrc_Wi_xmlenc_c patch-libsrc_Wi_xmlenc_h patch-libsrc_odbcsdk_include_sqltypes_h patch-libsrc_plugin_dlf_h patch-libsrc_util_usage_c patch-libsrc_zlib_contrib_minizip_ioapi_h databases/virtuoso/pkg: DESCR PLIST Log message: Remove databases/virtuoso. Imported for nepomuk which already left the tree. Not used by anything else. Since it was never updated to more recent versions, it's getting in the way of libcrypto changes. ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/11/25 08:11:47 Modified files: geo/py-laspy : Makefile distinfo geo/py-laspy/pkg: PLIST Removed files: geo/py-laspy/patches: patch-setup_py Log message: geo/py-laspy: update to 2.0.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2021/11/25 08:02:50 Modified files: sysutils/firmware/iwx: Makefile distinfo sysutils/firmware/iwx/pkg: PLIST Log message: Update our iwx(4) firmware package. Remove -48 firmware images which are no longer used by the driver. Add -67 firmware images which allegedly contain security fixes. We should be able to use these soon. The driver has been patched to work with -67 images but has not yet been switched over (pending more testing). Add newest available firmware images for any AX201 devices which are not yet matched by the driver but will hopefully be supported eventually. ok sthen@ committed over AX201 running fw ver 67.8f59b80b.0
Re: sparc64 bulk build report
On Sun, November 21, 2021 07:39, k...@openbsd.org wrote: > Bulk build on sparc64-0a.ports.openbsd.org > > Started : Thu Nov 18 11:32:04 MST 2021 > Finished: Sat Nov 20 21:39:18 MST 2021 > Duration: 2 Days 10 hours 7 minutes > > Built using OpenBSD 7.0-current (GENERIC.MP) #1057: Wed Nov 17 16:51:35 MST > 2021 [...] Hi! The patch below fixes build on sparc64. OK? > http://build-failures.rhaalovely.net/sparc64/2021-11-18/graphics/enblend-enfuse.log Index: patches/patch-src_minimizer_h === RCS file: patches/patch-src_minimizer_h diff -N patches/patch-src_minimizer_h --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_minimizer_h 25 Nov 2021 08:51:18 - @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: src/minimizer.h +--- src/minimizer.h.orig src/minimizer.h +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include +
Re: [maintainer update] nnn 4.3 -> 4.4
Am Thu, Nov 25, 2021 at 10:09:40AM +0100 schrieb Sijmen J. Mulder:
> Stefan Hagen :
> > Yes, we should use gsed RUN_DEP and the ifdef removal patch. I saw the
> > patch has been merged upstream already, so we'll get it either way ;-)
>
> For later reference: https://github.com/jarun/nnn/pull/1243
>
I created and tested a diff with the changes from Omar Polo.
Tested on two amd64 systems.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile4 Oct 2021 14:16:52 - 1.17
+++ Makefile25 Nov 2021 12:58:07 -
@@ -2,7 +2,7 @@
COMMENT = the missing terminal file browser for X
-V =4.3
+V =4.4
DISTNAME = nnn-v${V}
PKGNAME = nnn-${V}
@@ -31,6 +31,8 @@ USE_GMAKE = Yes
NO_TEST = Yes
WRKDIST = ${WRKDIR}/nnn-${V}
+
+RUN_DEPENDS = textproc/gsed
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions/
Index: distinfo
===
RCS file: /cvs/ports/sysutils/nnn/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo4 Oct 2021 14:16:52 - 1.14
+++ distinfo25 Nov 2021 12:58:07 -
@@ -1,2 +1,2 @@
-SHA256 (nnn-v4.3.tar.gz) = tt+OJi5WE90ZK6xhCm2nETBmJ9Vlc/GncKFz7weJU7s=
-SIZE (nnn-v4.3.tar.gz) = 236606
+SHA256 (nnn-v4.4.tar.gz) = 4Eo/Dwwq8eGMtvAF0YJnx3A2RCdNIbuT8Dsw5P09FlM=
+SIZE (nnn-v4.4.tar.gz) = 239005
Index: patches/patch-nnn
===
RCS file: patches/patch-nnn
diff -N patches/patch-nnn
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-nnn 25 Nov 2021 12:58:07 -
@@ -0,0 +1,28 @@
+commit deead97e23981074d0e33520558d54b6e34fa374
+URL: https://github.com/jarun/nnn/pull/1243
+Author: Omar Polo
+Date: Wed Nov 24 11:40:59 2021 +0100
+
+drop unnecessary ifdef __linux__
+
+since nnn requires gsed anyway, why don't use it?
+Probably forgot in #1210
+
+diff --git src/nnn.c src/nnn.c
+index 1f02008..20a6051 100644
+--- src/nnn.c
src/nnn.c
+@@ -2729,12 +2729,7 @@ static void archive_selection(const char *cmd, const
char *archive, const char *
+ }
+
+ snprintf(buf, CMD_LEN_MAX,
+-#ifdef __linux__
+ SED" -ze 's|^%s/||' '%s' | xargs -0 %s %s", curpath, selpath,
cmd, archive
+-#else
+- "tr '\\0' '\n' < '%s' | "SED" -e 's|^%s/||' | tr '\n' '\\0' |
xargs -0 %s %s",
+- selpath, curpath, cmd, archive
+-#endif
+ );
+ spawn(utils[UTIL_SH_EXEC], buf, NULL, NULL, F_CLI | F_CONFIRM);
+ free(buf);
+
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2021/11/25 05:59:00 Modified files: inputmethods/ibus-typing-booster: Makefile distinfo Log message: Update to ibus-typing-booster-2.15.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2021/11/25 05:53:48 Modified files: www/uget : Makefile distinfo www/uget/patches: patch-tests_test-plugin+app_c patch-ui-gtk_UgtkSetting_c Log message: Update to uget-2.2.2 ok bcallah@ (maintainer) tests from op@ (including a MEGA link)
Re: update textproc/libmarisa to add perl and ruby bindings
On Wed, Nov 24, 2021 at 02:31:32PM +, Stuart Henderson wrote:
> On 2021/11/24 21:39, Kinichiro Inoguchi wrote:
> > On Wed, Nov 24, 2021 at 08:45:36AM +, Stuart Henderson wrote:
> > > On 2021/11/23 17:33, Kinichiro Inoguchi wrote:
> > > > This adds perl and ruby bindings to libmarisa as sub packages.
> > > > Currently only python binding is included.
> > > > I had checked this with sample.pl and sample.rb on my openbsd7.0/amd64,
> > > > and saw this works fine.
> > > >
> > > > Incremented REVISION-main and added REVISION-python in Makefile.
> > > >
> > > > ok?
> > >
> > > There are some surplus WANTLIB:
> > >
> > > $ make port-lib-depends-check
> > >
> > > p5-libmarisa-0.2.6(textproc/libmarisa,-perl):
> > > Extra: c++.8 c++abi.5 pthread.26
> > >
> > > py3-libmarisa-0.2.6p0(textproc/libmarisa,-python):
> > > Extra: python3.9.0
> > >
> > > ruby-libmarisa-0.2.6(textproc/libmarisa,-ruby):
> > > Extra: gmp.11 ruby30.0
> > >
> > >
> > > Removing those WANTLIB will invalidate the LIB_DEPENDS entries (there
> > > needs to
> > > be an associated WANTLIB), so those will need to change to RUN_DEPENDS.
> > >
> >
> > Thanks for pointing out this.
> > I had checked all WANTLIB and LIB_DEPENDS again and now I saw
> > 'make port-lib-depends-check' finished successfully.
> > I did not add RUN_DEPENDS for this since LIB_DEPENDS is enough.
> > ok?
>
> There are RUN_DEPENDS for both Python and Ruby in all subpackages:
>
> $ make dump-vars|grep RUN_DEPENDS
> textproc/libmarisa,-main.RUN_DEPENDS=lang/python/3.9 lang/ruby/3.0
> textproc/libmarisa,-perl.RUN_DEPENDS=lang/python/3.9 lang/ruby/3.0
> textproc/libmarisa,-python.RUN_DEPENDS=lang/python/3.9 lang/ruby/3.0
> textproc/libmarisa,-ruby.RUN_DEPENDS=lang/python/3.9 lang/ruby/3.0
>
> So you need:
>
> RUN_DEPENDS-main= # empty
> RUN_DEPENDS-perl= # empty
> RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS}
> RUN_DEPENDS-ruby= ${MODRUBY_RUN_DEPENDS}
>
> Also running "make plist" adds new files to PLIST-perl:
>
> --- pkg/PLIST-perlWed Nov 24 14:13:37 2021
> +++ pkg/PLIST-perl.newWed Nov 24 14:27:36 2021
> @@ -3,4 +3,6 @@ ${P5ARCH}/
> ${P5ARCH}/auto/
> ${P5ARCH}/auto/marisa/
> @so ${P5ARCH}/auto/marisa/marisa.so
> +${P5ARCH}/benchmark.pl
> ${P5ARCH}/marisa.pm
> +${P5ARCH}/sample.pl
>
> I agree with removing them, but it should be explicit so they don't
> get added back in by mistake later. Either add to PLIST with @comment:
>
> @so ${P5ARCH}/auto/marisa/marisa.so
> @comment ${P5ARCH}/benchmark.pl
> ${P5ARCH}/marisa.pm
> @comment ${P5ARCH}/sample.pl
>
> or rm in post-install.
>
Thanks for your review.
Now I added RUN_DEPENDS-* and update PLIST-perl with @comment.
benchmark.pl and sample.pl are sample scripts and I do not think it should be
placed under the ${P5ARCH}/.
I tested build and install on amd64 and works fine.
'make port-lib-depends-check' tells nothing.
Index: Makefile
===
RCS file: /cvs/ports/textproc/libmarisa/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile14 Sep 2021 10:51:53 - 1.2
+++ Makefile25 Nov 2021 12:39:32 -
@@ -1,13 +1,18 @@
# $OpenBSD: Makefile,v 1.2 2021/09/14 10:51:53 inoguchi Exp $
COMMENT-main = C++ library for MARISA matching algorithm
+COMMENT-perl = marisa-trie bindings for Perl (SWIG)
COMMENT-python = marisa-trie bindings for Python (SWIG)
+COMMENT-ruby = marisa-trie bindings for Ruby (SWIG)
V =0.2.6
PKGNAME-main = libmarisa-${V}
+PKGNAME-perl = p5-libmarisa-${V}
PKGNAME-python = py3-libmarisa-${V}
+PKGNAME-ruby = ruby-libmarisa-${V}
-REVISION-main =0
+REVISION-main =1
+REVISION-python = 0
GH_ACCOUNT = s-yata
GH_PROJECT = marisa-trie
@@ -22,20 +27,39 @@ MAINTAINER =Yifei Zhan
-.if ${BUILD_PACKAGES:M-python}
+.if ${BUILD_PACKAGES:M-perl} || ${BUILD_PACKAGES:M-python} ||
${BUILD_PACKAGES:M-ruby}
BUILD_DEPENDS += devel/swig
+.endif
+
+.if ${BUILD_PACKAGES:M-perl}
+MODULES += perl
+LIB_DEPENDS-perl = ${BUILD_PKGPATH},-main=${V}
+RUN_DEPENDS-perl = # empty
+WANTLIB-perl = c marisa perl
+.endif
+
+.if ${BUILD_PACKAGES:M-python}
MODULES += lang/python
-LIB_DEPENDS-python = ${BUILD_PKGPATH},-main=${V} ${MODPY_LIB_DEPENDS}
-WANTLIB-python = ${COMPILER_LIBCXX} ${MODPY_WANTLIB} m marisa
+LIB_DEPENDS-python = ${BUILD_PKGPATH},-main=${V}
+RUN_DEPENDS-python = ${MODPY_RUN_DEPENDS}
+WANTLIB-python = ${COMPILER_LIBCXX} m marisa
+.endif
+
+.if ${BUILD_PACKAGES:M-ruby}
+MODULES += lang/ruby
+LIB_DEPENDS-ruby = ${BUILD_PKGPATH},-main=${V}
+RUN_DEPENDS-ruby = ${MODRUBY_RUN_DEPENDS}
+WANTLIB-ruby = ${COMPILER_LIBCXX} c m marisa pthread
.endif
AUTOCONF_VERSION = 2.69
@@ -48,6 +72,14 @@ CONFIGURE_ARGS +=--enable-sse2
.endif
post-build:
+.if
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/11/25 04:35:02 ports/inputmethods/libkkc/patches Update of /cvs/ports/inputmethods/libkkc/patches In directory cvs.openbsd.org:/tmp/cvs-serv33973/patches Log Message: Directory /cvs/ports/inputmethods/libkkc/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/25 02:30:53 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: quirks for php-markdown, php-predis
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/25 02:29:52 Modified files: www: Makefile Removed files: www/php-markdown: Makefile distinfo www/php-markdown/pkg: DESCR PLIST www/php-predis : Makefile distinfo www/php-predis/pkg: DESCR PLIST Log message: remove two outdated PEAR-ish php ports that survived the recent cleanup
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/25 02:24:38 Modified files: security/py-keyring: Makefile distinfo security/py-keyring/pkg: PLIST Log message: update to py3-keyring-23.3.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/25 02:18:52 Modified files: math/calc : Makefile distinfo math/calc/pkg : PLIST Log message: update to calc-2.14.0.9
Re: [NEW] www/ruby-jekyll
On 2021/11/24 11:27, joshua stein wrote: > On Wed, 24 Nov 2021 at 18:09:33 +0100, Clemens Gößnitzer wrote: > > Beginning with this email, I'll send out a couple of new ports which are all > > dependencies for www/ruby-jekyll. With these, I get a working jekyll for my > > applications. I tested that `serve' and `build' commands work, and > > --incremental and --watch flags, too. If you have some more tests, I'd be > > happy > > to know if something does not work. > > Is there really any reason to keep this in the ports tree? I > thought we were doing away with ports for simple Ruby modules. > > Jekyll installs fine with Bundler and since I'd imagine most would > need a custom Gemfile with other things in it anyway, why bother > having a system-wide Jekyll installation that will be ~6 months out > of date in each OpenBSD release? > Besides this, sending a batch of this many new ports in one go is too much for us to deal with, manageable chunks please. Max 3 or 4 at once would be more like it (keep dependency chains together, in a single email if they're fairly closely related).
Re: [maintainer update] nnn 4.3 -> 4.4
Stefan Hagen : > Yes, we should use gsed RUN_DEP and the ifdef removal patch. I saw the > patch has been merged upstream already, so we'll get it either way ;-) For later reference: https://github.com/jarun/nnn/pull/1243
Re: missing WANTLIB in inputmethods/ibus
On 2021/11/25 03:22, Yifei Zhan wrote:
> ibus is missing a few WANTLIBs:
>
> ibus-1.5.25p3(inputmethods/ibus,-main):
> Missing: Xau.10 (/usr/local/libexec/ibus-x11) (system lib)
> Missing: Xdmcp.11 (/usr/local/libexec/ibus-x11) (system lib)
> WANTLIB += Xau Xdmcp
>
> ibus-gtk2-1.5.25p1(inputmethods/ibus,-gtk2):
> Missing: Xau.10 (/usr/local/lib/gtk-2.0/2.10.0/immodules/im-ibus.so) (system
> lib)
> Missing: Xdmcp.11 (/usr/local/lib/gtk-2.0/2.10.0/immodules/im-ibus.so)
> (system lib)
> WANTLIB += Xau Xdmcp
>
> ibus-gtk4-1.5.25p1(inputmethods/ibus,-gtk4):
> Missing: Xau.10 (/usr/local/lib/gtk-4.0/4.0.0/immodules/libim-ibus.so)
> (system lib)
> Missing: Xdmcp.11 (/usr/local/lib/gtk-4.0/4.0.0/immodules/libim-ibus.so)
> (system lib)
> WANTLIB += Xau Xdmcp
>
>
> Here is a diff to add Xau and Xdmcp to its WANTLIB list. After that,
> make port-lib-depends-check runs cleanly.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/inputmethods/ibus/Makefile,v
> retrieving revision 1.74
> diff -u -r1.74 Makefile
> --- Makefile 18 Nov 2021 10:23:09 - 1.74
> +++ Makefile 25 Nov 2021 03:12:14 -
> @@ -14,6 +14,7 @@
> PKGNAME-gtk2 = ibus-gtk2-${GH_TAGNAME}
> PKGNAME-gtk4 = ibus-gtk4-${GH_TAGNAME}
>
> +REVISION = 0
> REVISION-main = 3
> REVISION-gtk2 = 1
> REVISION-gtk4 = 1
Committed with REVISION markers fixed. For a multi package port, REVISION
sets the default used for subpackages and is overridden by
REVISION-(subpackage).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/25 02:05:42 Added files: net/icinga/core2/patches: patch-lib_icinga_usergroup_cpp Log message: icinga2: add missing header to fix non-unity build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2021/11/25 01:50:03 Modified files: www/goaccess : Makefile distinfo www/goaccess/patches: patch-src_browsers_c www/goaccess/pkg: PLIST Log message: update to goaccess-1.5.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/25 01:27:50 Modified files: net/icinga/core2: Makefile Log message: icinga2: use unity build on all LP64, not just amd64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/11/25 01:25:22 Modified files: inputmethods/ibus: Makefile Log message: ibus: sync WANTLIB, from Yifei Zhan (I fixed REVISION markers)
