Re: UPDATE: Boost 1.70
On 10/30/2020 9:04 PM, Daniel Dickman wrote: games/pokerth In file included from ../src/net/common/chatcleanermanager.cpp:32: In file included from ../src/net/chatcleanermanager.h:36: In file included from /usr/local/include/boost/asio.hpp:24: In file included from /usr/local/include/boost/asio/basic_datagram_socket.hpp:20: In file included from /usr/local/include/boost/asio/basic_socket.hpp:27: In file included from /usr/local/include/boost/asio/executor.hpp:338: /usr/local/include/boost/asio/impl/executor.hpp:179:22: error: no member named 'context' in 'std::__1::reference_wrapper' Think diff below might fix this one. Sourced from archlinux. With this I was able to check that the game starts up. I had just started looking into this port. This saves me time. Thanks!
Re: [Update] gerbv 2.6.2 -> 2.7.0
Hi Tracey -- On Thursday, October 29, 2020 1:29 PM, Brian Callahan wrote: > Hi Tracey -- > > On Thursday, October 29, 2020 12:53 PM, Tracey Emery tra...@traceyemery.net > wrote: > > > Hello ports and Brian, > > This is an update for gerbv to version 2.7.0. I'm working on another > > port that fails to build with 2.6.2, as there was apparently a bug > > introduced the breaks linking with an undefined reference to screen. The > > port builds fine with this update. Looks like quite a few functions were > > removed, so I bumped the major. > > Thoughts? Ok? > > Thanks for this. I have something similar locally; I'll double check when I > get home a little later today. > > ~Brian make test fails. I looked into it and it looks like the test script wants LD_PRELOAD and friends set. I don't think I like that so much, so I will put on my todo list to fix things. But I don't think that should get in the way of updating. It works fine here. ok for me, and thanks again. ~Brian
Re: [maintainer update] py-setuptools 41.6.0 -> 44.1.1
On Fri, 30 Oct 2020, Kurt Mosiejczuk wrote: > Ping. I've added py-packaging to TEST_DEPENDS to fix the issue daniel@ saw. > (I don't see it because the tests using py-packaging don't run when using > PORTS_PRIVSEP). > > So this went throught a sparc64 bulk without issues. > > ok? > seems like a good time in the release cycle to do this. ok.
Re: UPDATE: Boost 1.70
>
> games/pokerth
>
> In file included from ../src/net/common/chatcleanermanager.cpp:32:
> In file included from ../src/net/chatcleanermanager.h:36:
> In file included from /usr/local/include/boost/asio.hpp:24:
> In file included from
> /usr/local/include/boost/asio/basic_datagram_socket.hpp:20:
> In file included from /usr/local/include/boost/asio/basic_socket.hpp:27:
> In file included from /usr/local/include/boost/asio/executor.hpp:338:
> /usr/local/include/boost/asio/impl/executor.hpp:179:22: error: no member
> named 'context' in 'std::__1::reference_wrapper'
>
>
Think diff below might fix this one. Sourced from archlinux.
With this I was able to check that the game starts up.
Index: Makefile
===
RCS file: /cvs/ports/games/pokerth/Makefile,v
retrieving revision 1.47
diff -u -p -u -r1.47 Makefile
--- Makefile20 Mar 2020 16:44:23 - 1.47
+++ Makefile31 Oct 2020 00:48:37 -
@@ -5,7 +5,7 @@ COMMENT=texas hold'em poker game with o
BROKEN-hppa = needs atomic ops
DISTNAME = pokerth-1.1.2
-REVISION = 5
+REVISION = 6
CATEGORIES=games x11
Index:
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
===
RCS file:
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
diff -N
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
31 Oct 2020 00:48:37 -
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp
+--- src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp.orig
src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp
+@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_
+ * needed.
+ */
+ timer_ptr set_timer(long duration, timer_handler callback) {
+-timer_ptr new_timer = lib::make_shared(
+-lib::ref(*m_io_service),
+-lib::asio::milliseconds(duration)
++timer_ptr new_timer(
++new lib::asio::steady_timer(
++*m_io_service,
++lib::asio::milliseconds(duration))
+ );
+
+ if (config::enable_multithreading) {
+@@ -461,8 +462,7 @@ class connection : public config::socket_type::socket_
+ m_io_service = io_service;
+
+ if (config::enable_multithreading) {
+-m_strand = lib::make_shared(
+-lib::ref(*io_service));
++m_strand.reset(new lib::asio::io_service::strand(*io_service));
+ }
+
+ lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
Index:
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
===
RCS file:
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
diff -N
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
31 Oct 2020 00:48:37 -
@@ -0,0 +1,36 @@
+$OpenBSD$
+
+Index: src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp
+--- src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig
src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp
+@@ -191,8 +191,7 @@ class endpoint : public config::socket_type { (public)
+
+ m_io_service = ptr;
+ m_external_io_service = true;
+-m_acceptor = lib::make_shared(
+-lib::ref(*m_io_service));
++m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
+
+ m_state = READY;
+ ec = lib::error_code();
+@@ -660,9 +659,7 @@ class endpoint : public config::socket_type { (public)
+ * @since 0.3.0
+ */
+ void start_perpetual() {
+-m_work = lib::make_shared(
+-lib::ref(*m_io_service)
+-);
++m_work.reset(new lib::asio::io_service::work(*m_io_service));
+ }
+
+ /// Clears the endpoint's perpetual flag, allowing it to exit when empty
+@@ -826,8 +823,7 @@ class endpoint : public config::socket_type { (public)
+
+ // Create a resolver
+ if (!m_resolver) {
+-m_resolver = lib::make_shared(
+-lib::ref(*m_io_service));
++m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));
+ }
+
+ tcon->set_uri(u);
Index:
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_none_hpp
===
RCS file:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/30 16:44:17 Modified files: net/unifi/lts : Tag: OPENBSD_6_8 Makefile net/unifi/lts/pkg: Tag: OPENBSD_6_8 DESCR Log message: MFC, update unifi/lts DESCR information about security support to past-tense. only use this branch if you have one of the devices that do not work with the unifi/stable release (Broadcom 11ac and Pico M2 flashed with unifi firmware). Prompted by a mail from Jordan Geoghegan.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/30 16:21:50 Modified files: net/unifi : Tag: OPENBSD_6_8 Makefile.inc Log message: oops, this part needed too for last unifi/stable/Makefile change to work
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/30 16:20:34 Modified files: net/unifi/stable: Tag: OPENBSD_6_8 Makefile distinfo Log message: switch unifi/stable in 6.8-stable to a different build of snappy-java, problem reported by claudio@ and Jordan Geoghegan, fixed differently in -current (by moving unifi/stable to a newer branch with newer snappy-java build). this approach to fixing tested by Jordan Geoghegan (though not directly with this diff).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/10/30 16:13:37 Modified files: net/unifi/lts : Makefile net/unifi/lts/pkg: DESCR Log message: Update unifi/lts DESCR information about security support to past-tense. only use this branch if you have one of the devices that do not work with the unifi/stable release (Broadcom 11ac and Pico M2 flashed with unifi firmware). Prompted by a mail from Jordan Geoghegan.
Re: NEW: net/i2p
On Sat, 24 Oct 2020 17:06:41 - "Dimitri Karamazov" : > Ping Both ports looks fine to me. Now someone else need to review the ports and give their OK so we can import the ports into the tree.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2020/10/30 16:07:20 Modified files: lang/ruby/2.7 : Makefile distinfo lang/ruby/2.7/patches: patch-common_mk Log message: Add distpatch to fix crashes when using fibers on sparc64 Also add local patch to compile a couple of fiber-related files with -O0, as that is also needed to prevent the crash on sparc64. Add a second distpatch to fix a regression in 2.7.2 causing a crash when calling ffi_closure_free. OK kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/10/30 14:55:01 Modified files: multimedia/mediainfo: Makefile distinfo Log message: update to 20.09
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2020/10/30 14:42:00 Modified files: multimedia : Makefile Log message: hook up kid3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2020/10/30 14:40:53 Log message: Import Kid3, a multimedia tags editor. The utility supports editing multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF files at once, having full control over ID3v1 & v2 tags. There are both GUI and interactive CLI. input from sthen@ and rsadowski@, okay rsadowski@ Status: Vendor Tag: zhuk Release Tags: zhuk_20201030 N ports/multimedia/kid3/Makefile N ports/multimedia/kid3/distinfo N ports/multimedia/kid3/patches/patch-src_app_cli_standardiohandler_cpp N ports/multimedia/kid3/patches/patch-src_core_CMakeLists_txt N ports/multimedia/kid3/patches/patch-src_gui_CMakeLists_txt N ports/multimedia/kid3/pkg/DESCR N ports/multimedia/kid3/pkg/PLIST No conflicts created by this import
Update games/mnemosyne 2.7.2 (WIP)
Hi,
Here is a draft to update mnemosyne to 2.7.2 (latest). I am using it as
desktop app, webserver and syncserver successfully; it also sync with
the Android application properly.
This port is currently in games/mnemosyne. Would it be possible to move
it under education/mnemosyne? What's the process to do that?
Also, I disabled the google integration because it requires gTTS and
googletrans which aren't in the ports (yet?).
What's the correct approach here? Should I port the missing deps?
Should I work with upstream to have an option to disable google
integration?
(
>From the mnemosyne README:
> - gTTS for Google text-to-speech (https://pypi.org/project/gTTS/)
> - googletrans for Google translate support
> (https://pypi.org/project/googletrans/) Make sure to use the latest
> development version, not the 2.4.0 release!
)
diff --git games/mnemosyne/Makefile games/mnemosyne/Makefile
index f149675850f..76fd82ec4f9 100644
--- games/mnemosyne/Makefile
+++ games/mnemosyne/Makefile
@@ -2,7 +2,7 @@
COMMENT= flash-card tool which optimises your learning process
-MODPY_EGG_VERSION = 2.6.1
+MODPY_EGG_VERSION = 2.7.2
DISTNAME= Mnemosyne-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:L}
CATEGORIES= games education
@@ -17,6 +17,12 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mnemosyne-proj/}
MODULES= lang/python
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+# XXX From anki/Makefile. Is it needed?
+# build needs some of the py-qt5 tools; pull them in via
+# py-qtwebengine so that build fails early on arches where
+# qtwebengine isn't available
+BUILD_DEPENDS = www/py-qtwebengine${MODPY_FLAVOR}
+
MODPY_SETUPTOOLS=yes
RUN_DEPENDS= x11/py-qt5,python3 \
diff --git games/mnemosyne/distinfo games/mnemosyne/distinfo
index ef5ff7b5466..afca1d8651f 100644
--- games/mnemosyne/distinfo
+++ games/mnemosyne/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Mnemosyne-2.6.1.tar.gz) = YzEkG8fK8m/tLk0yw8GNozEWOJtnr2IdpnmpUPCMnHU=
-SIZE (Mnemosyne-2.6.1.tar.gz) = 1269280
+SHA256 (Mnemosyne-2.7.2.tar.gz) = /no7LHyLJW0yYDN2bYj0Y2s41rRM6yVrSyx3ANhP1yc=
+SIZE (Mnemosyne-2.7.2.tar.gz) = 1271414
diff --git games/mnemosyne/patches/patch-mnemosyne_libmnemosyne___init___py games/mnemosyne/patches/patch-mnemosyne_libmnemosyne___init___py
new file mode 100644
index 000..d76360708ea
--- /dev/null
+++ games/mnemosyne/patches/patch-mnemosyne_libmnemosyne___init___py
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: mnemosyne/libmnemosyne/__init__.py
+--- mnemosyne/libmnemosyne/__init__.py.orig
mnemosyne/libmnemosyne/__init__.py
+@@ -156,10 +156,10 @@ class Mnemosyne(Component):
+ "Translator"),
+ ("mnemosyne.libmnemosyne.pronouncer",
+ "Pronouncer"),
+- ("mnemosyne.libmnemosyne.translators.google_translator",
+- "GoogleTranslator"),
+- ("mnemosyne.libmnemosyne.pronouncers.google_pronouncer",
+- "GooglePronouncer"),
++ # ("mnemosyne.libmnemosyne.translators.google_translator",
++ # "GoogleTranslator"),
++ # ("mnemosyne.libmnemosyne.pronouncers.google_pronouncer",
++ # "GooglePronouncer"),
+ ("mnemosyne.libmnemosyne.languages.afrikaans",
+ "Afrikaans"),
+ ("mnemosyne.libmnemosyne.languages.albanian",
diff --git games/mnemosyne/patches/patch-mnemosyne_pyqt_ui_mnemosyne games/mnemosyne/patches/patch-mnemosyne_pyqt_ui_mnemosyne
new file mode 100644
index 000..6ba5d0fdb17
--- /dev/null
+++ games/mnemosyne/patches/patch-mnemosyne_pyqt_ui_mnemosyne
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Index: mnemosyne/pyqt_ui/mnemosyne
+--- mnemosyne/pyqt_ui/mnemosyne.orig
mnemosyne/pyqt_ui/mnemosyne
+@@ -261,12 +261,12 @@ mnemosyne.gui_for_component["CramAll"] = [\
+ mnemosyne.gui_for_component["CramRecent"] = [\
+("mnemosyne.pyqt_ui.review_wdgt_cramming",
+ "ReviewWdgtCramming")]
+-mnemosyne.gui_for_component["GooglePronouncer"] = [\
+- ("mnemosyne.pyqt_ui.pronouncer_dlg",
+-"PronouncerDlg")]
+-mnemosyne.gui_for_component["GoogleTranslator"] = [\
+- ("mnemosyne.pyqt_ui.translator_dlg",
+-"TranslatorDlg")]
++# mnemosyne.gui_for_component["GooglePronouncer"] = [\
++#("mnemosyne.pyqt_ui.pronouncer_dlg",
++# "PronouncerDlg")]
++# mnemosyne.gui_for_component["GoogleTranslator"] = [\
++#("mnemosyne.pyqt_ui.translator_dlg",
++# "TranslatorDlg")]
+
+ # Run Mnemosyne.
+ mnemosyne.initialise(data_dir=data_dir, filename=filename,
diff --git games/mnemosyne/patches/patch-setup_py games/mnemosyne/patches/patch-setup_py
index c7214ce6281..b0a700eae72 100644
--- games/mnemosyne/patches/patch-setup_py
+++ games/mnemosyne/patches/patch-setup_py
@@ -7,8 +7,8 @@ Index: setup.py
else:
base_path = os.path.join(sys.exec_prefix, "lib", "python" + sys.version[:3],
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/30 14:12:35 Modified files: devel : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: py-elftools went python3-only
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/30 14:12:10 Modified files: devel/py-elftools: Makefile distinfo devel/py-elftools/pkg: PLIST Log message: - update to py-elftools-0.27 - switch to python3-only
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/30 13:44:33 Modified files: lang/elixir: Makefile distinfo lang/elixir/pkg: PLIST Log message: update to elixir-1.11.1
NEW: audio/dgedit
Dgedit is drumgizmo drumkit editor is currently in a functioning, but early phase of development. I'll send drumgizmo as a separate port. Dgedit was split up from drumgizmo recently. The editor is a huge help when creating the individual drumkit instruments (snare, kickdrum, toms, crashes and so on). The entire process of taking a bunch of wav files that you've recorded using, for instance, 16 microphones and then converting them into working instruments with hit energy levels is fully supported. I've have run-tested the program, with audio samples, Works well. Any comments/OK's? dgedit.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/30 13:38:27 Modified files: security/pwntools: Makefile distinfo Log message: update to pwntools-4.2.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/30 13:29:08 Modified files: security/py-scp: Makefile distinfo security/py-scp/pkg: PLIST Log message: update to py-scp-0.13.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/30 13:28:51 Modified files: security/boofuzz: Makefile distinfo security/boofuzz/pkg: PLIST Log message: update to boofuzz-0.2.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/30 13:25:57 Modified files: graphics/orthanc/webviewer-plugin: Makefile Added files: graphics/orthanc/webviewer-plugin/patches: patch-Orthanc_Core_Toolbox_cpp patch-Plugin_Cache_CacheManager_h Log message: fix build with newer versions of boost from brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/30 13:18:12 Modified files: net/gupnp : Makefile.inc net/gupnp/av : Makefile net/gupnp/core : Makefile net/gupnp/dlna : Makefile net/gupnp/tools: Makefile Log message: - update HOMEPAGE - most ports in here use meson which get their CONFIGURE_STYLE from the module, so stop setting it to 'gnu' in Makefile.inc by default
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/30 13:17:12 Modified files: net/gupnp/igd : Makefile distinfo net/gupnp/igd/pkg: PLIST Log message: - update to gupnp-igd-1.2.0 - switch to meson
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/30 12:48:36 ports/x11/libhandy/patches Update of /cvs/ports/x11/libhandy/patches In directory cvs.openbsd.org:/tmp/cvs-serv50087/patches Log Message: Directory /cvs/ports/x11/libhandy/patches added to the repository
Re: UPDATE mail/notmuch-0.31
On Tue 27/10/2020 08:38, Olivier Taïbi wrote:
> On Fri, Oct 16, 2020 at 01:22:32PM +0200, Bjorn Ketelaars wrote:
> > Diff below brings notmuch to 0.31. From NEWS [0]:
> > - notmuch now supports Emacs 27.1
> > - add support for moving between threads after
> > notmuch-tree-from-search-thread
> >
> > The test suite completes with 4 failing tests, test.log attached:
> >
> > 1210/1219 tests passed.
> > 3 broken tests failed as expected.
> > 4 tests failed.
> > 2 tests skipped.
> > All tests in 1 file skipped.
> >
> > I'm not sure if these failures are new. Current version in ports hangs
> > during 'make test' after 'Message with quote in Message-Id:'. Probably
> > related with Emacs 27.1. Unfortunately I don't understand these failures
> > and could use some help.
> >
> > No issues found while using this update, in combination with neomutt, on
> > amd64. Python bindings have been build tested only.
> >
> > [0] https://notmuchmail.org/news/release-0.31/
>
> Thanks for the diff, a few comments:
> - REVISION-main = 0 should be removed
> - the changelog mentions "Add notmuch_message_get_flag_st and
> notmuch_message_has_maildir_flag_st, and deprecate the existing non-status
> providing versions", and OpenBSD's src/lib/check_sym confirms that
> notmuch_message_get_flag was removed. I don't think that anything in the
> ports tree uses this symbol, but to be safe one should probably bump the
> library major number.
> - the "realpath" non-portability issue was recently fixed upstream, replacing
> "realpath emacs" by "cd emacs && pwd -P", so perhaps the same fix could be
> applied for 0.31 in ports.
>
> About the tests:
> - I don't think that I experienced a hang in the tests in previous versions.
> - T360-symbol-hiding is just a linking (with relative path) problem, I tried
> fixing it manually (not a permanent solution) and it passed.
> - The "Yen tests" were already failing before, and are not real failures
> (there
> is more than one codepoint representing the Yen symbol, if I remember
> correctly one of these is fullwidth).
> - Now the segfault in "notmuch_database_get_config_list: closed db" in
> T590-libconfig is worrying. I'll send a bug report to the notmuch mailing
> list right now. Note that this test is new in 0.31, so that might not be a
> new problem. Also it is unlikely to be triggered in real life (close a db
> and
> then try to access it) so I don't think that should be a blocker for the
> port.
Thanks for your feedback, and the bug report upstream. New diff below,
which I intent to commit this weekend...unless someone objects.
- Removed forgotten REVISION-main=0
- Major of shared lib has been bumped because of the removal of a symbol
(two new symbols have been added)
- Grabbed two patches from upstream, one of them fixes the segfault that
you have reported upstream and the other addresses the realpath
non-portability issue
- Test T360-symbol-hiding has been fixed by a possibly ugly hack
The only tests failing are the "Yen tests", which were already failing
before.
diff --git Makefile.inc Makefile.inc
index a1a0e2c0411..e0a6a135fce 100644
--- Makefile.inc
+++ Makefile.inc
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.2 2020/08/13 18:21:18 sthen Exp $
-V =0.30
+V =0.31
DISTNAME = notmuch-$V
EXTRACT_SUFX = .tar.xz
diff --git notmuch/Makefile notmuch/Makefile
index dabd27a6f32..fee245de3f6 100644
--- notmuch/Makefile
+++ notmuch/Makefile
@@ -4,10 +4,9 @@ COMMENT-main = mail indexer, tagger and threader
COMMENT-emacs =Emacs bindings for notmuch
PKGNAME-main = notmuch-${V}
-REVISION-main =0
PKGNAME-emacs =notmuch-emacs-${V}
-SHARED_LIBS += notmuch 0.0
+SHARED_LIBS += notmuch 1.0
MULTI_PACKAGES = -main -emacs
DEBUG_PACKAGES = -main
diff --git notmuch/distinfo notmuch/distinfo
index 6acd960833a..159d653a986 100644
--- notmuch/distinfo
+++ notmuch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.30.tar.xz) = Xjuqb+EdZcZ+Jq5Ii+EbMguuBOM2rMnGRiH340SQlvo=
-SIZE (notmuch-0.30.tar.xz) = 711904
+SHA256 (notmuch-0.31.tar.xz) = Vx+g4VOchmErHyssgKOY4I7P71LifvfkjPjjuE+hg5Q=
+SIZE (notmuch-0.31.tar.xz) = 713144
diff --git notmuch/patches/patch-Makefile_global
notmuch/patches/patch-Makefile_global
index 7e12c72b2a3..dcbd72e8ea9 100644
--- notmuch/patches/patch-Makefile_global
+++ notmuch/patches/patch-Makefile_global
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_global,v 1.1.1.1 2020/05/15 08:58:14
sthen Exp $
Index: Makefile.global
--- Makefile.global.orig
+++ Makefile.global
-@@ -16,7 +16,7 @@ else
+@@ -17,7 +17,7 @@ else
DATE:=$(shell date +%F)
endif
diff --git notmuch/patches/patch-configure notmuch/patches/patch-configure
index c09b2e882cb..15ec6a3f606 100644
--- notmuch/patches/patch-configure
+++ notmuch/patches/patch-configure
@@ -1,9 +1,13 @@
$OpenBSD: patch-configure,v 1.4 2020/10/05
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/30 12:21:16 Modified files: x11/bspwm : Makefile x11/sxhkd : Makefile Log message: take maintainership
UPDATE: nextcloudclient-3.0.3
Hi.
Update for nextcloudclient v3.0.3.
Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.0.3
OK?
--
Adriano Barbosa
Index: Makefile
===
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 4 Oct 2020 15:48:32 - 1.10
+++ Makefile 30 Oct 2020 17:51:09 -
@@ -2,7 +2,7 @@
COMMENT = desktop sync client for Nextcloud
-V = 3.0.2
+V = 3.0.3
DISTNAME = nextcloudclient-${V}
GH_ACCOUNT = nextcloud
Index: distinfo
===
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 4 Oct 2020 15:48:32 - 1.8
+++ distinfo 30 Oct 2020 17:51:09 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-3.0.2.tar.gz) = B9gRHkfItjUfcHQ1XgkTQjYyYvk9gc485F3R745qab0=
-SIZE (nextcloudclient-3.0.2.tar.gz) = 19114545
+SHA256 (nextcloudclient-3.0.3.tar.gz) = q9Ah/wbssmciGiIdv4tO/TvY5BgFPMSba2+qKQcXxtg=
+SIZE (nextcloudclient-3.0.3.tar.gz) = 19202718
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: juan...@cvs.openbsd.org 2020/10/30 11:17:01 Modified files: devel/jansson : Makefile Log message: Move HOMEPAGE and MASTER_SITES to https. Suggested by tj@. OK kirby@ (MAINTAINER).
Re: assembler error on trying to port OpenBLAS
On 2020/10/29 20:25, Aisha Tammy wrote: > I'm trying to port OpenBLAS to the tree and am currently getting > some weird assembler errors (port makefile is attached at end math/openblas) not that weird, the source code has inline asm, it is passed to /usr/bin/as which is pretty old and pre-dates support for this being added > Presumably this is happening due to the assembler being used is > the one from base as we don't build the ports egcc with gas for > anything except aarch64 and arm. > I'm kind of stumped here as it seems like using gfortran sets the > compiler to egcc (compiling the above file with cc works). > Is it possible to mix gfortran with base-clang C compiler? > Another (possible) solution would be to build egcc all archs with > the new gas assembler, but that sounds a lot more dangerous and I > don't know enough to know if that is possible/or even a good idea/ > or if it will even work :-/ I think ports/lang/gcc should start using the newer version of gas from ports on i386 and amd64. On these archs it doesn't affect many ports (fortran things, asterisk, seabios [vmm-firmware], maybe one or two others). For other archs there is higher risk as large parts of the ports tree use ports-gcc on most of these. But there's probably less need for the newer assembler on those too.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/10/30 10:21:12 Modified files: archivers/bzip2: Makefile Log message: Stop using -fno-strength-reduce. It is ignored by gcc4 and triggers a warning by clang. Add debug package.
Re: Interest Bump! - [New] sysutils/direnv
Ping. On Sat, 24 Oct 2020 at 21:20, Ashton Fagg wrote: > > Interest bump! > > It was also suggested that new ports should be submitted as a tarball. I > have addressed that (as attached). > > Thanks. > > > Ashton Fagg writes: > > > Hello folks, > > > > I have created a port of direnv (https://direnv.net). It is a utility > > (written in Go) that hooks onto your shell, and lets you define > > project specific environments. > > > > Portcheck is clean. The package builds successfully, I was able to > > pkg_add it to my machine and test it (amd64 with zsh). > > > > There is a small example on the github page, I was able to confirm > > that it is working. `man direnv` and related pages also work. > > > > Any suggestions appreciated. Thanks. direnv.tgz Description: application/gzip
UPDATE: Nono-0.1.2
Hello, Update for Nono to 0.1.2: http://www.pastel-flower.jp/~isaki/nono/ Ok? Comments? Cheers.- -- - gonzalo Index: Makefile === RCS file: /cvs/ports/emulators/nono/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile10 Oct 2020 19:45:45 - 1.7 +++ Makefile30 Oct 2020 16:01:10 - @@ -6,8 +6,7 @@ BROKEN-i386=requires __m128i and simil COMMENT= LUNA-I emulator -DISTNAME= nono-0.1.1 -REVISION= 0 +DISTNAME= nono-0.1.2 CATEGORIES=emulators MAINTAINER=Gonzalo L. R. Index: distinfo === RCS file: /cvs/ports/emulators/nono/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo7 Oct 2020 07:29:04 - 1.3 +++ distinfo30 Oct 2020 16:01:10 - @@ -1,2 +1,2 @@ -SHA256 (nono-0.1.1.tar.gz) = hazrKvpXwNpU7oRFTJD/elylkW+nd1oQRsjnB3fvkBE= -SIZE (nono-0.1.1.tar.gz) = 2335735 +SHA256 (nono-0.1.2.tar.gz) = EoRnTMfEStgyAA/PZVqpZ5GqK7PNmVYxP6bEL0SFQpA= +SIZE (nono-0.1.2.tar.gz) = 2351573
Re: UPDATE: Boost 1.70
graphics/orthanc/webviewer-plugin /pobj/orthanc-plugin-webviewer-2.3/OrthancWebViewer-2.3/Orthanc/Core/Toolbox.cpp:43:10: fatal error: 'boost/uuid/sha1.hpp' file not found #include comms/sigrok/pulseview In file included from pulseview_autogen/mocs_compilation.cpp:6: In file included from pulseview_autogen/4KQHGSF5UX/moc_analogsegment.cpp:10: In file included from pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/analogsegment.hpp:23: In file included from pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/segment.hpp:24: In file included from /pobj/pulseview-0.4.1/pulseview-0.4.1/pv/util.hpp:28: /usr/local/include/boost/multiprecision/cpp_dec_float.hpp:613:12: error: implicit instantiation of undefined template 'boost::serialization::nvp' games/pokerth In file included from ../src/net/common/chatcleanermanager.cpp:32: In file included from ../src/net/chatcleanermanager.h:36: In file included from /usr/local/include/boost/asio.hpp:24: In file included from /usr/local/include/boost/asio/basic_datagram_socket.hpp:20: In file included from /usr/local/include/boost/asio/basic_socket.hpp:27: In file included from /usr/local/include/boost/asio/executor.hpp:338: /usr/local/include/boost/asio/impl/executor.hpp:179:22: error: no member named 'context' in 'std::__1::reference_wrapper'
Re: assembler error on trying to port OpenBLAS
On Thu, Oct 29, 2020 at 08:25:05PM -0400, Aisha Tammy wrote: > I'm trying to port OpenBLAS to the tree and am currently getting > some weird assembler errors (port makefile is attached at end math/openblas) [...] > > Presumably this is happening due to the assembler being used is > the one from base as we don't build the ports egcc with gas for > anything except aarch64 and arm. > I'm kind of stumped here as it seems like using gfortran sets the > compiler to egcc (compiling the above file with cc works). > Is it possible to mix gfortran with base-clang C compiler? it is certainly possible to build OpenBLAS with clang as C compiler and gfortran as Fortran compiler. Not sure how to do this using OpenBLAS port machinery, but CC=clang FC=egfortran cmake && gmake && gmake test works for me on 6.7. It seems that clang's llvm assembler is used in such a configuration. (I suppose egfortran is installed as a part of g95 package, and provides gfortran 8.3) Hope this helps. Dima [...]
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/30 07:28:54 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-316.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/30 07:20:04 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.18.168.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/30 07:19:49 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.16.8.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/30 07:19:38 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py3-botocore-1.19.8.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/30 07:11:31 Modified files: net/gnugk : Makefile distinfo Removed files: net/gnugk/patches: patch-Toolkit_cxx Log message: Update to gnugk-5.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/30 05:27:28 Added files: textproc/libical/patches: patch-src_libical_icalrecur_c Log message: Unbreak with upcoming icu4c update.
Re: TMPDIR for building go ports ?
On Wed, Oct 28, 2020 at 11:01:54PM +0100, Matthieu Herrb wrote:
> On Wed, Oct 28, 2020 at 08:59:14PM +, Stuart Henderson wrote:
> > On 2020/10/28 21:34, Matthieu Herrb wrote:
> > > Hi,
> > >
> > > On one of my machines where I'm building ports, I have a /tmp
> > > partition that is a too small (300MB) for building many of the go
> > > ports (gitea, facette,...)
> > >
> > > Those ports seem to unconditionnaly use /tmp as intermediate storage.
> > >
> > > I've plenty of space under /usr/ports. Is there a knob somehere to
> > > tell ports build (via dpb) to write to, let's say /usr/ports/tmp
> > > instead.
> > >
> > > (I've tried seting the TMPDIR environment variable without success...)
> > >
> > > Thanks.
> > > --
> > > Matthieu Herrb
> > >
> >
> > This might be one way to do it..
>
> That works. Thanks a lot.
>
Hi,
I don't know if there is some interest in having this
committed. During my last bulk build I discovered that it's not fully
ok though. I had to add some additionnal manual creation of go-tmp to
several ports. I don't really understand why the SETUP_WORKSAPCE hook
in go.ports.mk doesn't work for them. Here is the full diff I have:
diff --git databases/influxdb/Makefile databases/influxdb/Makefile
index 347954d2d9c..c9ee16f3863 100644
--- databases/influxdb/Makefile
+++ databases/influxdb/Makefile
@@ -42,6 +42,9 @@ NO_TEST = Yes
MODGO_LDFLAGS +=-X main.version=$V
+pre-configure:
+ mkdir -p ${WRKDIR}/go-tmp
+
do-build:
cd ${WRKSRC} && ${MODGO_BUILD_CMD} ./...
cd ${WRKSRC}/man && ${MAKE_PROGRAM}
diff --git lang/go/go.port.mk lang/go/go.port.mk
index fafa318b562..121d9f85e17 100644
--- lang/go/go.port.mk
+++ lang/go/go.port.mk
@@ -45,6 +45,7 @@ MODGO_GOPATH ?=
${MODGO_WORKSPACE}:${MODGO_PACKAGE_PATH}
# to explicitly disable SSE on i386 builds.
MAKE_ENV +=GO386=387
MAKE_ENV +=GOCACHE="${MODGO_GOCACHE}"
+MAKE_ENV +=GOTMPDIR="${WRKDIR}/go-tmp"
MODGO_CMD ?= ${SETENV} ${MAKE_ENV} go
MODGO_BUILD_CMD = ${MODGO_CMD} install ${MODGO_FLAGS}
@@ -108,6 +109,8 @@ WRKSRC ?=
${WRKDIR}/${MODGO_MODNAME}@${MODGO_VERSION}
MODGO_SETUP_WORKSPACE =ln -sf ${WRKSRC} ${WRKDIR}/${MODGO_MODNAME}
.endif
+MODGO_SETUP_WORKSPACE += mkdir -p ${WRKDIR}/go-tmp;
+
INSTALL_STRIP =
.if ${MODGO_TYPE:L:Mbin}
MODGO_INSTALL_TARGET = ${INSTALL_PROGRAM_DIR} ${PREFIX}/${MODGO_BINDIR} && \
diff --git net/gomuks/Makefile net/gomuks/Makefile
index 8ff935d63ac..c01912c95e2 100644
--- net/gomuks/Makefile
+++ net/gomuks/Makefile
@@ -25,6 +25,9 @@ MAKE_ENV += CGO_CFLAGS=-I${LOCALBASE}/include \
MODULES = lang/go
+pre-configure:
+ mkdir -p ${WRKDIR}/go-tmp
+
MODGO_MODULES =\
github.com/!puerkito!bio/goquery v1.5.1 \
github.com/alecthomas/assert
v0.0.0-20170929043011-405dbfeb8e38 \
diff --git net/miniflux/Makefile net/miniflux/Makefile
index c0ae8829aac..af9e991fb3d 100644
--- net/miniflux/Makefile
+++ net/miniflux/Makefile
@@ -22,6 +22,9 @@ ALL_TARGET = ${MODGO_MODNAME}/...
SUBST_VARS = VARBASE \
SYSCONFDIR
+pre-configure:
+ mkdir -p ${WRKDIR}/go-tmp
+
do-install:
${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/miniflux.app \
${PREFIX}/bin/miniflux
diff --git net/termshark/Makefile net/termshark/Makefile
index e5f6c51a3b1..cb4b9c4e744 100644
--- net/termshark/Makefile
+++ net/termshark/Makefile
@@ -25,6 +25,9 @@ WANTLIB += c pthread
MODULES = lang/go
RUN_DEPENDS = net/wireshark,-text
+pre-configure:
+ mkdir -p ${WRKDIR}/go-tmp
+
MODGO_MODULES =github.com/!burnt!sushi/toml
v0.3.1 \
github.com/!d!a!t!a-!d!o!g/go-sqlmockv1.3.3
\
github.com/alecthomas/template
v0.0.0-20160405071501-a0175ee3bccc \
diff --git security/age/Makefile security/age/Makefile
index 99799b49319..64dd2a16073 100644
--- security/age/Makefile
+++ security/age/Makefile
@@ -44,4 +44,7 @@ MODGO_MODULES = \
gopkg.in/check.v1v1.0.0-20190902080502-41f04d3bba15 \
gopkg.in/yaml.v2 v2.2.4
+pre-configure:
+ mkdir -p ${WRKDIR}/go-tmp
+
.include
diff --git security/ogvt/Makefile security/ogvt/Makefile
index f166b5d8c73..b5d7de34d6d 100644
--- security/ogvt/Makefile
+++ security/ogvt/Makefile
@@ -21,6 +21,9 @@ WANTLIB += c pthread
MODULES = lang/go
+pre-configure:
+ mkdir -p ${WRKDIR}/go-tmp
+
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/${MODGO_BINDIR} && \
${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/* \
diff --git sysutils/beats/packetbeat/Makefile sysutils/beats/packetbeat/Makefile
index b7f2829933e..cc6e763a47d 100644
--- sysutils/beats/packetbeat/Makefile
+++ sysutils/beats/packetbeat/Makefile
@@ -9,6 +9,7 @@ CONFIGS =
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/10/30 02:34:36 Modified files: devel/git : Makefile distinfo Log message: Update to git 2.29.2.
Re: some icu4c fallout
On Fri, Oct 30, 2020 at 12:38:35AM +0100, Matthias Kilian wrote: > Hi, > > it looks like the recent update of icu4c breaks a couple of other > ports (editors/libreoffice, www/webkitgtk4, x11/qt5/qtwebkit, > x11/qt5/qtwebengine, textproc/libical so far for my build). The > reason appears to be that icu4c used to #define TRUE and FALSE but > no lonber does, and the consuming ports relied on TRUE and FALSE. > > TRUE and FALSE are #defined in include/unicode/umachine.h from icu4c, > but are now shielded by an > > #if U_DEFINE_FALSE_AND_TRUE || defined(U_IN_DOXYGEN) > ... > #endif > > umachine.h also has this comment: > > /** > * \def U_DEFINE_FALSE_AND_TRUE > * Normally turns off defining macros FALSE=0 & TRUE=1 in public ICU headers. > * These obsolete macros sometimes break compilation of other code that > * defines enum constants or similar with these names. > * C++ has long defined bool/false/true. > * C99 also added definitions for these, although as macros; see stdbool.h. > * > * You may transitionally define U_DEFINE_FALSE_AND_TRUE=1 if you need time > to migrate code. > * > * @internal ICU 68 > */ > > I'm not sure about the best way to fix the current problems -- patch > icu4c to $define U_DEFINE_FALSE_AND_TRUE 1, patch depending (and > currently broken) ports to #define U_DEFINE_FALSE_AND_TRUE 1, patch > depending ports to no longer use TRUE and FALSE (that would be the > best for submitting upstream). > > Thoughts? I reverted the update for the time being and will see how to fix those. Thanks. -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/30 01:02:01 Modified files: textproc/icu4c : Makefile distinfo textproc/icu4c/patches: patch-source_common_Makefile_in patch-source_common_putil_cpp patch-source_i18n_Makefile_in patch-source_io_Makefile_in patch-source_layoutex_Makefile_in patch-source_stubdata_Makefile_in patch-source_tools_ctestfw_Makefile_in patch-source_tools_toolutil_Makefile_in textproc/icu4c/pkg: PLIST-main Log message: Revert previus; too many breakages I need to fix first.
