Re: [NEW] luassert 1.7.11
Sebastien Marie wrote: > On Sat, Sep 19, 2020 at 06:40:16PM +0200, Stefan Hagen wrote: > > Hello, > > > > I want to be able to run the test-suite of www/luakit. These tests > > are using `luassert` > > > > Luassert extends Lua's built-in assertions to provide additional tests > > and the ability to create your own. It comes preloaded with argument > > formatters for common Lua types, but it is easy to roll your own. > > > > Port attached. > > > > port-lib-depends-check: ok > > portcheck -N: ok > > > > Luasset requires devel/lua-say, which I will send to ports@ next. > > > > ok semarie@ for import ping?
Re: [NEW] devel/lua-say 1.3.1
Sebastien Marie wrote: > On Sat, Sep 19, 2020 at 07:12:43PM +0200, Stefan Hagen wrote: > > Sebastien Marie wrote: > > > On Sat, Sep 19, 2020 at 06:42:55PM +0200, Stefan Hagen wrote: > > > > Hello, > > > > > > > > Lua-say is required by devel/luassert, which I've sent in a minute ago. > > > > > > > > Say is a simple string key/value store for i18n or any other case where > > > > you want namespaced strings. > > > > > > > > > ok semarie@ for import ping?
Re: [macppc] www/luakit is not BROKEN anymore
Charlene Wendling wrote:
> On Wed, 11 Nov 2020 21:30:36 +0100
> Stefan Hagen wrote:
>
> > Charlene Wendling wrote:
> > > The latest Luakit update fix the build on macppc [0]. There is no
> > > runtime issue with the fixed webkitgtk4.
> > >
> > > OK?
> >
> > I've attached you the latest luakit with the missing dependencies
> > for the test suite. So "make test" should work in the luakit port
> > dir.
> >
> > The image_css test fails here more often than not. But everything
> > else should succeed.
>
> It builds and works well on macppc. Tests are passing, excepted a few
> who are failing due to expected timeout, and they call git (that should
> be patched out).
OK from my side then.
Below is the current version including your change and with
NO_TESTS = yes, because the test dependencies are not yet imported.
Best Regards,
Stefan
Index: www/luakit/Makefile
===
RCS file: /cvs/ports/www/luakit/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- www/luakit/Makefile 17 Sep 2020 18:20:14 - 1.27
+++ www/luakit/Makefile 12 Nov 2020 07:08:02 -
@@ -1,13 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2020/09/17 18:20:14 semarie Exp $
-
-BROKEN-powerpc = help2man: can't get `--help' info from ./luakit
+# $OpenBSD: Makefile,v 1.26 2020/09/15 07:04:25 pamela Exp $
COMMENT = fast, small, webkit based browser written in lua
GH_ACCOUNT = luakit
-GH_TAGNAME = 2.2
GH_PROJECT = luakit
-REVISION = 1
+GH_TAGNAME = 2.2.1
EPOCH =1
@@ -31,8 +28,6 @@ WANTLIB += pangocairo-1.0 pthread soup-2
MODULES = lang/lua
-NO_TEST = Yes
-
BUILD_DEPENDS =devel/help2man \
devel/luafs
@@ -42,6 +37,13 @@ RUN_DEPENDS =devel/desktop-file-utils \
LIB_DEPENDS = lang/luajit \
www/webkitgtk4
+
+TEST_DEPENDS = devel/luassert \
+ devel/luacheck
+
+TEST_TARGET = run-tests
+
+NO_TEST = yes
# webkit browsing
RUN_DEPENDS += multimedia/gstreamer1/plugins-good \
Index: www/luakit/distinfo
===
RCS file: /cvs/ports/www/luakit/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- www/luakit/distinfo 23 Aug 2020 22:00:39 - 1.10
+++ www/luakit/distinfo 12 Nov 2020 07:08:02 -
@@ -1,2 +1,2 @@
-SHA256 (luakit-2.2.tar.gz) = cEkpoySYSv4kbGMmNmfrHWTAYLT390ztWf7F1ALDd9w=
-SIZE (luakit-2.2.tar.gz) = 488550
+SHA256 (luakit-2.2.1.tar.gz) = 81NZ9YY/q+K51Cb00+9tKc5bs7rHtMjggkJC+JhoyA4=
+SIZE (luakit-2.2.1.tar.gz) = 488845
Index: www/luakit/patches/patch-common_ipc_c
===
RCS file: www/luakit/patches/patch-common_ipc_c
diff -N www/luakit/patches/patch-common_ipc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ www/luakit/patches/patch-common_ipc_c 12 Nov 2020 07:08:02 -
@@ -0,0 +1,31 @@
+$OpenBSD$
+
+NetBSD EOF fix
+
+Index: common/ipc.c
+--- common/ipc.c.orig
common/ipc.c
+@@ -21,6 +21,7 @@
+ #include "common/lualib.h"
+ #include "common/luaserialize.h"
+ #include "common/ipc.h"
++#include "log.h"
+
+ /* Prototypes for ipc_recv_... functions */
+ #define X(name) void ipc_recv_##name(ipc_endpoint_t *ipc, const void *msg,
guint length);
+@@ -138,6 +139,15 @@ ipc_recv_and_dispatch_or_enqueue(ipc_endpoint_t *ipc)
+ case G_IO_STATUS_AGAIN:
+ return;
+ case G_IO_STATUS_EOF:
++verbose("g_io_channel_read_chars(): End Of File received");
++/* OSX and NetBSD are sending EOF on nonblocking channels first.
++ * These requests can be ignored. They should end up in
++ * recv_hup(), but unfortunately they do not.
++ *
++ * If we do not close the socket, glib will continue to
++ * call the G_IO_IN handler.
++ */
++g_atomic_int_dec_and_test(&ipc->refcount);
+ return;
+ case G_IO_STATUS_ERROR:
+ if (!g_str_equal(ipc->name, "UI"))
Index: www/luakit/patches/patch-lib_session_lua
===
RCS file: www/luakit/patches/patch-lib_session_lua
diff -N www/luakit/patches/patch-lib_session_lua
--- www/luakit/patches/patch-lib_session_lua17 Sep 2020 18:20:14 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,36 +0,0 @@
-$OpenBSD: patch-lib_session_lua,v 1.1 2020/09/17 18:20:14 semarie Exp $
-Use os.remove() instead of spawning rm(1) process.
-
-Backport
https://github.com/luakit/luakit/commit/4b22c18d5eb5594136091b7b615dc8f9ded0e32f
-Index: lib/session.lua
lib/session.lua.orig
-+++ lib/session.lua
-@@ -19,10 +19,6 @@ local _M = {}
-
- lousy.signal.setup(_M, true)
-
--local function rm(file)
--luakit.spawn(string.format("rm %q", file))
--end
--
- --- Path to session file.
- -- @type string
- -- @readwrite
-@@ -82,7 +78,7 @@ _M.save = function (file)
-
Re: Update: audio/puddletag-2.0.1
On Fri Oct 23, 2020 at 09:10:49PM +0200, Rafael Sadowski wrote: > On Wed Sep 16, 2020 at 09:46:45PM +0100, Stuart Henderson wrote: > > On 2020/09/16 22:39, Rafael Sadowski wrote: > > > On Wed Sep 16, 2020 at 09:10:16PM +0100, Stuart Henderson wrote: > > > > > > > > > > Does anyone want to leave an OK? > > > > > > > > Surely the rabbit hole needs following otherwise the update breaks > > > > working functionality? > > > > > > No, that has never worked before. See: > > > > > > $ puddletag > > > puddletag Version: 1.2.0 > > > Locale: en_US > > > Object::disconnect: Unexpected null parameter > > > Error loading quodlibetlib: No module named quodlibet.config > > > > > > This is about my initial DESCR upgrade: > > > > > > > > > > > +Doing web lookups > > > > > > > > +using Amazon (including cover art), Discogs (does cover art > > > > > > > > too!), FreeDB and > > > > > > > > +MusicBrainz is also supported. > > > > > > I took that out again, because it has never worked before. > > > > No idea about using it with quodlibet but it used to do ID-based > > tagging using chromaprint if you installed the relevant package. > > Not sure if that is still working with what's in-tree - I can't > > test now (I won't run X on my workstation until I have time to do an > > install on a separate HD to test with, the filesystem corruption > > from the hangs was getting too much). > > > > If you describe to me how I can test it, I can do it for you/us. For me > the updated version behaves like the in-tree version. > > Rafael > Friendly reminder.
Update: devel/glog: 0.3.5 -> 0.4.0
Attached is a patch for devel/glog to update to the latest version.
Since it did not have a maintainer listed, I've added my name. I'm happy
to take that on as I use it quite a bit and I need it as a dependency
for another port I'm working. If that's a problem, no worries, don't
want to step on anyone else.
This bumps the version from 0.3.5 -> 0.4.0.
I tested this on amd64 and observed unit tests failures (this is also
present in the version that's currently committed). However, it builds
and installs just fine.
The changelog is somewhat lengthy given that there's a few versions
between what's in ports vs the current version. Nonetheless, this can be
perused here:
https://github.com/google/glog/releases/tag/v0.4.0
I used showvictims.py to search for anything this would victimize,
nothing reported.
[fagg@elara][~][0] -> obsd-ports-tools/showvictims.py devel/glog
LIB_DEPENDS
BUILD_DEPENDS
RUN_DEPENDS
TEST_DEPENDS
Patch attached. Comments/feedback welcome.
diff --git a/devel/glog/Makefile b/devel/glog/Makefile
index 963135f..a663fcc 100644
--- a/devel/glog/Makefile
+++ b/devel/glog/Makefile
@@ -4,16 +4,17 @@ COMMENT = C++ application-level logging library
GH_ACCOUNT = google
GH_PROJECT = glog
-GH_TAGNAME = v0.3.5
-REVISION = 1
+GH_TAGNAME = v0.4.0
-SHARED_LIBS += glog 1.0 # 0.2.1
+SHARED_LIBS += glog 2.0 # 0.2.1
CATEGORIES = devel
# New BSD
PERMIT_PACKAGE = Yes
+MAINTAINER= Ashton Fagg
+
WANTLIB += ${COMPILER_LIBCXX} gflags m
COMPILER = base-clang ports-gcc base-gcc
diff --git a/devel/glog/distinfo b/devel/glog/distinfo
index 61d3b55..b586ccb 100644
--- a/devel/glog/distinfo
+++ b/devel/glog/distinfo
@@ -1,2 +1,2 @@
-SHA256 (glog-0.3.5.tar.gz) = dYDkCKLAtaicohRzmXjOb/SAtefY12mKKqkvrcSE0eA=
-SIZE (glog-0.3.5.tar.gz) = 532275
+SHA256 (glog-0.4.0.tar.gz) = 8oNZrroS8w1z2eRxHvNW3IQohpaBEhYrxzACZFE5w5w=
+SIZE (glog-0.4.0.tar.gz) = 200955
diff --git a/devel/glog/pkg/PLIST b/devel/glog/pkg/PLIST
index 07a8499..9dee1da 100644
--- a/devel/glog/pkg/PLIST
+++ b/devel/glog/pkg/PLIST
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2018/05/17 09:45:58 espie Exp $
include/glog/
-include/glog/config.h
include/glog/log_severity.h
include/glog/logging.h
include/glog/raw_logging.h
Re: UPDATE: libsndfile 1.0.30 - CVE
On 11/11/2020 2:38 PM, Jan Stary wrote:
On Oct 31 01:26:50, b...@comstyle.com wrote:
Here is an update to libsndfile 1.0.30.
Thanks for the diff, and sorry for the delay.
(Real life interferes quite a bit around here.)
The port as updated by this diff basically works;
please see comments inline.
Jan
Index: Makefile
===
RCS file: /cvs/ports/audio/libsndfile/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile12 Jul 2019 20:43:35 - 1.33
+++ Makefile31 Oct 2020 05:07:55 -
@@ -2,31 +2,33 @@
COMMENT= library to handle various audio file formats
-DISTNAME= libsndfile-1.0.28
+DISTNAME= libsndfile-1.0.30
CATEGORIES= audio
+GH_ACCOUNT=libsndfile
+GH_PROJECT=libsndfile
+GH_TAGNAME=v1.0.30
Right. No version after 1.0.28 seems to exist
on the old HOMEPAGE.
HOMEPAGE= http://www.mega-nerd.com/libsndfile/
I asked upstream to remove the page completely.
It is and outdated version of the real thing at github.
MAINTAINER= Jan Stary
-SHARED_LIBS += sndfile 6.0 # .1.28
+
+SHARED_LIBS += sndfile 7.0 # .1.28
# LGPLv2.1
PERMIT_PACKAGE= Yes
-MASTER_SITES= ${HOMEPAGE}files/
+WANTLIB= c m sndio FLAC ogg opus vorbis vorbisenc
-WANTLIB= c m sndio FLAC ogg vorbis vorbisenc
+MODULES= devel/cmake
AFAIU, it still supports the autoconf build.
Is there any specific reason you are switching to cmake?
It seem to pull in a number of py3-* build dependencies,
including stuff like py3-babel and py3-imagesize and ninja ...
Much as I hate the autotools, it seems to be
less of a burden then this cmake build.
The Python requirement which I was not aware of is there whether
using Autotools or CMake. I went looking to see where it came into
play and found this commit...
https://github.com/libsndfile/libsndfile/commit/3d8399dfde36827a9bff38a15392783f8a127fb6#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810
From 3d8399dfde36827a9bff38a15392783f8a127fb6 Mon Sep 17 00:00:00 2001
From: evpobr
Date: Wed, 24 May 2017 11:16:54 +0500
Subject: [PATCH] Fix broken ABI
Unfortunately ABI was broken when symbols files were removed
in favour of new visibility control of exported functions.
Visibility control with -fvisibility works fine, but symbol
scripts had another feature - versioned symbols. And we lost it.
Since we can not make our symbols to be versioned with the new
approach, it's decided to return everything back.
* CMake: Restore symbol files generation
* CMake: Python is required to build shared libraries
* Autotools: Restore symbol files generation
Closes: https://github.com/erikd/libsndfile/issues/268
Re: devel/boost: drop python2 support and speed up make fake
On 11/11/2020 11:46 AM, Rafael Sadowski wrote:
On Wed Nov 11, 2020 at 05:02:08PM +0100, Jeremie Courreges-Anglas wrote:
On Mon, Nov 09 2020, Jeremie Courreges-Anglas wrote:
On Sun, Nov 08 2020, Rafael Sadowski wrote:
On Sun Nov 08, 2020 at 01:46:14AM +0100, Jeremie Courreges-Anglas wrote:
This diff drops boost_python27 and boost_numpy27. I switched the
defaults to python3 but the boost-build .py files aren't ready for that
(using python3 -m compileall fails with syntax errors). No idea how
used/useful boost-build actually is or how maintainers want to deal with
this python2/3 mix. One possible approach would be to run 2to3 on
those files, but this doesn't catch all the py2->py3 gotchas.
I also worked on it yesterday and found the same py2->py3 issue.
So what do you think should be done? :)
I can propose:
1. keep the diff as is, it looks weird but maybe boost-build still works fine
(no idea how to test that)
2. drop the boost-build parts until a new release brings proper python3
support
3. some hacks to make the current boost-build work with python3 (I have
nothing against it but I'd prefer not to care about this myself)
< rsadowski> My idea would be
[2] remove all in share/boost-build
[4] remove the compileall.py task.
I'd prefer to go with option 2, option 4 means that .pyc files can stay
around if the user starts boost-build as root.
So, shall we go ahead with this diff? If so I'll ask Antoine to slip
this in his next bulk (per sthen@ suggestion). More tests are obviously
welcome.
I have just committed the make fake tweak, so you need to apply this on
a fresh CVS checkout.
If Brad accept option 2, I would like to install the following tools
anyway. This means that the boost build system can still be used.
- # boost-build:
- ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
- ${PREFIX}/bin
...
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/boost-build
- ${INSTALL_DATA} ${WRKSRC}/tools/build/example/site-config.jam \
- ${PREFIX}/share/examples/boost-build
Well the only question I have is if we remove this does anything in the
ports tree
depend it for building anything? If not, then I'd say go with removing
it all together
for the time being until it is updated to be compatible with Python 3.
If the answer
is yes then how many ports?
Re: [new] multimedia/opustags
Ashton Fagg writes:
> Omar Polo writes:
>
>> [...snip...]
>> The port is straightforward. I believe that the comment and the DESCR
>> could be improved, but that was the best I was able to write, help
>> appreciated.
>>
>> The last minute doubt is if audio is a better category than multimedia.
>
> Hey,
>
> So I gave this a try. It builds ok. But running "make test" seems to
> fail.
>
> At a brief look I can't see anything that stands out as unit and/or
> regression tests, so you should add:
>
> # No tests from upstream
> NO_TEST = Yes
>
> to the Makefile so make test doesn't error out.
There is a regression test, but under a different target (‘check’) than
the default ‘test’. I haven’t noticed it before, my bad.
> You can also just use GH_TAGNAME directly instead of V. Just set:
>
> GH_TAGNAME = 1.5.0
>
> and I think not defining distname (default) should be OK.
You’re right, it doesn’t need the -${V} on the distname.
> Don't take my word as law though, I'm a newbie myself.
>
> Hope that helps.
>
> Ash
I’ll enable the tests and update port tomorrow.
Thank you for testing :)
Re: [macppc] www/luakit is not BROKEN anymore
On Wed, 11 Nov 2020 21:30:36 +0100 Stefan Hagen wrote: > Charlene Wendling wrote: > > The latest Luakit update fix the build on macppc [0]. There is no > > runtime issue with the fixed webkitgtk4. > > > > OK? > > Sweet! I bought a mac recently to try it out. You've been faster. > Unfortunately the latest luakit with the fixed test suite has > not (yet) been committed. > > I've attached you the latest luakit with the missing dependencies > for the test suite. So "make test" should work in the luakit port > dir. > > The image_css test fails here more often than not. But everything > else should succeed. > > Thanks, > Stefan It builds and works well on macppc. Tests are passing, excepted a few who are failing due to expected timeout, and they call git (that should be patched out). Charlène.
Re: [new] multimedia/opustags
Omar Polo writes: > [...snip...] > The port is straightforward. I believe that the comment and the DESCR > could be improved, but that was the best I was able to write, help > appreciated. > > The last minute doubt is if audio is a better category than multimedia. Hey, So I gave this a try. It builds ok. But running "make test" seems to fail. At a brief look I can't see anything that stands out as unit and/or regression tests, so you should add: # No tests from upstream NO_TEST = Yes to the Makefile so make test doesn't error out. You can also just use GH_TAGNAME directly instead of V. Just set: GH_TAGNAME = 1.5.0 and I think not defining distname (default) should be OK. Don't take my word as law though, I'm a newbie myself. Hope that helps. Ash
Re: UPDATE: libsndfile 1.0.30 - CVE
> > +MODULES= devel/cmake > > AFAIU, it still supports the autoconf build. > Is there any specific reason you are switching to cmake? > It seem to pull in a number of py3-* build dependencies, > including stuff like py3-babel and py3-imagesize and ninja ... > > Much as I hate the autotools, it seems to be > less of a burden then this cmake build. Aaaargh, the 1.0.30 tarball does not include a ./configure (just configure.ac and autogen.sh) Quoting from https://github.com/libsndfile/libsndfile/blob/master/README.md : Although Autotools is the primary and recommended build toolchain, CMake meta build generator is also available. Jan
UPDATE: net/weechat
Update weechat to 3.0.
- Changelog: https://weechat.org/news/111/2020-Version-3.0/
- Add simple patch to unbreak the build
- Remove WANTLIB-ruby, hint by make port-lib-depends-check:
weechat-ruby-3.0(net/weechat,-ruby):
Extra: c.96 gmp.11 m.10 pthread.26 ruby26.
- ctest: 100% tests passed, 0 tests failed out of 1
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 Makefile
--- Makefile23 Jul 2020 04:38:21 - 1.49
+++ Makefile11 Nov 2020 20:46:46 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.9
+V= 3.0
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
@@ -32,7 +32,6 @@ WANTLIB-main= aspell c curl iconv intl m
WANTLIB-lua= ${MODLUA_WANTLIB} m
WANTLIB-python=${MODPY_WANTLIB}
-WANTLIB-ruby= ${MODRUBY_WANTLIB}
WANTLIB-tcl= ${MODTCL_WANTLIB}
MODULES= devel/cmake \
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 distinfo
--- distinfo23 Jul 2020 04:38:21 - 1.27
+++ distinfo11 Nov 2020 20:46:46 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.9.tar.gz) = OngGO3bEK6MG6s+PdMuMmiYPimHRkV0LXXbxHSvmmlM=
-SIZE (weechat-2.9.tar.gz) = 4419872
+SHA256 (weechat-3.0.tar.gz) = vSP+THdf6l4UCtau1pbaoi3ul6KYo3IR0NorRZNb8HY=
+SIZE (weechat-3.0.tar.gz) = 4446169
Index: patches/patch-src_gui_gui-hotlist_h
===
RCS file: patches/patch-src_gui_gui-hotlist_h
diff -N patches/patch-src_gui_gui-hotlist_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_gui_gui-hotlist_h 11 Nov 2020 20:46:46 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/gui/gui-hotlist.h
+--- src/gui/gui-hotlist.h.orig
src/gui/gui-hotlist.h
+@@ -20,6 +20,8 @@
+ #ifndef WEECHAT_GUI_HOTLIST_H
+ #define WEECHAT_GUI_HOTLIST_H
+
++#include
++
+ enum t_gui_hotlist_priority
+ {
+ GUI_HOTLIST_LOW = 0,
Index: patches/patch-tests_CMakeLists_txt
===
RCS file: /cvs/ports/net/weechat/patches/patch-tests_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-tests_CMakeLists_txt
--- patches/patch-tests_CMakeLists_txt 23 Jul 2020 04:38:21 - 1.5
+++ patches/patch-tests_CMakeLists_txt 11 Nov 2020 20:46:46 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-tests_CMakeLists_txt,v 1
Index: tests/CMakeLists.txt
--- tests/CMakeLists.txt.orig
+++ tests/CMakeLists.txt
-@@ -73,7 +73,7 @@ if(ICONV_LIBRARY)
+@@ -74,7 +74,7 @@ if(ICONV_LIBRARY)
list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
endif()
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 PLIST-main
--- pkg/PLIST-main 23 Jul 2020 04:38:21 - 1.14
+++ pkg/PLIST-main 11 Nov 2020 20:46:46 -
@@ -21,7 +21,6 @@ lib/weechat/plugins/
@so lib/weechat/plugins/spell.so
@so lib/weechat/plugins/trigger.so
@so lib/weechat/plugins/xfer.so
-share/applications/
share/applications/weechat.desktop
share/doc/weechat/
share/doc/weechat/weechat_dev.en.adoc
[New] sysutils/glances (Python)
Hello, I have a new port attached for Glances [1]. It's a system monitoring tool (similar to top, htop etc), written in Python. It has built-in support for monitoring a remote system, nice web GUI etc. It does a bunch of other things beyond just what top/htop does - it also monitors network activity, disk I/O, temperature sensors and a couple other things (some of this is Linux only right now...). The attached port has been tested on amd64, and a patch included to make sure the man pages get put in the right place. make configure, make build, make test, make fake, make install, make deinstall all work. portcheck reports clean. Appears to function as expected. Question, comments, suggestions appreciated. Thanks, Ash [1] https://nicolargo.github.io/glances/ glances.tgz Description: Binary data
Re: [macppc] www/luakit is not BROKEN anymore
Charlene Wendling wrote: > The latest Luakit update fix the build on macppc [0]. There is no > runtime issue with the fixed webkitgtk4. > > OK? Sweet! I bought a mac recently to try it out. You've been faster. Unfortunately the latest luakit with the fixed test suite has not (yet) been committed. I've attached you the latest luakit with the missing dependencies for the test suite. So "make test" should work in the luakit port dir. The image_css test fails here more often than not. But everything else should succeed. Thanks, Stefan luakit221.tgz Description: application/tar-gz
[UPDATE] www/honk
Upgraded to v0.9.3
- add autobonker toy
- update README
Changes:
=== 0.9.3 Notacanthous Nutshell
++ backup command.
+ Relax requirement for multipart/form-data posts in API.
+ Dedupe blob file data.
+ Better support for rich text bios.
+ Follow and unfollow should work a little better.
+ Option to mention all in replies.
+ Reduce interference between various text substitution rules.
+ Fix crash in search with extra space.
+ Fix pubkey issue with domain only keys.
- Custom lingo for those who don't like honking.
On 10/16/20, Horia Racoviceanu wrote:
> Just a simple ping, sorry.
>
> On 9/1/20, Horia Racoviceanu wrote:
>> - Add the help section
>> - Add rc_stop() for related daemons
>>
>> On 8/29/20, Horia Racoviceanu wrote:
>>> Upgrade to v0.9.2
>>> - add toys: gettoken, saytheday, sprayandpray, youvegothonks
>>> - remove man pages from doc
>>> - add views/chatter.html
>>>
>>> Changes:
>>>
>>> === 0.9.2 Malleable Maltote
>>>
>>> + Fix compilation on mac.
>>>
>>> === 0.9.1 Late Stage Lusciousness
>>>
>>> ++ Boing boom tschak chonky chatter. Chat messages with Pleroma.
>>>
>>> + Custom rgb flag: emoji.
>>>
>>> + Slightly better ActivityPub compat
>>>
>>> + ## headings for markdown
>>>
>>> + Workaround js only twitter for hoot: feature.
>>>
>>> + Quote unquote reliability improvements.
>>>
>>> + Much better omit images handling.
>>>
>>> + Fix update activity.
>>>
>>> + A few API refinements and additions.
>>>
>>> === 0.9.0 Monitor vs Merrimack
>>>
>>> --- Add Reactions.
>>>
>>> +++ Rename react to badonk.
>>>
>>> + Quick fix to hide all images.
>>>
>>> + Allow resending follow requests.
>>>
>>> + Improved search query parsing.
>>>
>>> + Tables
>>>
>>> + Reduce retries talking to dumb servers.
>>>
>>> + Maybe possible to use @u...@example.com wihtout subdomain.
>>>
>>
>
Index: Makefile
===
RCS file: /cvs/ports/www/honk/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile24 Oct 2020 15:37:33 - 1.12
+++ Makefile11 Nov 2020 09:51:49 -
@@ -2,7 +2,7 @@
COMMENT = federated status conveyance
-DISTNAME = honk-0.9.2
+DISTNAME = honk-0.9.3
CATEGORIES = www
HOMEPAGE = https://humungus.tedunangst.com/r/honk
@@ -28,7 +28,7 @@ DOCDIR ?= ${PREFIX}/share/doc/honk
EXAMPLESDIR = ${PREFIX}/share/examples/honk
post-build:
-.for toy in gettoken saytheday sprayandpray youvegothonks
+.for toy in autobonker gettoken saytheday sprayandpray youvegothonks
${MODGO_CMD} build ${MODGO_FLAGS} -o ${MODGO_WORKSPACE}/bin/${toy} \
${MODGO_WORKSPACE}/src/${ALL_TARGET}/toys/${toy}.go
.endfor
Index: distinfo
===
RCS file: /cvs/ports/www/honk/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo24 Oct 2020 15:37:33 - 1.8
+++ distinfo11 Nov 2020 09:51:49 -
@@ -1,2 +1,2 @@
-SHA256 (honk-0.9.2.tgz) = gznmavRe3GAtQHxfvebmInXsIbNZTm7qf7kRgyhIwMk=
-SIZE (honk-0.9.2.tgz) = 509274
+SHA256 (honk-0.9.3.tgz) = VLIBQeCyOw5OWFmNRf+8K2ybLqON7Ya94TTGs27IkAg=
+SIZE (honk-0.9.3.tgz) = 512365
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/honk/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 24 Oct 2020 15:37:33 - 1.6
+++ pkg/PLIST 11 Nov 2020 09:51:49 -
@@ -2,6 +2,7 @@
@newgroup _honk:833
@newuser _honk:833:_honk:daemon:Honk User:${VARBASE}/honk:/sbin/nologin
@rcscript ${RCDIR}/honk
+@bin bin/autobonker
@bin bin/gettoken
@bin bin/honk
@bin bin/saytheday
Index: pkg/README
===
RCS file: /cvs/ports/www/honk/pkg/README,v
retrieving revision 1.3
diff -u -p -r1.3 README
--- pkg/README 24 Oct 2020 15:37:33 - 1.3
+++ pkg/README 11 Nov 2020 09:51:49 -
@@ -9,21 +9,12 @@ Initial configuration
honk expects to be fronted by a TLS terminating reverse proxy.
-acme-client(1)
---
-
-# acme-client.conf(5)
-domain honk.example.com {
- domain key "${SYSCONFDIR}/ssl/private/honk.example.com.key"
- domain full chain certificate
"${SYSCONFDIR}/ssl/honk.example.com.fullchain.pem"
- sign with letsencrypt
-}
-
Icon and favicon
honk# mkdir ${VARBASE}/www/htdocs/honk
-honk# ftp -o ${VARBASE}/www/htdocs/honk/icon.png
https://honk.tedunangst.com/icon.png
+honk# ftp -o ${VARBASE}/www/htdocs/honk/icon.png \
+ https://honk.tedunangst.com/icon.png
honk# ftp -o ${VARBASE}/www/htdocs/honk/favicon.ico \
https://honk.tedunangst.com/favicon.ico
@@ -47,17 +38,31 @@ server "honk.example.com" {
honk# rcctl enable httpd
honk# rcctl start httpd
+
+acme-client(1)
+--
+
+# acme-client.conf(5)
+domain honk.example.com {
+ domain key "${SYSCONFDIR}/ssl/private/honk.example.com.key"
+ domain full chain certificate "${SYSC
Re: UPDATE: libsndfile 1.0.30 - CVE
On Oct 31 01:26:50, b...@comstyle.com wrote:
> Here is an update to libsndfile 1.0.30.
Thanks for the diff, and sorry for the delay.
(Real life interferes quite a bit around here.)
The port as updated by this diff basically works;
please see comments inline.
Jan
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/libsndfile/Makefile,v
> retrieving revision 1.33
> diff -u -p -u -p -r1.33 Makefile
> --- Makefile 12 Jul 2019 20:43:35 - 1.33
> +++ Makefile 31 Oct 2020 05:07:55 -
> @@ -2,31 +2,33 @@
>
> COMMENT= library to handle various audio file formats
>
> -DISTNAME=libsndfile-1.0.28
> +DISTNAME=libsndfile-1.0.30
> CATEGORIES= audio
> +GH_ACCOUNT= libsndfile
> +GH_PROJECT= libsndfile
> +GH_TAGNAME= v1.0.30
Right. No version after 1.0.28 seems to exist
on the old HOMEPAGE.
> HOMEPAGE=http://www.mega-nerd.com/libsndfile/
I asked upstream to remove the page completely.
It is and outdated version of the real thing at github.
> MAINTAINER= Jan Stary
> -SHARED_LIBS += sndfile 6.0 # .1.28
> +
> +SHARED_LIBS += sndfile 7.0 # .1.28
>
> # LGPLv2.1
> PERMIT_PACKAGE= Yes
>
> -MASTER_SITES=${HOMEPAGE}files/
> +WANTLIB= c m sndio FLAC ogg opus vorbis vorbisenc
>
> -WANTLIB= c m sndio FLAC ogg vorbis vorbisenc
> +MODULES= devel/cmake
AFAIU, it still supports the autoconf build.
Is there any specific reason you are switching to cmake?
It seem to pull in a number of py3-* build dependencies,
including stuff like py3-babel and py3-imagesize and ninja ...
Much as I hate the autotools, it seems to be
less of a burden then this cmake build.
> -CONFIGURE_STYLE=gnu
> -CONFIGURE_ARGS= --disable-alsa \
> - --disable-octave \
> - --disable-sqlite
> -
> -CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include"
> -MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/Cfg
> +CONFIGURE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \
> + -DCMAKE_DISABLE_FIND_PACKAGE_ALSA:BOOL=True \
> + -DCMAKE_DISABLE_FIND_PACKAGE_Speex:BOOL=True \
> + -DCMAKE_DISABLE_FIND_PACKAGE_SQLite3:BOOL=True
>
> LIB_DEPENDS= audio/flac \
> audio/libogg \
> - audio/libvorbis
> -
> -FAKE_FLAGS= htmldocdir=${PREFIX}/share/doc/libsndfile
> + audio/libvorbis \
> + audio/opus
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/libsndfile/distinfo,v
> retrieving revision 1.17
> diff -u -p -u -p -r1.17 distinfo
> --- distinfo 23 Apr 2018 08:48:54 - 1.17
> +++ distinfo 31 Oct 2020 05:07:55 -
> @@ -1,2 +1,2 @@
> -SHA256 (libsndfile-1.0.28.tar.gz) =
> H/M5KfBC+jM67R6JI6pijD7p4euFUSaGxVCS0eWp36k=
> -SIZE (libsndfile-1.0.28.tar.gz) = 1202833
> +SHA256 (libsndfile-1.0.30.tar.gz) =
> WUK5Y9HbPtirH/uFcIMiqpY333bZ/oTh3+Sal6kOj0c=
> +SIZE (libsndfile-1.0.30.tar.gz) = 650659
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-CMakeLists_txt 31 Oct 2020 05:07:55 -
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> CMakeLists.txt
> +@@ -56,6 +56,7 @@ if (MSVC AND (CMAKE_VERSION VERSION_LESS 3.15))
> + endif ()
> + option (ENABLE_PACKAGE_CONFIG "Generate and install package config file" ON)
> + option (INSTALL_PKGCONFIG_MODULE "Generate and install pkg-config module"
> ON)
> ++option (INSTALL_MANPAGES "Install man pages for programs" ON)
> +
> + list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
> +
> +@@ -74,7 +75,6 @@ if (NOT ENABLE_CPU_CLIP)
> + set (CPU_CLIPS_NEGATIVE FALSE)
> + endif ()
> + cmake_dependent_option (ENABLE_COMPATIBLE_LIBSNDFILE_NAME "Set DLL name to
> libsndfile-1.dll (canonical name), sndfile.dll otherwise" OFF
> "WIN32;BUILD_SHARED_LIBS" OFF)
> +-cmake_dependent_option (INSTALL_MANPAGES "Install man pages for programs"
> ON "BUILD_PROGRAMS AND (UNIX OR MINGW OR CYGWIN)" OFF)
> +
> + set (HAVE_EXTERNAL_XIPH_LIBS ${ENABLE_EXTERNAL_LIBS})
> + set (HAVE_SQLITE3 ${BUILD_REGTEST})
> Index: patches/patch-configure
> ===
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- patches/patch-configure 23 Apr 2018 08:48:54 - 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-configure,v 1.3 2018/04/23 08:48:54 jca Exp $
> -
> -Some compilers don't have -Wvla
> -
> -Index: configure
> configure.orig
> -+++ configure
> -@@ -20828,7 +20828,7 @@ rm -f core conftest.err conftest.$ac_objext \
> - common_flags="-Wcast-align -Wcast-qual -Wshadow -Wwrite-strings -Wundef
> -Wuninitial
Re: [New] devel/fmt
Jeremie Courreges-Anglas writes:
> [...snip...]
> You have this line:
>
> WANTLIB+= c++ c++abi ${COMPILER_LIBCXX}
>
> "c++ c++abi" *is* the content of COMPILER_LIBCXX when you use
> base-clang, so no need to duplicate it. The contents of COMPILER_LIBCXX
> will change according to the compiler used.
> [...snip...]
Thanks, that's good to know.
> I think the port as-is is ripe and ready to commit, but I don't know yet
> if there are ports that might pick this up.
Cool. If it goes in, that'd be great. I'm interested to see if there's
other ports that can use it also.
> No idea if there are written rules somewhere. I thought it was mostly:
> - use tabs for indentation
> - try to align values in variable assignements
> - generally try to keep things consistent unless inconvenient
>
> Since you use emacs, M-x whitespace-mode can help (I don't use it by
> default because it's way too verbose but it can be configured ofc).
Ok yeah, that helps. whitespace-mode should help with eyeballing to see
whether things are lined up - I was just concerned there was something
"off" with my config that was causing it to look different to other
people. It seems that's not the case.
Thanks.
Ash
[macppc] www/luakit is not BROKEN anymore
Hi, The latest Luakit update fix the build on macppc [0]. There is no runtime issue with the fixed webkitgtk4. OK? Charlène. [0] https://bin.charlenew.xyz/luakit.log Index: Makefile === RCS file: /cvs/ports/www/luakit/Makefile,v retrieving revision 1.27 diff -u -p -u -p -r1.27 Makefile --- Makefile17 Sep 2020 18:20:14 - 1.27 +++ Makefile11 Nov 2020 18:01:28 - @@ -1,7 +1,5 @@ # $OpenBSD: Makefile,v 1.27 2020/09/17 18:20:14 semarie Exp $ -BROKEN-powerpc = help2man: can't get `--help' info from ./luakit - COMMENT = fast, small, webkit based browser written in lua GH_ACCOUNT = luakit
[new] multimedia/opustags
Hello ports, opustags is a small cli to view/edit tags of ogg opus files. It also has a mode where it opens your $EDITOR to edit the tags, that's more comfortable than fighting the shell escaping rules in most cases. Around one month ago I needed to fix tags of a bunch of files, so I searched for a tool to batch change the tags, and I stumbled upon this. Upstream has been kind enough not only to fix some preexisting compilation errors, but also to make sure the latest version, released three days ago, build and works on OpenBSD. The port is straightforward. I believe that the comment and the DESCR could be improved, but that was the best I was able to write, help appreciated. The last minute doubt is if audio is a better category than multimedia. Comments/improvements/OK ? opustags.tar.gz Description: Binary data
Re: devel/boost: drop python2 support and speed up make fake
On Wed Nov 11, 2020 at 05:02:08PM +0100, Jeremie Courreges-Anglas wrote:
> On Mon, Nov 09 2020, Jeremie Courreges-Anglas wrote:
> > On Sun, Nov 08 2020, Rafael Sadowski wrote:
> >> On Sun Nov 08, 2020 at 01:46:14AM +0100, Jeremie Courreges-Anglas wrote:
> >>>
> >>> This diff drops boost_python27 and boost_numpy27. I switched the
> >>> defaults to python3 but the boost-build .py files aren't ready for that
> >>> (using python3 -m compileall fails with syntax errors). No idea how
> >>> used/useful boost-build actually is or how maintainers want to deal with
> >>> this python2/3 mix. One possible approach would be to run 2to3 on
> >>> those files, but this doesn't catch all the py2->py3 gotchas.
> >>
> >> I also worked on it yesterday and found the same py2->py3 issue.
> >
> > So what do you think should be done? :)
> >
> > I can propose:
> > 1. keep the diff as is, it looks weird but maybe boost-build still works
> > fine
> >(no idea how to test that)
> > 2. drop the boost-build parts until a new release brings proper python3
> >support
> > 3. some hacks to make the current boost-build work with python3 (I have
> >nothing against it but I'd prefer not to care about this myself)
>
> < rsadowski> My idea would be
> [2] remove all in share/boost-build
> [4] remove the compileall.py task.
>
> I'd prefer to go with option 2, option 4 means that .pyc files can stay
> around if the user starts boost-build as root.
>
> So, shall we go ahead with this diff? If so I'll ask Antoine to slip
> this in his next bulk (per sthen@ suggestion). More tests are obviously
> welcome.
>
> I have just committed the make fake tweak, so you need to apply this on
> a fresh CVS checkout.
>
If Brad accept option 2, I would like to install the following tools
anyway. This means that the boost build system can still be used.
>
> - # boost-build:
> - ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
> - ${PREFIX}/bin
...
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/boost-build
> - ${INSTALL_DATA} ${WRKSRC}/tools/build/example/site-config.jam \
> - ${PREFIX}/share/examples/boost-build
Re: update games/jag 0.3.8
Thanks for the work on this. A few issues that I found.
First, there are some legacy issues in the Makefile in my opinion:
LIB_DEPENDS = devel/sdl2 \
devel/sdl2-mixer \
devel/sdl2 is superfluous, as sdl2-mixer pulls it in anyway.
Fixing DOS line endings should be okay here, but any sophisticated
find(1) heuristic runs the risk of changing a binary file.
# delete DOS line endings
post-extract:
@find ${WRKSRC} -type f \( -name "*.cpp" -o -name "*.h" \) -exec \
perl -i -pe 's/\r$$//' {} +
Less risky to enumerate all files needing patches. See Makefile.template:
# Fix dos line-endings in files needing patches
#pre-patch:
# @cd ${WRKSRC} && perl -i -pe 's/\r$$//' [...]
$ make port-lib-depends-check
jag-0.3.8(games/jag):
Missing: GL.17 (/usr/local/bin/jag-editor) (system lib)
WANTLIB += GL
I recommend to always check port-lib-depends-check and portcheck with
updates.
On Wed, Nov 11, 2020 at 02:55:27AM -0800, Nam Nguyen wrote:
> Nam Nguyen writes:
> > Nam Nguyen writes:
> >
> > ping
>
> ping
>
> >
> >> Here is an update for games/jag 0.3.8, released September 7, 2020.
> >> changelog: https://gitlab.com/coringao/jag/-/tags/0.3.8
> >>
> >> This update:
> >> - switches to -std=gnu++17 by default
Need to adjust compiler line with this change.
See Makefile.template:
# Standard for C++11 or newer:
#COMPILER = base-clang ports-gcc
> >> - removes gameprofile.cpp and displaywrapper.cpp patches, as they have
> >> already been added upstream
> >> https://gitlab.com/coringao/jag/-/commit/9edca4bdfdb8a049ad6ca0628b3d427e461d17f5
> >> https://gitlab.com/coringao/jag/-/commit/4f67546bc8e8b2ac60156605ad32fa0a3880d5dd
> >> - PERMIT_PACKAGE = Yes due to removal of all themes except for the
> >> default theme
> >> discussion: https://gitlab.com/coringao/jag/-/issues/1
> >> All questionable assets were removed so I propose PERMIT_PACKAGE =
> >> Yes. I still could not find a license for the default theme made by
> >> PixelMixer. Given that the default theme's assets are featured on the
> >> website and they were not made by Fasticon, they should fall under the
> >> JAG menu's statement: "Thanks to the authors of graphics, icons and
> >> sounds, which are used under free licenses in the game." Hopefully this
> >> is sufficient for PERMIT_PACKAGE = Yes.
I think the questions are:
1. who is the copyright holder (usually creator) of the default theme?
2. What license did they publish it with? (or maybe none?)
In my opinion, upstream has to do their do diligence before they claim
this to be GPLv3(+). Are there any unlicensed assets not included in
the copyright of the project to your best knowledge?
> >>
> >> Some warnings remain and seem safe to ignore:
> >> - deprecated os info testing for windows vista
> >> - overloaded exec(const Qstring &qs) vs exec() in gamemenu.h and
> >> qdialog.h. gamemenu.h's version is always called.
> >>
> >> In file included from ../src/menucontrol.cpp:26:
> >> ../src/gamemenu.h:55:9: warning: 'ConfirmDialog::exec' hides overloaded
> >> virtual
> >> int exec(const QString &qs);
> >> ^
> >>
> >> /usr/local/include/X11/qt5/QtWidgets/qdialog.h:95:17: note: hidden
> >> overloaded virtual function 'QDialog::exec' declared here: different
> >> number of parameters (0 vs 1)
> >> virtual int exec();
> >>
> >> I tested jag and jag-editor runtimes. Feedback and tests are welcome.
Tested runtime briefly (started a game, clicked a few boxes, then
abandoned it); didn't notice any issues.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/jag/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 1 Aug 2020 05:34:08 - 1.12
> +++ Makefile 18 Sep 2020 22:20:57 -
> @@ -1,14 +1,12 @@
> # $OpenBSD: Makefile,v 1.12 2020/08/01 05:34:08 landry Exp $
> COMMENT =arcade-puzzle game
> -V = 0.3.7
> +V = 0.3.8
> DISTNAME = jag-${V}
> CATEGORIES = games
> HOMEPAGE = https://gitlab.com/coringao/jag
>
> # GPLv3
Looks like this should be GPLv3+:
* JAG is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
(found in src/baseitem.cpp)
> -# https://gitlab.com/coringao/jag/-/issues/1
> -PERMIT_PACKAGE = restrictively licensed themes
> -PERMIT_DISTFILES = restrictively licensed themes
> +PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
> WANTLIB += Qt5X11Extras SDL2 SDL2_mixer X11 Xrandr c
add GL to WANTLIB (see make port-lib-depends-check, mentioned above)
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/jag/distinfo,v
> retriev
Re: devel/boost: drop python2 support and speed up make fake
On Mon, Nov 09 2020, Jeremie Courreges-Anglas wrote:
> On Sun, Nov 08 2020, Rafael Sadowski wrote:
>> On Sun Nov 08, 2020 at 01:46:14AM +0100, Jeremie Courreges-Anglas wrote:
>>>
>>> This diff drops boost_python27 and boost_numpy27. I switched the
>>> defaults to python3 but the boost-build .py files aren't ready for that
>>> (using python3 -m compileall fails with syntax errors). No idea how
>>> used/useful boost-build actually is or how maintainers want to deal with
>>> this python2/3 mix. One possible approach would be to run 2to3 on
>>> those files, but this doesn't catch all the py2->py3 gotchas.
>>
>> I also worked on it yesterday and found the same py2->py3 issue.
>
> So what do you think should be done? :)
>
> I can propose:
> 1. keep the diff as is, it looks weird but maybe boost-build still works fine
>(no idea how to test that)
> 2. drop the boost-build parts until a new release brings proper python3
>support
> 3. some hacks to make the current boost-build work with python3 (I have
>nothing against it but I'd prefer not to care about this myself)
< rsadowski> My idea would be
[2] remove all in share/boost-build
[4] remove the compileall.py task.
I'd prefer to go with option 2, option 4 means that .pyc files can stay
around if the user starts boost-build as root.
So, shall we go ahead with this diff? If so I'll ask Antoine to slip
this in his next bulk (per sthen@ suggestion). More tests are obviously
welcome.
I have just committed the make fake tweak, so you need to apply this on
a fresh CVS checkout.
Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.102
diff -u -p -r1.102 Makefile
--- Makefile11 Nov 2020 15:53:41 - 1.102
+++ Makefile11 Nov 2020 15:55:39 -
@@ -6,6 +6,7 @@ COMMENT-main= free peer-reviewed portabl
COMMENT-md=machine-dependent libraries for boost
VERSION= 1.70.0
+REVISION= 0
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME-main= boost-${VERSION}
PKGNAME-md=boost-md-${VERSION}
@@ -33,9 +34,7 @@ BOOST_LIBS= boost_atomic-mt \
boost_math_tr1l-mt boost_math_tr1l \
boost_prg_exec_monitor-mt boost_prg_exec_monitor \
boost_program_options-mt boost_program_options \
- boost_numpy27-mt boost_numpy27 \
boost_numpy38-mt boost_numpy38 \
- boost_python27-mt boost_python27 \
boost_python38-mt boost_python38 \
boost_random-mt boost_random \
boost_regex-mt boost_regex \
@@ -79,12 +78,10 @@ COMPILER= base-clang ports-gcc
MULTI_PACKAGES=-main -md
MODULES= lang/python
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP= No
-# extras needed until py2 support can be removed
-BUILD_DEPENDS+=math/py-numpy \
- math/py-numpy,python3 \
- lang/python/${MODPY_DEFAULT_VERSION_3}
+BUILD_DEPENDS= math/py-numpy${MODPY_FLAVOR}
LIB_DEPENDS= archivers/bzip2 \
textproc/icu4c
@@ -116,11 +113,11 @@ BJAM_CONFIG= -sICU_PATH=${LOCALBASE} \
cxxflags='${CXXFLAGS} -pthread' \
variant=release \
link=static,shared \
- threading=single,multi \
+ threading=single,multi
BOOTSTRAP= --with-bjam=${WRKSRC}/bjam \
--with-toolset=${TOOLSET} \
- --with-python-root=${LOCALBASE}
+ --with-python=${MODPY_BIN}
# 'context' and 'coroutine' use MD bits and miss support for Alpha,
# PA-RISC, SPARC and SuperH. The author does not care
@@ -129,18 +126,6 @@ BOOTSTRAP= --with-bjam=${WRKSRC}/bjam \
BOOTSTRAP+=--without-libraries=context,coroutine,fiber,stacktrace
.endif
-PY2_BOOTSTRAP= --with-python=${LOCALBASE}/bin/python${MODPY_DEFAULT_VERSION_2}
\
- --with-python-version=${MODPY_DEFAULT_VERSION_2} \
-
-PY3_BOOTSTRAP= --with-python=${LOCALBASE}/bin/python${MODPY_DEFAULT_VERSION_3}
\
- --with-python-version=${MODPY_DEFAULT_VERSION_3} \
-
-PY2_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_2}
-PY3_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_3}
-
-# temporary dir to stash libs when rebuilding with py2
-PY3_DIR= ${WRKDIR}/lib.py3
-
# python.port.mk makes assumptions about an empty CONFIGURE_STYLE
CONFIGURE_STYLE= none
@@ -164,51 +149,18 @@ do-configure:
cd ${WRKSRC}/tools/build/src/engine && \
${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" /bin/sh ./build.sh cc
&& \
cp bin.openbsd*/b2 bin.openbsd*/bjam ${WRKSRC}
+ cd ${WRKSRC} && ${SETENV} /bin/sh ./bootstrap.sh ${BOOTSTRAP}
-# b2 doesn't seem to respect python parameter, we need to run twice with
-# separate python environments. when we remove py2 support later, bootstrap
-# can move back to the configure stage and avoid the build/rm/rebuild dance..
do-bui
Re: [New] devel/fmt
On Mon, Nov 09 2020, Ashton Fagg wrote:
> Jeremie Courreges-Anglas writes:
>
>> Here are some items that need fixing:
tl;dr everything looks good except WANTLIB.
[...]
>> * WANTLIB is off, don't copy/paste it from other ports. You can just
>> copy/paste the suggested WANTLIB line(s) from make
>> port-lib-depends-check, with no editing:
>>
>> --8<--
>> russell /usr/ports/mystuff/devel/fmt$ make port-lib-depends-check
>>
>> fmt-7.1.1(devel/fmt):
>> Extra: pthread.26
>> russell /usr/ports/mystuff/devel/fmt$ make show=COMPILER_LIBCXX
>> c++ c++abi pthread
>> -->8--
>>
>> Dunno why libfmt isn't linked against libpthread here, but the suggested
>> WANTLIB is almost certainly correct.
>
> Addressed.
You have this line:
WANTLIB+= c++ c++abi ${COMPILER_LIBCXX}
"c++ c++abi" *is* the content of COMPILER_LIBCXX when you use
base-clang, so no need to duplicate it. The contents of COMPILER_LIBCXX
will change according to the compiler used.
So the line should be just WANTLIB = ${COMPILER_LIBCXX}, this is fixed
in the updated tarball attached, I also moved WANTLIB to follow
Makefile.template ordering and s/+=/=/ for CONFIGURE_ARGS (because
there's no technical reason to use += here, the variable isn't set at
that point).
fmt-7.1.1-jca.tgz
Description: Binary data
I think the port as-is is ripe and ready to commit, but I don't know yet
if there are ports that might pick this up.
[...]
>> * Weird spacing: please only use tabs for indentation, not spaces then
>> tabs.
>
> Fixed this as well, I think. There seems to be a lot of tribal knowledge
> around this. Are there any written rules beyond just "use tabs" and make
> it look neat? It looks fine in my emacs (screenshot attached) but I
> wonder if it's misconfigured and other people are seeing it
> differently. (I checked with vi and it looks the same).
No idea if there are written rules somewhere. I thought it was mostly:
- use tabs for indentation
- try to align values in variable assignements
- generally try to keep things consistent unless inconvenient
Since you use emacs, M-x whitespace-mode can help (I don't use it by
default because it's way too verbose but it can be configured ofc).
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: gpg no uid patch
On Wed, Nov 11 2020, Edd Barrett wrote: > Hi, > > While working with keys.openpgp.org, I've become aware of a patch that > allows gpg to recieve keys with no uid: > > https://keys.openpgp.org/about/faq#older-gnupg > > Perhaps that's good for privacy, but upstream have rejected the patch. Tricky... > Some Linux distros are applying the patch locally. Should we? My initial feeling is that we shouldn't contribute to a fragmented ecosystem, and that this issue would be better sorted out upstream, even if there's disagreement so far. Maybe some other folks have a clearer view of the problem at hand, right now I don't. My 0 cents, -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: gpg no uid patch
Edd Barrett writes: > Hi, > > While working with keys.openpgp.org, I've become aware of a patch that > allows gpg to recieve keys with no uid: > > https://keys.openpgp.org/about/faq#older-gnupg > > Perhaps that's good for privacy, but upstream have rejected the patch. > > Some Linux distros are applying the patch locally. Should we? Ahha! all this time I thought I was JustMissingSomething! I find more and more keys with no uid.. personally I think this would be an improvement!
gpg no uid patch
Hi, While working with keys.openpgp.org, I've become aware of a patch that allows gpg to recieve keys with no uid: https://keys.openpgp.org/about/faq#older-gnupg Perhaps that's good for privacy, but upstream have rejected the patch. Some Linux distros are applying the patch locally. Should we? -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: update intel microcode to 20201110
On Wednesday, November 11, 2020, Stuart Henderson wrote: > On 2020/11/11 18:48, Jonathan Gray wrote: > > https://github.com/intel/Intel-Linux-Processor- > Microcode-Data-Files/blob/microcode-20201110/releasenote.md > > > > Changed files are for skylake and newer so I can't test this. > > https://github.com/intel/Intel-Linux-Processor- > Microcode-Data-Files/issues/31 > suggests it may fix the problems seen with 06-4e-03 and 06-5e-03 on the > 20200609 ucode. > > CC'ing acamari, you had problems with the previous microcode on > i3-6100U. Are you able to test this one? > > > > Index: Makefile > > === > > RCS file: /cvs/ports/sysutils/firmware/intel/Makefile,v > > retrieving revision 1.24 > > diff -u -p -r1.24 Makefile > > --- Makefile 3 Jul 2020 12:10:41 - 1.24 > > +++ Makefile 11 Nov 2020 07:36:17 - > > @@ -3,7 +3,7 @@ > > COMMENT= microcode update binaries for Intel CPUs > > FW_DRIVER= intel > > > > -FW_VER= 20200616 > > +FW_VER= 20201110 > > EPOCH= 0 > > GH_ACCOUNT= intel > > GH_PROJECT= Intel-Linux-Processor-Microcode-Data-Files > > Index: distinfo > > === > > RCS file: /cvs/ports/sysutils/firmware/intel/distinfo,v > > retrieving revision 1.17 > > diff -u -p -r1.17 distinfo > > --- distinfo 3 Jul 2020 12:10:41 - 1.17 > > +++ distinfo 11 Nov 2020 07:36:24 - > > @@ -1,2 +1,2 @@ > > -SHA256 (firmware/intel-20200616.tar.gz) = 60+ > TlCGsbN6jxYbJ2YTsUYMg8AwH6ys9Z1QwnIPJM3E= > > -SIZE (firmware/intel-20200616.tar.gz) = 3036726 > > +SHA256 (firmware/intel-20201110.tar.gz) = > yeQq0AMtjNYRx7wvuUoWQprEhceXGAlzewVVUKSfWLg= > > +SIZE (firmware/intel-20201110.tar.gz) = 3609989 > > Index: pkg/PLIST > > === > > RCS file: /cvs/ports/sysutils/firmware/intel/pkg/PLIST,v > > retrieving revision 1.13 > > diff -u -p -r1.13 PLIST > > --- pkg/PLIST 18 Nov 2019 18:06:59 - 1.13 > > +++ pkg/PLIST 11 Nov 2020 07:36:46 - > > @@ -72,6 +72,7 @@ firmware/intel/06-55-03 > > firmware/intel/06-55-04 > > firmware/intel/06-55-06 > > firmware/intel/06-55-07 > > +firmware/intel/06-55-0b > > firmware/intel/06-56-02 > > firmware/intel/06-56-03 > > firmware/intel/06-56-04 > > @@ -85,6 +86,8 @@ firmware/intel/06-66-03 > > firmware/intel/06-7a-01 > > firmware/intel/06-7a-08 > > firmware/intel/06-7e-05 > > +firmware/intel/06-8a-01 > > +firmware/intel/06-8c-01 > > firmware/intel/06-8e-09 > > firmware/intel/06-8e-0a > > firmware/intel/06-8e-0b > > @@ -94,7 +97,11 @@ firmware/intel/06-9e-0a > > firmware/intel/06-9e-0b > > firmware/intel/06-9e-0c > > firmware/intel/06-9e-0d > > +firmware/intel/06-a5-02 > > +firmware/intel/06-a5-03 > > +firmware/intel/06-a5-05 > > firmware/intel/06-a6-00 > > +firmware/intel/06-a6-01 > > firmware/intel/0f-00-07 > > firmware/intel/0f-00-0a > > firmware/intel/0f-01-02 > > > Hi, will check this today later, thanks for letting me know
Re: update games/jag 0.3.8
Nam Nguyen writes:
> Nam Nguyen writes:
>
> ping
ping
>
>> Here is an update for games/jag 0.3.8, released September 7, 2020.
>> changelog: https://gitlab.com/coringao/jag/-/tags/0.3.8
>>
>> This update:
>> - switches to -std=gnu++17 by default
>> - removes gameprofile.cpp and displaywrapper.cpp patches, as they have
>> already been added upstream
>> https://gitlab.com/coringao/jag/-/commit/9edca4bdfdb8a049ad6ca0628b3d427e461d17f5
>> https://gitlab.com/coringao/jag/-/commit/4f67546bc8e8b2ac60156605ad32fa0a3880d5dd
>> - PERMIT_PACKAGE = Yes due to removal of all themes except for the
>> default theme
>> discussion: https://gitlab.com/coringao/jag/-/issues/1
>>
>> All questionable assets were removed so I propose PERMIT_PACKAGE =
>> Yes. I still could not find a license for the default theme made by
>> PixelMixer. Given that the default theme's assets are featured on the
>> website and they were not made by Fasticon, they should fall under the
>> JAG menu's statement: "Thanks to the authors of graphics, icons and
>> sounds, which are used under free licenses in the game." Hopefully this
>> is sufficient for PERMIT_PACKAGE = Yes.
>>
>> Some warnings remain and seem safe to ignore:
>> - deprecated os info testing for windows vista
>> - overloaded exec(const Qstring &qs) vs exec() in gamemenu.h and
>> qdialog.h. gamemenu.h's version is always called.
>>
>> In file included from ../src/menucontrol.cpp:26:
>> ../src/gamemenu.h:55:9: warning: 'ConfirmDialog::exec' hides overloaded
>> virtual
>> int exec(const QString &qs);
>> ^
>>
>> /usr/local/include/X11/qt5/QtWidgets/qdialog.h:95:17: note: hidden
>> overloaded virtual function 'QDialog::exec' declared here: different
>> number of parameters (0 vs 1)
>> virtual int exec();
>>
>> I tested jag and jag-editor runtimes. Feedback and tests are welcome.
Index: Makefile
===
RCS file: /cvs/ports/games/jag/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile1 Aug 2020 05:34:08 - 1.12
+++ Makefile18 Sep 2020 22:20:57 -
@@ -1,14 +1,12 @@
# $OpenBSD: Makefile,v 1.12 2020/08/01 05:34:08 landry Exp $
COMMENT = arcade-puzzle game
-V =0.3.7
+V =0.3.8
DISTNAME = jag-${V}
CATEGORIES = games
HOMEPAGE = https://gitlab.com/coringao/jag
# GPLv3
-# https://gitlab.com/coringao/jag/-/issues/1
-PERMIT_PACKAGE = restrictively licensed themes
-PERMIT_DISTFILES = restrictively licensed themes
+PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
WANTLIB += Qt5X11Extras SDL2 SDL2_mixer X11 Xrandr c
Index: distinfo
===
RCS file: /cvs/ports/games/jag/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo1 Aug 2020 05:34:08 - 1.2
+++ distinfo18 Sep 2020 22:20:57 -
@@ -1,2 +1,2 @@
-SHA256 (jag-0.3.7.tar.gz) = jI+SYKL476N4ojzhUdWjoEDklJ+EFBClnRDUzeJH9t4=
-SIZE (jag-0.3.7.tar.gz) = 6971529
+SHA256 (jag-0.3.8.tar.gz) = NG07uNFmccGCsFaLkpg7jVM6Caz7PQPpSneO6HnS1gQ=
+SIZE (jag-0.3.8.tar.gz) = 3025319
Index: patches/patch-src_displaywrapper_cpp
===
RCS file: patches/patch-src_displaywrapper_cpp
diff -N patches/patch-src_displaywrapper_cpp
--- patches/patch-src_displaywrapper_cpp1 Aug 2020 05:34:08 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_displaywrapper_cpp,v 1.1 2020/08/01 05:34:08 landry Exp $
-
-Index: src/displaywrapper.cpp
src/displaywrapper.cpp.orig
-+++ src/displaywrapper.cpp
-@@ -305,8 +305,6 @@ void DisplayWrapper::dw_init(bool filter, int minWidth
- //short original_rate = XRRConfigCurrentRate(conf);
- //SizeID original_size_id = XRRConfigCurrentConfiguration(conf,
&original_rotation);
-
-- XCloseDisplay(dpy);
--
- for (int i = 0; i < num_sizes; i++)
- {
- int width = xrrs[i].width;
-@@ -325,6 +323,8 @@ void DisplayWrapper::dw_init(bool filter, int minWidth
- modes.append(mode);
- }
- }
-+
-+ XCloseDisplay(dpy);
-
- if (filter)
- modeNames.removeDuplicates();
Index: patches/patch-src_editor_jag-editor_pro
===
RCS file: /cvs/ports/games/jag/patches/patch-src_editor_jag-editor_pro,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_editor_jag-editor_pro
--- patches/patch-src_editor_jag-editor_pro 1 Aug 2020 05:34:08 -
1.1
+++ patches/patch-src_editor_jag-editor_pro 18 Sep 2020 22:20:57 -
@@ -5,7 +5,7 @@ install jag-editor to correct prefix. ja
Index: src/editor/jag-editor.pro
--- src/editor/jag-editor.pro.orig
+++ src/editor/jag-editor.pro
-@@ -22,11 +22,8 @@ QMAKE_CXXFLAGS += -g -std=gnu++14 -D_FORTIFY_SOURCE=2
+@@ -22,11 +22,8 @@ QMAKE_CXXFLAGS += -g -std=gn
update editors/TeXmacs 1.99.14
This is an update for editors/TeXmacs-1.99.14, released November 5,
2020.
Changelog: https://texmacs.org/tmweb/about/changes.en.html
Ports changes:
- reverts back to DISTNAME and PKGNAME as in revision 1.15 now that
distfile extracts to -src again.
- notes in README that octave plugin requires gnuplot.
I tested with all plugins and it works. Feedback and tests are welcome.
Index: Makefile
===
RCS file: /cvs/ports/editors/TeXmacs/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile1 Aug 2020 11:00:31 - 1.18
+++ Makefile11 Nov 2020 10:38:20 -
@@ -2,8 +2,8 @@
COMMENT= wysiwyw (what you see is what you want) editing platform
-DISTNAME= TeXmacs-1.99.13
-EXTRACT_SUFX= -src.tar.gz
+DISTNAME= TeXmacs-1.99.14-src
+PKGNAME= ${DISTNAME:S/-src//}
CATEGORIES=editors print x11
HOMEPAGE= https://texmacs.org/
Index: distinfo
===
RCS file: /cvs/ports/editors/TeXmacs/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo1 Aug 2020 11:00:31 - 1.4
+++ distinfo11 Nov 2020 10:38:20 -
@@ -1,2 +1,2 @@
-SHA256 (TeXmacs-1.99.13-src.tar.gz) =
Aq0cS47QqmFQHelxRjANeJlgXCXagnYRykpAq7wHqbQ=
-SIZE (TeXmacs-1.99.13-src.tar.gz) = 37181886
+SHA256 (TeXmacs-1.99.14-src.tar.gz) =
yj6GK5CUkltE5RrHbqfl9SNb0wpUjiDksPbdC1sLdP0=
+SIZE (TeXmacs-1.99.14-src.tar.gz) = 36570468
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/editors/TeXmacs/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt1 Aug 2020 11:00:31 - 1.3
+++ patches/patch-CMakeLists_txt11 Nov 2020 10:38:20 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 202
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -586,7 +586,7 @@ if (TEXMACS_GUI MATCHES "Qt.*")
+@@ -591,7 +591,7 @@ if (TEXMACS_GUI MATCHES "Qt.*")
set (TeXmacs_All_SRCS ${TeXmacs_All_SRCS} ${TeXmacs_Qt_SRCS}
${TeXmacs_Qt_Moc_HDRS})
set (TeXmacs_Include_Dirs ${TeXmacs_Include_Dirs} ${QT_INCLUDES})
Index: patches/patch-src_Plugins_Qt_qt_gui_cpp
===
RCS file: /cvs/ports/editors/TeXmacs/patches/patch-src_Plugins_Qt_qt_gui_cpp,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_Plugins_Qt_qt_gui_cpp
--- patches/patch-src_Plugins_Qt_qt_gui_cpp 1 Aug 2020 11:00:31 -
1.4
+++ patches/patch-src_Plugins_Qt_qt_gui_cpp 11 Nov 2020 10:38:20 -
@@ -2,12 +2,12 @@ $OpenBSD: patch-src_Plugins_Qt_qt_gui_cp
Index: src/Plugins/Qt/qt_gui.cpp
--- src/Plugins/Qt/qt_gui.cpp.orig
+++ src/Plugins/Qt/qt_gui.cpp
-@@ -838,7 +838,7 @@ qt_gui_rep::update () {
+@@ -868,7 +868,7 @@ qt_gui_rep::update () {
time_t delay = delayed_commands.lapse - texmacs_time();
if (needing_update) delay = 0;
- elsedelay = max (0, min (std_delay, delay));
+ elsedelay = max (static_cast(0), min
(static_cast(std_delay), delay));
- if (postpone_treatment) delay= 100; // NOTE: force occasional display
+ if (postpone_treatment) delay= 9; // NOTE: force occasional display
updatetimer->start (delay);
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/TeXmacs/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 1 Aug 2020 11:00:31 - 1.8
+++ pkg/PLIST 11 Nov 2020 10:38:20 -
@@ -651,6 +651,11 @@ share/TeXmacs/doc/devel/style/style.fr.t
share/TeXmacs/doc/devel/style/style.pt.tm
share/TeXmacs/doc/fdl.txt
share/TeXmacs/doc/main/
+share/TeXmacs/doc/main/automated/
+share/TeXmacs/doc/main/automated/tag-help.en.tm
+share/TeXmacs/doc/main/automated/tag-help.fr.tm
+share/TeXmacs/doc/main/automated/top-help.en.tm
+share/TeXmacs/doc/main/automated/top-help.fr.tm
share/TeXmacs/doc/main/beamer/
share/TeXmacs/doc/main/beamer/man-animations.en.tm
share/TeXmacs/doc/main/beamer/man-beamer-export.en.tm
@@ -1451,30 +1456,36 @@ share/TeXmacs/examples/
share/TeXmacs/examples/plugins/
share/TeXmacs/examples/plugins/complete/
share/TeXmacs/examples/plugins/complete/Makefile
+share/TeXmacs/examples/plugins/complete/bin/
share/TeXmacs/examples/plugins/complete/progs/
share/TeXmacs/examples/plugins/complete/progs/init-complete.scm
share/TeXmacs/examples/plugins/complete/src/
share/TeXmacs/examples/plugins/complete/src/complete.cpp
share/TeXmacs/examples/plugins/dynlink/
share/TeXmacs/examples/plugins/dynlink/Makefile.in
+share/TeXmacs/examples/plugins/dynlink/bin/
+share/TeXmacs/examples/plugins/dynlink/lib/
share/TeXmacs/examples/plugins/dynlink/progs/
share/TeXmacs/examples/plugins/dynlink/progs/init-dynlink.scm
share/TeXmacs/examples/plugins/dynlink/src/
share/TeXmacs/exampl
Re: update intel microcode to 20201110
On 2020/11/11 18:48, Jonathan Gray wrote: > https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/blob/microcode-20201110/releasenote.md > > Changed files are for skylake and newer so I can't test this. https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31 suggests it may fix the problems seen with 06-4e-03 and 06-5e-03 on the 20200609 ucode. CC'ing acamari, you had problems with the previous microcode on i3-6100U. Are you able to test this one? > Index: Makefile > === > RCS file: /cvs/ports/sysutils/firmware/intel/Makefile,v > retrieving revision 1.24 > diff -u -p -r1.24 Makefile > --- Makefile 3 Jul 2020 12:10:41 - 1.24 > +++ Makefile 11 Nov 2020 07:36:17 - > @@ -3,7 +3,7 @@ > COMMENT= microcode update binaries for Intel CPUs > FW_DRIVER= intel > > -FW_VER= 20200616 > +FW_VER= 20201110 > EPOCH= 0 > GH_ACCOUNT= intel > GH_PROJECT= Intel-Linux-Processor-Microcode-Data-Files > Index: distinfo > === > RCS file: /cvs/ports/sysutils/firmware/intel/distinfo,v > retrieving revision 1.17 > diff -u -p -r1.17 distinfo > --- distinfo 3 Jul 2020 12:10:41 - 1.17 > +++ distinfo 11 Nov 2020 07:36:24 - > @@ -1,2 +1,2 @@ > -SHA256 (firmware/intel-20200616.tar.gz) = > 60+TlCGsbN6jxYbJ2YTsUYMg8AwH6ys9Z1QwnIPJM3E= > -SIZE (firmware/intel-20200616.tar.gz) = 3036726 > +SHA256 (firmware/intel-20201110.tar.gz) = > yeQq0AMtjNYRx7wvuUoWQprEhceXGAlzewVVUKSfWLg= > +SIZE (firmware/intel-20201110.tar.gz) = 3609989 > Index: pkg/PLIST > === > RCS file: /cvs/ports/sysutils/firmware/intel/pkg/PLIST,v > retrieving revision 1.13 > diff -u -p -r1.13 PLIST > --- pkg/PLIST 18 Nov 2019 18:06:59 - 1.13 > +++ pkg/PLIST 11 Nov 2020 07:36:46 - > @@ -72,6 +72,7 @@ firmware/intel/06-55-03 > firmware/intel/06-55-04 > firmware/intel/06-55-06 > firmware/intel/06-55-07 > +firmware/intel/06-55-0b > firmware/intel/06-56-02 > firmware/intel/06-56-03 > firmware/intel/06-56-04 > @@ -85,6 +86,8 @@ firmware/intel/06-66-03 > firmware/intel/06-7a-01 > firmware/intel/06-7a-08 > firmware/intel/06-7e-05 > +firmware/intel/06-8a-01 > +firmware/intel/06-8c-01 > firmware/intel/06-8e-09 > firmware/intel/06-8e-0a > firmware/intel/06-8e-0b > @@ -94,7 +97,11 @@ firmware/intel/06-9e-0a > firmware/intel/06-9e-0b > firmware/intel/06-9e-0c > firmware/intel/06-9e-0d > +firmware/intel/06-a5-02 > +firmware/intel/06-a5-03 > +firmware/intel/06-a5-05 > firmware/intel/06-a6-00 > +firmware/intel/06-a6-01 > firmware/intel/0f-00-07 > firmware/intel/0f-00-0a > firmware/intel/0f-01-02 >
Re: [Update] graphics/img2pdf : Update to 0.4.0
On 2020/11/11 06:10, wen heping wrote:
> Hi, ports@:
>
> Here is a patch for graphics/img2pdf:
> i) Update to 0.4.0
> ii) Add py-pikepdf as RUND
> iii) Remove py-Pillow from TEST_DEPENDS, since it is
> RUND and there is no test code upstream
There is test code but it wasn't run correctly. I have fixed that with
MODPY_PYTEST=Yes.
> iv) Remove the comments about pdfrw, now it does
> not require pdfrw.
I have kept these. img2pdf didn't require pdfrw before, it was optional
(and still is) but still causes test failures if not present.
>
> It build well and run well on amd64-6.8 system, and no
> other ports depend on it.
>
>
> Cheers !
> wen
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/img2pdf/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 6 Jul 2020 10:07:44 - 1.14
> +++ Makefile 11 Nov 2020 06:03:12 -
> @@ -2,7 +2,7 @@
>
> COMMENT =losslessly convert images to PDF
>
> -MODPY_EGG_VERSION = 0.3.6
> +MODPY_EGG_VERSION = 0.4.0
> DISTNAME = img2pdf-${MODPY_EGG_VERSION}
>
> CATEGORIES = graphics
> @@ -17,9 +17,7 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION
> MODPY_SETUPTOOLS = Yes
> MODPY_PI = Yes
>
> -# some tests fail as they require pdfrw (overall this is optional for
> -# img2pdf and autodetected at runtime; we don't have it in ports yet)
> -RUN_DEPENDS =graphics/py-Pillow${MODPY_FLAVOR}
> -TEST_DEPENDS = graphics/py-Pillow${MODPY_FLAVOR}
> +RUN_DEPENDS =graphics/py-Pillow${MODPY_FLAVOR} \
> + print/py-pikepdf${MODPY_FLAVOR}
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/img2pdf/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 6 Jul 2020 10:07:44 - 1.6
> +++ distinfo 11 Nov 2020 06:03:12 -
> @@ -1,2 +1,2 @@
> -SHA256 (img2pdf-0.3.6.tar.gz) = jNVQmmC3X0RCuJe609WT4l69MUEF8wNKjxfe85akoPs=
> -SIZE (img2pdf-0.3.6.tar.gz) = 91006
> +SHA256 (img2pdf-0.4.0.tar.gz) = 6u5pCrhAPdGpy02xCv7kHdPmx+1jvazgKgEh+f6tsMk=
> +SIZE (img2pdf-0.4.0.tar.gz) = 107027
Re: 回复: [Update] databases/py-sqlparse : Update to 0.4.1
On 2020/11/10 11:28, wen heping wrote:
> Revised patch, now it include:
>i) Update databases/Makefile to remove py-sqlparse
>and py-sqlalchemy-migrate
>ii) Update devel/quirks
>iii) Add "@pkgpath databases/py-sqlports" to pkg/PLIST
>
> Cheers !
> wen
>
> 发件人: Stuart Henderson
> 发送时间: 2020年11月10日 16:05
> 收件人: wen heping
> 抄送: ports@openbsd.org
> 主题: Re: [Update] databases/py-sqlparse : Update to 0.4.1
>
> On 2020/11/10 07:53, wen heping wrote:
> > Hi, ports@:
> >
> > Here is a patch for databases/py-sqlparse:
> > i) Update to 0.4.1
> > ii) Switch to MODPY_DEFAULT_VERSION_3
>
> Whdn moving a port to py3-only, we are using this:
>
> FLAVORS=python3
> FLAVOR= python3
>
> otherwise things get confusing in dependent ports.
>
> It is also necessary to update the Makefile in the parent directory (so
> databases/Makefile) to remove the py2 version, add an entry to devel/quirks
> to merge the old version (see the many existing py- -> py3- entries),
> and add "@pkgpath databases/py-sqlports" to pkg/PLIST.
>
Oops typo, py-sqlparse rather than py-sqlports. But you have used it in
py-sqlalchemy-migrate as well directly. The whole point of this is to
replace the existing py2 package with the new py3 one so it needs
adapting for the port.
Diff inline fixes that, adds missed REVISION bumps, keeps ${MODPY_FLAVOR}
in the dependency, and stops renaming the scripts in /usr/local/bin with
the -3 suffix (which means that @conflict lines must be added too).
I think this is now right but I'm in a hurry today and might have missed
something so not going to commit it now, if someone else checks and is
OK with it then please go ahead :)
Index: databases/Makefile
===
RCS file: /cvs/ports/databases/Makefile,v
retrieving revision 1.406
diff -u -p -r1.406 Makefile
--- databases/Makefile 19 Aug 2020 02:21:51 - 1.406
+++ databases/Makefile 11 Nov 2020 10:15:53 -
@@ -189,13 +189,11 @@
SUBDIR += py-sql,python3
SUBDIR += py-sqlalchemy
SUBDIR += py-sqlalchemy,python3
- SUBDIR += py-sqlalchemy-migrate
SUBDIR += py-sqlalchemy-migrate,python3
SUBDIR += py-sqlite
SUBDIR += py-sqlite2
SUBDIR += py-sqlobject
SUBDIR += py-sqlobject,python3
- SUBDIR += py-sqlparse
SUBDIR += py-sqlparse,python3
SUBDIR += py-storm
SUBDIR += py-sybase
Index: databases/py-sqlalchemy-migrate/Makefile
===
RCS file: /cvs/ports/databases/py-sqlalchemy-migrate/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- databases/py-sqlalchemy-migrate/Makefile3 Jul 2020 21:12:37 -
1.15
+++ databases/py-sqlalchemy-migrate/Makefile11 Nov 2020 10:15:53 -
@@ -5,7 +5,7 @@ COMMENT = schema migration tools for SQ
MODPY_EGG_VERSION =0.13.0
DISTNAME = sqlalchemy-migrate-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
+REVISION = 1
CATEGORIES = databases
@@ -26,15 +26,9 @@ RUN_DEPENDS =databases/py-sqlalchemy${
www/py-tempita${MODPY_FLAVOR}
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
# test needs unported tempest, py-cfgparse & py-scripttest
NO_TEST = Yes
-
-post-install:
- mv ${PREFIX}/bin/migrate \
- ${PREFIX}/bin/migrate${MODPY_BIN_SUFFIX}
- mv ${PREFIX}/bin/migrate-repository \
- ${PREFIX}/bin/migrate-repository${MODPY_BIN_SUFFIX}
.include
Index: databases/py-sqlalchemy-migrate/pkg/PLIST
===
RCS file: /cvs/ports/databases/py-sqlalchemy-migrate/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- databases/py-sqlalchemy-migrate/pkg/PLIST 30 Dec 2019 13:02:48 -
1.6
+++ databases/py-sqlalchemy-migrate/pkg/PLIST 11 Nov 2020 10:15:53 -
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.6 2019/12/30 13:02:48 sthen Exp $
-bin/migrate${MODPY_BIN_SUFFIX}
-bin/migrate-repository${MODPY_BIN_SUFFIX}
+@conflict py-sqlalchemy-migrate-*
+@pkgpath databases/py-sqlalchemy-migrate
+bin/migrate
+bin/migrate-repository
lib/python${MODPY_VERSION}/site-packages/migrate/
lib/python${MODPY_VERSION}/site-packages/migrate/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/migrate/${MODPY_PYCACHE}/
Index: databases/py-sqlparse/Makefile
===
RCS file: /cvs/ports/databases/py-sqlparse/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- databases/py-sqlparse/Makefile 3 Jul 2020 21:12:37 - 1.11
+++ databases/py-sqlparse/Makefile 11 Nov 2020 10:15:53 -
@@ -2,10 +2,9 @@
COMMENT = non-validating SQL parser
-MODPY_EGG_VERSION =
[update] devel/poedit 2.4.1 -> 2.4.2
Hello ports,
Please find attached the update for poedit. The changelog for this
release is:
- Minor improvements to syntax highlighting.
- Improved language and placeholders handling in XLIFF.
- [Windows] Fix issue with running gettext tools on UNC paths.
lightly tested, works here.
Cheers
Index: Makefile
===
RCS file: /cvs/ports/devel/poedit/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile23 Aug 2020 06:35:02 - 1.33
+++ Makefile11 Nov 2020 08:26:40 -
@@ -2,7 +2,7 @@
COMMENT= cross-platform gettext catalogs (PO-files) editor
-V= 2.4.1
+V= 2.4.2
DISTNAME= poedit-${V}
CATEGORIES=devel
Index: distinfo
===
RCS file: /cvs/ports/devel/poedit/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo23 Aug 2020 06:35:02 - 1.6
+++ distinfo11 Nov 2020 08:26:40 -
@@ -1,2 +1,2 @@
-SHA256 (poedit-2.4.1.tar.gz) = cBQ+VcFqiLmyn0jhKwueVXFBd7YLo2f8KdX6bcKEKcM=
-SIZE (poedit-2.4.1.tar.gz) = 2908225
+SHA256 (poedit-2.4.2.tar.gz) = /tmTKpIos4GqNj2DQOtRk9Yf/HYfTzKNPPPM6Pf7zU4=
+SIZE (poedit-2.4.2.tar.gz) = 2915675
