CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mar...@cvs.openbsd.org 2021/01/31 00:38:58 Modified files: sysutils/py-schedule: Makefile distinfo Log message: Update py-schedule to 1.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2021/01/31 00:37:18 Modified files: games/garden : Makefile Added files: games/garden/patches: patch-src_main_c Log message: Set -fcommon in the build.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2021/01/31 00:35:47 ports/games/garden/patches Update of /cvs/ports/games/garden/patches In directory cvs.openbsd.org:/tmp/cvs-serv80193/patches Log Message: Directory /cvs/ports/games/garden/patches added to the repository
audio/speech-dispatcher -fno-common
update speech-dispatcher to fix -fno-common build
this is used by x11/gnome/orca and x11/qt5/qtspeech
which are in turn used by quite a few other ports
$ show-reverse-deps audio/speech-dispatcher | wc -l
264
/tmp/libspeechd.so.2.1 --> /usr/local/lib/libspeechd.so.2.2
Dynamic export changes:
added:
spd_get_client_id
Index: Makefile
===
RCS file: /cvs/ports/audio/speech-dispatcher/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile3 Jul 2020 21:12:35 - 1.31
+++ Makefile31 Jan 2021 06:42:40 -
@@ -2,11 +2,10 @@
COMMENT= common interface to speech synthesis
-V= 0.9.1
+V= 0.10.2
DISTNAME= speech-dispatcher-${V}
-REVISION= 0
-SHARED_LIBS += speechd 2.1 # .8.0
+SHARED_LIBS += speechd 2.2 # .10.2
CATEGORIES=audio
Index: distinfo
===
RCS file: /cvs/ports/audio/speech-dispatcher/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo16 May 2020 12:00:07 - 1.10
+++ distinfo31 Jan 2021 06:42:40 -
@@ -1,2 +1,2 @@
-SHA256 (speech-dispatcher-0.9.1.tar.gz) =
N8BA45w6yNp1XUkByTt2Zv20yFhW/fXm0VnnaaEob5k=
-SIZE (speech-dispatcher-0.9.1.tar.gz) = 166
+SHA256 (speech-dispatcher-0.10.2.tar.gz) =
sGMZ8gHhXlbGKWZTr1vPwwDLNI6XLVF9+LBurHfq4tw=
+SIZE (speech-dispatcher-0.10.2.tar.gz) = 4431520
Index: patches/patch-src_modules_module_utils_h
===
RCS file: patches/patch-src_modules_module_utils_h
diff -N patches/patch-src_modules_module_utils_h
--- patches/patch-src_modules_module_utils_h16 May 2020 12:00:07 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_modules_module_utils_h,v 1.1 2020/05/16 12:00:07 ajacoutot
Exp $
-
-error: invalid suffix on literal;
-C++11 requires a space between literal and identifier
[-Wreserved-user-defined-literal]
-
-Index: src/modules/module_utils.h
src/modules/module_utils.h.orig
-+++ src/modules/module_utils.h
-@@ -122,10 +122,10 @@ const char *module_name;
- } while(0)
-
- #define FATAL(msg) do { \
-- fprintf(stderr, "FATAL ERROR in output module [%s:%d]:\n
"msg, \
-+ fprintf(stderr, "FATAL ERROR in output module [%s:%d]:\n "
msg, \
- __FILE__, __LINE__); \
- if (Debug > 1) \
-- fprintf(CustomDebugFile, "FATAL ERROR in output module
[%s:%d]:\n "msg, \
-+ fprintf(CustomDebugFile, "FATAL ERROR in output module
[%s:%d]:\n " msg, \
- __FILE__, __LINE__); \
- exit(EXIT_FAILURE); \
- } while (0)
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/speech-dispatcher/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 16 May 2020 12:00:08 - 1.9
+++ pkg/PLIST 31 Jan 2021 06:42:42 -
@@ -52,6 +52,7 @@ lib/speech-dispatcher-modules/
@bin lib/speech-dispatcher-modules/sd_generic
@bin lib/speech-dispatcher-modules/sd_ibmtts
@bin lib/speech-dispatcher-modules/sd_kali
+@bin lib/speech-dispatcher-modules/sd_voxin
@so lib/speech-dispatcher/spd_libao.so
share/examples/speech-dispatcher/
share/examples/speech-dispatcher/speech-dispatcher/
@@ -69,8 +70,6 @@ share/examples/speech-dispatcher/speech-
@sample ${SYSCONFDIR}/speech-dispatcher/modules/dtk-generic.conf
share/examples/speech-dispatcher/speech-dispatcher/modules/epos-generic.conf
@sample ${SYSCONFDIR}/speech-dispatcher/modules/epos-generic.conf
-share/examples/speech-dispatcher/speech-dispatcher/modules/espeak-generic.conf
-@sample ${SYSCONFDIR}/speech-dispatcher/modules/espeak-generic.conf
share/examples/speech-dispatcher/speech-dispatcher/modules/espeak-mbrola-generic.conf
@sample ${SYSCONFDIR}/speech-dispatcher/modules/espeak-mbrola-generic.conf
share/examples/speech-dispatcher/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf
@@ -88,15 +87,22 @@ share/examples/speech-dispatcher/speech-
share/examples/speech-dispatcher/speech-dispatcher/modules/kali.conf
share/examples/speech-dispatcher/speech-dispatcher/modules/llia_phon-generic.conf
@sample ${SYSCONFDIR}/speech-dispatcher/modules/llia_phon-generic.conf
-share/examples/speech-dispatcher/speech-dispatcher/modules/mary-generic.conf
-share/examples/speech-dispatcher/speech-dispatcher/modules/pico-generic.conf
+share/examples/speech-dispatcher/speech-dispatcher/modules/mary-generic-disabled.conf
share/examples/speech-dispatcher/speech-dispatcher/modules/swift-generic.conf
@sample ${SYSCONFDIR}/speech-dispatcher/modules/swift-generic.conf
+share/examples/speech-dispatcher/speech-dispatcher/modules/voxin.conf
share/examples/speech-dispatcher/speech-dispatcher/speechd.conf
Re: Question about lang/ghc module (trying to port git-annex)
> Here is what I have so far. P.S. to anyone trying to build git-annex, you'll need the following patch, which I didn't yet get around to adding to my WIP port: https://git-annex.branchable.com/bugs/__91__PATCH__93___OpenBSD__58___fix_Utility.DirWatcher.Kqueue/?updated#comment-0b3828545e6cf6ec417c0f82645888cb -- James
Question about lang/ghc module (trying to port git-annex)
Hi ports@, I'm trying to write a port for git-annex, which is built using Haskell's Cabal. I'm new to OpenBSD porting and don't completely understand the lang/ghc module. Basic question: do all of the Haskell dependencies (from git-annex.cabal) need to already have their own ports (like devel/hs-async, devel/hs-network, etc)? (Or will the missing ones be magically built like cabal-install normally does?) If they do need to all be ported, how isn't there e.g. a devel/hs-containers port --- doesn't basically every Haskell project depend on the containers package? git-annex has at least 50 dependencies I couldn't find in ports, so I want to make sure I understand this before I start porting them one at a time (or just give up)... Also, I'm using devel/darcs/Makefile as my model but don't understand the following comment. Should I also be listing git-annex's dependencies in BUILD_DEPENDS instead of LIB_DEPENDS? # Yes, build dependencies, because GHC libs are still static and we # don't want to pull in all of ghc. BUILD_DEPENDS = archivers/hs-zip-archive>=0.2.3,<0.4 \ archivers/hs-zlib>=0.6.1.2,<0.7.0.0 \ ... Another question: what is MODGHC_PACKAGE_KEY? ghc.port.mk describes it as the "package key" of the library, but I don't know what that means. Here is what I have so far. I only included the dependencies that are already in ports. Currently make build fails with a compiler error "Could not find module ‘System.FilePath.ByteString’", indicating that it is indeed a problem that there's no filepath-bytestring port. diff --git a/devel/git-annex/Makefile b/devel/git-annex/Makefile new file mode 100644 index 000..57ae7fe1079 --- /dev/null +++ b/devel/git-annex/Makefile @@ -0,0 +1,54 @@ +# $OpenBSD$ +# +# TODO: +# Use /usr/ports/infrastructure/bin/portcheck + +COMMENT = manage files with git without checking in file contents + +DISTNAME = git-annex-8.20210127 +CATEGORIES = devel +HOMEPAGE = https://git-annex.branchable.com/ + +MODULES = lang/ghc +MODGHC_BUILD = cabal hackage nort + +# Many licenses listed in COPYRIGHT. All permit redistribution. +PERMIT_PACKAGE = Yes + +# TODO +# "make port-lib-depends-check" can help +#WANTLIB = ??? + +# TODO +# Dependencies +#BUILD_DEPENDS = ??? +RUN_DEPENDS = net/rsync devel/git-lfs +LIB_DEPENDS = devel/hs-network-uri>=2.6 \ + devel/hs-exceptions>=0.6 \ + devel/hs-data-default \ + devel/hs-random \ + devel/hs-dlist \ + devel/hs-unix-compat \ + devel/hs-async \ + devel/hs-hslogger \ + devel/hs-utf8-string \ + devel/hs-sandi \ + devel/hs-monad-control \ + devel/hs-edit-distance \ + devel/hs-resourcet \ + devel/hs-conduit \ + devel/hs-old-locale \ + devel/hs-unliftio-core \ + devel/hs-vector \ + devel/hs-unordered-containers \ + devel/hs-regex-tdfa \ + devel/hs-byteable \ + security/hs-crypto-api \ + devel/hs-split \ + textproc/hs-attoparsec \ + devel/hs-QuickCheck +#version doesn't match +#devel/hs-network>=3.0.0.0 +TEST_DEPENDS = net/rsync + +.include diff --git a/devel/git-annex/distinfo b/devel/git-annex/distinfo new file mode 100644 index 000..9d9fa1c5788 --- /dev/null +++ b/devel/git-annex/distinfo @@ -0,0 +1,2 @@ +SHA256 (ghc/git-annex-8.20210127.tar.gz) = Y29DlCDyipKoJQufi0IlZ+Q5MV8/LSPLC+o7Cg5XVcM= +SIZE (ghc/git-annex-8.20210127.tar.gz) = 1361993
Re: powerpc64 bulk build report
jas...@openbsd.org writes:
> Bulk build on powerpc64.ports.openbsd.org
>
> Started : Mon Jan 25 11:41:33 MST 2021
> Finished: Sat Jan 30 12:29:09 MST 2021
> Duration: 5 Days 0 hours 48 minutes
...
> Build failures: 25
> http://build-failures.rhaalovely.net/powerpc64/2021-01-25/devel/electron.log
> http://build-failures.rhaalovely.net/powerpc64/2021-01-25/www/chromium.log
> http://build-failures.rhaalovely.net/powerpc64/2021-01-25/www/iridium.log
These end with:
...
[182/182] LINK gn
[0x24fdbd234a00:0127/183158.750205:FATAL:args.cc(361)] Check failed: false. OS
architecture not handled. (powerpc64)
The three ports above might go a bit further if variants of the
following patch were to be applied. Only tested to still compile on
amd64.
Let me know how we should test this.
>From 8698fa1f94a1efd5f4ea126bbf4f6dd77d653821 Mon Sep 17 00:00:00 2001
From: Greg Steuck
Date: Sat, 30 Jan 2021 22:04:46 -0800
Subject: [PATCH] Support powerpc64 in gn
---
.../patches/patch-tools_gn_src_gn_args_cc| 16
1 file changed, 16 insertions(+)
create mode 100644 www/chromium/patches/patch-tools_gn_src_gn_args_cc
diff --git www/chromium/patches/patch-tools_gn_src_gn_args_cc
www/chromium/patches/patch-tools_gn_src_gn_args_cc
new file mode 100644
index 000..4aefe14a3aa
--- /dev/null
+++ www/chromium/patches/patch-tools_gn_src_gn_args_cc
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+OpenBSD has a different architecture name not seen before in gn.
+
+Index: tools/gn/src/gn/args.cc
+--- tools/gn/src/gn/args.cc.orig
tools/gn/src/gn/args.cc
+@@ -356,7 +356,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const {
+ arch = kMips64;
+ else if (os_arch == "s390x")
+ arch = kS390X;
+- else if (os_arch == "ppc64" || os_arch == "ppc64le")
++ else if (os_arch == "ppc64" || os_arch == "ppc64le" || os_arch ==
"powerpc64")
+ // We handle the endianness inside //build/config/host_byteorder.gni.
+ // This allows us to use the same toolchain as ppc64 BE
+ // and specific flags are included using the host_byteorder logic.
--
2.30.0
security/libsrtp -fno-common
https://github.com/cisco/libsrtp/commit/716a73862b387a2107f37398c0fb7d9a754c0ccd.patch
/tmp/libsrtp2.so.1.0 --> /usr/local/lib/libsrtp2.so.2.0
Dynamic export changes:
removed:
bit_string
Index: Makefile
===
RCS file: /cvs/ports/security/libsrtp/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile3 Feb 2020 20:40:40 - 1.12
+++ Makefile31 Jan 2021 05:31:09 -
@@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.12 2020/02/03 20:40:40 sthen Exp $
-SHARED_LIBS += srtp2 1.0 # 0.0
+SHARED_LIBS += srtp2 2.0 # 0.0
COMMENT= secure RTP library
GH_ACCOUNT=cisco
GH_PROJECT=libsrtp
GH_TAGNAME=v2.3.0
-REVISION= 0
+REVISION= 1
CATEGORIES=security telephony
Index: patches/patch-crypto_math_datatypes_c
===
RCS file: patches/patch-crypto_math_datatypes_c
diff -N patches/patch-crypto_math_datatypes_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-crypto_math_datatypes_c 31 Jan 2021 05:31:09 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix building with gcc-10
+716a73862b387a2107f37398c0fb7d9a754c0ccd
+
+Index: crypto/math/datatypes.c
+--- crypto/math/datatypes.c.orig
crypto/math/datatypes.c
+@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet)
+
+ /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */
+
+-char bit_string[MAX_PRINT_STRING_LEN];
++static char bit_string[MAX_PRINT_STRING_LEN];
+
+ uint8_t srtp_nibble_to_hex_char(uint8_t nibble)
+ {
Index: patches/patch-test_util_c
===
RCS file: patches/patch-test_util_c
diff -N patches/patch-test_util_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-test_util_c 31 Jan 2021 05:31:09 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix building with gcc-10
+716a73862b387a2107f37398c0fb7d9a754c0ccd
+
+Index: test/util.c
+--- test/util.c.orig
test/util.c
+@@ -49,7 +49,7 @@
+ #include
+
+ /* include space for null terminator */
+-char bit_string[MAX_PRINT_STRING_LEN + 1];
++static char bit_string[MAX_PRINT_STRING_LEN + 1];
+
+ static inline int hex_char_to_nibble(uint8_t c)
+ {
Re: [update] x11/xvkbd (Re: Build failures from -fno-common)
> Thank you. Unfortunately your mailer has garbled the attachment.
> Can you resend it?
wow, sorry. it seems my cvs usage was bad...
I created another bare diff output here.
x---x---x---x---x---x---x---x---x---x---x---x---x---x---x---x---x
diff -Nur Makefile.orig Makefile
--- Makefile.orig Sat Jul 13 05:51:31 2019
+++ MakefileSun Jan 31 03:50:15 2021
@@ -2,7 +2,7 @@
COMMENT= virtual keyboard for X Window System
-DISTNAME= xvkbd-3.9
+DISTNAME= xvkbd-4.1
CATEGORIES=x11
HOMEPAGE= http://t-sato.in.coocan.jp/xvkbd/
@@ -11,13 +11,12 @@
# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB += ICE SM X11 Xau Xaw3d Xdmcp Xext Xmu Xpm Xt Xtst c
+WANTLIB += X11 Xaw3d Xmu Xt Xtst c
MASTER_SITES= ${HOMEPAGE}
LIB_DEPENDS= x11/Xaw3d
-CONFIGURE_STYLE= imake
-NO_TEST= Yes
+CONFIGURE_STYLE= gnu
.include
diff -Nur distinfo.orig xvkbd/distinfo
--- distinfo.orig Mon Apr 1 20:54:14 2019
+++ distinfoSat Jan 30 23:28:53 2021
@@ -1,2 +1,2 @@
-SHA256 (xvkbd-3.9.tar.gz) = uBw33ft7eJk9rRXTBPj9eOVA1XwKcvfjMW/UX7qRmp0=
-SIZE (xvkbd-3.9.tar.gz) = 88440
+SHA256 (xvkbd-4.1.tar.gz) = lS0H3w/h5FKGUgt8mLT9AP1g2/Pj6P9h4Swln3ajvvQ=
+SIZE (xvkbd-4.1.tar.gz) = 408704
diff -Nur patches/patch-Makefile_in.orig patches/patch-Makefile_in
--- patches/patch-Makefile_in.orig Thu Jan 1 09:00:00 1970
+++ patches/patch-Makefile_in Sun Jan 31 02:05:29 2021
@@ -0,0 +1,35 @@
+$OpenBSD$
+
+installation directories specified using LOCALBASE, and
+avoid "$<" to make "make" happy (-:
+
+Index: Makefile.in
+--- Makefile.in.orig
Makefile.in
+@@ -325,7 +325,7 @@ bindir = @bindir@
+ build_alias = @build_alias@
+ builddir = @builddir@
+ datadir = @datadir@
+-datarootdir = $(shell pkg-config --variable=datarootdir xt)
++datarootdir = ${LOCALBASE}/share
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+@@ -353,7 +353,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-appdefaultdir = $(shell pkg-config --variable=appdefaultdir xt)
++appdefaultdir = ${LOCALBASE}/lib/X11/app-defaults
+ SUBDIRS = .
+ man_MANS = xvkbd.1
+ xvkbd_SOURCES = xvkbd.c findwidget.c resources.h XVkbd-common.h
+@@ -982,7 +982,7 @@ uninstall-man: uninstall-man1
+
+ xvkbd.1: xvkbd.man
+ [ ! -e $@ ] || rm $@
+- -ln -s $< $@
++ -ln -s xvkbd.man $@
+
+ XVkbd-common.h: XVkbd-common.ad
+ [ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h
diff -Nur patches/patch-resources_h.orig patches/patch-resources_h
--- patches/patch-resources_h.orig Thu Jan 1 09:00:00 1970
+++ patches/patch-resources_h Sun Jan 31 02:07:38 2021
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+the variables should be long enabling conversion to pointers.
+
+Index: resources.h
+--- resources.h.orig
resources.h
+@@ -103,8 +103,8 @@ struct appres_struct {
+ float max_height_ratio;
+ int text_delay;
+ int key_click_pitch;
+- int key_click_duration;
+- int autoclick_delay;
++ long key_click_duration;
++ long autoclick_delay;
+
+ int save_private_dict_interval;
+ float private_dict_decay;
diff -Nur patches/patch-xvkbd_c.orig patches/patch-xvkbd_c
--- patches/patch-xvkbd_c.orig Mon Apr 1 20:54:14 2019
+++ patches/patch-xvkbd_c Sun Jan 31 02:08:52 2021
@@ -1,23 +1,94 @@
-$OpenBSD: patch-xvkbd_c,v 1.3 2019/04/01 11:54:14 naddy Exp $
+$OpenBSD$
+the variables should be long enabling conversion to pointers,
+and one indentation fix.
+
Index: xvkbd.c
--- xvkbd.c.orig
+++ xvkbd.c
-@@ -1114,7 +1114,7 @@ static void SendKeyPressedEvent(KeySym keysym, unsigne
- for (inx = (keycode - min_keycode) * keysym_per_keycode;
-inx < (keycode - min_keycode + 1) * keysym_per_keycode;
-inx++)
--fprintf(stderr, " 0x%x (%s)",
-+fprintf(stderr, " 0x%lx (%s)",
- keysym_table[inx], keysym_table[inx] ?
XKeysymToString(keysym_table[inx]) : "null");
- fprintf(stderr, "\n");
- } else
-@@ -1964,7 +1964,7 @@ static void SetWindowManagerHint(Boolean initial)
- FALSE, SubstructureNotifyMask | SubstructureRedirectMask,
- (XEvent *));
- if (appres.debug)
-- fprintf(stderr, "SetWindowManagerHint: _NET_WM_STATE_ABOVE = %d\n",
ev.data.l[0]);
-+ fprintf(stderr, "SetWindowManagerHint: _NET_WM_STATE_ABOVE = %ld\n",
ev.data.l[0]);
- }
- }
+@@ -1730,7 +1730,7 @@ static void SendString(const char *str)
+ const char *cp, *cp2;
+ char key[50];
+ int len;
+- int val;
++ long val;
+ Window target_root, child, junk_w;
+ int junk_i;
+ unsigned junk_u;
+@@ -1828,7 +1828,7 @@ static void SendString(const char *str)
+ break;
+ case 'x':
+ case 'y': /* move mouse pointer */
+- sscanf(cp + 1, "%d", );
++ sscanf(cp + 1, "%ld", );
+ target_root = RootWindow(target_dpy, DefaultScreen(target_dpy));
+
devel/boehm-gc -fno-common
https://github.com/ivmai/bdwgc/commit/808af929bf55cd2b31e354f1903e182b151e8668.patch
Index: patches/patch-include_private_gc_priv_h
===
RCS file: patches/patch-include_private_gc_priv_h
diff -N patches/patch-include_private_gc_priv_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-include_private_gc_priv_h 31 Jan 2021 05:00:46 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix GC_jmp_buf multiple definition
+808af929bf55cd2b31e354f1903e182b151e8668
+
+Index: include/private/gc_priv.h
+--- include/private/gc_priv.h.orig
include/private/gc_priv.h
+@@ -2515,7 +2515,7 @@ GC_INNER ptr_t GC_store_debug_info(ptr_t p, word sz, c
+
+ #if defined(NEED_FIND_LIMIT) \
+ || (defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS))
+- JMP_BUF GC_jmp_buf;
++ GC_EXTERN JMP_BUF GC_jmp_buf;
+
+ /* Set up a handler for address faults which will longjmp to */
+ /* GC_jmp_buf;*/
Index: patches/patch-os_dep_c
===
RCS file: patches/patch-os_dep_c
diff -N patches/patch-os_dep_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-os_dep_c 31 Jan 2021 05:00:46 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix GC_jmp_buf multiple definition
+808af929bf55cd2b31e354f1903e182b151e8668
+
+Index: os_dep.c
+--- os_dep.c.orig
os_dep.c
+@@ -897,6 +897,8 @@ GC_INNER word GC_page_size = 0;
+ /* Some tools to implement HEURISTIC2 */
+ # define MIN_PAGE_SIZE 256/* Smallest conceivable page size, bytes */
+
++GC_INNER JMP_BUF GC_jmp_buf;
++
+ STATIC void GC_fault_handler(int sig GC_ATTR_UNUSED)
+ {
+ LONGJMP(GC_jmp_buf, 1);
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2021/01/30 21:09:38 Modified files: math/gbc : Makefile Added files: math/gbc/patches: patch-bc_global_h Log message: Add fixes for -fno-common >From FreeBSD: https://svnweb.freebsd.org/ports/head/math/gnubc/files/patch-bc_global.h?revision=547437=co ok kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2021/01/30 21:08:41 ports/math/gbc/patches Update of /cvs/ports/math/gbc/patches In directory cvs.openbsd.org:/tmp/cvs-serv51135/patches Log Message: Directory /cvs/ports/math/gbc/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2021/01/30 21:07:22 Modified files: games/spacezero: Makefile Added files: games/spacezero/patches: patch-include_snow_h patch-src_snow_c patch-src_spacecomm_c Log message: Add fixes for -fno-common ok cwen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2021/01/30 21:06:03 Modified files: textproc/halibut: Makefile Added files: textproc/halibut/patches: patch-bk_paper_c patch-paper_h Log message: Add fixes for -fno-common >From Debian: https://sources.debian.org/data/main/h/halibut/1.2-3/debian/patches/gcc-no-common.patch ok cwen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2021/01/30 21:05:11 ports/textproc/halibut/patches Update of /cvs/ports/textproc/halibut/patches In directory cvs.openbsd.org:/tmp/cvs-serv67321/patches Log Message: Directory /cvs/ports/textproc/halibut/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2021/01/30 21:02:52 Modified files: games/cpat : Makefile Added files: games/cpat/patches: patch-src_common_c patch-src_cpat_h Log message: Add fixes for -fno-common ok cwen@
[update] intellij and pycharm
Hello,
Here are updates for the JetBrains duo.
intellij release notes:
https://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+2020.3.2+%28203.7148.57+build%29+Release+Notes
https://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+2020.3.1+%28203.6682.168+build%29+Release+Notes
pycharm release notes:
https://confluence.jetbrains.com/display/PYH/PyCharm+2020.3.3+Release+Notes
https://confluence.jetbrains.com/display/PYH/PyCharm+2020.3.2+Release+Notes
https://confluence.jetbrains.com/display/PYH/PyCharm+2020.3.1+Release+Notes
Build and work fine for me, let me know otherwise
Lucas
diff 8c3ce0a8d256fa24f9c4a67449a2acd28b09eb72 /usr/ports
blob - a72ffb2b3b3f258c10c434ccd0724bc4493c34fe
file + devel/intellij/Makefile
--- devel/intellij/Makefile
+++ devel/intellij/Makefile
@@ -2,7 +2,7 @@
COMMENT= IntelliJ IDEA Java IDE
-V= 2020.3
+V= 2020.3.2
DISTNAME= ideaIC-${V}
PKGNAME= intellij-${V}
CATEGORIES=devel
blob - e8a3b0bfe194cd9aadc2ebfef03870f4b3dd8020
file + devel/intellij/distinfo
--- devel/intellij/distinfo
+++ devel/intellij/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ideaIC-2020.3.tar.gz) = xveLcs97gmGWhWUa6FF8P6+YPcVYxNT0wXGAGrjUNnQ=
-SIZE (ideaIC-2020.3.tar.gz) = 738387806
+SHA256 (ideaIC-2020.3.2.tar.gz) = LbhO8BnaYVfVRMQ9eAkB1heL0CnOaGJn7smsI+Kucn4=
+SIZE (ideaIC-2020.3.2.tar.gz) = 732818262
blob - 0d3bf8ae6efa6e834b9642c071955d20f24960ed
file + devel/intellij/pkg/PLIST
--- devel/intellij/pkg/PLIST
+++ devel/intellij/pkg/PLIST
@@ -356,7 +356,7 @@ intellij/lib/testFramework-java.jar
intellij/lib/testFramework.core.jar
intellij/lib/testFramework.jar
intellij/lib/tests_bootstrap.jar
-intellij/lib/tips-intellij-idea-community-202.13.jar
+intellij/lib/tips-intellij-idea-community-203.16.jar
intellij/lib/trang-core.jar
intellij/lib/trove4j.jar
intellij/lib/txw2-2.3.1.jar
@@ -806,6 +806,11 @@ intellij/plugins/junit/lib/idea-junit.jar
intellij/plugins/junit/lib/junit-rt.jar
intellij/plugins/junit/lib/junit5-rt.jar
intellij/plugins/junit/lib/resources_en.jar
+intellij/plugins/lombok/
+intellij/plugins/lombok/lib/
+intellij/plugins/lombok/lib/lombok-generated.jar
+intellij/plugins/lombok/lib/lombok.jar
+intellij/plugins/lombok/lib/resources_en.jar
intellij/plugins/markdown/
intellij/plugins/markdown/lib/
intellij/plugins/markdown/lib/markdown-0.1.41.jar
diff 8c3ce0a8d256fa24f9c4a67449a2acd28b09eb72 /usr/ports
blob - d9f973411cf532172d99d49e9858df9e893e6aab
file + devel/pycharm/Makefile
--- devel/pycharm/Makefile
+++ devel/pycharm/Makefile
@@ -2,7 +2,7 @@
COMMENT= Python IDE based on IntelliJ IDEA
-V= 2020.3
+V= 2020.3.3
DISTNAME= pycharm-community-${V}
PKGNAME= pycharm-${V}
CATEGORIES=devel
blob - c7e39f342f4b9408d6256b7902e0511efa007979
file + devel/pycharm/distinfo
--- devel/pycharm/distinfo
+++ devel/pycharm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pycharm-community-2020.3.tar.gz) =
S5LZEsllC0qU3+CGnpySqF0A3i996miIl+Qd0bH+UbA=
-SIZE (pycharm-community-2020.3.tar.gz) = 486641961
+SHA256 (pycharm-community-2020.3.3.tar.gz) =
kVqIA9stR90Mc52mEDTreH98np5RLrywLqGkXN27BVw=
+SIZE (pycharm-community-2020.3.3.tar.gz) = 479693125
blob - bba14889eb7907110466a033a7d7ba58ea80ba00
file + devel/pycharm/pkg/PLIST
--- devel/pycharm/pkg/PLIST
+++ devel/pycharm/pkg/PLIST
@@ -1419,7 +1419,7 @@ pycharm/plugins/python-ce/helpers/pydev/jython_test_de
pycharm/plugins/python-ce/helpers/pydev/jython_test_deps/ant.jar
pycharm/plugins/python-ce/helpers/pydev/jython_test_deps/junit.jar
pycharm/plugins/python-ce/helpers/pydev/merge_pydev_pycharm.txt
-pycharm/plugins/python-ce/helpers/pydev/pycharm-readme.txt
+pycharm/plugins/python-ce/helpers/pydev/pycharm-readme.rst
pycharm/plugins/python-ce/helpers/pydev/pycompletionserver.py
pycharm/plugins/python-ce/helpers/pydev/pydev_app_engine_debug_startup.py
pycharm/plugins/python-ce/helpers/pydev/pydev_console/
@@ -2999,7 +2999,7 @@ pycharm/plugins/python-ce/helpers/typeshed/third_party
pycharm/plugins/python-ce/helpers/typeshed/third_party/3/waitress/wasyncore.pyi
pycharm/plugins/python-ce/helpers/virtualenv-16.7.10-py2.py3-none-any.whl
pycharm/plugins/python-ce/lib/
-pycharm/plugins/python-ce/lib/completion-ranking-python-0.1.3.jar
+pycharm/plugins/python-ce/lib/completion-ranking-python-0.2.2.jar
pycharm/plugins/python-ce/lib/libthrift-0.11.0.jar
pycharm/plugins/python-ce/lib/ml-completion-prev-exprs-models-1.11.jar
pycharm/plugins/python-ce/lib/python-ce.jar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/01/30 20:19:36 Modified files: graphics/piglit: Makefile distinfo graphics/piglit/patches: patch-CMakeLists_txt patch-tests_util_CMakeLists_txt graphics/piglit/pkg: PLIST Removed files: graphics/piglit/patches: patch-piglit patch-tests_egl_egl-configless-context_c patch-tests_egl_egl-context-priority_c patch-tests_util_piglit-subprocess_c Log message: update to a newer piglit snapshot switch to python3 as upstream dropped python2 support fixes -fno-common build parts from an earlier diff by daniel@ ok kn@
Re: update piglit to a newer snapshot
On Sun, Jan 31, 2021 at 01:49:05PM +1100, Jonathan Gray wrote: > upstream support for python2 no longer exists > https://gitlab.freedesktop.org/mesa/piglit/-/commit/19eb8323c8c96b786520d2e57741ae9e96be740c Even better, sorry for not having checked that earlier. OK kn
[update] py-ldap0 and web2ldap
Hello,
Here are updates to databases/py-ldap0 and databases/web2ldap after the
py-dnspython split.
web2ldap changelog: https://web2ldap.de/changes-1.5.html
Lucas
diff 824a5c3a3bba7b42ed4543112553f72b425be4ee /usr/ports
blob - 3b2efe8dfa1d906de9c5f7c531cc4a87fadce1be
file + databases/web2ldap/Makefile
--- databases/web2ldap/Makefile
+++ databases/web2ldap/Makefile
@@ -2,9 +2,8 @@
COMMENT = full-featured LDAP client running as web application
-MODPY_EGG_VERSION =1.5.81
+MODPY_EGG_VERSION =1.5.112
DISTNAME = web2ldap-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = databases www sysutils
blob - 016ec04950cd386a51c00c2fdf62e74f45cd1ad8
file + databases/web2ldap/distinfo
--- databases/web2ldap/distinfo
+++ databases/web2ldap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (web2ldap-1.5.81.tar.gz) = V+ozJBvA0r5UUfGw934q4T7Ca66XA6Z0vkZSJqiVj/Q=
-SIZE (web2ldap-1.5.81.tar.gz) = 519941
+SHA256 (web2ldap-1.5.112.tar.gz) = qK8xKZTShLVov0pMpj0RtexWYSRbLJSq/hoiHDzXBkQ=
+SIZE (web2ldap-1.5.112.tar.gz) = 523572
blob - babdb7a30d3d2381c92c578135abb4ab7a0a0eb4
file + databases/web2ldap/pkg/PLIST
--- databases/web2ldap/pkg/PLIST
+++ databases/web2ldap/pkg/PLIST
@@ -351,16 +351,17 @@ share/doc/web2ldap/faq.html
share/doc/web2ldap/features.html
share/doc/web2ldap/files.html
share/doc/web2ldap/install.html
+share/doc/web2ldap/install_container.html
share/doc/web2ldap/install_opensuse.html
share/doc/web2ldap/news.html
share/doc/web2ldap/related.html
-share/doc/web2ldap/roadmap.html
share/doc/web2ldap/robots.txt
share/doc/web2ldap/ssi/
share/doc/web2ldap/ssi/changes_navigation.html
share/doc/web2ldap/ssi/footer.html
share/doc/web2ldap/ssi/head.html
share/doc/web2ldap/ssi/navigation.html
+share/doc/web2ldap/todo.html
share/doc/web2ldap/usability.html
share/doc/web2ldap/web2ldap.html
share/doc/web2ldap/web2ldapcnf.html
@@ -420,6 +421,7 @@ share/examples/web2ldap/templates/ae-dir/add_aeMailbox
share/examples/web2ldap/templates/ae-dir/add_aeNwDevice.ldif
share/examples/web2ldap/templates/ae-dir/add_aePerson.ldif
share/examples/web2ldap/templates/ae-dir/add_aeService.ldif
+share/examples/web2ldap/templates/ae-dir/add_aeService_posixAccount.ldif
share/examples/web2ldap/templates/ae-dir/add_aeSrvGroup.ldif
share/examples/web2ldap/templates/ae-dir/add_aeSudoRule_su_root.ldif
share/examples/web2ldap/templates/ae-dir/add_aeTag.ldif
@@ -450,7 +452,6 @@ share/examples/web2ldap/templates/ae-dir/inputform_aeS
share/examples/web2ldap/templates/ae-dir/inputform_aeTag.html
share/examples/web2ldap/templates/ae-dir/inputform_aeUser.html
share/examples/web2ldap/templates/ae-dir/inputform_aeZone.html
-share/examples/web2ldap/templates/ae-dir/inputform_msPwdResetObject.html
share/examples/web2ldap/templates/ae-dir/login.html
share/examples/web2ldap/templates/ae-dir/passwd.html
share/examples/web2ldap/templates/ae-dir/read_aeAuthcToken.html
@@ -471,8 +472,8 @@ share/examples/web2ldap/templates/ae-dir/read_aeSudoRu
share/examples/web2ldap/templates/ae-dir/read_aeTag.html
share/examples/web2ldap/templates/ae-dir/read_aeUser.html
share/examples/web2ldap/templates/ae-dir/read_aeZone.html
-share/examples/web2ldap/templates/ae-dir/read_msPwdResetObject.html
share/examples/web2ldap/templates/ae-dir/searchform_aedir.html
+share/examples/web2ldap/templates/ae-dir/searchform_null.html
share/examples/web2ldap/templates/ae-dir/top.html
share/examples/web2ldap/templates/connect.html
share/examples/web2ldap/templates/dhcp/
@@ -498,6 +499,7 @@ share/examples/web2ldap/templates/inputform_inetOrgPer
share/examples/web2ldap/templates/inputform_mailboxRelatedObject.html
share/examples/web2ldap/templates/inputform_msOrganization.html
share/examples/web2ldap/templates/inputform_msPerson.html
+share/examples/web2ldap/templates/inputform_msPwdResetObject.html
share/examples/web2ldap/templates/inputform_msPwdResetPolicy.html
share/examples/web2ldap/templates/inputform_musician.html
share/examples/web2ldap/templates/inputform_namedObject.html
@@ -567,6 +569,7 @@ share/examples/web2ldap/templates/read_mailboxRelatedO
share/examples/web2ldap/templates/read_monitorConnection.html
share/examples/web2ldap/templates/read_msOrganization.html
share/examples/web2ldap/templates/read_msPerson.html
+share/examples/web2ldap/templates/read_msPwdResetObject.html
share/examples/web2ldap/templates/read_msPwdResetPolicy.html
share/examples/web2ldap/templates/read_musician.html
share/examples/web2ldap/templates/read_namedObject.html
diff 824a5c3a3bba7b42ed4543112553f72b425be4ee /usr/ports
blob - 8d0af47c5f10b957146e192f60c88a3f6a847aa1
file + databases/py-ldap0/Makefile
--- databases/py-ldap0/Makefile
+++ databases/py-ldap0/Makefile
@@ -2,11 +2,10 @@
COMMENT = provides an API to access LDAP directory servers for Python
-MODPY_EGG_VERSION =1.0.11
+MODPY_EGG_VERSION =1.1.4
DISTNAME = ldap0-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = databases devel
blob -
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/01/30 19:49:36 Modified files: archivers/pigz : Makefile distinfo archivers/pigz/patches: patch-pigz_c Log message: Update to pigz 2.5 Feedback daniel millert
Re: update piglit to a newer snapshot
On Sun, Jan 31, 2021 at 03:40:33AM +0100, Klemens Nanni wrote: > On Sat, Jan 30, 2021 at 03:19:04PM +1100, Jonathan Gray wrote: > > Update piglit to a newer snapshot and switch to python3. > > Fixes -fno-common build. > > > > Tested with the "quick" tests on a broadwell machine with Mesa 20.0.8. > You could also commit the update only and leave the python3 conversion > to another commit, that should make review/testing easier and we don't > have the non-trivial python3 bits out of the way fixing `-fno-common'. > upstream support for python2 no longer exists https://gitlab.freedesktop.org/mesa/piglit/-/commit/19eb8323c8c96b786520d2e57741ae9e96be740c
Re: update piglit to a newer snapshot
On Sat, Jan 30, 2021 at 03:19:04PM +1100, Jonathan Gray wrote: > Update piglit to a newer snapshot and switch to python3. > Fixes -fno-common build. > > Tested with the "quick" tests on a broadwell machine with Mesa 20.0.8. You could also commit the update only and leave the python3 conversion to another commit, that should make review/testing easier and we don't have the non-trivial python3 bits out of the way fixing `-fno-common'.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/01/30 19:11:42 Added files: games/chocolate-doom/patches: patch-src_hexen_mn_menu_c Log message: backport a -fno-common build fix ok Ryan Freeman
Re: Update arm-none-eabi binutils to 2.31.1
On Sat, Jan 30, 2021 at 04:45:01PM +0100, Mark Kettenis wrote: > U-Boot targets that use the CONFIG_POSITION_INDEPENDENT and > CONFIG_LINUX_KERNEL_IMAGE_HEADER options don't build because they > generate a relocation that binutils 2.30 doesn't like. This is fixed > in binutils 2.31. Given that there is a 2.31.1 I updated to that one. > > ok? The existing targets which default to both are arm64 xen and tegra. building the xenguest_arm64 target with binutils 2.30 LD u-boot aarch64-none-elf-ld.bfd: arch/arm/cpu/armv8/start.o: relocation R_AARCH64_ABS32 against `_kernel_offset_le_lo32' can not be used when making a shared object builds with 2.31.1. ok jsg@
Re: [update] x11/xvkbd (Re: Build failures from -fno-common)
Yozo TODA: > here attached xvkbd updates to 4.1 where > * -fno-common problem is fixed > * change CONFIGURE_STYLE to gnu since configure is provided > * port-lib-depends-check passes > * compiles and works on amd64, with Xquartz/macOS as X server > > anyone please check and commit to the ports tree? Thank you. Unfortunately your mailer has garbled the attachment. Can you resend it? -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/01/30 17:36:12 Modified files: net: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: net/packit : Makefile distinfo net/packit/patches: patch-src_inject_defs_h patch-src_injection_c patch-src_print_ts_c patch-src_print_ts_h net/packit/pkg : DESCR PLIST Log message: Remove net/packit Our packaged 1.0 version seems to be the last one that can be fetched from upstream, which is long dead; HOMEPAGE http://packit.sf.net points to a generic corporate stub. FreeBSD packages an "updated" version, see https://github.com/resurrecting-open-source-projects/packit/blob/master/ChangeLog which effectively is the old source could with all readily available distribution patches from Debian, Gento, etc. applied on top; other than that there's no development, the project README explicitly asks for help from actual developers to keep such life support running. Since noone could be bothered with updating our port since at least 2016, I doubt there's much interest. packit is a mixture of tcpdump(1) and scapy(1), it's synopsis uses every letter (upper and lower) of the alphabet and IPv6 is not supported at all (not even printing captured packets). Basic tests showed no output when capturing on lo(4) devices. tl;dr: There's little to no value in beating a dead horse. OK solene
Re: archivers/pigz: update to 2.5, build with -D_BSD_SOURCE
On Tue, Jan 26, 2021 at 12:36:47AM +0100, Klemens Nanni wrote:
> - Add --alias/-A option to set .zip name for stdin input
> - Add --comment/-C option to add comment in .gz or .zip
> - Fix a bug that misidentified a multi-entry .zip
> - Fix a bug that did not emit double syncs for -i -p 1
> - Fix a bug in yarn that could try to access freed data
> - Do not delete multi-entry .zip files when extracting
> - Do not reject .zip entries with bit 11 set
> - Avoid a possible threads lock-order inversion
> - Ignore trailing junk after a gzip stream by default
>
> Besides the routine update, I had to amend CFLAGS to fix the following
> warning:
>
> cc -O2 -pipe -Wall -Wextra -c pigz.c
> pigz.c:4543:9: warning: implicit declaration of function 'pledge' is
> invalid in C99 [-Wimplicit-function-declaration]
> if (pledge("stdio rpath wpath cpath fattr chown", NULL) == -1) {
> ^
>
> That's because of this change in 2.5:
>
> --- pig.c Mon Jan 25 23:26:18 2021
> +++ pig.c Mon Jan 25 23:42:30 2021
> @@ -321,8 +330,10 @@
> buffers to about the same number.
> */
>
> -// Use large file functions if available.
> -#define _FILE_OFFSET_BITS 64
> +// Portability defines.
> +#define _FILE_OFFSET_BITS 64// Use large file functions
> +#define _LARGE_FILES// Same thing for AIX
> +#define _POSIX_C_SOURCE 200809L // For MinGW
>
> // Included headers and what is expected from each.
> #include // fflush(), fprintf(), fputs(), getchar(), putc(),
>
>
> _POSIX_C_SOURCE makes define __POSIX_VISIBLE and, because
> _BSD_SOURCE is not defined, therefore also define __BSD_VISIBLE 0.
>
> only protoypes pledge(2) under __BSD_VISIBLE, so fix the
> warning by defining _BSD_SOURCE such that defines
> __BSD_VISIBLE 1.
daniel@ suggested putting `+#define _POSIX_C_SOURCE 200809L' under
`ifndef __OpenBSD__' which does seem a bit more straight forward.
> @@ -22,6 +21,10 @@ MASTER_SITES = https://zlib.net/pigz/
>
> MAKE_FLAGS = CC="${CC}" \
> CFLAGS="${CFLAGS} -Wall -Wextra"
> +
> +# pigz.c 2.5 defines _POSIX_C_SOURCE which prevents from
> +# prototyping pledge(2), override the define
> +CFLAGS +=-D_BSD_SOURCE
>
> ALL_TARGET = pigz
We could also add the following below the include and try to upstream
the overall patch for pledge(2) support:
#ifdef __OpenBSD__
# define _BSD_SOURCE/* prototype pledge(2) */
#endif
For now, here's what I think is the least intrusive version, i.e.
practically reverting the define for everything but MinGW such that this
hunk in itself could be upstreamed regardless of OpenBSD/pledge(2).
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/archivers/pigz/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile12 Jul 2019 20:43:29 - 1.8
+++ Makefile31 Jan 2021 00:02:24 -
@@ -5,8 +5,7 @@ NOT_FOR_ARCHS= ${GCC3_ARCHS}
COMMENT = parallel implementation of gzip utilizing multiple cores
-DISTNAME = pigz-2.4
-REVISION = 0
+DISTNAME = pigz-2.5
CATEGORIES = archivers
HOMEPAGE = https://zlib.net/pigz/
Index: distinfo
===
RCS file: /cvs/ports/archivers/pigz/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo25 Jan 2018 10:34:49 - 1.4
+++ distinfo25 Jan 2021 22:26:27 -
@@ -1,2 +1,2 @@
-SHA256 (pigz-2.4.tar.gz) = pPgWIip7Qmm9IyaAWQtXnMxyWR8bta2vzXIIynfhT3M=
-SIZE (pigz-2.4.tar.gz) = 98234
+SHA256 (pigz-2.5.tar.gz) = oAZkVwLKrsrOYzqJ61w3FIK0SkjQTzTgBY4rhdddTDY=
+SIZE (pigz-2.5.tar.gz) = 106438
Index: patches/patch-pigz_c
===
RCS file: /cvs/ports/archivers/pigz/patches/patch-pigz_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-pigz_c
--- patches/patch-pigz_c10 Jul 2018 13:32:44 - 1.1
+++ patches/patch-pigz_c31 Jan 2021 00:15:20 -
@@ -1,9 +1,26 @@
$OpenBSD: patch-pigz_c,v 1.1 2018/07/10 13:32:44 kn Exp $
+Revert an unconditional define of _POSIX_C_SOURCE introduced in pigz 2.5
+which causes to define __POSIX_VISIBLE and therefore
+(because _BSD_SOURCE is not defined) also define __BSD_VISIBLE 0
+which prevents from prototyping pledge(2).
+
+Use pledge.
+
Index: pigz.c
--- pigz.c.orig
+++ pigz.c
-@@ -4307,6 +4307,11 @@ int main(int argc, char **argv) {
+@@ -333,7 +333,9 @@
+ // Portability defines.
+ #define _FILE_OFFSET_BITS 64// Use large file functions
+ #define _LARGE_FILES// Same thing for AIX
++#ifdef __MINGW32__
+ #define _POSIX_C_SOURCE 200809L // For MinGW
++#endif
+
+ // Included headers and what is expected from each.
+ #include // fflush(), fprintf(), fputs(), getchar(), putc(),
+@@ -4540,6 +4542,11 @@ int main(int argc, char **argv) {
char *opts, *p;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org 2021/01/30 16:37:40
Added files:
shells/tcsh/patches: patch-tests_subst_at
patch-tests_variables_at
Log message:
shells/tcsh: fix testsuite failures in 6.22.03
autom4te inserts spurious '(' opening parentheses to balance ')' closing
parentheses that are part of a case statement, creating invalid shell
code
[update/fix] graphics/mtpaint 3.40 -> 3.50 (-fno-common)
Hi,
Here is an update for mtpaint to 3.50.
Upstream re-enabled -fcommon with clang11 and gcc10 in this version, but
since the compiler version is checked, it's still failing with a patched
`-fno-common' patched clang-10. I have been advised by naddy to
explicitly use `-fcommon' until clang-11 becomes our default compiler.
While here, the spacing was inconsistent around '=', so i fixed this
as well, since it did not hinder much the diff readability.
It has been built and (lightly) tested on amd64 (patched clang) and
macppc (vanilla clang).
OK?
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/graphics/mtpaint/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile12 Jul 2019 20:47:04 - 1.5
+++ Makefile30 Jan 2021 23:20:43 -
@@ -2,9 +2,8 @@
COMMENT = simple GTK+2 raster painting program
-DISTNAME = mtpaint-3.40
+DISTNAME = mtpaint-3.50
EXTRACT_SUFX = .tar.bz2
-REVISION = 2
CATEGORIES = graphics
@@ -16,8 +15,9 @@ PERMIT_PACKAGE = Yes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 intl jasper jpeg lcms2 m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 png pthread tiff z
+WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz intl jasper jpeg lcms2
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread
+WANTLIB += tiff z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mtpaint/}
@@ -30,11 +30,15 @@ LIB_DEPENDS = devel/gettext,-runtime \
RUN_DEPENDS = devel/desktop-file-utils
USE_GMAKE =Yes
-CONFIGURE_STYLE = simple
-CONFIGURE_ARGS = nogif jpeg jasper staticft tiff lcms \
-lcms2 intl man thread cflags \
---mandir=${TRUEPREFIX}/man
-
-NO_TEST= Yes
+CONFIGURE_STYLE = simple
+CONFIGURE_ARGS = nogif jpeg jasper staticft tiff lcms \
+ lcms2 intl man thread cflags \
+ --mandir=${TRUEPREFIX}/man
+
+NO_TEST = Yes
+
+# Remove after clang update to LLVM11. Meanwhile it avoids false positives with
+# a patched clang-10 (mtpaint uses that flag only with clang-11 and gcc-10)
+CFLAGS += -fcommon
.include
Index: distinfo
===
RCS file: /cvs/ports/graphics/mtpaint/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo25 Apr 2016 13:22:00 - 1.1.1.1
+++ distinfo30 Jan 2021 23:20:43 -
@@ -1,2 +1,2 @@
-SHA256 (mtpaint-3.40.tar.bz2) = 7zIdK0BIOce5Cb31KD6yKjf73TW0zJ44DdxABXPXyJA=
-SIZE (mtpaint-3.40.tar.bz2) = 600857
+SHA256 (mtpaint-3.50.tar.bz2) = aVzqEMQoqPEi7Vm+7l/6Sdzcuo2IpHkOrzxk/Xxz1qw=
+SIZE (mtpaint-3.50.tar.bz2) = 800134
Re: games/xblast: fix with -fno-common
On Saturday, January 30, 2021 11:57 AM, Charlene Wendling wrote: > I took this from FreeBSD [0]. It builds and works fine on amd64. > > OK? > ok bcallah@
Re: [portgen go] try harder to determine the version
Andrew Hewus Fresh writes:
> On Sat, Jan 30, 2021 at 01:20:25PM -0700, Aaron Bieber wrote:
>>
>> Aaron Bieber writes:
>>
>> > Andrew Hewus Fresh writes:
>> >
>> >> On Tue, Jan 26, 2021 at 05:23:30PM -0700, Aaron Bieber wrote:
>> >>> Hi,
>> >>>
>> >>> Recently a program was found that caused breakage in 'portgen go'. The
>> >>> breakage was two fold:
>> >>>
>> >>> 1) https://proxy.golang.org/qvl.io/promplot/@latest returns unexpected
>> >>>results. This caused portgen to bomb out.
>> >>> 2) Even it 1) had worked, the logic in 'get_ver_info' was broken and it
>> >>>picked the wrong version.
>> >>>
>> >>> This diff changes things so we first try to get our version from
>> >>> '/@latest'. If that fails, we call `get_ver_info` which pulls down the
>> >>> full list of versions from the '/@v/list' endpoint.
>> >>>
>> >>> Thanks to afresh1 for showing me the neat '//=' perl trick!
>> >>>
>> >>> Tested with:
>> >>> portgen go qvl.io/promplot
>> >>>
>> >>> as well as a number of other ports.
>> >>>
>> >>> OK? Cluesticks?
>> >>>
>> >>
>> >> This seems OK to me, a couple of comments though, but it's up to you
>> >> whether you change anything.
>> >>
>> >>
>> >>> diff 6a862af059a42a1899fe9a62461b2acfc0f8eedc /usr/ports
>> >>> blob - 89f2c7297409ef9d54fd1bdde73cf1829c742ff3
>> >>> file + infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
>> >>> --- infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
>> >>> +++ infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
>> >>> @@ -67,12 +67,9 @@ sub _go_determine_name
>> >>> # Some modules end in "v1" or "v2", if we find one of these, we
>> >>> need
>> >>> # to set PKGNAME to something up a level
>> >>> my ( $self, $module ) = @_;
>> >>> -my $json = $self->get_json( $self->_go_mod_normalize($module) .
>> >>> '/@latest' );
>> >>>
>> >>> -if ($json->{Version} =~ m/incompatible/) {
>> >>> -my $msg = "${module} $json->{Version} is incompatible
>> >>> with Go modules.";
>> >>> -croak $msg;
>> >>> -}
>> >>
>> >> Do you still need to check for "incompatible" someplace?
>> >
>> > As mentioned in irc - this is leftover and we don't actually hit the
>> > condition anyway.
>> >>
>> >>
>> >>> +my $json = eval { $self->get_json(
>> >>> $self->_go_mod_normalize($module) . '/@latest' ) };
>> >>
>> >> Should this eval'd check for `@latest` be in `get_ver_info`?
>> >> If not, why not?
>> >>
>>
>> Here is a version that moves all the version checks into
>> get_ver_info. Really it just removes the duplicate I had >.>
>>
>
>> diff 9ae2711eb3404621b05283a43f79a65b656ddf47 /usr/ports
>> blob - 89f2c7297409ef9d54fd1bdde73cf1829c742ff3
>> file + infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
>> --- infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
>> +++ infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
>> @@ -67,12 +67,8 @@ sub _go_determine_name
>> # Some modules end in "v1" or "v2", if we find one of these, we need
>> # to set PKGNAME to something up a level
>> my ( $self, $module ) = @_;
>> -my $json = $self->get_json( $self->_go_mod_normalize($module) .
>> '/@latest' );
>>
>> -if ($json->{Version} =~ m/incompatible/) {
>> -my $msg = "${module} $json->{Version} is incompatible with Go
>> modules.";
>> -croak $msg;
>> -}
>> +my $json = $self->get_ver_info($module);
>>
>> if ($module =~ m/v\d$/) {
>> $json->{Name} = ( split '/', $module )[-2];
>> @@ -90,6 +86,7 @@ sub get_dist_info
>> my ( $self, $module ) = @_;
>>
>> my $json = $self->_go_determine_name($module);
>> +
>> my ($dist, $mods) = $self->_go_mod_info($json);
>> $json->{License} = $self->_go_lic_info($module);
>>
>> @@ -133,7 +130,7 @@ sub _go_mod_info
>>
>> my $mod = $self->get($self->_go_mod_normalize($json->{Module}) .
>> "/\@v/$json->{Version}.mod");
>> my ($module) = $mod =~ /\bmodule\s+(.*?)\s/;
>> -
>> +
>> unless ( $json->{Module} eq $module ) {
>> my $msg = "Module $json->{Module} doesn't match $module";
>> croak $msg;
>> @@ -213,28 +210,36 @@ sub _go_mod_normalize
>> sub get_ver_info
>> {
>> my ( $self, $module ) = @_;
>> -my $version_list = $self->get( $module . '/@v/list' );
>> +
>> +# We already ran, skip re-running.
>> +return $self->{version_info} if defined $self->{version_info};
>> +
>> +my $json;
>> +my $version_list = eval { $self->get( $module . '/@v/list' ) };
>
> My understanding of go version numbers is that "0" is not a valid
> version, which means that all valid versions will be truthy. If that
> understanding is wrong, then this code is probably wrong, but if true
> that means you don't need the `//= ""` because you can just test
> $version_list in boolean context directly.
>
> Here's an untested suggestion of how I'd write get_ver_info.
> (this also avoids re-parsing what we think is the latest version
> multiple times)
>
> my
Re: [update] haproxy to 2.3.4 (latest stable)
On Sat, 23 Jan 2021 09:46:11 -0500, Daniel Jakots wrote: > Here's a patch based on yours. It looks good to me so I'll commit it > in a few days. It's in. Thanks! Daniel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2021/01/30 15:10:01 Modified files: net/haproxy: Makefile distinfo net/haproxy/patches: patch-doc_haproxy_1 Removed files: net/haproxy/patches: patch-Makefile patch-src_log_c Log message: Update to haproxy-2.3.4 "Haproxy now supports keeping the private and public keys in separate files, while previously, they needed to be in the same file. This allows us to directly use the output of acme-client(1) without doing extra scripting." Based on a diff from Aisha Tammy who also authored the quote.
[update] x11/xvkbd (Re: Build failures from -fno-common)
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
> Here are the results from a first amd64 bulk build with -fno-common.
> x11/xvkbd UPDATEy...@v007.vaio.ne.jp
here attached xvkbd updates to 4.1 where
* -fno-common problem is fixed
* change CONFIGURE_STYLE to gnu since configure is provided
* port-lib-depends-check passes
* compiles and works on amd64, with Xquartz/macOS as X server
anyone please check and commit to the ports tree?
(cf. https://github.com/yozot/OpenBSD-ports-mystuff/tree/master/x11/xvkbd/)
-- yozo.
-BEGIN PGP SIGNATURE-
iQJJBAEBCgAzFiEEP48DGKttLBTWuiCMx2ep6SZGbGQFAmAVuJ0VHHlvem9AdjAw
Ny52YWlvLm5lLmpwAAoJEMdnqekmRmxkxWcQALbnNaQreFRsvmGkpV8jeVRLqvba
3bGOCiaaqWvOGKS4YgeFPdbbA1QJ3NXdS21t1h9CIe7Sy02MpxFpMxWOexBeGJq6
xciC1EFFxOmo2Cdy26lVFFM4PhK/4lBRLyNks4DR7hAHSwONjo1DxFXRXnR+zxDc
kz4vxsol11a20gnN92n2T7FT1CGDCmiE2aQBaX7xMuz1ttYuDclMIuYzObVAQktu
6DSKoHeF7jhrUH70v0oTGbIQqzPUZs+eseAoZenMORWpShVQhIVn+6W/BUNW5ZH4
mcz8qrW0NjeHEMzvRwgxZtJasuol72IuTW2mVYFFsAjRsIVM7pY2LUMFr9DGmAt0
30yPHJ32fFLUC7r9F9Ha0/MooP/5+X8vLcN3uzzfiP4iZaKXnbuADwY7RvHcnFd6
Zb6VZYxQ4N4QW8z1twYXuII8u2aakLprDj6jF/WJbQ+i6aVzvoKMgBDXGyMg+onz
e2Bd7G9PBBJolj+7n7owziCnqIxUIT5/iV2Fsystk04r1tCSWWkN3jGPQilY42G5
5FZWq62MXbA10PFlQt2eCzA0XNuHBXiVfl5IVSXFwnktI1j54EEBCIykf9t5FTpb
7nFPlPXtmyOLDcThyKhbNRYhmbhCxHzQ5VozLcoMeqX23KZjBUwwwR+gUfnx9n0u
4RFRcwq6lu7DN0Bx
=M+If
-END PGP SIGNATURE-
Index: Makefile
===
RCS file: /cvs/ports/x11/xvkbd/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile12 Jul 2019 20:51:31 - 1.21
+++ Makefile30 Jan 2021 19:23:25 -
@@ -2,7 +2,7 @@
COMMENT= virtual keyboard for X Window System
-DISTNAME= xvkbd-3.9
+DISTNAME= xvkbd-4.1
CATEGORIES=x11
HOMEPAGE= http://t-sato.in.coocan.jp/xvkbd/
@@ -11,13 +11,12 @@ MAINTAINER= Yozo TODA
Index: distinfo
===
RCS file: /cvs/ports/x11/xvkbd/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo1 Apr 2019 11:54:14 - 1.10
+++ distinfo30 Jan 2021 19:23:25 -
@@ -1,2 +1,2 @@
-SHA256 (xvkbd-3.9.tar.gz) = uBw33ft7eJk9rRXTBPj9eOVA1XwKcvfjMW/UX7qRmp0=
-SIZE (xvkbd-3.9.tar.gz) = 88440
+SHA256 (xvkbd-4.1.tar.gz) = lS0H3w/h5FKGUgt8mLT9AP1g2/Pj6P9h4Swln3ajvvQ=
+SIZE (xvkbd-4.1.tar.gz) = 408704
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in 30 Jan 2021 19:23:25 -
@@ -0,0 +1,35 @@
+$OpenBSD$
+
+installation directories specified using LOCALBASE, and
+avoid "$<" to make "make" happy (-:
+
+Index: Makefile.in
+--- Makefile.in.orig
Makefile.in
+@@ -325,7 +325,7 @@ bindir = @bindir@
+ build_alias = @build_alias@
+ builddir = @builddir@
+ datadir = @datadir@
+-datarootdir = $(shell pkg-config --variable=datarootdir xt)
++datarootdir = ${LOCALBASE}/share
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+@@ -353,7 +353,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-appdefaultdir = $(shell pkg-config --variable=appdefaultdir xt)
++appdefaultdir = ${LOCALBASE}/lib/X11/app-defaults
+ SUBDIRS = .
+ man_MANS = xvkbd.1
+ xvkbd_SOURCES = xvkbd.c findwidget.c resources.h XVkbd-common.h
+@@ -982,7 +982,7 @@ uninstall-man: uninstall-man1
+
+ xvkbd.1: xvkbd.man
+ [ ! -e $@ ] || rm $@
+- -ln -s $< $@
++ -ln -s xvkbd.man $@
+
+ XVkbd-common.h: XVkbd-common.ad
+ [ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h
Index: patches/patch-resources_h
===
RCS file: patches/patch-resources_h
diff -N patches/patch-resources_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-resources_h 30 Jan 2021 19:23:25 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+the variables should be long enabling conversion to pointers.
+
+Index: resources.h
+--- resources.h.orig
resources.h
+@@ -103,8 +103,8 @@ struct appres_struct {
+ float max_height_ratio;
+ int text_delay;
+ int key_click_pitch;
+- int key_click_duration;
+- int autoclick_delay;
++ long key_click_duration;
++ long autoclick_delay;
+
+ int save_private_dict_interval;
+ float private_dict_decay;
Index: patches/patch-xvkbd_c
===
RCS file: patches/patch-xvkbd_c
diff -N patches/patch-xvkbd_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-xvkbd_c 30 Jan 2021 19:23:25 -
@@ -0,0 +1,94 @@
+$OpenBSD$
+
+the variables should be long enabling conversion to pointers,
+and one indentation fix.
+
+Index:
Re: [portgen go] try harder to determine the version
On Sat, Jan 30, 2021 at 01:20:25PM -0700, Aaron Bieber wrote:
>
> Aaron Bieber writes:
>
> > Andrew Hewus Fresh writes:
> >
> >> On Tue, Jan 26, 2021 at 05:23:30PM -0700, Aaron Bieber wrote:
> >>> Hi,
> >>>
> >>> Recently a program was found that caused breakage in 'portgen go'. The
> >>> breakage was two fold:
> >>>
> >>> 1) https://proxy.golang.org/qvl.io/promplot/@latest returns unexpected
> >>>results. This caused portgen to bomb out.
> >>> 2) Even it 1) had worked, the logic in 'get_ver_info' was broken and it
> >>>picked the wrong version.
> >>>
> >>> This diff changes things so we first try to get our version from
> >>> '/@latest'. If that fails, we call `get_ver_info` which pulls down the
> >>> full list of versions from the '/@v/list' endpoint.
> >>>
> >>> Thanks to afresh1 for showing me the neat '//=' perl trick!
> >>>
> >>> Tested with:
> >>> portgen go qvl.io/promplot
> >>>
> >>> as well as a number of other ports.
> >>>
> >>> OK? Cluesticks?
> >>>
> >>
> >> This seems OK to me, a couple of comments though, but it's up to you
> >> whether you change anything.
> >>
> >>
> >>> diff 6a862af059a42a1899fe9a62461b2acfc0f8eedc /usr/ports
> >>> blob - 89f2c7297409ef9d54fd1bdde73cf1829c742ff3
> >>> file + infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
> >>> --- infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
> >>> +++ infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
> >>> @@ -67,12 +67,9 @@ sub _go_determine_name
> >>> # Some modules end in "v1" or "v2", if we find one of these, we need
> >>> # to set PKGNAME to something up a level
> >>> my ( $self, $module ) = @_;
> >>> - my $json = $self->get_json( $self->_go_mod_normalize($module) .
> >>> '/@latest' );
> >>>
> >>> - if ($json->{Version} =~ m/incompatible/) {
> >>> - my $msg = "${module} $json->{Version} is incompatible with Go
> >>> modules.";
> >>> - croak $msg;
> >>> - }
> >>
> >> Do you still need to check for "incompatible" someplace?
> >
> > As mentioned in irc - this is leftover and we don't actually hit the
> > condition anyway.
> >>
> >>
> >>> + my $json = eval { $self->get_json( $self->_go_mod_normalize($module) .
> >>> '/@latest' ) };
> >>
> >> Should this eval'd check for `@latest` be in `get_ver_info`?
> >> If not, why not?
> >>
>
> Here is a version that moves all the version checks into
> get_ver_info. Really it just removes the duplicate I had >.>
>
> diff 9ae2711eb3404621b05283a43f79a65b656ddf47 /usr/ports
> blob - 89f2c7297409ef9d54fd1bdde73cf1829c742ff3
> file + infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
> --- infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
> +++ infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
> @@ -67,12 +67,8 @@ sub _go_determine_name
> # Some modules end in "v1" or "v2", if we find one of these, we need
> # to set PKGNAME to something up a level
> my ( $self, $module ) = @_;
> - my $json = $self->get_json( $self->_go_mod_normalize($module) .
> '/@latest' );
>
> - if ($json->{Version} =~ m/incompatible/) {
> - my $msg = "${module} $json->{Version} is incompatible with Go
> modules.";
> - croak $msg;
> - }
> + my $json = $self->get_ver_info($module);
>
> if ($module =~ m/v\d$/) {
> $json->{Name} = ( split '/', $module )[-2];
> @@ -90,6 +86,7 @@ sub get_dist_info
> my ( $self, $module ) = @_;
>
> my $json = $self->_go_determine_name($module);
> +
> my ($dist, $mods) = $self->_go_mod_info($json);
> $json->{License} = $self->_go_lic_info($module);
>
> @@ -133,7 +130,7 @@ sub _go_mod_info
>
> my $mod = $self->get($self->_go_mod_normalize($json->{Module}) .
> "/\@v/$json->{Version}.mod");
> my ($module) = $mod =~ /\bmodule\s+(.*?)\s/;
> -
> +
> unless ( $json->{Module} eq $module ) {
> my $msg = "Module $json->{Module} doesn't match $module";
> croak $msg;
> @@ -213,28 +210,36 @@ sub _go_mod_normalize
> sub get_ver_info
> {
> my ( $self, $module ) = @_;
> - my $version_list = $self->get( $module . '/@v/list' );
> +
> + # We already ran, skip re-running.
> + return $self->{version_info} if defined $self->{version_info};
> +
> + my $json;
> + my $version_list = eval { $self->get( $module . '/@v/list' ) };
My understanding of go version numbers is that "0" is not a valid
version, which means that all valid versions will be truthy. If that
understanding is wrong, then this code is probably wrong, but if true
that means you don't need the `//= ""` because you can just test
$version_list in boolean context directly.
Here's an untested suggestion of how I'd write get_ver_info.
(this also avoids re-parsing what we think is the latest version
multiple times)
my $version_list = do { local $@; eval { local $SIG{__DIE__};
$self->get( $module . '/@v/list' ) } };
my $version_info;
if ($version_list) {
my %v = ( o =>
Re: [portgen go] try harder to determine the version
Aaron Bieber writes:
> Andrew Hewus Fresh writes:
>
>> On Tue, Jan 26, 2021 at 05:23:30PM -0700, Aaron Bieber wrote:
>>> Hi,
>>>
>>> Recently a program was found that caused breakage in 'portgen go'. The
>>> breakage was two fold:
>>>
>>> 1) https://proxy.golang.org/qvl.io/promplot/@latest returns unexpected
>>>results. This caused portgen to bomb out.
>>> 2) Even it 1) had worked, the logic in 'get_ver_info' was broken and it
>>>picked the wrong version.
>>>
>>> This diff changes things so we first try to get our version from
>>> '/@latest'. If that fails, we call `get_ver_info` which pulls down the
>>> full list of versions from the '/@v/list' endpoint.
>>>
>>> Thanks to afresh1 for showing me the neat '//=' perl trick!
>>>
>>> Tested with:
>>> portgen go qvl.io/promplot
>>>
>>> as well as a number of other ports.
>>>
>>> OK? Cluesticks?
>>>
>>
>> This seems OK to me, a couple of comments though, but it's up to you
>> whether you change anything.
>>
>>
>>> diff 6a862af059a42a1899fe9a62461b2acfc0f8eedc /usr/ports
>>> blob - 89f2c7297409ef9d54fd1bdde73cf1829c742ff3
>>> file + infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
>>> --- infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
>>> +++ infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
>>> @@ -67,12 +67,9 @@ sub _go_determine_name
>>> # Some modules end in "v1" or "v2", if we find one of these, we need
>>> # to set PKGNAME to something up a level
>>> my ( $self, $module ) = @_;
>>> - my $json = $self->get_json( $self->_go_mod_normalize($module) .
>>> '/@latest' );
>>>
>>> - if ($json->{Version} =~ m/incompatible/) {
>>> - my $msg = "${module} $json->{Version} is incompatible with Go
>>> modules.";
>>> - croak $msg;
>>> - }
>>
>> Do you still need to check for "incompatible" someplace?
>
> As mentioned in irc - this is leftover and we don't actually hit the
> condition anyway.
>>
>>
>>> + my $json = eval { $self->get_json( $self->_go_mod_normalize($module) .
>>> '/@latest' ) };
>>
>> Should this eval'd check for `@latest` be in `get_ver_info`?
>> If not, why not?
>>
Here is a version that moves all the version checks into
get_ver_info. Really it just removes the duplicate I had >.>
diff 9ae2711eb3404621b05283a43f79a65b656ddf47 /usr/ports
blob - 89f2c7297409ef9d54fd1bdde73cf1829c742ff3
file + infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
--- infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
+++ infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
@@ -67,12 +67,8 @@ sub _go_determine_name
# Some modules end in "v1" or "v2", if we find one of these, we need
# to set PKGNAME to something up a level
my ( $self, $module ) = @_;
- my $json = $self->get_json( $self->_go_mod_normalize($module) . '/@latest' );
- if ($json->{Version} =~ m/incompatible/) {
- my $msg = "${module} $json->{Version} is incompatible with Go modules.";
- croak $msg;
- }
+ my $json = $self->get_ver_info($module);
if ($module =~ m/v\d$/) {
$json->{Name} = ( split '/', $module )[-2];
@@ -90,6 +86,7 @@ sub get_dist_info
my ( $self, $module ) = @_;
my $json = $self->_go_determine_name($module);
+
my ($dist, $mods) = $self->_go_mod_info($json);
$json->{License} = $self->_go_lic_info($module);
@@ -133,7 +130,7 @@ sub _go_mod_info
my $mod = $self->get($self->_go_mod_normalize($json->{Module}) . "/\@v/$json->{Version}.mod");
my ($module) = $mod =~ /\bmodule\s+(.*?)\s/;
-
+
unless ( $json->{Module} eq $module ) {
my $msg = "Module $json->{Module} doesn't match $module";
croak $msg;
@@ -213,28 +210,36 @@ sub _go_mod_normalize
sub get_ver_info
{
my ( $self, $module ) = @_;
- my $version_list = $self->get( $module . '/@v/list' );
+
+ # We already ran, skip re-running.
+ return $self->{version_info} if defined $self->{version_info};
+
+ my $json;
+ my $version_list = eval { $self->get( $module . '/@v/list' ) };
my $version = "v0.0.0";
- my $ret;
+ $version_list //= "";
+
# If list isn't populated, it's likely that upstream doesn't follow
# semver, this means we will have to fallback to @latest to get the
# version information.
if ($version_list eq "") {
- $ret = $self->get_json( $self->_go_mod_normalize($module) . '/@latest' );
+ $json = $self->get_json( $self->_go_mod_normalize($module) . '/@latest' );
} else {
my @parts = split("\n", $version_list);
for my $v ( @parts ) {
my $a = OpenBSD::PackageName::version->from_string($version);
my $b = OpenBSD::PackageName::version->from_string($v);
- if ($a->compare($b)) {
+ if ($a->compare($b) == -1) {
$version = $v;
}
}
- $ret = { Module => $module, Version => $version };
+ $json = { Module => $module, Version => $version };
}
- return $ret;
+ $self->{version_info} = $json;
+
+ return $json;
}
sub name_new_port
Re: Remove net/packit
On Sat, 30 Jan 2021 16:40:32 +0100 Klemens Nanni : > On Sat, Jan 30, 2021 at 04:05:26PM +0100, Solene Rapenne wrote: > > Is it working? > ChangeLog lists several fixes for crashes between 1.0 and 1.6, so our > version does not have those. > > > At leasts for lo(4), capturing only works if writing to a file, e.g. no > matter which options I try and/or which packets I produce on lo0, packit > never prints them: > > $ doas packit -m capture -i lo0 > [producing packets in another xterm, yet nothing is printed] > ^C > -| Packet Capture Statistics > |-- > Received: 4 Dropped: 0 Processed: 0 > > Do the same with `-w dump' and `tcpdump -r dump' will print them. > > > Injecting IPv6 packets is not supported, fair enough. > But packit also fails to capture any IPv6 packets, e.g. > > $ doas packit -m capture -i trunk0 > > Shows nothing... enabling IPv4 and pinging something does make it print > those packets, so at least printing per se works. > > I don't consider this working. > > > I'm totally fine to remove old network daemons for security concerns > > or ports adding burden like deprecated dependencies, heavy patches > > requirements, runtime or compilation failures. > The very idea behind the new repository is to carry patches to ship > what I wouldn't call updates -- it's life support. > > > This program doesn't seem to be in one of those categories. > > If it doesn't add extra work I think we should keep it. > Sure, the path of least resistance is to keep building with "-fcommon". > Or wait for someone to update to the "new version" but even that is not > less work, it merely hides the work inside the repository instead of our > tree. ok solene@ for removal
[update, fix] games/xmj 1.0 -> 1.16 (-fno-common)
Hi,
On top of failing with `-fno-common', xmj does not work at all, here on
my amd64 machine:
$ doas pkg_add xmj
$ xmj
Segmentation Fault
So, here is an update for the 20 years old xmj 1.0, to 2020's 1.16. There
are major upstream changes, notably they dropped Imake (yay!), and
xmj is now gtk+2 based.
Port changes:
- Update license marker, refresh WANTLIB (ports-lib-depends-check is happy)
- Use up to date HOMEPAGE and MASTER_SITES (found out thanks to Macports
and repology)
- Requires gmake. The Makefile, for a reason i can't explain, is not
able to properly use path separators, so i forced them at definition
time, which is easier to deal with that in the different install
targets.
- Remove some hardcoded stuff (DESTDIR, CC, and -g flag), add our own
default CFLAGS.
- Install the manpages
Note that this new version does not need fixes for clang 11.
Testing:
- It builds fine on macppc (vanilla clang) and amd64 (modified with
naddy's patch)
- The runtime is great on these 2 platforms. I tried networked games
without issues.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/games/xmj/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile12 Jul 2019 20:46:27 - 1.25
+++ Makefile30 Jan 2021 19:24:33 -
@@ -2,22 +2,33 @@
COMMENT= Mahjongg game for X11
-DISTNAME= xmj
-PKGNAME= xmj-1.0
-REVISION = 3
+DISTNAME= mj-1.16-src
+PKGNAME= x${DISTNAME:S/-src$//}
+
CATEGORIES=games
-# BSD
+HOMEPAGE= https://mahjong.julianbradfield.org/
+
+# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB= X11 Xau Xdmcp Xext c xcb
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 z
+
+MASTER_SITES= ${HOMEPAGE}/Source/
+
+LIB_DEPENDS= x11/gtk+2
+
+MAKE_ENV+= CC="${CC}" EXTRA_CFLAGS="${CFLAGS}"
+FAKE_FLAGS+= DESTDIR="${WRKINST}${PREFIX}"
+
+USE_GMAKE= Yes
-CONFIGURE_STYLE=imake noman
NO_TEST= Yes
-pre-configure:
- @perl -pi -e 's,_height=,_height ,g;' \
- -e 's,_width=,_width ,g' $i \
- ${WRKSRC}/tiles/c*
+INSTALL_TARGET=install install.man
.include
Index: distinfo
===
RCS file: /cvs/ports/games/xmj/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:14:04 - 1.4
+++ distinfo30 Jan 2021 19:24:33 -
@@ -1,2 +1,2 @@
-SHA256 (xmj.tar.gz) = EGcUMVIKBYSp3BJHqnYPM988WHP7G7IVgN//NK7xhyg=
-SIZE (xmj.tar.gz) = 52255
+SHA256 (mj-1.16-src.tar.gz) = wl6YSPSfcGNeXjugy1l5nlvBSalfeGYhuZaWtmeHop0=
+SIZE (mj-1.16-src.tar.gz) = 403981
Index: patches/patch-Imakefile
===
RCS file: patches/patch-Imakefile
diff -N patches/patch-Imakefile
--- patches/patch-Imakefile 27 Oct 2007 13:32:05 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-$OpenBSD: patch-Imakefile,v 1.1 2007/10/27 13:32:05 ajacoutot Exp $
Imakefile.orig Fri May 5 16:46:04 1989
-+++ Imakefile Sat Oct 27 15:15:14 2007
-@@ -4,4 +4,4 @@ LOCAL_LIBRARIES = $(XLIB)
-OBJS = bicons.o cicons.o cicons1.o cicons2.o cicons3.o cicons4.o \
- cicons5.o event.o icons.o mj.o nicons.o
-
--ComplexProgramTarget(xmj)
-+ComplexProgramTargetNoMan(xmj)
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile 30 Jan 2021 19:24:33 -
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+Don't hardcode CC and PREFIX, ensure path separators are properly used,
+and don't build with -g
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -52,10 +52,10 @@ TILESETPATH=NULL
+ # (Don't bother with this on Windows; I don't have an install target
+ # for Windows.)
+ # The binaries go into $(DESTDIR)$(BINDIR)
+-DESTDIR = /usr/local/
+-BINDIR = bin
++DESTDIR ?= /usr/local/
++BINDIR = /bin
+ # The man pages go into $(DESTDIR)$(MANDIR)
+-MANDIR = man/man1
++MANDIR = /man/man1
+ # and the appropriate suffix is 1
+ MANSUFFIX = 1
+
+@@ -72,7 +72,7 @@ MGW=/home/jcb/MinGW
+ # makefile was made by stripping out most of an imake-generated file.
+
+ # It's best to use gcc if you can.
+-CC = gcc
++CC ?= cc
+
+ # C debugging and optimization flags.
+ # In development, we turn on all reasonable warnings.
+@@ -85,8 +85,6 @@ CC = gcc
+ # just leave optimization switched off.
+ ifdef Warnings
+ CDEBUGFLAGS = -g -Wall -W -Wstrict-prototypes -Wmissing-prototypes
+-else
+-CDEBUGFLAGS = -g
+ endif
+ # The -Wconversion flag
Re: games/chocolate-doom -fno-common
On Sat, Jan 30, 2021 at 04:08:08PM +1100, Jonathan Gray wrote: > backport a patch to fix -fno-common build > https://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2.patch > looks good to me > --- /dev/null Sat Jan 30 16:04:08 2021 > +++ games/chocolate-doom/patches/patch-src_hexen_mn_menu_cSat Jan 30 > 15:59:47 2021 > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +Remove redundant demoextend definition > +a8fd4b1f563d24d4296c3e8225c8404e2724d4c2 > + > +Index: src/hexen/mn_menu.c > +--- src/hexen/mn_menu.c.orig > src/hexen/mn_menu.c > +@@ -131,7 +131,6 @@ boolean MenuActive; > + int InfoType; > + int messageson = true; > + boolean mn_SuicideConsole; > +-boolean demoextend; // from h2def.h > + > + // PRIVATE DATA DEFINITIONS > + >
powerpc64 bulk build report
Bulk build on powerpc64.ports.openbsd.org Started : Mon Jan 25 11:41:33 MST 2021 Finished: Sat Jan 30 12:29:09 MST 2021 Duration: 5 Days 0 hours 48 minutes Built using OpenBSD 6.8-current (GENERIC.MP) #13: Sun Jan 24 13:43:51 MST 2021 Built 9391 packages Number of packages built each day: Jan 25: 1585 Jan 26: 1848 Jan 27: 1056 Jan 28: 1126 Jan 29: 822 Jan 30: 2954 Critical path missing pkgs: http://build-failures.rhaalovely.net/powerpc64/2021-01-25/summary.log Build failures: 25 http://build-failures.rhaalovely.net/powerpc64/2021-01-25/audio/hydrogen.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/devel/ccache.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/devel/electron.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/emulators/retroarch.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/games/astromenace.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/games/odamex.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/graphics/pecl-imagick,php74.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/lang/chicken/bootstrap.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/lang/swi-prolog.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/mail/elm.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/math/gbc.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/multimedia/synfigstudio.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/net/bro.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/productivity/gnucash.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/security/gpgme.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/security/pecl-mcrypt,php74.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/sysutils/u-boot,aarch64.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/www/chromium.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/www/iridium.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/x11/i3.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/x11/i3-gaps.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/x11/i3-mousedrag.log http://build-failures.rhaalovely.net/powerpc64/2021-01-25/x11/mate/menu-advanced.log Recurrent failures: failures/devel/electron.log failures/emulators/retroarch.log failures/games/astromenace.log failures/lang/chicken/bootstrap.log failures/lang/swi-prolog.log failures/mail/elm.log failures/math/gbc.log failures/multimedia/synfigstudio.log failures/net/bro.log failures/productivity/gnucash.log failures/security/gpgme.log failures/sysutils/u-boot,aarch64.log failures/www/chromium.log failures/www/iridium.log New failures: +failures/audio/hydrogen.log +failures/devel/ccache.log +failures/games/odamex.log +failures/graphics/pecl-imagick,php74.log +failures/security/pecl-mcrypt,php74.log +failures/x11/i3-gaps.log +failures/x11/i3-mousedrag.log +failures/x11/i3.log +failures/x11/mate/menu-advanced.log Resolved failures: -failures/astro/gnuastro.log -failures/audio/cmu-sphinxbase.log -failures/devel/liboil.log -failures/devel/mk.log -failures/devel/openmpi.log -failures/games/valyriatear.log -failures/graphics/darktable.log -failures/graphics/openimageio.log -failures/lang/gpc.log -failures/lang/pfe.log -failures/math/hdf5.log -failures/math/suitesparse.log -failures/net/pmacct,postgresql.log -failures/shells/ksh93.log Packages newly built: +astro/gnuastro +audio/cmu-sphinx3 +audio/cmu-sphinxbase +comms/xastir +databases/tdb, +databases/tdb,,-main +databases/tdb,,-python +databases/tdb,-main +databases/tdb,-python +devel/liboil +devel/mk +devel/openmpi +devel/p5-Alien-LibGumbo +devel/py-lief,python3 +devel/yarn +emulators/emulationstation +geo/gdal +geo/gdal,-main +geo/gdal,-perl +geo/gdal,-python +geo/gdal,python3 +geo/gdal,python3,-main +geo/gdal,python3,-perl +geo/gdal,python3,-python +geo/libosmium +geo/mapcache +geo/mapserver +geo/mapserver, +geo/mapserver,,-main +geo/mapserver,,-perl +geo/mapserver,,-php +geo/mapserver,,-python +geo/mapserver,,-utils +geo/mapserver,-main +geo/mapserver,-perl +geo/mapserver,-php +geo/mapserver,-python +geo/mapserver,-utils +geo/mdal +geo/merkaartor +geo/osm2pgrouting +geo/osm2pgsql +geo/osrm-backend +geo/pdal +geo/pgrouting +geo/postgis +geo/py-fiona,python3 +geo/py-rasterio,python3 +geo/py-rio-cogeo,python3 +geo/py-supermercado,python3 +graphics/gmt +graphics/gmt,-full +graphics/gmt,-high +graphics/gmt,-main +graphics/nomacs +graphics/opencv +graphics/opencv,-main +graphics/openimageio +graphics/openscenegraph +graphics/simgear +lang/racket-minimal +math/armadillo +math/cgal +math/eigen3 +math/ensmallen +math/grace +math/grace,no_x11 +math/hdf5 +math/matio +math/mlpack +math/mlpack,-main +math/mlpack,-python +math/netcdf +math/octave +math/py-cftime,python3 +math/py-cvxopt,python3 +math/py-h5py,python3 +math/py-netcdf4 +math/py-tables +math/suitesparse +multimedia/lives
Fix math/gbc -fno-common
Hello ports -- Attached is a diff to fix math/gbc -fno-common. It is from FreeBSD: https://svnweb.freebsd.org/ports/head/math/gnubc/files/patch-bc_global.h?revision=547437=co OK? ~Brian gbc-nocommon.diff Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/01/30 12:17:11 Modified files: security : Makefile Log message: + rbw
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2021/01/30 12:16:45 Log message: Import rbw, a Bitwarden command line clinet written in rust. OK and patches from tb@ Status: Vendor Tag: abieber Release Tags: abieber_20210130 N ports/security/rbw/Makefile N ports/security/rbw/distinfo N ports/security/rbw/patches/patch-src_locked_rs N ports/security/rbw/patches/patch-Cargo_toml N ports/security/rbw/patches/patch-modcargo-crates_net2-0_2_36_src_ext_rs N ports/security/rbw/pkg/DESCR N ports/security/rbw/pkg/PLIST No conflicts created by this import
Re: Remove net/packit
On Sat, 30 Jan 2021 15:57:29 +0100 Klemens Nanni : > I see little value in beating a dead horse here like FreeBSD does; > I think we should instead point users at tcpdump and scapy for those are > maintained and usable. > > Feedback? Objections? OK? > Is it working? I'm totally fine to remove old network daemons for security concerns or ports adding burden like deprecated dependencies, heavy patches requirements, runtime or compilation failures. This program doesn't seem to be in one of those categories. If it doesn't add extra work I think we should keep it.
Re: nicotine-plus port (take 2)
>This is take 2 for this port, I wasn't subscribed and I managed to >read over a small mistake for which is fixed in the included tarball. > > >Hi there, > >I've been working with the nicotine-plus team for over 9 month now and >it has been going from flakey outdated code to a very nice program. It >has been extensively tested on amd64 and I do expect it to work on >other platforms as well, but your mileage may vary. > >This is my first port in a long time and I'm open to improvements. I'd >like to thank epsilonKNOT from the #OpenBSD channel for his tips. > >Nicotine+ is a graphical client for the Soulseek peer-to-peer file >sharing network. > >Nicotine+ aims to be a pleasant, Free and Open Source (FOSS) >alternative to the official Soulseek client, providing additional >functionality while keeping current with the Soulseek protocol. > > >https://nicotine-plus.org/ > > > ># Han Tested on my OpenBSD amd64 -current system with my Soulseek account and it works great for me, thanks! -Tom
Re: Update micro editor to v2.0.8
Hi,
do you mean like this?
I have not seen any Makefile yet, where PORTS_PRIVSEP=Yes is set.
The only place where I have seen this is /etc/mk.conf.
On Mon, 25 Jan 2021, Aaron Bieber wrote:
> On Fri, 22 Jan 2021 at 15:35:04 +0100, Thaison Nguyen wrote:
> > Hi,
> >
> > I have updated micro to the latest version (2.0.8). I had to change quite
> > a lot because of the go modules. The modules list I have retrieved using
> > the new macro.
> > I have only tested it on amd64.
> >
> > OK?
> >
>
> Looks good! One of the things our Go build stuff sets is "-modcacherw" - this
> fixes cleanup issues when running with PORTS_PRIVSEP=Yes set.
>
> OK abieber@ once a patch is added to set that. :D
>
Index: editors/micro/Makefile
===
RCS file: /cvs/ports/editors/micro/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- editors/micro/Makefile 12 Jul 2019 20:46:06 - 1.4
+++ editors/micro/Makefile 30 Jan 2021 13:57:49 -
@@ -2,11 +2,11 @@
COMMENT = modern and intuitive terminal-based text editor
-V =1.1.3
-DISTNAME = micro-${V}-src
-PKGNAME = micro-${V}
-REVISION = 0
+MODGO_MODNAME =github.com/zyedidia/micro/v2
+MODGO_VERSION =v2.0.8
+
+DISTNAME = micro-${MODGO_VERSION}
CATEGORIES = editors
HOMEPAGE = https://micro-editor.github.io/
MAINTAINER = Edd Barrett
@@ -16,11 +16,62 @@ PERMIT_PACKAGE =Yes
WANTLIB += c pthread
-MASTER_SITES =
https://github.com/zyedidia/micro/releases/download/v${V}/
+PORTS_PRIVSEP =Yes
MODULES = lang/go
MODGO_TYPE =bin
-WRKDIST = ${WRKDIR}/micro
+
+MODGO_MODULES =\
+ github.com/blang/semver v3.5.1+incompatible \
+ github.com/chzyer/logex v1.1.10 \
+ github.com/chzyer/readline
v0.0.0-20180603132655-2972be24d48e \
+ github.com/chzyer/test
v0.0.0-20180213035817-a1ea475d72b1 \
+ github.com/davecgh/go-spew v1.1.1 \
+ github.com/dustin/go-humanizev1.0.0 \
+ github.com/gdamore/encoding v1.0.0 \
+ github.com/go-errors/errors v1.0.1 \
+ github.com/kballard/go-shellquote
v0.0.0-20180428030007-95032a82bc51 \
+ github.com/kr/pretty v0.1.0 \
+ github.com/kr/ptyv1.1.1 \
+ github.com/kr/text v0.1.0 \
+ github.com/lucasb-eyer/go-colorful v1.0.3 \
+ github.com/mattn/go-isatty v0.0.11 \
+ github.com/mattn/go-runewidthv0.0.7 \
+ github.com/mitchellh/go-homedir v1.1.0 \
+ github.com/p-e-w/go-runewidth
v0.0.10-0.20200613030200-3e1705c5c059 \
+ github.com/pmezard/go-difflibv1.0.0 \
+ github.com/robertkrimen/otto
v0.0.0-20191219234010-c382bd3c16ff \
+ github.com/sergi/go-diff v1.1.0 \
+ github.com/stretchr/objx v0.1.0 \
+ github.com/stretchr/testify v1.4.0 \
+ github.com/xo/terminfo
v0.0.0-20200218205459-454e5b68f9e8 \
+ github.com/yuin/gopher-lua
v0.0.0-20191220021717-ab39c6098bdb \
+ github.com/zyedidia/clipboardv1.0.3 \
+ github.com/zyedidia/glob
v0.0.0-20170209203856-dd4023a66dc3 \
+ github.com/zyedidia/go-shellquote
v0.0.0-20200613203517-eccd813c0655 \
+ github.com/zyedidia/highlight
v0.0.0-20170330143449-201131ce5cf5 \
+ github.com/zyedidia/json5
v0.0.0-20200102012142-2da050b1a98d \
+ github.com/zyedidia/poller v1.0.1 \
+ github.com/zyedidia/pty v2.0.0+incompatible \
+ github.com/zyedidia/tcell/v2 v2.0.6 \
+ github.com/zyedidia/terminal
v0.0.0-20180726154117-533c623e2415 \
+ golang.org/x/sys
v0.0.0-20191026070338-33540a1f6037 \
+ golang.org/x/textv0.3.2 \
+ golang.org/x/tools
v0.0.0-20180917221912-90fa682c2a6e \
+ gopkg.in/check.v1
v1.0.0-20190902080502-41f04d3bba15 \
+ gopkg.in/sourcemap.v1v1.0.5 \
+ gopkg.in/yaml.v2 v2.2.7 \
+ layeh.com/gopher-luarv1.0.7
+
+MODGO_MODFILES = \
+ github.com/davecgh/go-spew v1.1.0 \
+ github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583 \
+ golang.org/x/sys v0.0.0-20190204203706-41f3e6584952 \
+ golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 \
+ golang.org/x/textv0.3.0 \
+ gopkg.in/check.v1v0.0.0-20161208181325-20d25e280405 \
+
Re: nicotine-plus port (take 2)
Tom Murphy wrote: > Tested on my OpenBSD amd64 -current system with my Soulseek account > and it works great for me, thanks! Thanks for testing, Tom. Much appreciated. # Han
games/xblast: fix with -fno-common
I took this from FreeBSD [0]. It builds and works fine on amd64.
OK?
Charlène.
[0] https://github.com/freebsd/freebsd-ports/commit/52377c76
Index: Makefile
===
RCS file: /cvs/ports/games/xblast/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile12 Jul 2019 20:46:26 - 1.30
+++ Makefile30 Jan 2021 16:56:00 -
@@ -3,7 +3,7 @@
COMMENT= graphical multi-player real-time strategy game for X11
DISTNAME= xblast-2.10.4
-REVISION= 3
+REVISION= 4
DIST_SUBDIR= xblast
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
images-2005-01-06${EXTRACT_SUFX} \
Index: patches/patch-cfg_control_h
===
RCS file: patches/patch-cfg_control_h
diff -N patches/patch-cfg_control_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cfg_control_h 30 Jan 2021 16:56:00 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: cfg_control.h
+--- cfg_control.h.orig
cfg_control.h
+@@ -29,7 +29,7 @@
+ #define NUM_KEYB_CONTROLS 2
+
+ /* constant assignment of control to event type */
+-const XBEventCode keyEventType[NUM_KEYB_CONTROLS];
++extern const XBEventCode keyEventType[NUM_KEYB_CONTROLS];
+
+ /* ingame controls for editing*/
+ typedef struct
Index: patches/patch-network_h
===
RCS file: patches/patch-network_h
diff -N patches/patch-network_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-network_h 30 Jan 2021 16:56:00 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: network.h
+--- network.h.orig
network.h
+@@ -105,7 +105,7 @@ typedef enum
+ #define TEAM_UNDEF 252
+
+ /* team color assignment */
+-const XBColor teamColors[NUM_XBTS];
++extern const XBColor teamColors[NUM_XBTS];
+
+ /* results of game config receive/create */
+ typedef enum
games/xinvaders: fix with -fno-common
I took this from FreeBSD [0], the runtime is fine on amd64.
OK?
Charlène.
[0] https://github.com/freebsd/freebsd-ports/commit/9bd2b3e4
Index: Makefile
===
RCS file: /cvs/ports/games/xinvaders/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile14 Jul 2019 00:39:37 - 1.35
+++ Makefile30 Jan 2021 16:32:23 -
@@ -3,7 +3,7 @@
COMMENT= shoot them nasty little bugs
DISTNAME= xinvaders-2.1.1
-REVISION= 2
+REVISION= 3
CATEGORIES=games
PERMIT_PACKAGE=Yes
Index: patches/patch-vaders_h
===
RCS file: /cvs/ports/games/xinvaders/patches/patch-vaders_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-vaders_h
--- patches/patch-vaders_h 27 Aug 2015 15:00:32 - 1.2
+++ patches/patch-vaders_h 30 Jan 2021 16:32:23 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-vaders_h,v 1.2 2015/08/27 15:00:32 naddy Exp $
vaders.h.orig Mon Sep 11 00:32:40 2000
-+++ vaders.h Tue Aug 25 21:28:01 2015
+Index: vaders.h
+--- vaders.h.orig
vaders.h
@@ -90,15 +90,82 @@ typedef struct _VadersRec {
@@ -86,7 +87,7 @@ $OpenBSD: patch-vaders_h,v 1.2 2015/08/2
ext int level;
ext Display *dpy;
-@@ -111,30 +178,17 @@ ext int basesleft;
+@@ -111,54 +178,31 @@ ext int basesleft;
/* Base info: */
@@ -97,7 +98,8 @@ $OpenBSD: patch-vaders_h,v 1.2 2015/08/2
-ext Pixel basepixel;
-ext Pixel buildingpixel;
- ext Boolean basedestroyed;/* TRUE if the base is non-existant */
+-ext Boolean basedestroyed;/* TRUE if the base is non-existant */
++extern Boolean basedestroyed; /* TRUE if the base is non-existant */
/* Vader info: */
@@ -116,8 +118,12 @@ $OpenBSD: patch-vaders_h,v 1.2 2015/08/2
- /* moving spacers. */
ext int spacerappear; /* same, but for the interval between
appearances */
- ext Boolean spacer_shown; /* Currnet_Spacer is something */
-@@ -144,21 +198,11 @@ ext int spacer_counter; /* number of cycles to
create
+-ext Boolean spacer_shown; /* Currnet_Spacer is something */
+-ext int spacer_counter; /* number of cycles to create a spacer
*/
++extern Boolean spacer_shown; /* Currnet_Spacer is something */
++extern int spacer_counter;/* number of cycles to create a spacer
*/
+
+ /* Shot info. */
ext XtIntervalId shottimerid;
ext XtIntervalId vshottimerid;
@@ -129,8 +135,10 @@ $OpenBSD: patch-vaders_h,v 1.2 2015/08/2
- /* once. */
-ext int maxvshots;/* How many shots are allowed to exist at */
- /* once. */
- ext int numshots; /* how many shots (from the base) there are
right now. */
- ext int numvshots;/* how many shots (from vaders) there are right
now. */
+-ext int numshots; /* how many shots (from the base) there are
right now. */
+-ext int numvshots;/* how many shots (from vaders) there are right
now. */
++extern int numshots; /* how many shots (from the base) there are
right now. */
++extern int numvshots; /* how many shots (from vaders) there are right
now. */
/* Score info */
Re: [UPDATE] py-toml python2
On Sat, Jan 30, 2021 at 12:22:45PM +0100, Klemens Nanni wrote:
> On Sat, Jan 30, 2021 at 08:19:29AM +, Dimitri Karamazov wrote:
> > The qutebrowser-2.0.0 needs py-importlib-resources backport
> > for python3.8 and lower. One of its dependencies is
> > setuptools_scm[toml]>3.4.1 so I need to turn on python2
> > flavor for py-toml to update it.
> I'd very much prefer if we'd work towards making qutebrowser and
> dependencies py3 only.
>
> Otherwise it's a step backwards.
>
py2 is not required for qutebrowser. Adding py-toml(only py3) as
runtime dependency after update to setuptools_scm will prevent its
py2 version from installing that is all. I just don't want to
break any other packages depending on setuptools_scm(py2) if any.
> Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/textproc/py-toml/pkg/PLIST,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 PLIST
> > --- pkg/PLIST 3 Nov 2020 13:52:14 - 1.3
> > +++ pkg/PLIST 30 Jan 2021 07:57:15 -
> > @@ -1,6 +1,4 @@
> > -@comment $OpenBSD: PLIST,v 1.3 2020/11/03 13:52:14 jasper Exp $
> > -@conflict py-toml-*
> > -@pkgpath textproc/py-toml
> > +@comment $OpenBSD: PLIST,v$
> There would still be a quirk:
>
> files/Quirks.pm
> 507: 'py-toml' => 'py3-toml',
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1136
diff -u -p -r1.1136 Makefile
--- devel/quirks/Makefile 25 Jan 2021 14:21:29 - 1.1136
+++ devel/quirks/Makefile 30 Jan 2021 12:14:21 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.524
+PKGNAME = quirks-3.525
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1152
diff -u -p -r1.1152 Quirks.pm
--- devel/quirks/files/Quirks.pm25 Jan 2021 14:21:29 - 1.1152
+++ devel/quirks/files/Quirks.pm30 Jan 2021 12:14:21 -
@@ -504,7 +504,6 @@ my $stem_extensions = {
'py-carbon' => 'py3-carbon',
'py-elftools' => 'py3-elftools',
'py-lockfile' => 'py3-lockfile',
- 'py-toml' => 'py3-toml',
'py-textfsm' => 'py3-textfsm',
'py-unicodecsv' => 'py3-unicodecsv',
'py-enchant' => 'py3-enchant',
Index: textproc/py-toml/Makefile
===
RCS file: /cvs/ports/textproc/py-toml/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- textproc/py-toml/Makefile 3 Nov 2020 13:52:13 - 1.7
+++ textproc/py-toml/Makefile 30 Jan 2021 12:14:49 -
@@ -17,6 +17,6 @@ MODPY_SETUPTOOLS =Yes
MODPY_PYTEST = Yes
FLAVORS = python3
-FLAVOR ?= python3
+FLAVOR ?=
.include
Index: textproc/py-toml/pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-toml/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- textproc/py-toml/pkg/PLIST 3 Nov 2020 13:52:14 - 1.3
+++ textproc/py-toml/pkg/PLIST 30 Jan 2021 12:14:49 -
@@ -1,6 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2020/11/03 13:52:14 jasper Exp $
-@conflict py-toml-*
-@pkgpath textproc/py-toml
+@comment $OpenBSD: PLIST,v$
lib/python${MODPY_VERSION}/site-packages/toml/
lib/python${MODPY_VERSION}/site-packages/toml-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/toml-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
games/typespeed: fix with -fno-common
Hi,
This fix is taken from Gentoo [0]. Built and tested on amd64.
OK?
Charlène.
[0]
https://gitweb.gentoo.org/repo/gentoo.git/tree/games-misc/typespeed/files/typespeed-0.6.5-use-extern.patch
Index: Makefile
===
RCS file: /cvs/ports/games/typespeed/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:26 - 1.6
+++ Makefile30 Jan 2021 16:16:29 -
@@ -3,7 +3,7 @@ COMMENT = Test your typing speed and ge
DISTNAME = typespeed-0.6.5
CATEGORIES = games
-REVISION = 3
+REVISION = 4
HOMEPAGE = http://typespeed.sourceforge.net/
Index: patches/patch-src_file_c
===
RCS file: /cvs/ports/games/typespeed/patches/patch-src_file_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_file_c
--- patches/patch-src_file_c22 Jan 2016 15:24:30 - 1.1.1.1
+++ patches/patch-src_file_c30 Jan 2021 16:16:29 -
@@ -1,10 +1,22 @@
$OpenBSD: patch-src_file_c,v 1.1.1.1 2016/01/22 15:24:30 landry Exp $
-Don't check if the userconf exists, inconditionally create
-the userdir in ~/.typespeed and the user scorefile.
+Hunk #1: Fix -fno-common build failure.
+Hunk #2: Don't check if the userconf exists, inconditionally create
+ the userdir in ~/.typespeed and the user scorefile.
src/file.c.origWed Aug 13 17:08:09 2008
-+++ src/file.c Fri Jan 22 15:21:45 2016
+Index: src/file.c
+--- src/file.c.orig
src/file.c
+@@ -142,6 +142,9 @@ extern int hfd;
+ extern char *rankki[11];
+ extern char *typorank[12];
+ extern char *usedwordfile;
++extern struct rules rules;
++struct rawdatawords;
++struct optopt;
+
+ char ruledir[MAXPATHLEN];
+ char worddir[MAXPATHLEN];
@@ -1125,7 +1125,7 @@ void
readconfig(void)
{
Index: patches/patch-src_menu_c
===
RCS file: patches/patch-src_menu_c
diff -N patches/patch-src_menu_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_menu_c30 Jan 2021 16:16:29 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: src/menu.c
+--- src/menu.c.orig
src/menu.c
+@@ -76,6 +76,9 @@ void tellstory(void);
+
+ extern int misses;
+ extern char *rankki[11];
++extern struct stats now;
++extern struct rules rules;
++extern struct opt opt;
+
+ struct positions {
+ int rank;
Index: patches/patch-src_misc_c
===
RCS file: /cvs/ports/games/typespeed/patches/patch-src_misc_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_misc_c
--- patches/patch-src_misc_c22 Jan 2016 15:24:30 - 1.1.1.1
+++ patches/patch-src_misc_c30 Jan 2021 16:16:29 -
@@ -1,9 +1,19 @@
$OpenBSD: patch-src_misc_c,v 1.1.1.1 2016/01/22 15:24:30 landry Exp $
-use arc4random()
+Hunk #1: Fix -fno-common build failure.
+Hunk #2: Use arc4random()
src/misc.c.origFri Jan 22 14:58:04 2016
-+++ src/misc.c Fri Jan 22 14:58:24 2016
+Index: src/misc.c
+--- src/misc.c.orig
src/misc.c
+@@ -75,6 +75,7 @@ char *xstrdup(char *);
+ void xstrncpy(char *, char *, size_t);
+
+ extern char *progname;
++extern struct opt opt;
+
+ static int graph = 0;
+
@@ -224,7 +224,7 @@ r(int range)
#ifdef WIN32
return (int)(rand() % range);
Index: patches/patch-src_network_c
===
RCS file: patches/patch-src_network_c
diff -N patches/patch-src_network_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_network_c 30 Jan 2021 16:16:29 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: src/network.c
+--- src/network.c.orig
src/network.c
+@@ -116,6 +116,7 @@ void setnoblock(void);
+ void writenum(char *, uint32_t);
+
+ extern FILE *netlogfile;
++extern struct opt opt;
+
+ static int ds = -1;
+ static int ss = -1;
Index: patches/patch-src_typespeed_c
===
RCS file: /cvs/ports/games/typespeed/patches/patch-src_typespeed_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_typespeed_c
--- patches/patch-src_typespeed_c 22 Jan 2016 15:24:30 - 1.1.1.1
+++ patches/patch-src_typespeed_c 30 Jan 2021 16:16:29 -
@@ -1,10 +1,30 @@
$OpenBSD: patch-src_typespeed_c,v 1.1.1.1 2016/01/22 15:24:30 landry Exp $
-Disable the code opening the systemwide highscore file
-and dropping privileges, since we're removing the setgid bit
+Hunk #1: Fix -fno-common build failure
+Hunk #2: Disable the code opening the systemwide highscore file
+ and dropping privileges, since we're removing the setgid bit
src/typespeed.c.orig Fri Jan 22
Re: Fix games/cpat -fno-common
On Sat, 30 Jan 2021 05:58:40 + Brian Callahan wrote: > Hi ports -- > > Attached is a diff to fix games/cpat for -fno-common > Independent invention, but it is fairly straightforward. > > OK? > > ~Brian OK cwen@
Re: Fix textproc/halibut -fno-common
On Sat, 30 Jan 2021 05:27:53 + Brian Callahan wrote: > Hello ports -- > > Attached is a diff to fix textproc/halibut with -fno-common. > It is taken from Debian: > https://sources.debian.org/data/main/h/halibut/1.2-3/debian/patches/gcc-no-common.patch > > OK? > > ~Brian OK cwen@
Update arm-none-eabi binutils to 2.31.1
U-Boot targets that use the CONFIG_POSITION_INDEPENDENT and
CONFIG_LINUX_KERNEL_IMAGE_HEADER options don't build because they
generate a relocation that binutils 2.30 doesn't like. This is fixed
in binutils 2.31. Given that there is a 2.31.1 I updated to that one.
ok?
Index: devel/arm-none-eabi/binutils/Makefile
===
RCS file: /cvs/ports/devel/arm-none-eabi/binutils/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- devel/arm-none-eabi/binutils/Makefile 6 Oct 2020 05:53:05 -
1.6
+++ devel/arm-none-eabi/binutils/Makefile 30 Jan 2021 13:57:12 -
@@ -2,7 +2,7 @@
COMMENT= binutils for ${CONFIG} cross-development
-VERSION= 2.30
+VERSION= 2.31.1
DISTNAME= binutils-${VERSION}
FLAVORS= aarch64 arm
Index: devel/arm-none-eabi/binutils/distinfo
===
RCS file: /cvs/ports/devel/arm-none-eabi/binutils/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- devel/arm-none-eabi/binutils/distinfo 6 Oct 2020 05:53:05 -
1.3
+++ devel/arm-none-eabi/binutils/distinfo 30 Jan 2021 13:57:12 -
@@ -1,2 +1,2 @@
-SHA256 (binutils/binutils-2.30.tar.bz2) =
7+rehIBn6aA/GRix2g03qv+gsBJ6BrXpI2IphR2dDAk=
-SIZE (binutils/binutils-2.30.tar.bz2) = 29541188
+SHA256 (binutils/binutils-2.31.1.tar.bz2) =
/8w4JpW/lH2mE150NrjtUtmRzycNuJcZDxnW+YOFZNA=
+SIZE (binutils/binutils-2.31.1.tar.bz2) = 30110779
Index: devel/arm-none-eabi/binutils/patches/patch-bfd_doc_Makefile_in
===
RCS file:
/cvs/ports/devel/arm-none-eabi/binutils/patches/patch-bfd_doc_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-bfd_doc_Makefile_in
--- devel/arm-none-eabi/binutils/patches/patch-bfd_doc_Makefile_in 16 Jul
2017 12:44:19 - 1.2
+++ devel/arm-none-eabi/binutils/patches/patch-bfd_doc_Makefile_in 30 Jan
2021 13:57:12 -
@@ -2,12 +2,12 @@ $OpenBSD: patch-bfd_doc_Makefile_in,v 1.
Index: bfd/doc/Makefile.in
--- bfd/doc/Makefile.in.orig
+++ bfd/doc/Makefile.in
-@@ -104,7 +104,7 @@ CONFIG_CLEAN_VPATH_FILES =
- depcomp =
- am__depfiles_maybe =
- SOURCES =
+@@ -174,7 +174,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
+ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+ am__v_texidevnull_0 = > /dev/null
+ am__v_texidevnull_1 =
-INFO_DEPS = bfd.info
+INFO_DEPS =
- TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/../texinfo
+ am__TEXINFO_TEX_DIR = $(srcdir)
DVIS = bfd.dvi
+ PDFS = bfd.pdf
Index: devel/arm-none-eabi/binutils/patches/patch-binutils_doc_Makefile_in
===
RCS file:
/cvs/ports/devel/arm-none-eabi/binutils/patches/patch-binutils_doc_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-binutils_doc_Makefile_in
--- devel/arm-none-eabi/binutils/patches/patch-binutils_doc_Makefile_in 16 Jul
2017 12:44:19 - 1.2
+++ devel/arm-none-eabi/binutils/patches/patch-binutils_doc_Makefile_in 30 Jan
2021 13:57:12 -
@@ -2,12 +2,12 @@ $OpenBSD: patch-binutils_doc_Makefile_in
Index: binutils/doc/Makefile.in
--- binutils/doc/Makefile.in.orig
+++ binutils/doc/Makefile.in
-@@ -101,7 +101,7 @@ CONFIG_CLEAN_VPATH_FILES =
- depcomp =
- am__depfiles_maybe =
- SOURCES =
+@@ -177,7 +177,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
+ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+ am__v_texidevnull_0 = > /dev/null
+ am__v_texidevnull_1 =
-INFO_DEPS = binutils.info
+INFO_DEPS =
- TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/../texinfo
+ am__TEXINFO_TEX_DIR = $(srcdir)
DVIS = binutils.dvi
+ PDFS = binutils.pdf
Index: devel/arm-none-eabi/binutils/patches/patch-gas_doc_Makefile_in
===
RCS file:
/cvs/ports/devel/arm-none-eabi/binutils/patches/patch-gas_doc_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gas_doc_Makefile_in
--- devel/arm-none-eabi/binutils/patches/patch-gas_doc_Makefile_in 16 Jul
2017 12:44:19 - 1.2
+++ devel/arm-none-eabi/binutils/patches/patch-gas_doc_Makefile_in 30 Jan
2021 13:57:12 -
@@ -2,12 +2,12 @@ $OpenBSD: patch-gas_doc_Makefile_in,v 1.
Index: gas/doc/Makefile.in
--- gas/doc/Makefile.in.orig
+++ gas/doc/Makefile.in
-@@ -99,7 +99,7 @@ CONFIG_CLEAN_VPATH_FILES =
- depcomp =
- am__depfiles_maybe =
- SOURCES =
+@@ -174,7 +174,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
+ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+ am__v_texidevnull_0 = > /dev/null
+ am__v_texidevnull_1 =
-INFO_DEPS = as.info
+INFO_DEPS =
- TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/../texinfo
+ TEXINFO_TEX = $(top_srcdir)/../texinfo.tex
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/..
DVIS =
Re: Fix games/spacezero -fno-common
On Sat, 30 Jan 2021 01:16:50 + Brian Callahan wrote: > Hi ports -- > > Attached is a patch to fix games/spacezero for -fno-common. > Upstream is long silent. Could not find other packages that had fixed > this. But the fix was easy. > > OK? > > ~Brian OK cwen@
Re: Fix math/gbc -fno-common
On Sat, Jan 30, 2021 at 03:26:04PM +, Brian Callahan wrote: > Attached is a diff to fix math/gbc -fno-common. It is from FreeBSD: > https://svnweb.freebsd.org/ports/head/math/gnubc/files/patch-bc_global.h?revision=547437=co OK kn
Re: Remove net/packit
On Sat, Jan 30, 2021 at 04:05:26PM +0100, Solene Rapenne wrote: > Is it working? ChangeLog lists several fixes for crashes between 1.0 and 1.6, so our version does not have those. At leasts for lo(4), capturing only works if writing to a file, e.g. no matter which options I try and/or which packets I produce on lo0, packit never prints them: $ doas packit -m capture -i lo0 [producing packets in another xterm, yet nothing is printed] ^C -| Packet Capture Statistics |-- Received: 4 Dropped: 0 Processed: 0 Do the same with `-w dump' and `tcpdump -r dump' will print them. Injecting IPv6 packets is not supported, fair enough. But packit also fails to capture any IPv6 packets, e.g. $ doas packit -m capture -i trunk0 Shows nothing... enabling IPv4 and pinging something does make it print those packets, so at least printing per se works. I don't consider this working. > I'm totally fine to remove old network daemons for security concerns > or ports adding burden like deprecated dependencies, heavy patches > requirements, runtime or compilation failures. The very idea behind the new repository is to carry patches to ship what I wouldn't call updates -- it's life support. > This program doesn't seem to be in one of those categories. > If it doesn't add extra work I think we should keep it. Sure, the path of least resistance is to keep building with "-fcommon". Or wait for someone to update to the "new version" but even that is not less work, it merely hides the work inside the repository instead of our tree.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2021/01/30 08:37:06 Modified files: devel/fmt : Makefile Added files: devel/fmt/patches: patch-CMakeLists_txt Log message: devel/fmt: fix the build on clang+ld.bfd archs. fmt needs to be built without -Wl,--as-needed on these archs, add a AS_NEEDED option to do so. This fixes the build on powerpc and mips64. Thanks to jj@ for testing on mips64, where there is still an int128 related test failure. OK jca@ and Ashton Fagg (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2021/01/30 08:34:20 Modified files: sysutils/ansible: Makefile distinfo Log message: Update ansible 2.9.16 -> 2.9.17 Changelog: https://github.com/ansible/ansible/blob/stable-2.9/changelogs/CHANGELOG-v2.9.rst#v2-9-17
Re: Update micro editor to v2.0.8
On Sat, 30 Jan 2021 at 15:39:41 +0100, Thaison Nguyen wrote:
> Hi,
>
> do you mean like this?
> I have not seen any Makefile yet, where PORTS_PRIVSEP=Yes is set.
> The only place where I have seen this is /etc/mk.conf.
>
Correct. It is a mk.conf option and without '-modcacherw' set 'make clean'
breaks.
>
> On Mon, 25 Jan 2021, Aaron Bieber wrote:
>
> > On Fri, 22 Jan 2021 at 15:35:04 +0100, Thaison Nguyen wrote:
> > > Hi,
> > >
> > > I have updated micro to the latest version (2.0.8). I had to change quite
> > > a lot because of the go modules. The modules list I have retrieved using
> > > the new macro.
> > > I have only tested it on amd64.
> > >
> > > OK?
> > >
> >
> > Looks good! One of the things our Go build stuff sets is "-modcacherw" -
> > this
> > fixes cleanup issues when running with PORTS_PRIVSEP=Yes set.
> >
> > OK abieber@ once a patch is added to set that. :D
> >
>
> Index: editors/micro/Makefile
> ===
> RCS file: /cvs/ports/editors/micro/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 Makefile
> --- editors/micro/Makefile12 Jul 2019 20:46:06 - 1.4
> +++ editors/micro/Makefile30 Jan 2021 13:57:49 -
> @@ -2,11 +2,11 @@
>
> COMMENT =modern and intuitive terminal-based text editor
>
> -V = 1.1.3
> -DISTNAME = micro-${V}-src
> -PKGNAME =micro-${V}
> -REVISION = 0
> +MODGO_MODNAME = github.com/zyedidia/micro/v2
> +MODGO_VERSION = v2.0.8
>
> +
> +DISTNAME = micro-${MODGO_VERSION}
> CATEGORIES = editors
> HOMEPAGE = https://micro-editor.github.io/
> MAINTAINER = Edd Barrett
> @@ -16,11 +16,62 @@ PERMIT_PACKAGE = Yes
>
> WANTLIB += c pthread
>
> -MASTER_SITES =
> https://github.com/zyedidia/micro/releases/download/v${V}/
> +PORTS_PRIVSEP = Yes
>
> MODULES =lang/go
> MODGO_TYPE =bin
> -WRKDIST =${WRKDIR}/micro
> +
> +MODGO_MODULES = \
> + github.com/blang/semver v3.5.1+incompatible \
> + github.com/chzyer/logex v1.1.10 \
> + github.com/chzyer/readline
> v0.0.0-20180603132655-2972be24d48e \
> + github.com/chzyer/test
> v0.0.0-20180213035817-a1ea475d72b1 \
> + github.com/davecgh/go-spew v1.1.1 \
> + github.com/dustin/go-humanizev1.0.0 \
> + github.com/gdamore/encoding v1.0.0 \
> + github.com/go-errors/errors v1.0.1 \
> + github.com/kballard/go-shellquote
> v0.0.0-20180428030007-95032a82bc51 \
> + github.com/kr/pretty v0.1.0 \
> + github.com/kr/ptyv1.1.1 \
> + github.com/kr/text v0.1.0 \
> + github.com/lucasb-eyer/go-colorful v1.0.3 \
> + github.com/mattn/go-isatty v0.0.11 \
> + github.com/mattn/go-runewidthv0.0.7 \
> + github.com/mitchellh/go-homedir v1.1.0 \
> + github.com/p-e-w/go-runewidth
> v0.0.10-0.20200613030200-3e1705c5c059 \
> + github.com/pmezard/go-difflibv1.0.0 \
> + github.com/robertkrimen/otto
> v0.0.0-20191219234010-c382bd3c16ff \
> + github.com/sergi/go-diff v1.1.0 \
> + github.com/stretchr/objx v0.1.0 \
> + github.com/stretchr/testify v1.4.0 \
> + github.com/xo/terminfo
> v0.0.0-20200218205459-454e5b68f9e8 \
> + github.com/yuin/gopher-lua
> v0.0.0-20191220021717-ab39c6098bdb \
> + github.com/zyedidia/clipboardv1.0.3 \
> + github.com/zyedidia/glob
> v0.0.0-20170209203856-dd4023a66dc3 \
> + github.com/zyedidia/go-shellquote
> v0.0.0-20200613203517-eccd813c0655 \
> + github.com/zyedidia/highlight
> v0.0.0-20170330143449-201131ce5cf5 \
> + github.com/zyedidia/json5
> v0.0.0-20200102012142-2da050b1a98d \
> + github.com/zyedidia/poller v1.0.1 \
> + github.com/zyedidia/pty v2.0.0+incompatible \
> + github.com/zyedidia/tcell/v2 v2.0.6 \
> + github.com/zyedidia/terminal
> v0.0.0-20180726154117-533c623e2415 \
> + golang.org/x/sys
> v0.0.0-20191026070338-33540a1f6037 \
> + golang.org/x/textv0.3.2 \
> + golang.org/x/tools
> v0.0.0-20180917221912-90fa682c2a6e \
> + gopkg.in/check.v1
> v1.0.0-20190902080502-41f04d3bba15 \
> + gopkg.in/sourcemap.v1v1.0.5 \
> + gopkg.in/yaml.v2 v2.2.7 \
> + layeh.com/gopher-luarv1.0.7
> +
> +MODGO_MODFILES = \
> + github.com/davecgh/go-spew v1.1.0 \
> + github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583 \
> + golang.org/x/sys
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/01/30 08:19:36 Modified files: sysutils/squashfs-tools/patches: patch-squashfs-tools_mksquashfs_h Log message: backport a -fno-common fix ok jasper@
sysutils/wmapm: fix with -fno-common, update HOMEPAGE and MASTER_SITES
Hi,
The fix is taken from Gentoo [0]. While here i've updated HOMEPAGE and
MASTER_SITES, refreshed WANTLIB and an existing patch.
It works fine on amd64.
OK?
Charlène.
[0]
https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-plugins/wmapm/files/wmapm-3.1-fno-common.patch
Index: Makefile
===
RCS file: /cvs/ports/sysutils/wmapm/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile12 Jul 2019 20:49:54 - 1.30
+++ Makefile30 Jan 2021 15:14:37 -
@@ -5,16 +5,16 @@ ONLY_FOR_ARCHS= ${APM_ARCHS}
COMMENT= wm-dockapp; APM/battery monitor
DISTNAME= wmapm-3.1
-REVISION = 3
+REVISION = 4
CATEGORIES=sysutils x11 x11/windowmaker
-HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+HOMEPAGE= https://www.dockapps.net/wmapm
# GPL
PERMIT_PACKAGE=Yes
-WANTLIB= X11 Xext Xpm c xcb
+WANTLIB= X11 Xext Xpm c
-MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
+MASTER_SITES= https://www.dockapps.net/download/
NO_TEST= Yes
Index: patches/patch-wmapm_c
===
RCS file: /cvs/ports/sysutils/wmapm/patches/patch-wmapm_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-wmapm_c
--- patches/patch-wmapm_c 7 Mar 2005 05:37:20 - 1.2
+++ patches/patch-wmapm_c 30 Jan 2021 15:14:37 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-wmapm_c,v 1.2 2005/03/07 05:37:20 mcbride Exp $
wmapm/wmapm.c.orig Tue Jan 11 17:37:25 2000
-+++ wmapm/wmapm.c Wed Jan 10 17:35:20 2001
+Index: wmapm/wmapm.c
+--- wmapm/wmapm.c.orig
wmapm/wmapm.c
@@ -151,12 +151,17 @@
#endif
@@ -84,20 +85,21 @@ $OpenBSD: patch-wmapm_c,v 1.2 2005/03/07
#endif
/*
-@@ -417,9 +427,10 @@ int main(int argc, char *argv[]) {
+@@ -417,10 +427,11 @@ int main(int argc, char *argv[]) {
#ifdef Linux
time_left = (my_cur_info.using_minutes) ?
my_cur_info.battery_time : my_cur_info.battery_time / 60;
--#endif
--#ifdef FreeBSD
-- time_left = (my_cur_info.using_minutes) ?
my_cur_info.battery_time / 60 : my_cur_info.battery_time / 3600;
+#elif defined(FreeBSD)
+ time_left = my_cur_info.battery_time / 3600;
+#elif defined(__OpenBSD__)
+ time_left = my_cur_info.battery_time;
#endif
+-#ifdef FreeBSD
+- time_left = (my_cur_info.using_minutes) ?
my_cur_info.battery_time / 60 : my_cur_info.battery_time / 3600;
+-#endif
hour_left = time_left / 60;
+ min_left = time_left % 60;
@@ -689,7 +700,7 @@ void pressEvent(XButtonEvent *xev){
copyXPMArea(21, 106, 13, 11, 46, 48);
RedrawWindow();
@@ -131,13 +133,13 @@ $OpenBSD: patch-wmapm_c,v 1.2 2005/03/07
-#endif
+#elif defined(__OpenBSD__)
+int apm_read(struct apm_power_info *temp_info) {
-+
+
+-#ifdef SunOS
+int fd;
+
+if ( (fd = open(APMDEV, O_RDONLY)) < 0){
+ return(1);
-
--#ifdef SunOS
++
+} else if ( ioctl(fd, APM_IOC_GETPOWER, temp_info) == -1 ) {
+
+close(fd);
Index: patches/patch-wmgeneral_wmgeneral_c
===
RCS file: patches/patch-wmgeneral_wmgeneral_c
diff -N patches/patch-wmgeneral_wmgeneral_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_wmgeneral_c 30 Jan 2021 15:14:37 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmgeneral/wmgeneral.c
+--- wmgeneral/wmgeneral.c.orig
wmgeneral/wmgeneral.c
+@@ -50,6 +50,7 @@ Window iconwin, win;
+ GCNormalGC;
+ XpmIcon wmgen;
+ Pixmappixmask;
++Display *display;
+
+ /*/
+ /* Mouse Regions */
Index: patches/patch-wmgeneral_wmgeneral_h
===
RCS file: patches/patch-wmgeneral_wmgeneral_h
diff -N patches/patch-wmgeneral_wmgeneral_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_wmgeneral_h 30 Jan 2021 15:14:37 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmgeneral/wmgeneral.h
+--- wmgeneral/wmgeneral.h.orig
wmgeneral/wmgeneral.h
+@@ -28,7 +28,7 @@ typedef struct {
+ /* Global variable */
+ /***/
+
+-Display *display;
++extern Display*display;
+
+ /***/
+ /* Function Prototypes */
Remove net/packit
Citing packit(1): NAME Packit - Packet analysis and injection tool SYNOPSIS Packet capture: packit -m capture [-cGHnvsX] [-i interface] [-r|-w file] expression Packet injection: packit -m inject [-t protocol] [-aAbcCdDeFgGhHjJkKlLmMnNoOpPqQrRsSTuUvwWxXyYzZ] [-i interface] DESCRIPTION Packit is a network auditing tool. Its value is derived from its ability to customize, inject, monitor, and manipulate IP traffic. By allowing you to define (spoof) all TCP, UDP, ICMP, IP, ARP, RARP and Ethernet header options, Packit can be useful in testing firewalls, intrusion detection systems, port scanning, simulating network traffic and general TCP/IP auditing. Packit is also an excellent tool for learning TCP/IP. Our packaged 1.0 version seems to be the last one that can be fetched from upstream, which is long dead; HOMEPAGE http://packit.sf.net points to a generic corporate stub. Looking at the web first showed lots of false positives, i.e. tools with with the same name. FreeBSD packages an "updated" version, see https://github.com/resurrecting-open-source-projects/packit/blob/master/ChangeLog That project's README says: Packit needs your help. If you are a programmer and if you wants to help a nice project, this is your opportunity. My name is Eriberto and I am not a C developer. I imported Packit from its old repository[1] to GitHub (the original homepage and developer are inactive). After this, I applied all patches found in Debian project and other places for this program. All my work was registered in ChangeLog file (version 1.1 and later releases). Since noone could be bothered with updating our port since at least 2016, I doubt there's much interest. packit is a mixture of tcpdump(1) and scapy(1), it has the worst synopsis I've seen so far (which is wrong, btw.) and does not support IPv6. I see little value in beating a dead horse here like FreeBSD does; I think we should instead point users at tcpdump and scapy for those are maintained and usable. Feedback? Objections? OK?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/01/30 07:38:50 Modified files: www/linkchecker: Makefile distinfo Log message: update to linkchecker-10.0.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/01/30 07:27:33 Modified files: biology: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: biology/nutdb : Makefile distinfo biology/nutdb/patches: patch-Makefile biology/nutdb/pkg: DESCR PLIST Log message: Remove biology/nutdb It fails to build with "-fno-common" and HOMEPAGE indicates that it's no longer being worked on. The website points at https://cronometer.com/ (website / mobile app) to be used in the interim until upstream's NUT rewrite is done. There is NUTsqlite on the sourceforge site's files section, not sure but perhaps that is the rewrite talked about on the website. It is written in Tcl/Tk. (thanks sthen) OK sthen
audio/libgpod build failure (python)
In my latest amd64 bulk build, audio/libgpod failed to build: configure: error: pygobject support explicitly requested but pygobject couldn't be found >>> Building on localhost under audio/libgpod BDEPENDS = [graphics/gdk-pixbuf2;devel/glib2;textproc/libxml;devel/gettext,-runtime;devel/libusb1;devel/libplist;textproc/intltool;databases/sqlite3;devel/gmake] DIST = [audio/libgpod:libgpod-0.8.0.tar.gz] FULLPKGNAME = libgpod-0.8.0p11 RDEPENDS = [devel/gettext,-runtime;devel/libplist;devel/libusb1;devel/glib2;graphics/gdk-pixbuf2;textproc/libxml;databases/sqlite3] (Junk lock obtained for localhost at 1612002203.11) >>> Running depends in audio/libgpod at 1612002203.17 last junk was in x11/kde-applications/rocs /usr/sbin/pkg_add -aI -Drepair gdk-pixbuf-2.42.2 glib2-2.66.4 libplist-1.12p1 libusb1-1.0.23p2 libxml-2.9.10p2 was: /usr/sbin/pkg_add -aI -Drepair gdk-pixbuf-2.42.2 gettext-runtime-0.21p0 glib2-2.66.4 gmake-4.3 intltool-0.51.0p2 libplist-1.12p1 libusb1-1.0.23p2 libxml-2.9.10p2 sqlite3-3.34.0 /usr/sbin/pkg_add -aI -Drepair gdk-pixbuf-2.42.2 glib2-2.66.4 libplist-1.12p1 libusb1-1.0.23p2 libxml-2.9.10p2 >>> Running show-prepare-results in audio/libgpod at 1612002205.50 ===> audio/libgpod ===> libgpod-0.8.0p11 depends on: intltool->=0.41.1p0 -> intltool-0.51.0p2 ===> libgpod-0.8.0p11 depends on: gmake-* -> gmake-4.3 ===> libgpod-0.8.0p11 depends on: sqlite3-* -> sqlite3-3.34.0 ===> libgpod-0.8.0p11 depends on: gettext-runtime-* -> gettext-runtime-0.21p0 ===> libgpod-0.8.0p11 depends on: glib2-* -> glib2-2.66.4 ===> libgpod-0.8.0p11 depends on: libplist-* -> libplist-1.12p1 ===> libgpod-0.8.0p11 depends on: gdk-pixbuf-* -> gdk-pixbuf-2.42.2 ===> libgpod-0.8.0p11 depends on: libxml-* -> libxml-2.9.10p2 ===> libgpod-0.8.0p11 depends on: libusb1-* -> libusb1-1.0.23p2 ===> Verifying specs: c ffi gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv intl lzma m pcre plist pthread sqlite3 usb-1.0 xml2 z ===> found c.96.0 ffi.1.2 gdk_pixbuf-2.0.3200.3 gio-2.0.4200.12 glib-2.0.4201.5 gmodule-2.0.4200.12 gobject-2.0.4200.12 iconv.7.0 intl.7.0 lzma.2.1 m.10.1 pcre.3.0 plist.2.0 pthread.26.1 sqlite3.37.11 usb-1.0.1.2 xml2.16.1 z.5.0 gdk-pixbuf-2.42.2 gettext-runtime-0.21p0 glib2-2.66.4 gmake-4.3 intltool-0.51.0p2 libplist-1.12p1 libusb1-1.0.23p2 libxml-2.9.10p2 sqlite3-3.34.0 (Junk lock released for localhost at 1612002206.65) distfiles size=997674 >>> Running build in audio/libgpod at 1612002206.71 ===> audio/libgpod ===> Checking files for libgpod-0.8.0p11 `/usr/ports/distfiles/libgpod-0.8.0.tar.gz' is up to date. >> (SHA256) libgpod-0.8.0.tar.gz: OK ===> Extracting for libgpod-0.8.0p11 ===> Patching for libgpod-0.8.0p11 ===> Applying OpenBSD patch patch-bindings_python_gpod_i_in Hmm... Looks like a unified diff to me... The text leading up to this was: -- |$OpenBSD: patch-bindings_python_gpod_i_in,v 1.1 2017/11/01 16:41:44 rsadowski Exp $ | |Use SWIG C++-style comments instead of Python comments which |SWIG interprets as preprocessor directives. | | |Index: bindings/python/gpod.i.in |--- bindings/python/gpod.i.in.orig |+++ bindings/python/gpod.i.in -- Patching file bindings/python/gpod.i.in using Plan A... Hunk #1 succeeded at 296. done ===> Applying OpenBSD patch patch-configure Hmm... Looks like a unified diff to me... The text leading up to this was: -- |$OpenBSD: patch-configure,v 1.1 2013/10/25 19:12:07 naddy Exp $ | |Do not pick up TagLib, which is only used by test-rebuild-db. | |--- configure.orig Tue Oct 12 13:59:23 2010 |+++ configure Fri Oct 25 21:08:25 2013 -- Patching file configure using Plan A... Hunk #1 succeeded at 16900. done ===> Compiler link: clang -> /usr/bin/clang ===> Compiler link: clang++ -> /usr/bin/clang++ ===> Compiler link: cc -> /usr/bin/cc ===> Compiler link: c++ -> /usr/bin/c++ ===> Generating configure for libgpod-0.8.0p11 ===> Configuring for libgpod-0.8.0p11 Using /usr/obj/ports/libgpod-0.8.0/config.site (generated) configure: loading site script /usr/obj/ports/libgpod-0.8.0/config.site checking for a BSD-compatible install... /usr/obj/ports/libgpod-0.8.0/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... mkdir -p checking for gawk... (cached) awk checking whether gmake sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by gmake... GNU checking for gcc... cc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... (cached) o checking whether we are using the GNU C compiler... (cached) yes checking whether cc accepts -g... (cached) yes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/01/30 07:14:38 Modified files: astro : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: astro/sattrack : Makefile distinfo astro/sattrack/patches: patch-run_getsts patch-run_gettle patch-src_Makefile patch-src_include_sattrack_h patch-src_sattrack_sattime_c patch-src_sattrack_sattrack_c astro/sattrack/pkg: DESCR MESSAGE PLIST Log message: Remove astro/sattrack Imported in 1998 and modified in 2009 to "fix Y2K bug" which means "we may not distribute modified versions [due to its license]". There has been no update and it now fails to build with "-fno-common". The servers used by "getsts" and "gettle" to fetch satellite information no longer exist. FreeBSD removed it in 2011, "No more public distfiles". (thanks naddy) OK naddy
Re: Remove astro/sattrack
On 2021-01-30, Klemens Nanni wrote: > Imported in 1998 and modified in 2009 to "fix Y2K bug" which means > "we may not distribute modified versions [due to its license]". > Feedback? Objections? OK? ok FreeBSD removed it in 2011, "No more public distfiles". -- Christian "naddy" Weisgerber na...@mips.inka.de
x11/wmclockmon: -fno-common fix
Hi,
Fix taken from Gentoo [0], while here i've refreshed WANTLIB. The runtime is
good on amd64.
OK?
Charlène.
[0]
https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gcc-10.patch
Index: Makefile
===
RCS file: /cvs/ports/x11/wmclockmon/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 20:51:24 - 1.19
+++ Makefile30 Jan 2021 13:43:31 -
@@ -5,7 +5,7 @@ BROKEN-sparc64 =ICE in change_address_1
DISTNAME= wmclockmon-0.8.1
CATEGORIES=x11 x11/windowmaker
-REVISION= 0
+REVISION= 1
HOMEPAGE= http://tnemeth.free.fr/projets/dockapps.html
@@ -17,8 +17,8 @@ PERMIT_PACKAGE= Yes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xpm Xrandr Xrender atk-1.0 c cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gtk-x11-2.0 intl pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pthread z
+WANTLIB += gtk-x11-2.0 harfbuzz intl pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pthread z
LIB_DEPENDS= devel/gettext,-runtime \
x11/gtk+2
Index: patches/patch-wmclockmon-cal_main_c
===
RCS file: patches/patch-wmclockmon-cal_main_c
diff -N patches/patch-wmclockmon-cal_main_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmclockmon-cal_main_c 30 Jan 2021 13:43:31 -
@@ -0,0 +1,30 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmclockmon-cal/main.c
+--- wmclockmon-cal/main.c.orig
wmclockmon-cal/main.c
+@@ -15,6 +15,22 @@
+ #include "mainwindow.h"
+ #include "main.h"
+
++GtkWidget *application;
++GtkWidget *alarmlist;
++GtkWidget *wid_backlight;
++GtkWidget *wid_blink;
++GtkWidget *wid_styledir;
++GtkWidget *wid_stylename;
++GtkWidget *wid_color;
++GtkWidget *wid_command;
++GtkWidget *wid_msgcmd;
++GtkWidget *wid_h12;
++GtkWidget *wid_itm;
++GtkWidget *wid_locale;
++
++int selected_row;
++
++struct tm *timeinfos;
+
+ void Usage () {
+ printf("Usage: "PACKAGE"-cal [-h] [-v]\n"
Index: patches/patch-wmclockmon-cal_main_h
===
RCS file: patches/patch-wmclockmon-cal_main_h
diff -N patches/patch-wmclockmon-cal_main_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmclockmon-cal_main_h 30 Jan 2021 13:43:31 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmclockmon-cal/main.h
+--- wmclockmon-cal/main.h.orig
wmclockmon-cal/main.h
+@@ -9,7 +9,7 @@
+ #include
+
+
+-struct tm *timeinfos;
++extern struct tm *timeinfos;
+
+ void quit_app();
+
Index: patches/patch-wmclockmon-cal_mainwindow_h
===
RCS file: patches/patch-wmclockmon-cal_mainwindow_h
diff -N patches/patch-wmclockmon-cal_mainwindow_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmclockmon-cal_mainwindow_h 30 Jan 2021 13:43:31 -
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmclockmon-cal/mainwindow.h
+--- wmclockmon-cal/mainwindow.h.orig
wmclockmon-cal/mainwindow.h
+@@ -7,20 +7,20 @@
+
+ #include
+
+-GtkWidget *application;
+-GtkWidget *alarmlist;
+-GtkWidget *wid_backlight;
+-GtkWidget *wid_blink;
+-GtkWidget *wid_styledir;
+-GtkWidget *wid_stylename;
+-GtkWidget *wid_color;
+-GtkWidget *wid_command;
+-GtkWidget *wid_msgcmd;
+-GtkWidget *wid_h12;
+-GtkWidget *wid_itm;
+-GtkWidget *wid_locale;
++extern GtkWidget *application;
++extern GtkWidget *alarmlist;
++extern GtkWidget *wid_backlight;
++extern GtkWidget *wid_blink;
++extern GtkWidget *wid_styledir;
++extern GtkWidget *wid_stylename;
++extern GtkWidget *wid_color;
++extern GtkWidget *wid_command;
++extern GtkWidget *wid_msgcmd;
++extern GtkWidget *wid_h12;
++extern GtkWidget *wid_itm;
++extern GtkWidget *wid_locale;
+
+-int selected_row;
++extern int selected_row;
+
+ gint list_unsel_cb (GtkCList *clist,
+ gint row,
Index: patches/patch-wmclockmon-config_actions_c
===
RCS file: patches/patch-wmclockmon-config_actions_c
diff -N patches/patch-wmclockmon-config_actions_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmclockmon-config_actions_c 30 Jan 2021 13:43:31 -
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmclockmon-config/actions.c
+--- wmclockmon-config/actions.c.orig
wmclockmon-config/actions.c
+@@ -19,6 +19,24 @@
+ #include "edit.h"
+ #include "actions.h"
+
++GtkWidget *application;
++GtkWidget *alarmlist;
++GtkWidget *wid_backlight;
++GtkWidget *wid_blink;
++GtkWidget *wid_styledir;
++GtkWidget *wid_stylename;
++GtkWidget *wid_color;
++GtkWidget *wid_command;
++GtkWidget *wid_msgcmd;
++GtkWidget
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2021/01/30 06:40:30 Modified files: databases/p5-SQL-Abstract-More: Makefile distinfo Log message: Update to p5-SQL-Abstract-More-1.37 from wen heping (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/01/30 06:07:21 Modified files: devel/dtc : Makefile distinfo devel/dtc/patches: patch-Makefile patch-libfdt_Makefile_libfdt Log message: Update to dtc 1.6.0 fixing build with -fno-common Consumers build-tested by jsg Feedback OK jsg
Re: devel/dtc: Update to 1.6.0
On Sat, Jan 30, 2021 at 12:25:59PM +0100, Klemens Nanni wrote:
> On Sat, Jan 30, 2021 at 04:59:33PM +1100, Jonathan Gray wrote:
> > On Fri, Jan 29, 2021 at 10:15:21PM +0100, Klemens Nanni wrote:
> > > The new version from 04.04.2020 fixes `-fno-common' builds.
> > > I sysutils/dtb already built on amd64 with this diff, the following
> > > consumers have yet to build-tested:
> > >
> > > $ show-reverse-deps devel/dtc
> > > emulators/qemu
> > > emulators/spike
> > > sysutils/u-boot
> > > sysutils/u-boot,aarch64
> > > sysutils/u-boot,arm
> > >
> > > Feedback? OK?
> >
> > looks like at least a minor crank is needed
> >
> > Dynamic export changes:
> > added:
> > fdt_header_size@@LIBFDT_1.2
> Thanks, I simply forgot checking that.
>
> Here's with a minor crank.
No problems seen building
sysutils/dtb
emulators/spike
emulators/qemu
sysutils/u-boot,aarch64
ok jsg@
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/dtc/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 8 Dec 2019 09:55:37 - 1.17
> +++ Makefile 30 Jan 2021 11:23:22 -
> @@ -2,12 +2,12 @@
>
> COMMENT= Device Tree Compiler
>
> -DISTNAME=dtc-1.5.1
> +DISTNAME=dtc-1.6.0
> CATEGORIES= sysutils devel
> MASTER_SITES=https://www.kernel.org/pub/software/utils/dtc/
> EXTRACT_SUFX=.tar.xz
>
> -SHARED_LIBS= fdt 5.0
> +SHARED_LIBS= fdt 5.1
>
> # GPLv2
> PERMIT_PACKAGE= Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/dtc/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 8 Dec 2019 09:55:37 - 1.7
> +++ distinfo 29 Jan 2021 21:06:45 -
> @@ -1,2 +1,2 @@
> -SHA256 (dtc-1.5.1.tar.xz) = Zgt0A5aQ/DcBNmBUTQkZGDTvtYUDxzxVXFUTunWrAx8=
> -SIZE (dtc-1.5.1.tar.xz) = 155780
> +SHA256 (dtc-1.6.0.tar.xz) = EFA7AhfhsHkz4p6NNHoAAVskMb6l9Zr+C+068wNAyC0=
> +SIZE (dtc-1.6.0.tar.xz) = 158584
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/devel/dtc/patches/patch-Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-Makefile
> --- patches/patch-Makefile8 Dec 2019 09:55:37 - 1.8
> +++ patches/patch-Makefile29 Jan 2021 21:07:59 -
> @@ -1,11 +1,13 @@
> $OpenBSD: patch-Makefile,v 1.8 2019/12/08 09:55:37 ajacoutot Exp $
>
> +Fix shared library versions.
> +
> Index: Makefile
> --- Makefile.orig
> +++ Makefile
> -@@ -18,8 +18,8 @@ CONFIG_LOCALVERSION =
> +@@ -22,8 +22,8 @@ ASSUME_MASK ?= 0
>
> - CPPFLAGS = -I libfdt -I .
> + CPPFLAGS = -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK)
> WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
> --Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
> -CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS)
> @@ -14,7 +16,7 @@ Index: Makefile
>
> BISON = bison
> LEX = flex
> -@@ -66,7 +66,7 @@ SHAREDLIB_LDFLAGS = -shared -Wl,--version-script=$(LIB
> +@@ -72,7 +72,7 @@ SHAREDLIB_LDFLAGS = -shared -Wl,--version-script=$(LIB
> else
> SHAREDLIB_EXT = so
> SHAREDLIB_CFLAGS = -fPIC
> @@ -23,7 +25,7 @@ Index: Makefile
> endif
>
> #
> -@@ -151,7 +151,7 @@ all: $(BIN) libfdt
> +@@ -157,7 +157,7 @@ all: $(BIN) libfdt
> check_python_deps = \
> if $(PKG_CONFIG) --cflags $(PYTHON) >/dev/null 2>&1; then \
> if which swig >/dev/null 2>&1; then \
> @@ -32,7 +34,7 @@ Index: Makefile
> fi; \
> fi; \
> if [ "$${can_build}" = "yes" ]; then \
> -@@ -198,9 +198,8 @@ $(LIBFDT_archive): $(addprefix $(LIBFDT_dir)/,$(LIBFDT
> +@@ -204,9 +204,8 @@ $(LIBFDT_archive): $(addprefix $(LIBFDT_dir)/,$(LIBFDT
>
> $(LIBFDT_lib): $(addprefix $(LIBFDT_dir)/,$(LIBFDT_OBJS)) $(LIBFDT_version)
> @$(VECHO) LD $@
> @@ -43,7 +45,7 @@ Index: Makefile
>
> ifneq ($(DEPTARGETS),)
> -include $(LIBFDT_OBJS:%.o=$(LIBFDT_dir)/%.d)
> -@@ -221,8 +220,6 @@ install-lib: all
> +@@ -227,8 +226,6 @@ install-lib: all
> @$(VECHO) INSTALL-LIB
> $(INSTALL) -d $(DESTDIR)$(LIBDIR)
> $(INSTALL_LIB) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
> Index: patches/patch-libfdt_Makefile_libfdt
> ===
> RCS file: /cvs/ports/devel/dtc/patches/patch-libfdt_Makefile_libfdt,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-libfdt_Makefile_libfdt
> --- patches/patch-libfdt_Makefile_libfdt 8 Dec 2019 09:55:37 -
> 1.3
> +++ patches/patch-libfdt_Makefile_libfdt 29 Jan 2021 21:08:06 -
> @@ -1,11 +1,13 @@
> $OpenBSD: patch-libfdt_Makefile_libfdt,v 1.3 2019/12/08 09:55:37 ajacoutot
> Exp $
>
> +Fix shared library versions.
> +
> Index: libfdt/Makefile.libfdt
> --- libfdt/Makefile.libfdt.orig
> +++
[Update] devel/p5-Getopt-Euclid : Update to 0.4.5
Hi, ports@:
Here is a patch for devel/p5-Getopt-Euclid to update to 0.4.5.
It build well and pass all tests on amd64-6.8 system.
Only one port depends on it: audio/p5-Audio-MPD. It build well
and pass all tests too with this patch.
Cheers !
wen
Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Getopt-Euclid/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile3 Jul 2020 21:44:55 - 1.10
+++ Makefile30 Jan 2021 12:56:36 -
@@ -2,9 +2,8 @@
COMMENT= Executable Uniform Command-Line Interface Descriptions
-V= 0.2.0
-DISTNAME= Getopt-Euclid-v$V
-REVISION= 1
+V= 0.4.5
+DISTNAME= Getopt-Euclid-$V
PKGNAME= p5-Getopt-Euclid-$V
CATEGORIES=devel
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-Getopt-Euclid/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:13:27 - 1.2
+++ distinfo30 Jan 2021 12:56:36 -
@@ -1,2 +1,2 @@
-SHA256 (Getopt-Euclid-v0.2.0.tar.gz) =
kevh4iI5Uqg/FJj7xldXN1cFFc4XW3rYOdQHnpihQW8=
-SIZE (Getopt-Euclid-v0.2.0.tar.gz) = 25664
+SHA256 (Getopt-Euclid-0.4.5.tar.gz) =
PNKfiAP7r+/mG1+L1kANPe3J8wE95FGJLa7RW9Bf/a4=
+SIZE (Getopt-Euclid-0.4.5.tar.gz) = 75005
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/p5-Getopt-Euclid/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 8 Jan 2009 12:17:57 - 1.1.1.1
+++ pkg/PLIST 30 Jan 2021 12:56:36 -
@@ -1,7 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/01/08 12:17:57 jasper Exp $
${P5SITE}/Getopt/
-${P5SITE}/Getopt/Euclid/
${P5SITE}/Getopt/Euclid.pm
-${P5SITE}/Getopt/Euclid/HierDemo.pm
@man man/man3p/Getopt::Euclid.3p
-@man man/man3p/Getopt::Euclid::HierDemo.3p
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/01/30 05:51:34 Modified files: plan9/plan9port: Makefile distinfo plan9/plan9port/patches: patch-INSTALL patch-bin_9c patch-bin_9l patch-src_mkhdr plan9/plan9port/pkg: PLIST Added files: plan9/plan9port/patches: patch-src_libthread_daemonize_c Removed files: plan9/plan9port/patches: patch-src_libsec_386_mkfile Log message: update plan9port to a newer snapshot fixes clang 11 / default -fno-common build ok gsoares@ kn@
Re: net/tcpreplay update [-fno-common]
On Sat, Jan 30, 2021 at 09:22:18AM +, Stuart Henderson wrote:
> +do-test:
> + @echo; echo "To run tests: cd ${WRKSRC}/test,"
> + @echo "edit Makefile and config to set interface, run gmake as root."
> + @echo
Why not setting TEST_IS_INTERACTIVE instead?
Re: update plan9/plan9port
On Sat, Jan 30, 2021 at 03:29:16PM +1100, Jonathan Gray wrote: > update plan9port to a newer snapshot > > fixes clang 11 build by using -fcommon: > https://github.com/9fans/plan9port/commit/69439fae6705a125047246c889384ed3aeb4d104 ok gsoares
[UPDATE] py-toml python2
The qutebrowser-2.0.0 needs py-importlib-resources backport
for python3.8 and lower. One of its dependencies is
setuptools_scm[toml]>3.4.1 so I need to turn on python2
flavor for py-toml to update it.
py-toml supports both py2 & py3 so no need to force py3.
Tests don't perform any different compared to python3 flavor.
Any comments/OK's?
Index: Makefile
===
RCS file: /cvs/ports/textproc/py-toml/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile3 Nov 2020 13:52:13 - 1.7
+++ Makefile30 Jan 2021 07:57:15 -
@@ -17,6 +17,6 @@ MODPY_SETUPTOOLS =Yes
MODPY_PYTEST = Yes
FLAVORS = python3
-FLAVOR ?= python3
+FLAVOR ?=
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-toml/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 3 Nov 2020 13:52:14 - 1.3
+++ pkg/PLIST 30 Jan 2021 07:57:15 -
@@ -1,6 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2020/11/03 13:52:14 jasper Exp $
-@conflict py-toml-*
-@pkgpath textproc/py-toml
+@comment $OpenBSD: PLIST,v$
lib/python${MODPY_VERSION}/site-packages/toml/
lib/python${MODPY_VERSION}/site-packages/toml-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/toml-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
[Maintainer Update]databases/p5-SQL-Abstract-More : Update to 1.37
Hi, Here is a simple patch for databases/p5-SQL-Abstract-More to update to 1.37. It build well and pass all tests on amd64-6.8 system. Currently there is no other ports depends on it. Cheers ! wen Index: Makefile === RCS file: /cvs/ports/databases/p5-SQL-Abstract-More/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile5 Jan 2021 07:46:51 - 1.1.1.1 +++ Makefile30 Jan 2021 07:20:49 - @@ -2,7 +2,7 @@ COMMENT = extension of SQL::Abstract with more constructs -DISTNAME = SQL-Abstract-More-1.33 +DISTNAME = SQL-Abstract-More-1.37 CATEGORIES = databases Index: distinfo === RCS file: /cvs/ports/databases/p5-SQL-Abstract-More/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo5 Jan 2021 07:46:51 - 1.1.1.1 +++ distinfo30 Jan 2021 07:20:49 - @@ -1,2 +1,2 @@ -SHA256 (SQL-Abstract-More-1.33.tar.gz) = +ZJn4WdhGd9KSqDjFwaLXWd/2lc4nYJsflQHTQ0V0ww= -SIZE (SQL-Abstract-More-1.33.tar.gz) = 55726 +SHA256 (SQL-Abstract-More-1.37.tar.gz) = +ICVxVibJCQkNR604xnPZUXc4nmzmI3K6m8PZeUv8qw= +SIZE (SQL-Abstract-More-1.37.tar.gz) = 62733
Remove astro/sattrack
Imported in 1998 and modified in 2009 to "fix Y2K bug" which means "we may not distribute modified versions [due to its license]". There has been no update and it now fails to build with "-fno-common". I can build sattrack and play around with `sattrack' by setting up a demo group of satallites, but that's about it. Fetching a list of satellites fails: $ getsts ftp: spacelink.msfc.nasa.gov: no address associated with name Not connected. Not connected. Not connected. Not connected. override rw-r--r-- root/bin for sts-81.bak? y mv: rename sts-81.dat to sts-81.bak: Permission denied sts-81.dat: Permission denied. Other parts fail similarly: $ gettle ftp: archive.afit.af.mil: no address associated with name Not connected. [...] [ a few EACCES and ENOENT errors ] [ a few blinking "can't write" errors ] I doubt anybody still uses sattrack; even if, the ports tree seems to the wrong place to host it when basic functionality is broken and we cannot distribute readily usable packages. Feedback? Objections? OK?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/01/30 04:45:54 Modified files: audio : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: audio/py-ogg : Makefile distinfo audio/py-ogg/patches: patch-src_pyoggpackbuff_c patch-src_pyoggpacket_c patch-src_pyoggpage_c patch-src_pyoggstreamstate_c patch-src_pyoggsyncstate_c audio/py-ogg/pkg: DESCR PLIST audio/py-vorbis: Makefile distinfo audio/py-vorbis/patches: patch-setup_py patch-src_general_h patch-src_pyvorbiscodec_c patch-src_pyvorbiscodec_h patch-src_pyvorbisfile_c patch-src_pyvorbisinfo_c patch-test_ogg123_py patch-test_short_py audio/py-vorbis/pkg: DESCR PLIST Log message: Remove audio/py-ogg and audio/py-vorbis Both are Python 2 only, collecting dust, their common upstream is dead and py-vorbis is the only consumer of py-ogg. Nothing in the tree uses either of them, not even as TEST_DEPENDS. py-ogg now fails to build with "-fno-common". OK sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/01/30 04:41:50 Modified files: x11: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: x11/xtraceroute: Makefile distinfo x11/xtraceroute/patches: patch-Makefile_in patch-configure_in patch-intl_Makefile_in patch-po_Makefile_in_in patch-share_xtraceroute-resolve-location_sh_in x11/xtraceroute/pkg: DESCR PLIST Log message: Remove x11/xtraceroute It often aborts upon start due to "free(): recursive call", does not support IPv6, segfaults in vfscanf(3) due to "traceroute: sendto: No route to host" and specifying a target only seems to work on the command line but not during runtim in the window. At runtime, it eventually aborts again. tb even reported graphics related crashes in X11's iris driver when clicking on the globe. This port fails to build with "-fno-common". No objections tb OK sthen
Re: update plan9/plan9port
On Sat, Jan 30, 2021 at 03:29:16PM +1100, Jonathan Gray wrote: > update plan9port to a newer snapshot > > fixes clang 11 build by using -fcommon: > https://github.com/9fans/plan9port/commit/69439fae6705a125047246c889384ed3aeb4d104 OK kn
Re: update piglit to a newer snapshot
On Sat, Jan 30, 2021 at 03:19:04PM +1100, Jonathan Gray wrote: > Update piglit to a newer snapshot and switch to python3. > Fixes -fno-common build. > > Tested with the "quick" tests on a broadwell machine with Mesa 20.0.8. Were you able to run this without Python 2 installed? I see you've thrown all which had a py2 shebang after `make fake' into MODPY_ADJ_FILES; that'll help, I hadn't done it in the previous thread simply because I couldn't test all files at runtime. If you've successfully run piglit with Python 2 installed that's OK kn piglit is a monster so I'd have to take some time to build and test it myself.
Re: devel/dtc: Update to 1.6.0
On Sat, Jan 30, 2021 at 04:59:33PM +1100, Jonathan Gray wrote:
> On Fri, Jan 29, 2021 at 10:15:21PM +0100, Klemens Nanni wrote:
> > The new version from 04.04.2020 fixes `-fno-common' builds.
> > I sysutils/dtb already built on amd64 with this diff, the following
> > consumers have yet to build-tested:
> >
> > $ show-reverse-deps devel/dtc
> > emulators/qemu
> > emulators/spike
> > sysutils/u-boot
> > sysutils/u-boot,aarch64
> > sysutils/u-boot,arm
> >
> > Feedback? OK?
>
> looks like at least a minor crank is needed
>
> Dynamic export changes:
> added:
> fdt_header_size@@LIBFDT_1.2
Thanks, I simply forgot checking that.
Here's with a minor crank.
Index: Makefile
===
RCS file: /cvs/ports/devel/dtc/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile8 Dec 2019 09:55:37 - 1.17
+++ Makefile30 Jan 2021 11:23:22 -
@@ -2,12 +2,12 @@
COMMENT= Device Tree Compiler
-DISTNAME= dtc-1.5.1
+DISTNAME= dtc-1.6.0
CATEGORIES=sysutils devel
MASTER_SITES= https://www.kernel.org/pub/software/utils/dtc/
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS= fdt 5.0
+SHARED_LIBS= fdt 5.1
# GPLv2
PERMIT_PACKAGE=Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/dtc/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo8 Dec 2019 09:55:37 - 1.7
+++ distinfo29 Jan 2021 21:06:45 -
@@ -1,2 +1,2 @@
-SHA256 (dtc-1.5.1.tar.xz) = Zgt0A5aQ/DcBNmBUTQkZGDTvtYUDxzxVXFUTunWrAx8=
-SIZE (dtc-1.5.1.tar.xz) = 155780
+SHA256 (dtc-1.6.0.tar.xz) = EFA7AhfhsHkz4p6NNHoAAVskMb6l9Zr+C+068wNAyC0=
+SIZE (dtc-1.6.0.tar.xz) = 158584
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/dtc/patches/patch-Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 patch-Makefile
--- patches/patch-Makefile 8 Dec 2019 09:55:37 - 1.8
+++ patches/patch-Makefile 29 Jan 2021 21:07:59 -
@@ -1,11 +1,13 @@
$OpenBSD: patch-Makefile,v 1.8 2019/12/08 09:55:37 ajacoutot Exp $
+Fix shared library versions.
+
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -18,8 +18,8 @@ CONFIG_LOCALVERSION =
+@@ -22,8 +22,8 @@ ASSUME_MASK ?= 0
- CPPFLAGS = -I libfdt -I .
+ CPPFLAGS = -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK)
WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
- -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
-CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS)
@@ -14,7 +16,7 @@ Index: Makefile
BISON = bison
LEX = flex
-@@ -66,7 +66,7 @@ SHAREDLIB_LDFLAGS = -shared -Wl,--version-script=$(LIB
+@@ -72,7 +72,7 @@ SHAREDLIB_LDFLAGS = -shared -Wl,--version-script=$(LIB
else
SHAREDLIB_EXT = so
SHAREDLIB_CFLAGS = -fPIC
@@ -23,7 +25,7 @@ Index: Makefile
endif
#
-@@ -151,7 +151,7 @@ all: $(BIN) libfdt
+@@ -157,7 +157,7 @@ all: $(BIN) libfdt
check_python_deps = \
if $(PKG_CONFIG) --cflags $(PYTHON) >/dev/null 2>&1; then \
if which swig >/dev/null 2>&1; then \
@@ -32,7 +34,7 @@ Index: Makefile
fi; \
fi; \
if [ "$${can_build}" = "yes" ]; then \
-@@ -198,9 +198,8 @@ $(LIBFDT_archive): $(addprefix $(LIBFDT_dir)/,$(LIBFDT
+@@ -204,9 +204,8 @@ $(LIBFDT_archive): $(addprefix $(LIBFDT_dir)/,$(LIBFDT
$(LIBFDT_lib): $(addprefix $(LIBFDT_dir)/,$(LIBFDT_OBJS)) $(LIBFDT_version)
@$(VECHO) LD $@
@@ -43,7 +45,7 @@ Index: Makefile
ifneq ($(DEPTARGETS),)
-include $(LIBFDT_OBJS:%.o=$(LIBFDT_dir)/%.d)
-@@ -221,8 +220,6 @@ install-lib: all
+@@ -227,8 +226,6 @@ install-lib: all
@$(VECHO) INSTALL-LIB
$(INSTALL) -d $(DESTDIR)$(LIBDIR)
$(INSTALL_LIB) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
Index: patches/patch-libfdt_Makefile_libfdt
===
RCS file: /cvs/ports/devel/dtc/patches/patch-libfdt_Makefile_libfdt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-libfdt_Makefile_libfdt
--- patches/patch-libfdt_Makefile_libfdt8 Dec 2019 09:55:37 -
1.3
+++ patches/patch-libfdt_Makefile_libfdt29 Jan 2021 21:08:06 -
@@ -1,11 +1,13 @@
$OpenBSD: patch-libfdt_Makefile_libfdt,v 1.3 2019/12/08 09:55:37 ajacoutot Exp
$
+Fix shared library versions.
+
Index: libfdt/Makefile.libfdt
--- libfdt/Makefile.libfdt.orig
+++ libfdt/Makefile.libfdt
@@ -10,7 +10,7 @@ LIBFDT_VERSION = version.lds
LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
fdt_empty_tree.c \
- fdt_addresses.c fdt_overlay.c
+ fdt_addresses.c fdt_overlay.c fdt_check.c
LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o)
-LIBFDT_LIB = libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT)
+LIBFDT_LIB =
Re: [UPDATE] py-toml python2
On Sat, Jan 30, 2021 at 08:19:29AM +, Dimitri Karamazov wrote: > The qutebrowser-2.0.0 needs py-importlib-resources backport > for python3.8 and lower. One of its dependencies is > setuptools_scm[toml]>3.4.1 so I need to turn on python2 > flavor for py-toml to update it. I'd very much prefer if we'd work towards making qutebrowser and dependencies py3 only. Otherwise it's a step backwards. Index: pkg/PLIST > === > RCS file: /cvs/ports/textproc/py-toml/pkg/PLIST,v > retrieving revision 1.3 > diff -u -p -r1.3 PLIST > --- pkg/PLIST 3 Nov 2020 13:52:14 - 1.3 > +++ pkg/PLIST 30 Jan 2021 07:57:15 - > @@ -1,6 +1,4 @@ > -@comment $OpenBSD: PLIST,v 1.3 2020/11/03 13:52:14 jasper Exp $ > -@conflict py-toml-* > -@pkgpath textproc/py-toml > +@comment $OpenBSD: PLIST,v$ There would still be a quirk: files/Quirks.pm 507: 'py-toml' => 'py3-toml',
sysutils/squashfs-tools -fno-common
https://github.com/plougher/squashfs-tools/commit/fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5.patch
Index: patches/patch-squashfs-tools_mksquashfs_h
===
RCS file:
/cvs/ports/sysutils/squashfs-tools/patches/patch-squashfs-tools_mksquashfs_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-squashfs-tools_mksquashfs_h
--- patches/patch-squashfs-tools_mksquashfs_h 16 Dec 2019 15:35:26 -
1.1.1.1
+++ patches/patch-squashfs-tools_mksquashfs_h 30 Jan 2021 10:57:40 -
@@ -2,6 +2,9 @@ $OpenBSD: patch-squashfs-tools_mksquashf
https://github.com/plougher/squashfs-tools/pull/69
+squashfs-tools: fix build failure against gcc-10
+fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5
+
Index: squashfs-tools/mksquashfs.h
--- squashfs-tools/mksquashfs.h.orig
+++ squashfs-tools/mksquashfs.h
@@ -13,3 +16,12 @@ Index: squashfs-tools/mksquashfs.h
struct dir_info {
char*pathname;
+@@ -143,7 +144,7 @@ struct append_file {
+ #endif
+
+ extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
+-struct cache *bwriter_buffer, *fwriter_buffer;
++extern struct cache *bwriter_buffer, *fwriter_buffer;
+ extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
+ *to_frag, *locked_fragment, *to_process_frag;
+ extern struct append_file **file_mapping;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/01/30 03:26:43 Modified files: misc/magicpoint/patches: patch-grammar_y Log message: Fix -fno-common build. From FreeBSD ports.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2021/01/30 03:05:43 Modified files: graphics/hugin : Makefile distinfo graphics/hugin/patches: patch-src_hugin_base_CMakeLists_txt graphics/hugin/pkg: PLIST Removed files: graphics/hugin/patches: patch-src_hugin1_hugin_RawImport_cpp patch-src_hugin_base_panodata_SrcPanoImage_cpp Log message: Update to hugin 2020-0-0 Changelog: - http://hugin.sourceforge.net/releases/2020.0.0/en.shtml - http://hugin.sourceforge.net/releases/2019.2.0/en.shtml
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2021/01/30 03:03:41 Modified files: sysutils/beats : Makefile.inc sysutils/beats/filebeat: distinfo sysutils/beats/heartbeat: distinfo sysutils/beats/metricbeat: Makefile distinfo sysutils/beats/metricbeat/patches: patch-metricbeat_modules_d_system_yml sysutils/beats/packetbeat: Makefile distinfo sysutils/beats/packetbeat/pkg: PLIST Added files: sysutils/beats/metricbeat/files: sigar_openbsd.go sysutils/beats/metricbeat/patches: patch-metricbeat_module_system_memory_memory_go Log message: Update beats 7.10.0 -> 7.10.2 Release notes: https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.10.2.html Port changes: * build: set BUILD_DEPENDS += lang/python/ instead of using MODULES += lang/python to prevent unnecessary python dependecy * metricbeat: report correct CPU/memory metrics - requires files/sigar_openbsd.go * metricbeat: swap usage metrics are turned off due to metricbeat crashes * metricbeat: remove configuration options which are useless under OpenBSD Many thanks to David Alten for providing the fix for metricbeat CPU metrics and testing
Fix games/cpat -fno-common
Hi ports -- Attached is a diff to fix games/cpat for -fno-common Independent invention, but it is fairly straightforward. OK? ~Brian cpat-nocommon.diff Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2021/01/30 02:31:13 Modified files: games/pioneers : Makefile Added files: games/pioneers/patches: patch-common_game_h Log message: upstream fix for -fno-common
Fix textproc/halibut -fno-common
Hello ports -- Attached is a diff to fix textproc/halibut with -fno-common. It is taken from Debian: https://sources.debian.org/data/main/h/halibut/1.2-3/debian/patches/gcc-no-common.patch OK? ~Brian halibut-nocommon.diff Description: Binary data
net/tcpreplay update [-fno-common]
Here's an update to tcpreplay that I've had sitting in my tree for
a while. I haven't tested real world use but the self tests run
(I only tried them with one interface though). Builds OK with
-fno-common.
Index: Makefile
===
RCS file: /cvs/ports/net/tcpreplay/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile12 Jul 2019 20:48:49 - 1.39
+++ Makefile30 Jan 2021 09:19:27 -
@@ -2,24 +2,28 @@
COMMENT= resend network traffic saved by tcpdump
-DISTNAME= tcpreplay-4.0.5
+V= 4.3.3
+DISTNAME= tcpreplay-$V
CATEGORIES=net
-REVISION= 2
-HOMEPAGE= http://tcpreplay.appneta.com/
+HOMEPAGE= https://tcpreplay.appneta.com/
MAINTAINER=Nigel Taylor
# GPLv3
PERMIT_PACKAGE=Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcpreplay/}
-
WANTLIB= c dnet>=1
+MASTER_SITES= https://github.com/appneta/tcpreplay/releases/download/v$V/
+
CONFIGURE_STYLE= gnu
LIB_DEPENDS= net/libdnet
-BUILD_DEPENDS= devel/autogen
+
+do-test:
+ @echo; echo "To run tests: cd ${WRKSRC}/test,"
+ @echo "edit Makefile and config to set interface, run gmake as root."
+ @echo
.include
Index: distinfo
===
RCS file: /cvs/ports/net/tcpreplay/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo16 Oct 2014 13:00:56 - 1.9
+++ distinfo30 Jan 2021 09:19:27 -
@@ -1,2 +1,2 @@
-SHA256 (tcpreplay-4.0.5.tar.gz) = Y3mMityeW+eUZ+I1k4OM4OYXslk4z84xFv7aJjA0TYA=
-SIZE (tcpreplay-4.0.5.tar.gz) = 2059744
+SHA256 (tcpreplay-4.3.3.tar.gz) = 7SQCyqlDT/XHSy57MReMc+fHxcTqHh0OLjmn3EaVj94=
+SIZE (tcpreplay-4.3.3.tar.gz) = 3727820
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 16 Oct 2014 13:43:48 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2014/10/16 13:43:48 nigel Exp $
configure.orig Fri Sep 5 17:16:38 2014
-+++ configure Fri Oct 10 15:21:36 2014
-@@ -18765,7 +18765,7 @@ else
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--[
-+
- #include
- #include
- #include
-@@ -18793,7 +18793,7 @@ main(int argc, char *argv[]) {
-
- /* else suck, no good */
- exit(-1);
--}]
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
-
Index: patches/patch-src_defines_h_in
===
RCS file: patches/patch-src_defines_h_in
diff -N patches/patch-src_defines_h_in
--- patches/patch-src_defines_h_in 6 Jul 2016 10:29:51 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_defines_h_in,v 1.1 2016/07/06 10:29:51 jasper Exp $
-
-CVE-2016-6160
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829350
-
src/defines.h.in.orig Fri May 9 19:28:13 2014
-+++ src/defines.h.in Wed Jul 6 10:54:28 2016
-@@ -145,7 +145,7 @@ typedef struct tcpr_speed_s {
- #define DEFAULT_MTU 1500/* Max Transmission Unit of standard ethernet
- * don't forget *frames* are MTU + L2 header!
*/
-
--#define MAXPACKET 65535 /* was 16436 linux loopback, but maybe
something is bigger then
-+#define MAXPACKET 65549 /* was 16436 linux loopback, but maybe
something is bigger then
-linux loopback */
-
- #define MAX_SNAPLEN 65535 /* tell libpcap to capture the entire packet
*/
Index: patches/patch-src_tcprewrite_c
===
RCS file: patches/patch-src_tcprewrite_c
diff -N patches/patch-src_tcprewrite_c
--- patches/patch-src_tcprewrite_c 6 Jul 2016 10:29:51 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_tcprewrite_c,v 1.1 2016/07/06 10:29:51 jasper Exp $
-
-CVE-2016-6160
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829350
-
src/tcprewrite.c.orig Fri May 9 19:28:13 2014
-+++ src/tcprewrite.c Wed Jul 6 10:54:06 2016
-@@ -250,6 +250,8 @@ rewrite_packets(tcpedit_t *tcpedit, pcap_t *pin, pcap_
- packetnum++;
- dbgx(2, "packet " COUNTER_SPEC " caplen %d", packetnum,
pkthdr.caplen);
-
-+if (pkthdr.caplen > MAXPACKET)
-+errx(-1, "Frame too big, caplen %d exceeds %d", pkthdr.caplen,
MAXPACKET);
- /*
- * copy over the packet so we can pad it out if necessary and
- * because pcap_next() returns a const ptr
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/01/30 02:12:45 Added files: textproc/heirloom-doctools/patches: patch-troff_n5_c Log message: backport a fix for -fno-common ok bentley@
www/dillo -fcommon
Hi,
Dillo's -fno-common problems have not been fixed upstream.
There are at least 11 linker errors, a bit beyond what I care to patch.
FreeBSD simply set -fcommon; I think we should do the same.
Is this the best place to put it?
Index: Makefile
===
RCS file: /cvs/ports/www/dillo/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile12 Jul 2019 20:50:18 - 1.59
+++ Makefile30 Jan 2021 08:41:08 -
@@ -33,7 +33,7 @@ USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-ipv6 \
--enable-ssl
-CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include -fcommon" \
LDFLAGS="-L${LOCALBASE}/lib"
FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/dillo/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2021/01/30 01:34:15 Modified files: geo/foxtrotgps : Makefile Added files: geo/foxtrotgps/patches: patch-src_callbacks_c patch-src_tracks_c Log message: Fix for -fno-common from upstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2021/01/30 01:05:43 Modified files: emulators/mupen64plus/core: Makefile Added files: emulators/mupen64plus/core/patches: patch-src_device_r4300_idec_h patch-src_main_workqueue_h Log message: Backport upstream fix for -fno-common.
textproc/heirloom-doctools -fno-common
https://github.com/n-t-roff/heirloom-doctools/commit/a5294cbbfd90e7b7b2c3c69186d6e67ba12bc913.patch
--- /dev/null Sat Jan 30 18:57:13 2021
+++ textproc/heirloom-doctools/patches/patch-troff_n5_c Sat Jan 30 18:55:00 2021
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix build with GCC 10.
+a5294cbbfd90e7b7b2c3c69186d6e67ba12bc913
+
+Index: troff/n5.c
+--- troff/n5.c.orig
troff/n5.c
+@@ -1588,8 +1588,6 @@ caseie(void)
+ caseif(1);
+ }
+
+-int tryglf;
+-
+ void
+ caseif(int x)
+ {
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/01/30 01:01:10 Modified files: infrastructure/bin: portcheck Log message: Remove Qt4 checks We no longer want to import "new" Qt4 applicatios.
