CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/05/16 23:29:11 Modified files: x11/tellico: Makefile distinfo x11/tellico/pkg: PLIST Log message: Update tellico to 3.4.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/05/16 23:17:42 Modified files: productivity/homebank: Makefile distinfo productivity/homebank/patches: patch-configure patch-po_POTFILES_in productivity/homebank/pkg: PLIST Log message: Update homebank to 5.5.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/05/16 22:57:28 Modified files: devel/jenkins/devel: Makefile distinfo Log message: Update jenkins-devel to 2.293
Re: [NEW] devel/rapidjson
On 05/16/21 18:05 PM, Stuart Henderson wrote: > On 2021/05/16 09:51, Anthony J. Bentley wrote: >> >> This packages 1.1.0 which was released in 2016. But rapidjson sees >> continuous development in Git, just no releases; see >> https://github.com/Tencent/rapidjson/issues/1759 >> >> As a result, many projects embed newer versions. Are we sure having >> this installed won't break any existing ports? Sorry, I didn't check if any other ports were already including this as a dependency. I found the following using grep in /usr/ports, but I guess that will miss some: devel/leatherman : bundles 1.0.2 in the upstream tar emulators/mgba/ : bundles an unknown version in the upstream tar games/barony : fetches release 1.1.0 in the port makefile games/ja2-stracciatella : bundles 0.11 in the upstream tar net/bro : bundles an unknown version in the upstream tar > > I agree with your concerns. Also ccls uses a specific commit id of > rapidjson as a git submodule: > https://github.com/MaskRay/ccls/tree/master/third_party > Yes, although CMakeLists.txt checks for minimum version 1.1.0 if USE_SYSTEM_RAPIDJSON is true. That might be because Linux distros which aggressively de-vendor dependencies are packaging that. I'm happy to bundle it in ccls and drop the separate port if that's preferred? Or ccls can fetch it directly like games/barony does. > Nick, I think you should just to generate a proper tar for ccls rather than > using the broken github autogenerated one. Sure. But does it need to be hosted permanently somewhere? > > (Also wondering, is ccls going to be another port that is going to need > work every time clang is updated?) I don't know, but I made this on 6.9 originally with clang/LLVM 10 and then rebuilt it without modification after updating to current with 11. -- Thanks, Nick
More haskell ports on the side
I keep a few rough ports out of ports tree at https://github.com/blackgnezdo/ports/commits/hs-ports * stack * hpack * ormolu * hlint * cabal-bundler If you are interested, feel free to use them. If there's sufficient reason to add them to the ports tree, we'll need to polish them first. Thanks Greg
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/05/16 19:54:15 Modified files: net/synapse: Makefile Log message: do-test target wasn't updated when port was moved to python3 only Drop "-3" suffix from do-test target to fix tests.
[Update] devel/py-atomicwrites 1.3.0 -> 1.4.0
This updates devel/py-atomicwrites 1.3.0 -> 1.4.0
I can't find a changelog, but all its tests pass on amd64 and the tests
of its consumers all pass the same or slightly better (generally exactly
the same or one additoinal successful test).
ok?
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/devel/py-atomicwrites/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile3 Jul 2020 21:12:40 - 1.4
+++ Makefile17 May 2021 01:27:55 -
@@ -2,10 +2,9 @@
COMMENT = atomic file writes
-MODPY_EGG_VERSION =1.3.0
+MODPY_EGG_VERSION =1.4.0
DISTNAME = atomicwrites-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/py-atomicwrites/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo26 Jun 2019 19:09:58 - 1.2
+++ distinfo17 May 2021 01:27:55 -
@@ -1,2 +1,2 @@
-SHA256 (atomicwrites-1.3.0.tar.gz) =
dalEW6wC2NBY1eH+aJZUulplVqHf2M5uxVoO15hmz6Y=
-SIZE (atomicwrites-1.3.0.tar.gz) = 11699
+SHA256 (atomicwrites-1.4.0.tar.gz) =
rnA5atGkNPnHBG/S3RlvwEsS+ekf+4WRZBk76LYWino=
+SIZE (atomicwrites-1.4.0.tar.gz) = 11790
Re: new productivity/p5-iCal-Parser
On Fri, Apr 23, 2021 at 11:41:42PM +0200, Alexander Bluhm wrote: > Hi, > > ok to import p5-iCal-Parser 1.21 ? OK afresh1@ > Comment: > parse iCalendar files into a data structure > > Description: > This module processes iCalendar (vCalendar 2.0) files as specified > in RFC 2445 into a data structure. It handles recurrences (`RRULE's), > exclusions (`EXDATE's), event updates (events with a `RECURRENCE-ID'), > and nested data structures (`ATTENDEES' and `VALARM's). It currently > ignores the `VTIMEZONE', `VJOURNAL' and `VFREEBUSY' entry types. > > bluhm
UPDATE: dav1d 0.9.0
Here is an update to dav1d 0.9.0.
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/dav1d/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile28 Mar 2021 09:54:59 - 1.26
+++ Makefile16 May 2021 18:08:58 -
@@ -2,13 +2,13 @@
COMMENT= small and fast AV1 decoder
-VER= 0.8.2
+VER= 0.9.0
DISTNAME= dav1d-${VER}
CATEGORIES=multimedia
MASTER_SITES= https://downloads.videolan.org/pub/videolan/dav1d/${VER}/
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS= dav1d 2.0
+SHARED_LIBS= dav1d 2.1
HOMEPAGE= https://code.videolan.org/videolan/dav1d/
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/dav1d/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo28 Mar 2021 09:54:59 - 1.12
+++ distinfo16 May 2021 18:00:52 -
@@ -1,2 +1,2 @@
-SHA256 (dav1d-0.8.2.tar.xz) = PdkdlrROnYun6CrZ5zDWxXmrXhntyg24V6YPWuag6xM=
-SIZE (dav1d-0.8.2.tar.xz) = 591296
+SHA256 (dav1d-0.9.0.tar.xz) = z66I6AZ8my5bltlaegAVXDUzdv6bmSqWtDNuDqsZ+fY=
+SIZE (dav1d-0.9.0.tar.xz) = 652036
[sparc64] fix graphics/mypaint build
The strategy of setting OPENMP_CFLAG and OPENMP_LDFLAG to an empty
string instead of '-fopenmp' doesn't work for gcc because this then
tries to access("", F_OK) which then results in this error:
egcc: error: : No such file or directory
http://build-failures.rhaalovely.net/sparc64/2021-05-10/graphics/mypaint.log
Instead, we can disable openmp differently. This builds and packages
both on sparc64 and on amd64.
Presumably it's also possible to set an appropriate option in
MODPY_SETUP_ARGS but I couldn't figure out how.
Index: Makefile
===
RCS file: /cvs/ports/graphics/mypaint/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile23 Feb 2021 19:39:26 - 1.4
+++ Makefile16 May 2021 21:02:39 -
@@ -5,7 +5,7 @@ COMMENT = raster graphics editor for dig
MODPY_EGG_VERSION =2.0.1
DISTNAME = mypaint-${MODPY_EGG_VERSION}
EXTRACT_SUFX = .tar.xz
-REVISION = 1
+REVISION = 2
CATEGORIES = graphics
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/graphics/mypaint/patches/patch-setup_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-setup_py
--- patches/patch-setup_py 12 Sep 2020 20:57:21 - 1.1.1.1
+++ patches/patch-setup_py 16 May 2021 21:04:50 -
@@ -5,14 +5,12 @@ OpenBSD does not have OpenMP available i
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -29,8 +29,8 @@ from setuptools.command.install_scripts import install
+@@ -437,7 +437,7 @@ class BuildExt (build_ext):
- # Some versions of clang requires different flag configurations than gcc
- # to link correctly, so we enable configuration via environment variables.
--OPENMP_CFLAG = os.getenv("OPENMP_CFLAG", "-fopenmp")
--OPENMP_LDFLAG = os.getenv("OPENMP_LDFLAG", "-fopenmp")
-+OPENMP_CFLAG = os.getenv("OPENMP_CFLAG", "")
-+OPENMP_LDFLAG = os.getenv("OPENMP_LDFLAG", "")
+ def initialize_options(self):
+ self.set_rpath = False
+-self.disable_openmp = False
++self.disable_openmp = True
+ build_ext.initialize_options(self)
-
- # Libmypaint dependency
+ def finalize_options(self):
python/openbsd7 [Re: graphics/blender fix GLTF2 exporter]
On 2021/05/15 12:27, Jeremie Courreges-Anglas wrote:
> On Sat, May 15 2021, Marc Espie wrote:
> > On Sat, May 15, 2021 at 10:45:19AM +0200, Omar Polo wrote:
> >> "openbsd6" comes directly from python' sys.platform. I find that
> >> strange too, but I assume it's for a good reason. Python (and python
> >> porting) is not really my area of expertise.
> >
> > Nope, there's about zero good reason. Oh well, that's python
net-snmp has similar (can't remember if i already preempted it or not),
and i think some other things that will show up once the release
number is bumped.
we can't really expect other projects to know how openbsd versioning
is done, and that approach does sort-of make sense for some other os
(at least sometimes).
> I know I've had to change some ports to use the
> sys.platform.startswith("openbsd") idiom, indeed it's a bit silly.
sys.platform.startswith("openbsd") seems the best thing to do really,
that's how python stdlib and tests are now doing it.
I suggest if we're patching ports that this is how we should patch them
as it will cope with old python versions, old+new openbsd, and will
still cope if python does later switch to just plain 'openbsd'.
> OpenBSD 7.0 ("openbsd7") is coming soon, now is probably the best time
> to push for a change upstream.
agreed this is the sane way to go, and it would probably be simpler
all round if they did it sooner rather than later.
If anyone contacts them and they push back about doing it outside of
a major python version update, point out that they didn't seem too
concerned about that when they changed EXT_SUFFIX for OpenBSD in
minor version 3.8.7, and that any downstream software currently
using "openbsd6" will be broken in a few months time anyway. ;)
UPDATE: VLC 3.0.14
Here is an update to VLC 3.0.14.
Index: Makefile
===
RCS file: /home/cvs/ports/x11/vlc/Makefile,v
retrieving revision 1.248
diff -u -p -u -p -r1.248 Makefile
--- Makefile3 Apr 2021 11:15:46 - 1.248
+++ Makefile16 May 2021 15:41:58 -
@@ -3,11 +3,10 @@
COMMENT-main= VideoLAN client; multimedia player
COMMENT-jack= JACK audio output module for VLC
-V= 3.0.12
+V= 3.0.14
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-jack= vlc-jack-${V}
-REVISION-main= 0
CATEGORIES=x11
MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${V}/
EXTRACT_SUFX= .tar.xz
@@ -34,13 +33,13 @@ WANTLIB-main= EGL GL ICE Qt5Core Qt5Gui
ffi fontconfig freetype fribidi gbm gcrypt gdk-3 gdk_pixbuf-2.0
\
gio-2.0 glapi glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0 \
gpg-error graphite2 gsm gthread-2.0 gtk-3 harfbuzz \
- hogweed icudata icui18n icuio icuuc idn2 jpeg lcms2 \
- lz4 lzma matroska mp3lame nettle nfs notify ogg opus \
- p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
- pcre2-16 pixman-1 placebo png postproc protobuf-lite \
- rsvg-2 smb2 sndio soxr speex speexdsp ssl swresample \
- swscale tag tar tasn1 theoradec theoraenc tiff unistring \
- usbhid vorbis vorbisenc vpx webp x264 x265 xcb xcb-composite \
+ hogweed icudata icui18n icuuc idn2 jpeg lcms2 lz4 lzma \
+ matroska mp3lame nettle nfs notify ogg opus p11-kit \
+ pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pcre2-16 \
+ pixman-1 placebo png postproc protobuf-lite rsvg-2 \
+ smb2 sndio soxr speex speexdsp ssl swresample swscale \
+ tag tar tasn1 theoradec theoraenc tiff unistring usbhid \
+ vorbis vorbisenc vpx webp x264 x265 xcb xcb-composite \
xcb-dri2 xcb-dri3 xcb-glx xcb-keysyms xcb-present xcb-randr \
xcb-render xcb-shm xcb-sync xcb-xfixes xcb-xv xml2 \
xshmfence xvidcore z zstd ${WANTLIB-common}
Index: distinfo
===
RCS file: /home/cvs/ports/x11/vlc/distinfo,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 distinfo
--- distinfo23 Jan 2021 09:50:09 - 1.44
+++ distinfo16 May 2021 15:43:03 -
@@ -1,2 +1,2 @@
-SHA256 (vlc-3.0.12.tar.xz) = 7/RY84qSEmCU9E8iY8K/LHze8nG0gZLQ/nsXJjiM+Hk=
-SIZE (vlc-3.0.12.tar.xz) = 25997468
+SHA256 (vlc-3.0.14.tar.xz) = Sbk+WzPeqjcGDmskqYIAytcMQHlH8U6yqLagxk2FNaY=
+SIZE (vlc-3.0.14.tar.xz) = 26424968
Index: patches/patch-src_posix_thread_c
===
RCS file: /home/cvs/ports/x11/vlc/patches/patch-src_posix_thread_c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_posix_thread_c
--- patches/patch-src_posix_thread_c3 Apr 2021 11:15:46 - 1.5
+++ patches/patch-src_posix_thread_c29 Apr 2021 15:38:01 -
@@ -1,8 +1,7 @@
$OpenBSD: patch-src_posix_thread_c,v 1.5 2021/04/03 11:15:46 sthen Exp $
-- Make use of clock_gettime() on OpenBSD. Until we have per-process
- timers and can enable _POSIX_TIMERS in unistd.h.
-- Make use of _SC_NPROCESSORS_ONLN.
+Make use of clock_gettime() on OpenBSD. Until we have per-process
+timers and can enable _POSIX_TIMERS in unistd.h.
Index: src/posix/thread.c
--- src/posix/thread.c.orig
@@ -25,12 +24,3 @@ Index: src/posix/thread.c
struct timespec ts;
vlc_clock_setup ();
-@@ -712,6 +712,8 @@ unsigned vlc_GetCPUCount(void)
- count = sysconf (_SC_NPROCESSORS_ONLN);
- free (cpulist);
- return count ? count : 1;
-+#elif defined(_SC_NPROCESSORS_ONLN)
-+return sysconf(_SC_NPROCESSORS_ONLN);
- #elif defined(_SC_NPROCESSORS_CONF)
- return sysconf(_SC_NPROCESSORS_CONF);
- #else
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/05/16 14:11:29 Modified files: sysutils/blackbox_exporter: Makefile distinfo sysutils/blackbox_exporter/pkg: PLIST Added files: sysutils/blackbox_exporter: modules.inc Removed files: sysutils/blackbox_exporter/patches: patch-Makefile_common Log message: update to blackbox_exporter 0.19.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/05/16 13:49:36 Modified files: net/lldpd : Makefile distinfo net/lldpd/patches: patch-src_daemon_priv_c Log message: update to lldpd-1.0.11
[macppc, !rust] cad/kicad* and cad/oce adjustments
Hi,
I've removed BROKEN-powerpc lines in ports that now need rust to be
built, since this arch has no rust support. kicad is one (and the last)
of them:
> $ cd /usr/ports/cad/kicad
> $ make full-build-depends | grep rust
> rust-1.52.1
It requires changes for other ports, and also other !rust archs,
so i preferred to share the diff for this one.
This is very unlikely that kicad will be rust-free in the future, but
who knows :) Also, i mentioned the ridiculous oce build time and lack
of consumers as BROKEN-powerpc reason.
Comments/feedback are welcome,
Charlène.
Index: oce/Makefile
===
RCS file: /cvs/ports/cad/oce/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- oce/Makefile30 Apr 2020 21:05:03 - 1.3
+++ oce/Makefile16 May 2021 19:21:14 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.3 2020/04/30 21:05:03 cwen Exp $
-BROKEN-powerpc = kicad is broken, this is the only consumer (save bulk
time)
+BROKEN-powerpc = no consumers, saves 53 build hours
COMMENT = C++ 3d modeling library
DPB_PROPERTIES = parallel
Index: kicad/Makefile
===
RCS file: /cvs/ports/cad/kicad/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- kicad/Makefile 23 Feb 2021 19:39:10 - 1.45
+++ kicad/Makefile 16 May 2021 19:21:14 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.45 2021/02/23 19:39:10 sthen Exp $
-# Sync cad/kicad-share/Makefile.inc with archs where kicad is broken
-BROKEN-powerpc = segfaults when trying to run the PCB editor
+# Sync cad/kicad-share/Makefile.inc with archs where kicad is broken,
+# or if kicad has no more rust in its build dependencies chain again.
V =5.1.7
COMMENT = schematic and PCB editing software
Index: kicad-share/Makefile.inc
===
RCS file: /cvs/ports/cad/kicad-share/Makefile.inc,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.inc
--- kicad-share/Makefile.inc19 Feb 2021 14:48:11 - 1.6
+++ kicad-share/Makefile.inc16 May 2021 19:21:14 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.6 2021/02/19 14:48:11 tracey Exp $
-NOT_FOR_ARCHS =powerpc
+ONLY_FOR_ARCHS = ${RUST_ARCHS}
PKG_ARCH ?=*
Re: [NEWish] py2-setuptools
On Sun, May 16, 2021 at 08:12:47PM +0100, Stuart Henderson wrote: > On 2021/05/16 14:57, Kurt Mosiejczuk wrote: > > On Sun, May 16, 2021 at 02:50:45PM -0400, Kurt Mosiejczuk wrote: > > > We're now running into python ports that need newer setuptools than the > > > version we have in tree as the last version that supports python2. > > > This "new" port clones the current version off into devel/py2-setuptools. > > > After committing this and the associated glue (also attached) we can look > > > at updating devel/py-setuptools to a more recent version. > > > Feedback? > > The one port that seems to need tweaking if this goes in is devel/py-test. > > It's the only one that explicitly includes py-setuptools as a RUN_DEPENDS > > but still actually has a python2 FLAVOR. > That's the only explicit one (and I don't understand why it does that; > I think the py-setuptools RUN_DEPENDS in py-test can just be removed > completely + bump), but every py2 port with MODPY_SETUPTOOLS=Yes does > register a run dependency so needs a bump for this change. That's an early one I did, so I may have misunderstood an error message. I'll take a look. > Quite a few; > $ sqlite3 /usr/local/share/sqlports "select count(distinct fullpkgpath) from > Depends where DependsPath = 'devel/py-setuptools'; > 338 Yeah. I need to remember that just because dependencies are added out of sight, doesn't mean they don't count for REVISION purposes. > but portbump can probably cope with most of these, maybe even all > of them. I'll take a look at doing just that. --Kurt
Re: [NEWish] py2-setuptools
On 2021/05/16 14:50, Kurt Mosiejczuk wrote: > This "new" port clones the current version off into devel/py2-setuptools. > After committing this and the associated glue (also attached) we can look > at updating devel/py-setuptools to a more recent version. py2-setuptools.tgz is ok with me when the other parts are ready. As well as the bumps in MODPY_SETUPTOOLS users, I think the py2 parts of devel/py-setuptools should be ripped out when changing over.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2021/05/16 13:15:23 Modified files: graphics/krita : Makefile Log message: krita: remove BROKEN-powerpc, it won't build there because rust is in its build dependencies chain.
Re: [NEWish] py2-setuptools
On 2021/05/16 14:57, Kurt Mosiejczuk wrote:
> On Sun, May 16, 2021 at 02:50:45PM -0400, Kurt Mosiejczuk wrote:
> > We're now running into python ports that need newer setuptools than the
> > version we have in tree as the last version that supports python2.
>
> > This "new" port clones the current version off into devel/py2-setuptools.
> > After committing this and the associated glue (also attached) we can look
> > at updating devel/py-setuptools to a more recent version.
>
> > Feedback?
>
> The one port that seems to need tweaking if this goes in is devel/py-test.
>
> It's the only one that explicitly includes py-setuptools as a RUN_DEPENDS
> but still actually has a python2 FLAVOR.
That's the only explicit one (and I don't understand why it does that;
I think the py-setuptools RUN_DEPENDS in py-test can just be removed
completely + bump), but every py2 port with MODPY_SETUPTOOLS=Yes does
register a run dependency so needs a bump for this change.
Quite a few;
$ sqlite3 /usr/local/share/sqlports "select count(distinct fullpkgpath) from
Depends where DependsPath = 'devel/py-setuptools';
338
but portbump can probably cope with most of these, maybe even all
of them.
> So here's the diff that would fix that.
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/py-test/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- Makefile 19 Feb 2021 23:13:02 - 1.37
> +++ Makefile 16 May 2021 18:55:43 -
> @@ -5,7 +5,7 @@ COMMENT= cross-project testing tool for
> MODPY_EGG_VERSION = 4.4.0
> DISTNAME=pytest-${MODPY_EGG_VERSION}
> PKGNAME= py-test-${MODPY_EGG_VERSION}
> -REVISION=2
> +REVISION=3
>
> CATEGORIES= devel
>
> @@ -31,11 +31,13 @@ RUN_DEPENDS = devel/py-atomicwrites${MO
> devel/py-more-itertools${MODPY_FLAVOR} \
> devel/py-pluggy${MODPY_FLAVOR}>=0.9 \
> devel/py-py${MODPY_FLAVOR} \
> - devel/py-setuptools${MODPY_FLAVOR} \
> devel/py-six${MODPY_FLAVOR}
> .if !${FLAVOR:Mpython3}
> RUN_DEPENDS += devel/py-funcsigs \
> - devel/py-pathlib2
> + devel/py-pathlib2 \
> + devel/py2-setuptools
> +.else
> +RUN_DEPENDS += devel/py-setuptools${MODPY_FLAVOR}
> .endif
>
> TEST_DEPENDS = ${FULLPKGNAME}:${FULLPKGPATH} \
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2021/05/16 13:09:53 Modified files: geo/qgis : Makefile Log message: qgis: remove BROKEN-powerpc, it won't build there because rust is in its build dependencies chain.
Re: [NEWish] py2-setuptools
On Sun, May 16, 2021 at 02:50:45PM -0400, Kurt Mosiejczuk wrote:
> We're now running into python ports that need newer setuptools than the
> version we have in tree as the last version that supports python2.
> This "new" port clones the current version off into devel/py2-setuptools.
> After committing this and the associated glue (also attached) we can look
> at updating devel/py-setuptools to a more recent version.
> Feedback?
The one port that seems to need tweaking if this goes in is devel/py-test.
It's the only one that explicitly includes py-setuptools as a RUN_DEPENDS
but still actually has a python2 FLAVOR.
So here's the diff that would fix that.
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/devel/py-test/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile19 Feb 2021 23:13:02 - 1.37
+++ Makefile16 May 2021 18:55:43 -
@@ -5,7 +5,7 @@ COMMENT=cross-project testing tool for
MODPY_EGG_VERSION =4.4.0
DISTNAME= pytest-${MODPY_EGG_VERSION}
PKGNAME= py-test-${MODPY_EGG_VERSION}
-REVISION= 2
+REVISION= 3
CATEGORIES=devel
@@ -31,11 +31,13 @@ RUN_DEPENDS = devel/py-atomicwrites${MO
devel/py-more-itertools${MODPY_FLAVOR} \
devel/py-pluggy${MODPY_FLAVOR}>=0.9 \
devel/py-py${MODPY_FLAVOR} \
- devel/py-setuptools${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR}
.if !${FLAVOR:Mpython3}
RUN_DEPENDS += devel/py-funcsigs \
- devel/py-pathlib2
+ devel/py-pathlib2 \
+ devel/py2-setuptools
+.else
+RUN_DEPENDS += devel/py-setuptools${MODPY_FLAVOR}
.endif
TEST_DEPENDS = ${FULLPKGNAME}:${FULLPKGPATH} \
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/05/16 12:55:07 Modified files: sysutils/firmware/vmm: Makefile distinfo sysutils/firmware/vmm/files: config sysutils/firmware/vmm/patches: patch-Makefile patch-src_boot_c patch-src_fw_paravirt_c patch-src_fw_paravirt_h patch-src_fw_pciinit_c patch-src_fw_smbios_c patch-src_optionroms_c Log message: update to seabios-1.14.0, diff from Brad which matches my earlier diff and tested by mlarkin (some small port tweaks by me on top but not affecting the built objects)
[NEWish] py2-setuptools
We're now running into python ports that need newer setuptools than the
version we have in tree as the last version that supports python2.
This "new" port clones the current version off into devel/py2-setuptools.
After committing this and the associated glue (also attached) we can look
at updating devel/py-setuptools to a more recent version.
Feedback?
--Kurt
py2-setuptools.tgz
Description: application/tar-gz
Index: devel/Makefile
===
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2099
diff -u -p -r1.2099 Makefile
--- devel/Makefile 14 May 2021 21:51:14 - 1.2099
+++ devel/Makefile 16 May 2021 18:48:01 -
@@ -1588,7 +1588,7 @@
SUBDIR += py-serial
SUBDIR += py-serial,python3
SUBDIR += py-setproctitle,python3
- SUBDIR += py-setuptools
+ SUBDIR += py2-setuptools
SUBDIR += py-setuptools,python3
SUBDIR += py-setuptools_git
SUBDIR += py-setuptools_git,python3
Index: lang/python/python.port.mk
===
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.131
diff -u -p -r1.131 python.port.mk
--- lang/python/python.port.mk 23 Feb 2021 22:04:35 - 1.131
+++ lang/python/python.port.mk 16 May 2021 18:48:01 -
@@ -131,7 +131,11 @@ _MODPY_PRE_BUILD_STEPS = :
.if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:L} == "yes"
# The setuptools module provides a package locator (site.py) that is
# required at runtime for the pkg_resources stuff to work
-MODPY_SETUPUTILS_DEPEND ?= devel/py-setuptools${MODPY_FLAVOR}>=39.0.1v0
+. if ${MODPY_MAJOR_VERSION} == 2
+MODPY_SETUPUTILS_DEPEND ?= devel/py2-setuptools
+. else
+MODPY_SETUPUTILS_DEPEND ?= devel/py-setuptools${MODPY_FLAVOR}
+. endif
MODPY_RUN_DEPENDS += ${MODPY_SETUPUTILS_DEPEND}
BUILD_DEPENDS += ${MODPY_SETUPUTILS_DEPEND}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/05/16 12:38:37 Modified files: net: Makefile net/py-socketio-client: Makefile net/py-socketio-client/pkg: PLIST devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Drop unnecessary python2 FLAVOR of net/py-socketio-client tweaks from sthen@ jca@ ok sthen@ jca@
Re: Drop python2 flavor of net/py-socketio-client
On 2021/05/16 14:29, Kurt Mosiejczuk wrote:
> On Sun, May 16, 2021 at 07:25:55PM +0100, Stuart Henderson wrote:
> > On 2021/05/16 14:06, Kurt Mosiejczuk wrote:
> > > py-socketio-client's only consumer, py-ripe.atlas.cousteau, is
> > > python3-only.
> > > We can safely drop the python2 flavor.
>
> > needs an @pkgpath marker
>
> > > my $obsolete_reason = {};
> > > @@ -1206,6 +1207,7 @@ setup_obsolete_reason(
> > > 3 => 'mailpile',
> > > 7 => 'p5-Geo-GDAL',
> > > 3 => 'gnome-latex',
> > > + 31 => 'py-socketio-client',
> > > );
>
> > and remove this
>
> Ah yes. Here's a revised version.
that's the one. OK
> --Kurt
>
> Index: net/py-socketio-client/Makefile
> ===
> RCS file: /cvs/ports/net/py-socketio-client/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- net/py-socketio-client/Makefile 3 Jul 2020 21:13:03 - 1.8
> +++ net/py-socketio-client/Makefile 16 May 2021 18:29:01 -
> @@ -5,7 +5,7 @@ COMMENT = python socket.io client libra
> MODPY_EGG_VERSION = 0.6.7
> DISTNAME = socketIO_client-${MODPY_EGG_VERSION}
> PKGNAME =py-socketIO-client-${MODPY_EGG_VERSION}
> -REVISION = 4
> +REVISION = 5
>
> CATEGORIES = net
>
> @@ -20,7 +20,7 @@ MODPY_SETUPTOOLS = Yes
>
> MODULES =lang/python
> FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> RUN_DEPENDS =devel/py-six${MODPY_FLAVOR} \
> net/py-websocket-client${MODPY_FLAVOR} \
> Index: net/py-socketio-client/pkg/PLIST
> ===
> RCS file: /cvs/ports/net/py-socketio-client/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- net/py-socketio-client/pkg/PLIST 29 May 2020 22:48:41 - 1.2
> +++ net/py-socketio-client/pkg/PLIST 16 May 2021 18:29:01 -
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.2 2020/05/29 22:48:41 sthen Exp $
> +@pkgpath net/py-socketio-client,python3
> lib/python${MODPY_VERSION}/site-packages/socketIO_client/
>
> lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> Index: net/Makefile
> ===
> RCS file: /cvs/ports/net/Makefile,v
> retrieving revision 1.1252
> diff -u -p -r1.1252 Makefile
> --- net/Makefile 24 Apr 2021 00:31:56 - 1.1252
> +++ net/Makefile 16 May 2021 18:29:02 -
> @@ -615,7 +615,6 @@
> SUBDIR += py-slixmpp,python3
> SUBDIR += py-smbc,python3
> SUBDIR += py-snmp
> - SUBDIR += py-socketio-client
> SUBDIR += py-socketio-client,python3
> SUBDIR += py-socks
> SUBDIR += py-socks,python3
> Index: devel/quirks/Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1260
> diff -u -p -r1.1260 Makefile
> --- devel/quirks/Makefile 15 May 2021 09:10:29 - 1.1260
> +++ devel/quirks/Makefile 16 May 2021 18:29:02 -
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-4.13
> +PKGNAME =quirks-4.14
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> Index: devel/quirks/files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1276
> diff -u -p -r1.1276 Quirks.pm
> --- devel/quirks/files/Quirks.pm 15 May 2021 09:10:29 - 1.1276
> +++ devel/quirks/files/Quirks.pm 16 May 2021 18:29:02 -
> @@ -462,6 +462,7 @@ my $stem_extensions = {
> 'py-tdb' => 'py3-tdb',
> 'bijiben' => 'gnome-notes',
> 'connections' => 'gnome-connections',
> + 'py-socketio-client' => 'py3-socketio-client',
> };
>
> my $obsolete_reason = {};
>
Re: Drop python2 flavor of net/py-socketio-client
On Sun, May 16 2021, Kurt Mosiejczuk wrote:
> py-socketio-client's only consumer, py-ripe.atlas.cousteau, is python3-only.
> We can safely drop the python2 flavor.
>
> ok?
See below,
> --Kurt
>
> Index: net/py-socketio-client/Makefile
> ===
> RCS file: /cvs/ports/net/py-socketio-client/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- net/py-socketio-client/Makefile 3 Jul 2020 21:13:03 - 1.8
> +++ net/py-socketio-client/Makefile 16 May 2021 18:05:53 -
> @@ -5,7 +5,7 @@ COMMENT = python socket.io client libra
> MODPY_EGG_VERSION = 0.6.7
> DISTNAME = socketIO_client-${MODPY_EGG_VERSION}
> PKGNAME =py-socketIO-client-${MODPY_EGG_VERSION}
> -REVISION = 4
> +REVISION = 5
I can't see why this would be needed, but if in doubt, bump.
>
> CATEGORIES = net
>
> @@ -20,7 +20,7 @@ MODPY_SETUPTOOLS = Yes
>
> MODULES =lang/python
> FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> RUN_DEPENDS =devel/py-six${MODPY_FLAVOR} \
> net/py-websocket-client${MODPY_FLAVOR} \
> Index: net/Makefile
> ===
> RCS file: /cvs/ports/net/Makefile,v
> retrieving revision 1.1252
> diff -u -p -r1.1252 Makefile
> --- net/Makefile 24 Apr 2021 00:31:56 - 1.1252
> +++ net/Makefile 16 May 2021 18:05:53 -
> @@ -615,7 +615,6 @@
> SUBDIR += py-slixmpp,python3
> SUBDIR += py-smbc,python3
> SUBDIR += py-snmp
> - SUBDIR += py-socketio-client
> SUBDIR += py-socketio-client,python3
> SUBDIR += py-socks
> SUBDIR += py-socks,python3
> Index: devel/quirks/Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1260
> diff -u -p -r1.1260 Makefile
> --- devel/quirks/Makefile 15 May 2021 09:10:29 - 1.1260
> +++ devel/quirks/Makefile 16 May 2021 18:05:53 -
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-4.13
> +PKGNAME =quirks-4.14
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> Index: devel/quirks/files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1276
> diff -u -p -r1.1276 Quirks.pm
> --- devel/quirks/files/Quirks.pm 15 May 2021 09:10:29 - 1.1276
> +++ devel/quirks/files/Quirks.pm 16 May 2021 18:05:54 -
> @@ -462,6 +462,7 @@ my $stem_extensions = {
> 'py-tdb' => 'py3-tdb',
> 'bijiben' => 'gnome-notes',
> 'connections' => 'gnome-connections',
> + 'py-socketio-client' => 'py3-socketio-client',
> };
This hunk automatically replaces py-socketio-client with
py3-socketio-client, thus
> my $obsolete_reason = {};
> @@ -1206,6 +1207,7 @@ setup_obsolete_reason(
> 3 => 'mailpile',
> 7 => 'p5-Geo-GDAL',
> 3 => 'gnome-latex',
> + 31 => 'py-socketio-client',
this hunk is not useful, please drop it. With this addressed, ok jca@
> );
>
> # though it's not yet used, these should be pkgnames, so that eventually
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Drop python2 flavor of net/py-socketio-client
On Sun, May 16, 2021 at 07:25:55PM +0100, Stuart Henderson wrote:
> On 2021/05/16 14:06, Kurt Mosiejczuk wrote:
> > py-socketio-client's only consumer, py-ripe.atlas.cousteau, is python3-only.
> > We can safely drop the python2 flavor.
> needs an @pkgpath marker
> > my $obsolete_reason = {};
> > @@ -1206,6 +1207,7 @@ setup_obsolete_reason(
> > 3 => 'mailpile',
> > 7 => 'p5-Geo-GDAL',
> > 3 => 'gnome-latex',
> > + 31 => 'py-socketio-client',
> > );
> and remove this
Ah yes. Here's a revised version.
--Kurt
Index: net/py-socketio-client/Makefile
===
RCS file: /cvs/ports/net/py-socketio-client/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- net/py-socketio-client/Makefile 3 Jul 2020 21:13:03 - 1.8
+++ net/py-socketio-client/Makefile 16 May 2021 18:29:01 -
@@ -5,7 +5,7 @@ COMMENT = python socket.io client libra
MODPY_EGG_VERSION =0.6.7
DISTNAME = socketIO_client-${MODPY_EGG_VERSION}
PKGNAME = py-socketIO-client-${MODPY_EGG_VERSION}
-REVISION = 4
+REVISION = 5
CATEGORIES = net
@@ -20,7 +20,7 @@ MODPY_SETUPTOOLS =Yes
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
net/py-websocket-client${MODPY_FLAVOR} \
Index: net/py-socketio-client/pkg/PLIST
===
RCS file: /cvs/ports/net/py-socketio-client/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- net/py-socketio-client/pkg/PLIST29 May 2020 22:48:41 - 1.2
+++ net/py-socketio-client/pkg/PLIST16 May 2021 18:29:01 -
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2020/05/29 22:48:41 sthen Exp $
+@pkgpath net/py-socketio-client,python3
lib/python${MODPY_VERSION}/site-packages/socketIO_client/
lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: net/Makefile
===
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1252
diff -u -p -r1.1252 Makefile
--- net/Makefile24 Apr 2021 00:31:56 - 1.1252
+++ net/Makefile16 May 2021 18:29:02 -
@@ -615,7 +615,6 @@
SUBDIR += py-slixmpp,python3
SUBDIR += py-smbc,python3
SUBDIR += py-snmp
- SUBDIR += py-socketio-client
SUBDIR += py-socketio-client,python3
SUBDIR += py-socks
SUBDIR += py-socks,python3
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1260
diff -u -p -r1.1260 Makefile
--- devel/quirks/Makefile 15 May 2021 09:10:29 - 1.1260
+++ devel/quirks/Makefile 16 May 2021 18:29:02 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-4.13
+PKGNAME = quirks-4.14
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1276
diff -u -p -r1.1276 Quirks.pm
--- devel/quirks/files/Quirks.pm15 May 2021 09:10:29 - 1.1276
+++ devel/quirks/files/Quirks.pm16 May 2021 18:29:02 -
@@ -462,6 +462,7 @@ my $stem_extensions = {
'py-tdb' => 'py3-tdb',
'bijiben' => 'gnome-notes',
'connections' => 'gnome-connections',
+ 'py-socketio-client' => 'py3-socketio-client',
};
my $obsolete_reason = {};
[maintainer update] herbstluftwm 0.9.3
Hi,
this updates x11/herbstluftwm to 0.9.3.
Light testing on amd64, no issues found.
I will additionally test i386 when newer snapshot packages are
available. I do not want to build all dependencies from source.
New features, bugfixes and new dependencies are listed here[1].
Comments? OK?
Thanks!
[1] https://github.com/herbstluftwm/herbstluftwm/blob/master/NEWS
Index: Makefile
===
RCS file: /cvs/ports/x11/herbstluftwm/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile6 Mar 2021 12:01:31 - 1.21
+++ Makefile16 May 2021 15:45:52 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.21 2021/03/06 12:01:31 sthen Exp $
COMMENT = manual tiling window manager
-DISTNAME = herbstluftwm-0.9.2
+DISTNAME = herbstluftwm-0.9.3
CATEGORIES = x11
HOMEPAGE = https://herbstluftwm.org/
@@ -12,8 +12,8 @@ MAINTAINER = Lucas , \
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} X11 Xext Xft Xinerama Xrandr c freetype
-WANTLIB += m z
+WANTLIB += ${COMPILER_LIBCXX} X11 Xext Xft Xinerama Xrandr Xrender
+WANTLIB += c freetype m z
MASTER_SITES = https://herbstluftwm.org/tarballs/
Index: distinfo
===
RCS file: /cvs/ports/x11/herbstluftwm/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo6 Mar 2021 12:01:31 - 1.9
+++ distinfo16 May 2021 15:45:52 -
@@ -1,2 +1,2 @@
-SHA256 (herbstluftwm-0.9.2.tar.gz) =
aETjBHYfexxOkhfWpqxwaLzZTmfdsyadstIZh0yGbis=
-SIZE (herbstluftwm-0.9.2.tar.gz) = 448757
+SHA256 (herbstluftwm-0.9.3.tar.gz) =
C6exvQKWbm7v4ngFdTCCQGotKVS8Qf4EDRzKrtJewQU=
+SIZE (herbstluftwm-0.9.3.tar.gz) = 497523
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/herbstluftwm/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 6 Mar 2021 12:01:31 - 1.10
+++ pkg/PLIST 16 May 2021 15:45:52 -
@@ -31,6 +31,7 @@ share/doc/herbstluftwm/examples/q3termin
share/doc/herbstluftwm/examples/savestate.sh
share/doc/herbstluftwm/examples/scratchpad.sh
share/doc/herbstluftwm/examples/toggledualhead.sh
+share/doc/herbstluftwm/examples/unminimize.sh
share/doc/herbstluftwm/examples/windowmenu.sh
share/doc/herbstluftwm/examples/wselect.sh
share/doc/herbstluftwm/hlwm-doc.json
Index: pkg/README
===
RCS file: /cvs/ports/x11/herbstluftwm/pkg/README,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 README
--- pkg/README 3 Nov 2020 19:46:04 - 1.1
+++ pkg/README 16 May 2021 15:45:52 -
@@ -4,6 +4,26 @@ $OpenBSD: README,v 1.1 2020/11/03 19:46:
| Running ${PKGSTEM} on OpenBSD
+---
+Migrating to 0.9.3
+==
+
+The command cycle_value now expects an attribute path instead of a settings
+name. For compatibility reasons, passing settings name directly (without the
+prefix settings.) is still supported.
+
+In ipc commands, herbstclient prints error messages always on stderr and normal
+output always on stdout. Before, both were printed to the same channel, either
+to stdout or stderr depending on the command’s exit status. This mainly
+affects combined commands.
+
+In the rules, toggle can not be used anymore in rule consequences. Moreover,
+invalid arguments to rule consequences now will be reported during rule
+creation, already.
+
+Only for people using the git-version: During the development of 0.9.3, the
+content_geometry attribute of clients initially had the name geometry_reported.
+
+
Migrating to 0.9.0
==
--
greetings,
Florian Viehweger
Re: Drop python2 flavor of net/py-socketio-client
On 2021/05/16 14:06, Kurt Mosiejczuk wrote:
> py-socketio-client's only consumer, py-ripe.atlas.cousteau, is python3-only.
> We can safely drop the python2 flavor.
>
> ok?
>
> --Kurt
>
> Index: net/py-socketio-client/Makefile
> ===
> RCS file: /cvs/ports/net/py-socketio-client/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- net/py-socketio-client/Makefile 3 Jul 2020 21:13:03 - 1.8
> +++ net/py-socketio-client/Makefile 16 May 2021 18:05:53 -
> @@ -5,7 +5,7 @@ COMMENT = python socket.io client libra
> MODPY_EGG_VERSION = 0.6.7
> DISTNAME = socketIO_client-${MODPY_EGG_VERSION}
> PKGNAME =py-socketIO-client-${MODPY_EGG_VERSION}
> -REVISION = 4
> +REVISION = 5
>
> CATEGORIES = net
>
> @@ -20,7 +20,7 @@ MODPY_SETUPTOOLS = Yes
>
> MODULES =lang/python
> FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> RUN_DEPENDS =devel/py-six${MODPY_FLAVOR} \
> net/py-websocket-client${MODPY_FLAVOR} \
needs an @pkgpath marker
> my $obsolete_reason = {};
> @@ -1206,6 +1207,7 @@ setup_obsolete_reason(
> 3 => 'mailpile',
> 7 => 'p5-Geo-GDAL',
> 3 => 'gnome-latex',
> + 31 => 'py-socketio-client',
> );
and remove this
Re: UPDATE: net/py-websocket-client 0.37.0 => 0.59.0
On Tue, May 11, 2021 at 07:31:08PM +, Brian Callahan wrote: > Hello ports -- > Attached is an update to py-websocket-client. It is needed for an update to > streamlink. Tests ok on amd64 and its dependents (only 2 ports) also are ok > with this update. > OK? I just sent a diff for net/py-socketio-client to drop its unneeded python2 FLAVOR. So with that, you could drop the python2 FLAVOR of this port also. Other than that change though, ok kmos --Kurt
Drop python2 flavor of net/py-socketio-client
py-socketio-client's only consumer, py-ripe.atlas.cousteau, is python3-only.
We can safely drop the python2 flavor.
ok?
--Kurt
Index: net/py-socketio-client/Makefile
===
RCS file: /cvs/ports/net/py-socketio-client/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- net/py-socketio-client/Makefile 3 Jul 2020 21:13:03 - 1.8
+++ net/py-socketio-client/Makefile 16 May 2021 18:05:53 -
@@ -5,7 +5,7 @@ COMMENT = python socket.io client libra
MODPY_EGG_VERSION =0.6.7
DISTNAME = socketIO_client-${MODPY_EGG_VERSION}
PKGNAME = py-socketIO-client-${MODPY_EGG_VERSION}
-REVISION = 4
+REVISION = 5
CATEGORIES = net
@@ -20,7 +20,7 @@ MODPY_SETUPTOOLS =Yes
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
net/py-websocket-client${MODPY_FLAVOR} \
Index: net/Makefile
===
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1252
diff -u -p -r1.1252 Makefile
--- net/Makefile24 Apr 2021 00:31:56 - 1.1252
+++ net/Makefile16 May 2021 18:05:53 -
@@ -615,7 +615,6 @@
SUBDIR += py-slixmpp,python3
SUBDIR += py-smbc,python3
SUBDIR += py-snmp
- SUBDIR += py-socketio-client
SUBDIR += py-socketio-client,python3
SUBDIR += py-socks
SUBDIR += py-socks,python3
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1260
diff -u -p -r1.1260 Makefile
--- devel/quirks/Makefile 15 May 2021 09:10:29 - 1.1260
+++ devel/quirks/Makefile 16 May 2021 18:05:53 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-4.13
+PKGNAME = quirks-4.14
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1276
diff -u -p -r1.1276 Quirks.pm
--- devel/quirks/files/Quirks.pm15 May 2021 09:10:29 - 1.1276
+++ devel/quirks/files/Quirks.pm16 May 2021 18:05:54 -
@@ -462,6 +462,7 @@ my $stem_extensions = {
'py-tdb' => 'py3-tdb',
'bijiben' => 'gnome-notes',
'connections' => 'gnome-connections',
+ 'py-socketio-client' => 'py3-socketio-client',
};
my $obsolete_reason = {};
@@ -1206,6 +1207,7 @@ setup_obsolete_reason(
3 => 'mailpile',
7 => 'p5-Geo-GDAL',
3 => 'gnome-latex',
+ 31 => 'py-socketio-client',
);
# though it's not yet used, these should be pkgnames, so that eventually
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/05/16 11:55:09 Modified files: x11/kde-applications/akonadi-calendar-tools: Makefile Log message: Fix: 1 line longer than 80 chars
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/05/16 11:15:25 Modified files: comms/syncterm : Makefile Log message: Mark comms/syncterm BROKEN-sparc64 ok jcs@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/05/16 11:14:41 Modified files: net/sniproxy : Makefile Log message: Fix build on sparc64 by using ports-gcc rather than base-gcc "looks fine to me" Renaud Allard (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/05/16 11:13:19 Modified files: x11/gnome/libadwaita: Makefile Log message: Fix build on sparc64 by using ports-gcc rather than base-gcc ok ajacoutot@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/05/16 11:12:24 Modified files: textproc/gtranslator: Makefile Log message: base-gcc needs to be told to use c99 for build to work on sparc64 ok ajacoutot@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/05/16 11:11:41 Modified files: editors/vim: Makefile editors/vim/pkg: PFRAG.gtk3-main Log message: vim: tweak @pkgpath marker, should fix issue with updating gtk2->gtk3 seen by jsg
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/05/16 11:11:18 Modified files: benchmarks/fio : Makefile Log message: Fix build on sparc64 by preferring ports-gcc on base-gcc arches ok kurt@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/05/16 11:10:44 Modified files: audio/beets: Makefile Added files: audio/beets/patches: patch-beetsplug_lyrics_py Log message: merge a newer version of lyrics.py plugin from beets git; fixes an "AttributeError: 'NoneType' object has no attribute 'get_text'" which occurs with the old version. from Johan Huldtgren
Re: [NEW] devel/rapidjson
On 2021/05/16 09:51, Anthony J. Bentley wrote: > Hi, > > Nick Gasson writes: > > Please find attached a new port devel/rapidjson which I'm packaging as a > > dependency of ccls (a C/C++ language server) which I'll send out > > shortly. > > This packages 1.1.0 which was released in 2016. But rapidjson sees > continuous development in Git, just no releases; see > https://github.com/Tencent/rapidjson/issues/1759 > > As a result, many projects embed newer versions. Are we sure having > this installed won't break any existing ports? I agree with your concerns. Also ccls uses a specific commit id of rapidjson as a git submodule: https://github.com/MaskRay/ccls/tree/master/third_party Nick, I think you should just to generate a proper tar for ccls rather than using the broken github autogenerated one. (Also wondering, is ccls going to be another port that is going to need work every time clang is updated?)
mozillas and i386
I=4773 B=822 Q=3866 T=1315 F=0 !=359 E=www/tor-browser/browser(i386-2) www/firefox-esr(i386-3) mail/mozilla-thunderbird(i386-2) www/mozilla-firefox(i386-2) The mozillas are now failing on i386; presumably this is rust now using too much RAM? libc++abi: terminating with uncaught exception of type std::bad_alloc: std::bad_alloc error: could not compile `style` Caused by: process didn't exit successfully: `CARGO=/usr/local/bin/cargo CARGO_CRATE_NAME=style CARGO_MANIFEST_DIR=/pobj/firefo x-esr-78.10.1/firefox-78.10.1/servo/components/style CARGO_PKG_AUTHORS='The Servo Project Developers' CARGO_PKG_DESCRI PTION='' CARGO_PKG_HOMEPAGE='' CARGO_PKG_LICENSE=MPL-2.0 CARGO_PKG_LICENSE_FILE='' CARGO_PKG_NAME=style CARGO_PKG_REPO SITORY='' CARGO_PKG_VERSION=0.0.1 CARGO_PKG_VERSION_MAJOR=0 CARGO_PKG_VERSION_MINOR=0 CARGO_PKG_VERSION_PATCH=1 CARGO_ PKG_VERSION_PRE='' LD_LIBRARY_PATH='/pobj/firefox-esr-78.10.1/build-i386/release/deps:/usr/local/lib' OUT_DIR=/pobj/fi refox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/build/style-48ca883c6d3fcf2a/out /usr/local/bin/rustc --crat e-name style servo/components/style/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts --crate-type lib --emit=dep-info,metadata,link -C opt-level=2 -C panic=abort -C embed-bitcode=no --cfg 'feature="bindgen"' --cfg 'f eature="gecko"' --cfg 'feature="nsstring"' --cfg 'feature="regex"' --cfg 'feature="serde"' --cfg 'feature="toml"' -C m etadata=607dca80604d3cb4 -C extra-filename=-607dca80604d3cb4 --out-dir /pobj/firefox-esr-78.10.1/build-i386/i686-unkno wn-openbsd/release/deps --target i686-unknown-openbsd -C linker=/pobj/firefox-esr-78.10.1/firefox-78.10.1/build/cargo- linker -L dependency=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps -L dependency=/pobj/firefo x-esr-78.10.1/build-i386/release/deps --extern app_units=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/rel ease/deps/libapp_units-78e24579651f5587.rmeta --extern arrayvec=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-open bsd/release/deps/libarrayvec-16805f30c7e75df8.rmeta --extern atomic_refcell=/pobj/firefox-esr-78.10.1/build-i386/i686- unknown-openbsd/release/deps/libatomic_refcell-74ea3c32afec4de3.rmeta --extern bitflags=/pobj/firefox-esr-78.10.1/buil d-i386/i686-unknown-openbsd/release/deps/libbitflags-b3b7090eb3c4be7c.rmeta --extern byteorder=/pobj/firefox-esr-78.10 .1/build-i386/i686-unknown-openbsd/release/deps/libbyteorder-3cfc4f8578749070.rmeta --extern cssparser=/pobj/firefox-e sr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libcssparser-d2d62141de04a137.rmeta --extern derive_more=/pobj /firefox-esr-78.10.1/build-i386/release/deps/libderive_more-97b7fda4b036510c.so --extern euclid=/pobj/firefox-esr-78.1 0.1/build-i386/i686-unknown-openbsd/release/deps/libeuclid-3bf0e9dc36f433d0.rmeta --extern fallible=/pobj/firefox-esr- 78.10.1/build-i386/i686-unknown-openbsd/release/deps/libfallible-4c8be9d82c368a06.rmeta --extern fxhash=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libfxhash-3ccd9fd5870c9016.rmeta --extern hashbrown=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libhashbrown-a9707fe560439409.rmeta --extern hashglobe=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libhashglobe-1ec8b64c34da2666.rmeta --extern indexmap=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libindexmap-3130c8dfb73b9b72.rmeta --extern itertools=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libitertools-b0123265ae5381cc.rmeta --extern itoa=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libitoa-9274668ad931c239.rmeta --extern lazy_static=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/liblazy_static-19fad46e3fec4a76.rmeta --extern log=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/liblog-42d007ed39a686cf.rmeta --extern malloc_size_of=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libmalloc_size_of-64119b8858a5cb45.rmeta --extern malloc_size_of_derive=/pobj/firefox-esr-78.10.1/build-i386/release/deps/libmalloc_size_of_derive-c5b7786c520a328b.so --extern matches=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libmatches-b49cbb697b154e80.rmeta --extern debug_unreachable=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libdebug_unreachable-96389ad62242967e.rmeta --extern nsstring=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libnsstring-20ea7fb9a5b48495.rmeta --extern num_derive=/pobj/firefox-esr-78.10.1/build-i386/release/deps/libnum_derive-bf0e7a5a3abcce23.so --extern num_integer=/pobj/firefox-esr-78.10.1/build-i386/i686-unknown-openbsd/release/deps/libnum_integer-d5135fac670df05b.rmeta --extern
Re: [sparc64] Fix build of benchmarks/fio
On 2021/05/16 14:23, Marc Espie wrote:
> On Sun, May 16, 2021 at 12:19:09AM -0400, Kurt Mosiejczuk wrote:
> > On Sat, May 15, 2021 at 10:04:29PM -0600, Theo de Raadt wrote:
> > > It is a both-compilers architecture.
> >
> > It has both in base, but ports doesn't consider it having clang in base.
> >
> > It's not listed under CLANG_ARCHS
>
> If base has switched to using clang for default builds, ports should as
> well...
> cautiously, with a bulk ;)
>
It has not; the place to check this is GCC4_ARCH in bsd.own.mk which
takes priority over CLANG_ARCH. (both-compilers and preferring clang would
look like amd64 did until recently; special exemption in ".if
!empty(GCC4_ARCH:M${_arch})\nBUILD_GCC4?=yes").
Specifically ports can't use base-clang unless X is also built with
base-clang (and likewise if X is built with base-clang then ports must be
too).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2021/05/16 10:12:10 Modified files: math : Makefile Log message: +superlu
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2021/05/16 10:11:31 Log message: sparse linear equations, future dependency of some stuff I'm working on okay rsadowski@ with minor cosmetic changes Status: Vendor Tag: espie Release Tags: ports N ports/math/superlu/Makefile N ports/math/superlu/distinfo N ports/math/superlu/pkg/PLIST N ports/math/superlu/pkg/DESCR No conflicts created by this import
Re: [NEW] devel/rapidjson
Hi, Nick Gasson writes: > Please find attached a new port devel/rapidjson which I'm packaging as a > dependency of ccls (a C/C++ language server) which I'll send out > shortly. This packages 1.1.0 which was released in 2016. But rapidjson sees continuous development in Git, just no releases; see https://github.com/Tencent/rapidjson/issues/1759 As a result, many projects embed newer versions. Are we sure having this installed won't break any existing ports? -- Anthony J. Bentley
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/05/16 09:14:28 Modified files: sysutils : Makefile Log message: hook up sysutils/find2perl to the build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/05/16 09:13:03 Log message: Import sysutils/find2perl 1.005. find2perl is a little translator to convert find(1) command lines to equivalent Perl code. The resulting code is typically faster than running find(1) itself. ok bluhm@ Status: Vendor Tag: naddy Release Tags: naddy_20210516 N ports/sysutils/find2perl/Makefile N ports/sysutils/find2perl/distinfo N ports/sysutils/find2perl/pkg/DESCR N ports/sysutils/find2perl/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/05/16 08:56:43 Modified files: x11/kde-applications/akonadiconsole: Makefile Log message: Clean up CONFIGURE_ARGS
Re: NEW Port: math/superlu
On Sun May 16, 2021 at 02:21:28PM +0200, Marc Espie wrote: > SuperLU is a sparse matrix linear equation solving library. > > It's a required dependency of something else I'm trying to port (opentoonz) > > This port itself is not a problem, I explicitly disabled the fortran > API unless someone asks for it. Build and the tests are good. Makefile tweaks: - Remove empty lines - Remove spaces before tabs - TRUE, FALSE => ON/OFF ... otherwise OK rsadowski --- Makefile.orig Sun May 16 16:16:27 2021 +++ MakefileSun May 16 16:17:02 2021 @@ -1,30 +1,28 @@ # $OpenBSD$ -COMMENT = library for solving sparse linear equation systems +COMMENT = library for solving sparse linear equation systems +GH_ACCOUNT = xiaoyeli +GH_PROJECT = superlu +GH_TAGNAME = v5.2.2 -GH_ACCOUNT = xiaoyeli -GH_PROJECT = superlu -GH_TAGNAME = v5.2.2 +SHARED_LIBS += superlu 0.0 # 5.2.2 -SHARED_LIBS += superlu 0.0 # 5.2.2 +CATEGORIES = math -CATEGORIES = math +HOMEPAGE = https://portal.nersc.gov/project/sparse/superlu/ -HOMEPAGE = https://portal.nersc.gov/project/sparse/superlu/ - # Mostly BSD PERMIT_PACKAGE = Yes -WANTLIB += m blas +WANTLIB += m blas -MODULES = devel/cmake +MODULES = devel/cmake LIB_DEPENDS = math/blas CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON -CONFIGURE_ARGS += -DUSE_XSDK_DEFAULTS=TRUE -CONFIGURE_ARGS += -DXSDK_ENABLE_Fortran=FALSE - +CONFIGURE_ARGS += -DUSE_XSDK_DEFAULTS=ON +CONFIGURE_ARGS += -DXSDK_ENABLE_Fortran=OFF .include
Re: [sparc64] Fix build of benchmarks/fio
On Sun, 2021-05-16 at 00:19 -0400, Kurt Mosiejczuk wrote: > On Sat, May 15, 2021 at 10:04:29PM -0600, Theo de Raadt wrote: > > > > It is a both-compilers architecture. > It has both in base, but ports doesn't consider it having clang in base. > > It's not listed under CLANG_ARCHS > > --Kurt Ah, I see. okay on your diff then. Thanks, -Kurt
Re: [NEW] devel/rapidjson
On Sun May 16, 2021 at 09:08:54PM +0800, Nick Gasson wrote: > Hi, > > Please find attached a new port devel/rapidjson which I'm packaging as a > dependency of ccls (a C/C++ language server) which I'll send out > shortly. > > Description: > > RapidJSON is a self-contained and header-only JSON parser and generator > for C++ with both SAX and DOM style APIs. It fully supports UTF-8, > UTF-16, UTF-32 (LE & BE) and also optionally supports SSE2/SSE4.2 for > acceleration. > > Categories: devel > > -- > Thanks, > Nick > OK rsadowski with NO_BUILD=Yes
[NEW] devel/rapidjson
Hi, Please find attached a new port devel/rapidjson which I'm packaging as a dependency of ccls (a C/C++ language server) which I'll send out shortly. Description: RapidJSON is a self-contained and header-only JSON parser and generator for C++ with both SAX and DOM style APIs. It fully supports UTF-8, UTF-16, UTF-32 (LE & BE) and also optionally supports SSE2/SSE4.2 for acceleration. Categories: devel -- Thanks, Nick rapidjson.tgz Description: rapidjson.tgz
[NEW] devel/ccls
Hi, I've attached a new port for ccls, a C/C++ language server (for code completion, indexing, etc.). Description: ccls is a C/C++/Objective-C language server supporting most features of the LSP protocol including code completion, cross references, formatting, caller/callee hierarchies, symbol renaming, diagnostics, semantic highlighting, and more. Categories: devel This (and the rapidjson dependency) is my first attempt at making a port so appreciate any feedback. I've run portcheck and been using it myself for a few weeks with Emacs lsp-mode. -- Thanks, Nick ccls.tgz Description: ccls.tgz
Re: [sparc64] Fix build of net/sniproxy
I can't test, but it looks fine to me. On 16/05/2021 05:42, Kurt Mosiejczuk wrote: net/sniproxy needs ports-gcc to compiler on sparc64 Fixes the build on sparc64 ok? (cc maintainer) --Kurt Index: Makefile === RCS file: /cvs/ports/net/sniproxy/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile13 Mar 2021 09:19:41 - 1.4 +++ Makefile16 May 2021 03:34:06 - @@ -15,6 +15,9 @@ MAINTAINER = Renaud Allard +COMPILER = base-clang ports-gcc +COMPILER_LANGS = c + # use pledge() WANTLIB += c ev pcre udns smime.p7s Description: S/MIME Cryptographic Signature
Re: [sparc64] Fix build of benchmarks/fio
On Sun, May 16, 2021 at 12:19:09AM -0400, Kurt Mosiejczuk wrote: > On Sat, May 15, 2021 at 10:04:29PM -0600, Theo de Raadt wrote: > > It is a both-compilers architecture. > > It has both in base, but ports doesn't consider it having clang in base. > > It's not listed under CLANG_ARCHS If base has switched to using clang for default builds, ports should as well... cautiously, with a bulk ;)
NEW Port: math/superlu
SuperLU is a sparse matrix linear equation solving library. It's a required dependency of something else I'm trying to port (opentoonz) This port itself is not a problem, I explicitly disabled the fortran API unless someone asks for it. superlu.tgz Description: application/tar-gz
wip - unbreak graphics/mapnik
The attached patch updates mapnik from 3.0.10 to 3.1.0.
* This resolves the undefined unicode string that broke
earlier releases of mapnik.
* I am unable to figure out how to set the XMLPARSER to
libxml2 so that OpenStreetMap map files can be parsed
by mapnik-render. I've tried setting it in MODSCONS_FLAGS,
and in this patch set it is currently set in MODSCONS_ENV.
The XML parsing issue is described at:
https://github.com/mapnik/mapnik/wiki/InstallationTroubleshooting
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 06069ab7617..6413f46db4e 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -1,19 +1,19 @@
# $OpenBSD: Makefile,v 1.37 2021/02/23 19:39:25 sthen Exp $
-BROKEN = undefined reference to '_ZN6icu_5613UnicodeStringC1EOS0_'
-
# out of memory, renderer_common/process_group_symbolizer.cpp
# powerpc OOM's on expression_grammar.cpp
ONLY_FOR_ARCHS = amd64
COMMENT = toolkit for developing mapping applications
-DISTNAME = mapnik-v3.0.10
-PKGNAME = ${DISTNAME:S/v//}
-EXTRACT_SUFX = .tar.bz2
-REVISION = 5
+V =3.1.0
+DISTNAME = mapnik-${V}
+
+GH_ACCOUNT =mapnik
+GH_PROJECT =mapnik
+GH_TAGNAME =v${V}
-SHARED_LIBS = mapnik 3.0 #3.0
+SHARED_LIBS = mapnik 3.1 #3.1
CATEGORIES = graphics geo
HOMEPAGE = http://mapnik.org/
@@ -23,14 +23,13 @@ DPB_PROPERTIES = nojunk
# LGPLv2.1
PERMIT_PACKAGE = Yes
-WANTLIB += X11 Xau Xdmcp Xext Xrender boost_filesystem-mt
-WANTLIB += boost_program_options-mt boost_regex-mt harfbuzz webp
-WANTLIB += boost_system-mt c cairo expat fontconfig freetype
-WANTLIB += gdal glib-2.0 gobject-2.0 iconv icuuc intl jpeg m pcre pixman-1
-WANTLIB += png>=17.0 pq proj pthread sqlite3 tiff
-WANTLIB += xcb xcb-render xcb-shm z ${COMPILER_LIBCXX}
+WANTLIB += X11 Xau Xdmcp Xext Xrender boost_filesystem
+WANTLIB += boost_program_options boost_regex harfbuzz webp
+WANTLIB += boost_system ffi icudata icui18n c cairo expat fontconfig freetype
+WANTLIB += gdal glib-2.0 gobject-2.0 icuuc intl jpeg m pcre pixman-1
+WANTLIB += png>=17.0 pq pthread sqlite3 tiff
+WANTLIB += xcb xcb-render xcb-shm xml2 z ${COMPILER_LIBCXX}
-MASTER_SITES = http://mapnik.s3.amazonaws.com/dist/v3.0.10/
MODULES = devel/scons \
lang/python
MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
@@ -42,14 +41,16 @@ MODGCC4_ARCHS = amd64 i386 powerpc sparc64
TEST_DEPENDS = shells/bash \
${BUILD_PKGPATH}
+BUILD_DEPENDS = geo/osrm-backend
+
LIB_DEPENDS = devel/boost>=1.58 \
databases/sqlite3 \
graphics/cairo \
graphics/libwebp \
- devel/proj \
devel/harfbuzz \
geo/gdal \
- textproc/icu4c
+ textproc/icu4c \
+ textproc/libxml
# Scons sucks. Use WARNING_CXXFLAGS as a way to pass freetype2 includes
MODSCONS_FLAGS = PREFIX="${TRUEPREFIX}" \
@@ -61,8 +62,12 @@ MODSCONS_FLAGS = PREFIX="${TRUEPREFIX}" \
WARNING_CXXFLAGS="-I${X11BASE}/include/freetype2" \
SYSTEM_FONTS=${X11BASE}/lib/X11/fonts/TTF/ \
FAST=yes \
+ CUSTOM_LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
INPUT_PLUGINS=raster,postgis,shape,gdal,ogr,sqlite
+MODSCONS_ENV = XMLPARSER=libxml2
+
+
pre-configure:
# subst shlib version
${SUBST_CMD} ${WRKSRC}/src/build.py
diff --git a/graphics/mapnik/distinfo b/graphics/mapnik/distinfo
index a85213a8ed8..124442ccf58 100644
--- a/graphics/mapnik/distinfo
+++ b/graphics/mapnik/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mapnik-v3.0.10.tar.bz2) = NkC87Bl6NO4HgVPmZ8NEM9pbceAvH6fBSAEtl702qjk=
-SIZE (mapnik-v3.0.10.tar.bz2) = 86209028
+SHA256 (mapnik-3.1.0.tar.gz) = R8RLUIqZEIDcCj1CKa30vf+C/KjXv5QYVkRHVHeutl4=
+SIZE (mapnik-3.1.0.tar.gz) = 10473693
diff --git a/graphics/mapnik/patches/patch-SConstruct
b/graphics/mapnik/patches/patch-SConstruct
index 6646a9a0c61..d3982ff3403 100644
--- a/graphics/mapnik/patches/patch-SConstruct
+++ b/graphics/mapnik/patches/patch-SConstruct
@@ -1,8 +1,8 @@
$OpenBSD: patch-SConstruct,v 1.7 2016/09/04 16:46:57 landry Exp $
2nd chunk is needed for proper boost_thread detection
SConstruct.origFri Feb 26 03:02:05 2016
-+++ SConstruct Sun Sep 4 17:29:08 2016
-@@ -290,7 +290,7 @@ opts.AddVariables(
+--- SConstruct.origFri Jan 8 06:20:06 2021
SConstruct Sat May 15 02:43:25 2021
+@@ -297,7 +297,7 @@
('CUSTOM_LDFLAGS', 'Custom linker flags, e.g. -L if you have
libraries in a nonstandard directory ', ''),
EnumVariable('LINKING', "Set library format for libmapnik",'shared',
['shared','static']),
EnumVariable('RUNTIME_LINK', "Set preference for linking
dependencies",'shared', ['shared','static']),
@@ -10,14 +10,13 @@ $OpenBSD: patch-SConstruct,v 1.7 2016/09/04 16:46:57 landry
Exp $
+
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/05/16 05:58:36 Modified files: x11/qt6/qtdeclarative: Makefile Log message: yet another missing dependency, today vulkan Pointed by naddy, thanks
Re: New: sysutils/find2perl
On Sat, May 15, 2021 at 11:26:06PM +0200, Christian Weisgerber wrote: > Alexander Bluhm: > > > A test dependecy to devel/p5-Devel-FindPerl is missing. > > > > I think @comment the dummy module out. > > Incorporated. > OK to import? OK bluhm@
Re: CVS: cvs.openbsd.org: ports
On Sun, May 16, 2021 at 03:44:05AM -0600, Marc Espie wrote: > CVSROOT: /cvs > Module name: ports > Changes by: es...@cvs.openbsd.org 2021/05/16 03:44:05 > > Modified files: > graphics : Makefile > > Log message: > +gimp > +gimp-qt > > The actual commit was right.. pointed by aja@ :)
Re: www/p5-HTTP-Cookies : Update to 6.10
overwhelmed with other things, and behind on OpenBSD versions so no testing, is a simple changes from 6.08, which was the last update I made locally, and tested. Ok from me On 16/05/2021 08:40, wen heping wrote: > Hi, > > Here is a patch for www/p5-HTTP-Cookies to update to 6.10, it > build well and pass all tests on amd64-6.9 system. > >5 ports depends on it ,all build well and pass all tests on amd64-6.9 > system. > > > > wen >
UPDATE archivers/zstd-1.5.0
Diff below updates zstd to 1.5.0, which is a major release featuring
large performance improvements as well as API changes. Overview on
changes can be found at
https://github.com/facebook/zstd/releases/tag/v1.5.0.
Changes to the port:
- Bumped major of libzstd because of removal of symbols
- Synced patches
Testing:
- 'make test' runs successful
- Run with several consumers
- Build tested consumers listed by:
echo "select fullpkgpath from depends where dependspath='archivers/zstd'" |
sqlite3 /usr/local/share/sqlports
Comments/OK?
diff --git Makefile Makefile
index 5d870dca9ef..063fcc3cb1a 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,10 @@
COMMENT = zstandard fast real-time compression algorithm
-V =1.4.9
+V =1.5.0
DISTNAME = zstd-${V}
-SHARED_LIBS = zstd5.0 # 1.4.9
+SHARED_LIBS = zstd6.0 # 1.5.0
CATEGORIES = archivers
diff --git distinfo distinfo
index 1560e8c4b44..6753a634ff2 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.4.9.tar.gz) = Kax04Z6ihlkBc2GXYkDEtcXCTbO4kzhzGm/rl8A40pM=
-SIZE (zstd-1.4.9.tar.gz) = 1821109
+SHA256 (zstd-1.5.0.tar.gz) = UZT7+ngfz0W5jF6EllGqezsKAIxrctSg23YPMAIpHpQ=
+SIZE (zstd-1.5.0.tar.gz) = 1851389
diff --git patches/patch-lib_Makefile patches/patch-lib_Makefile
index 07e5f754160..0ea7011ec09 100644
--- patches/patch-lib_Makefile
+++ patches/patch-lib_Makefile
@@ -7,7 +7,7 @@ $OpenBSD: patch-lib_Makefile,v 1.11 2021/03/06 19:31:22 bket
Exp $
Index: lib/Makefile
--- lib/Makefile.orig
+++ lib/Makefile
-@@ -52,7 +52,7 @@ endif
+@@ -55,7 +55,7 @@ endif
CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
-DDYNAMIC_BMI2=0 -DNDEBUG
else
@@ -16,7 +16,7 @@ Index: lib/Makefile
endif
DEBUGLEVEL ?= 0
-@@ -63,7 +63,7 @@ endif
+@@ -66,7 +66,7 @@ endif
DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
-Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
-Wstrict-prototypes -Wundef -Wpointer-arith \
@@ -25,12 +25,12 @@ Index: lib/Makefile
-Wredundant-decls -Wmissing-prototypes -Wc++-compat
CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
FLAGS = $(CPPFLAGS) $(CFLAGS)
-@@ -428,8 +428,6 @@ install-shared:
+@@ -456,8 +456,6 @@ install-shared:
[ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
@echo Installing shared library
$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
- ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
- ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+ .PHONY: install-includes
install-includes:
- [ -e $(DESTDIR)$(INCLUDEDIR) ] || $(INSTALL) -d -m 755
$(DESTDIR)$(INCLUDEDIR)/
diff --git patches/patch-tests_Makefile patches/patch-tests_Makefile
index e353a9d57ee..11cd4ef92f7 100644
--- patches/patch-tests_Makefile
+++ patches/patch-tests_Makefile
@@ -5,12 +5,12 @@ Some compilers don't have -Wvla
Index: tests/Makefile
--- tests/Makefile.orig
+++ tests/Makefile
-@@ -36,7 +36,7 @@ CFLAGS ?= -O3
+@@ -37,7 +37,7 @@ CFLAGS ?= -O3
CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow
\
-Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement
\
-Wstrict-prototypes -Wundef
\
- -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings
\
+ -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
- -Wredundant-decls -Wmissing-prototypes
+ -Wredundant-decls -Wmissing-prototypes
-Wno-deprecated-declarations
CFLAGS += $(DEBUGFLAGS)
CPPFLAGS += $(MOREFLAGS)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2021/05/16 03:50:19 Modified files: net/telepathy/folks/patches: patch-backends_eds_lib_edsf-persona_vala Log message: merged upstream
Re: unbreak games/supertux [Was: Re: games/supertux startup error]
Nam Nguyen writes:
Ping. Diff is inline for convenience.
> Nam Nguyen writes:
>
>> Here is a diff for unbreaking games/supertux, which segfaults on
>> startup. I opened an issue explaining the bug here:
>> https://github.com/SuperTux/supertux/issues/1726
>
> Here is a fresh diff for games/supertux 0.6.2, released on May 14,
> 2020.
>
> Changelogs:
> https://github.com/SuperTux/supertux/releases/tag/v0.6.2
> https://github.com/SuperTux/supertux/releases/tag/v0.6.1
>
> This diff:
> - updates to 0.6.2
> - backports proper fix for out-of-bounds memory read. see:
>
> https://github.com/SuperTux/supertux/commit/e1b89118f370f8a2ab8703ae98f5e3e9c3f4387d
>
> https://github.com/SuperTux/supertux/commit/1241e3361dd8443306fe37eae7de6badaf8c3aef
> - does not use fixed tux-statue.png
>
> https://github.com/SuperTux/supertux/commit/20eae9e21f42c46e8c336dd8394cbf86249405a0
>
>>
>> I bisected and found a commit from 2.0.10 that caused this segfault:
>> https://github.com/libsdl-org/SDL/commit/670f3d3327912b299e8e5ea9de4f01bd833414cc
>>
>> It reads out of bounds memory due to usage of SIMD functions since SDL
>> 2.0.10. My workaround is to make the resolution larger for the affected
>> image. I get the same backtrace on startup.
>>
>> Tests and feedback are welcome. OK? I would like to get this in to
>> unbreak games/supertux, but it is almost ports lock.
>
> To display FPS in the terminal:
> $ LIBGL_SHOW_FPS=1 supertux2
>
> I found some quirks while testing:
> - level music will eventually stop looping. restarting level in the menu
> fixes this.
> - performance stays at 60 FPS most of the time
> - ps4 controller works with right analog stick used to pan the camera
> (equivalent to home/end/pgdn/pgup)
> - Performance randomly drops sometimes to 40 fps after I get killed or
> switch window focus. It eventually recovers. Fullscreen seems to give
> more stable framerate. This is likely due to other processes running, as
> noticed in top(1).
>
> This is for after ports-unlock. As suggested by sthen@ I would like to
> commit to -stable at that time.
>
> I received OK pascal@ for previous workaround diff:
> Pascal Stumpf writes:
>
>> This is working for me. OK.
>
> Feedback and tests are welcome. Previously, Marcus MERIGHI and pascal@
> tested the workaround diff. OK?
Index: Makefile
===
RCS file: /cvs/ports/games/supertux/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile25 Feb 2021 22:26:02 - 1.23
+++ Makefile20 Apr 2021 00:46:35 -
@@ -2,10 +2,9 @@
COMMENT = jump 'n' run game
-V =0.6.0
+V =0.6.2
DISTNAME = SuperTux-v${V}-Source
PKGNAME = supertux-$V
-REVISION = 2
CATEGORIES = games
Index: distinfo
===
RCS file: /cvs/ports/games/supertux/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo4 Feb 2019 10:02:07 - 1.4
+++ distinfo20 Apr 2021 00:46:35 -
@@ -1,2 +1,2 @@
-SHA256 (SuperTux-v0.6.0-Source.tar.gz) =
xMPl+m+Q6HuMWtayKheempg5v5l+fyGeIrvNHJciOsA=
-SIZE (SuperTux-v0.6.0-Source.tar.gz) = 131203604
+SHA256 (SuperTux-v0.6.2-Source.tar.gz) =
JqnlbqLShBSISfMjkXfXd92ltnWhCrLXbuZYVMkf9Zg=
+SIZE (SuperTux-v0.6.2-Source.tar.gz) = 174295862
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/games/supertux/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt4 Feb 2019 10:02:07 - 1.4
+++ patches/patch-CMakeLists_txt20 Apr 2021 00:46:35 -
@@ -11,7 +11,7 @@ Index: CMakeLists.txt
set(BUILD_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/data")
set(BUILD_CONFIG_DATA_DIR "${CMAKE_BINARY_DIR}/data")
-@@ -249,7 +249,8 @@ if(NOT USE_SYSTEM_PHYSFS)
+@@ -256,7 +256,8 @@ if(NOT USE_SYSTEM_PHYSFS)
-DLIB_SUFFIX=${LIB_SUFFIX}
-DPHYSFS_BUILD_SHARED=${PHYSFS_BUILD_SHARED}
-DPHYSFS_BUILD_STATIC=${PHYSFS_BUILD_STATIC}
@@ -21,7 +21,7 @@ Index: CMakeLists.txt
if(WIN32)
add_library(physfs_lib SHARED IMPORTED)
-@@ -392,7 +393,9 @@ ExternalProject_Add(squirrel
+@@ -404,7 +405,9 @@ ExternalProject_Add(squirrel
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
@@ -32,7 +32,7 @@ Index: CMakeLists.txt
if(WIN32)
add_library(squirrel_lib SHARED IMPORTED)
-@@ -435,7 +438,8 @@ ExternalProject_Add(tinygettext
+@@ -454,7 +457,8 @@ ExternalProject_Add(tinygettext
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-DSDL2_LIBRARIES=${SDL2_LIBRARIES}
-DSDL2_INCLUDE_DIRS=${SDL2_INCLUDE_DIRS}
@@ -42,7 +42,7 @@ Index: CMakeLists.txt
add_library(tinygettext_lib STATIC IMPORTED)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2021/05/16 03:47:28 Modified files: graphics/gmic/patches: patch-CMakeLists_txt patch-src_CImg_h patch-src_gmic_cpp patch-src_gmic_stdlib_cpp patch-src_stdlib_defs_h Log message: comment on patches
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/05/16 03:45:16 Modified files: x11/gnome/seahorse-sharing: Makefile x11/gnome/seahorse-sharing/pkg: PLIST Log message: Regen WANTLIB+PLIST
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2021/05/16 03:44:05 Modified files: graphics : Makefile Log message: +gimp +gimp-qt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2021/05/16 03:42:24 Log message: gmic plugins for gimp and qt. Both are more less the same program for different hosts. Organized as sub-ports, because they yield totally different files, so flavors made little sense okay @solene Status: Vendor Tag: espie Release Tags: ports N ports/graphics/gmic-qt/Makefile N ports/graphics/gmic-qt/distinfo N ports/graphics/gmic-qt/Makefile.inc N ports/graphics/gmic-qt/patches/patch-CMakeLists_txt N ports/graphics/gmic-qt/patches/patch-src_gmic_cpp N ports/graphics/gmic-qt/pkg/DESCR N ports/graphics/gmic-qt/gimp/Makefile N ports/graphics/gmic-qt/gimp/pkg/PLIST N ports/graphics/gmic-qt/krita/Makefile N ports/graphics/gmic-qt/krita/pkg/PLIST No conflicts created by this import
Re: www/p5-HTTP-Message : Update to 6.31
On 16/05/2021 08:02, wen heping wrote: > Hi, > > Here is a patch for www/p5-HTTP-Message to update to 6.31, > it build well and pass all tests on amd64-6.9 system. > > 32 ports depends on it, I have tested some of it , such as: > www/p5-Dancer > www/p5-Plack > www/p5-Catalyst-Runtime > www/p5-HTML-Form > did not meet any problems, all build well and pass all tests. > > wen overwhelmed with other things, and behind on OpenBSD versions so no testing, is a simple changes from 6.24, which was the last update I made locally, and tested. Ok from me
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2021/05/16 03:40:38 Log message: gmic is a weird scripting language for graphics operation pipeline, which comes with a ton of algorithms and can yield 500+ filters for krita/gimp. Even though it's a bit hard to master, the results are impressive. okay solene@ Status: Vendor Tag: espie Release Tags: ports N ports/graphics/gmic/Makefile N ports/graphics/gmic/distinfo N ports/graphics/gmic/patches/patch-CMakeLists_txt N ports/graphics/gmic/patches/patch-src_gmic_cpp N ports/graphics/gmic/patches/patch-src_CImg_h N ports/graphics/gmic/patches/patch-src_gmic_stdlib_cpp N ports/graphics/gmic/patches/patch-src_stdlib_defs_h N ports/graphics/gmic/pkg/PLIST N ports/graphics/gmic/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/05/16 03:38:04 Modified files: x11/gnome/seahorse-nautilus: Makefile distinfo x11/gnome/seahorse-nautilus/pkg: PLIST Added files: x11/gnome/seahorse-nautilus/patches: patch-meson_build patch-tool_meson_build patch-tool_seahorse-widget_c Removed files: x11/gnome/seahorse-nautilus/patches: patch-configure Log message: Update to seahorse-nautilus-3.11.92.1.
Re: update net/libtorrent-rasterbar 1.2.11
Stuart Henderson writes:
> I suggest using ${MODPY_EGG_VERSION} in setup.py and instead of cp,
> use "${SUBST_CMD} -m $mode -c $file1 $file2"
>> RCS file: files/setup.py
>> diff -N files/setup.py
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ files/setup.py 5 Apr 2021 05:36:16 -
>> @@ -0,0 +1,195 @@
>> +#!/usr/bin/env python3
>
> ${MODPY_BIN} here perhaps?
Here is a fresh diff. It does the following:
- Uses ${MODPY_EGG_VERSION} and SUBST_CMD in setup.py to only have to
update version in one place (from sthen@)
- Uses ${MODPY_BIN} in ${FILESDIR}/setup.py (from sthen@)
- Removes -L{LOCALBASE}/lib in ${FILESDIR}/setup.py. Python bindings
incorrectly linked -ltorrent-rasterbar with
/usr/local/lib/libtorrent-rasterbar.so.3.0 instead of the freshly
built ${WRKSRC}/src/.libs/libtorrent-rasterbar.so.4.0.
To do this I modified ${FILESDIR}/setup.py:
cfg_vars[key] = value.replace('-L${LOCALBASE}/lib/', '')
mariani@ still OK? Looking for another OK in addition to
commit. Feedback and tests are welcome.
Details
===
Steps to reproduce:
1. pkg_add libtorrent-rasterbar (1.2.10p0)
2. /usr/local/lib/libtorrent-rasterbar.so.3.0 is picked up.
3. install this version 1.2.13
4. import libtorrent in python interpreter
$ python3
Python 3.8.8 (default, Apr 28 2021, 15:17:34)
[Clang 11.1.0 ] on openbsd6
Type "help", "copyright", "credits" or "license" for more information.
>>> import libtorrent
python3:/usr/local/lib/python3.8/site-packages/libtorrent.cpython-38.so:
undefined symbol '_ZN10libtorrent14session_handle6pausedE'
Traceback (most recent call last):
File "", line 1, in
ImportError: Cannot load specified object
Set a breakpoint in ${FILESDIR}/setup.py before ext = [Extension(
import pdb; pdb.set_trace()
Note "-L/usr/local/lib" in BLDSHARED and LDSHARED.
(Pdb) print(cfg_vars)
{'ABIFLAGS': '', 'AC_APPLE_UNIVERSAL_BUILD': 0,
'AIX_GENUINE_CPLUSPLUS': 0, 'ALT_SOABI': 0, 'ANDROID_API_LEVEL': 0,
'AR': 'ar', 'ARFLAGS': 'rcs', 'BASECFLAGS': '-Wno-unused-result
-Wsign-compare -Wunreachable-code', 'BASECPPFLAGS': '', 'BASEMODLIBS':
'', 'BINDIR': '/usr/local/bin', 'BINLIBDEST':
'/usr/local/lib/python3.8', 'BLDLIBRARY': '-L. -lpython3.8',
'BLDSHARED': 'cc -pthread -shared -fPIC -L/usr/local/lib/
-L/usr/obj/ports/Python-3.8.8/Python-3.8.8 -L/usr/local/lib/',
...
'LDSHARED': 'cc -pthread -shared -fPIC -L/usr/local/lib/
-L/usr/obj/ports/Python-3.8.8/Python-3.8.8 -L/usr/local/lib/'
This is the problematic line with the first two -L/usr/local/lib messing
up the search path for -ltorrent-rasterbar. With the fix, these two go
away:
c++ -pthread -shared -fPIC -L/usr/local/lib/
-L/usr/obj/ports/Python-3.8.8/Python-3.8.8 -L/usr/local/lib/ -O2 -pipe
bindings/python/src/alert.o
...
-L../../src/.libs -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib
-ltorrent-rasterbar -lboost_system-mt -lpthread -lboost_system-mt
-lboost_python38-mt -lpthread -lssl -lcrypto -o
build/lib.openbsd-6.9-amd64-3.8/libtorrent.cpython-38.so -fvisibility=hidden
-fvisibility-inlines-hidden /usr/local/lib/libiconv.so.7.0
> On 2021/04/24 01:47, Nam Nguyen wrote:
>> "Elias M. Mariani" writes:
>>
>> > Tested build on amd64.
>> >
>> > OK mariani@
>>
>> Ping for 1.2.13 update. The diff is pasted inline for convenience. I
>> would like another OK in addition to mariani@'s, focusing on my proposal
>> that carrying an old 1.2.11 ${FILESDIR}/setup.py is maintainable (with
>> backup plan going back to b2 and new setup.py if it ever stops
>> working). rsadowski@ gave an OK on an older 1.2.11 diff.
>>
>> >
>> > Cheers.
>> >
>> >
>> > On Mon, Apr 5, 2021 at 3:28 AM Nam Nguyen wrote:
>>
>> >> Here is a fresh diff with some tweaks. Need some additional feedback on
>> >> carrying the old 1.2.11 ${FILESDIR}/setup.py.
>> >>
>> >> Please find a fresh diff that additionally:
>> >> - remove autotools and use CONFIGURE_STYLE = gnu now that my pull
>> >> request was accepted for 1.2.13. configure now correctly detects the
>> >> default C++ standard. see:
>> >> https://github.com/arvidn/libtorrent/pull/5026
>> >> - removes patches/patch-configure_ac
>> >>
>> >> as before:
>> >> - major bump because check_sym reports removed symbols. one such removed
>> >> symbol is parameter change for add_read_buffer:
>> >> see:
>> >> https://github.com/arvidn/libtorrent/commit/6522fc46f599c49f96d184498e2ce2e4d95ed0ea
>> >> check_sym: https://namtsui.com/public/check_sym_libtorrent.txt
>> >> - carry ${FILESDIR}/setup.py from 1.2.11 because 1.2.12 relies on
>> >> boost-build (see justification inline).
>> >>
>> >> Carrying an old setup.py is relatively safe. I have a hacky WIP that
>> >> actually successfully builds libtorrent-rasterbar using the new setup.py
>> >> and boost-build (b2). There are unresolved issues:
>> >> - I had to create /usr/local/lib/libtorrent-rasterbar.so because the new
>> >> setup.py cannot cope with openbsd's versioning (e.g.,
>> >> libtorrent-rasterbar.so.4.0)
>> >> - I needed to specify BOOST_ROOT as boost's
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/05/16 03:17:26 Modified files: meta/gnome : Makefile Log message: Remove RDEP on x11/gnome/online-miners; it's only used by gnome-documents.
www/p5-HTTP-Cookies : Update to 6.10
Hi, Here is a patch for www/p5-HTTP-Cookies to update to 6.10, it build well and pass all tests on amd64-6.9 system. 5 ports depends on it ,all build well and pass all tests on amd64-6.9 system. wen Index: Makefile === RCS file: /cvs/ports/www/p5-HTTP-Cookies/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile3 Jul 2020 21:46:02 - 1.5 +++ Makefile16 May 2021 07:38:12 - @@ -2,9 +2,8 @@ COMMENT = HTTP Cookie jars -DISTNAME = HTTP-Cookies-6.04 +DISTNAME = HTTP-Cookies-6.10 CATEGORIES = www -REVISION = 0 MAINTAINER = Nigel Taylor Index: distinfo === RCS file: /cvs/ports/www/p5-HTTP-Cookies/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo27 Aug 2017 21:56:41 - 1.2 +++ distinfo16 May 2021 07:38:12 - @@ -1,2 +1,2 @@ -SHA256 (HTTP-Cookies-6.04.tar.gz) = DMfweQedytgpP+o2h171jdG/11zhpsJEzXPtlSPrE9Q= -SIZE (HTTP-Cookies-6.04.tar.gz) = 39502 +SHA256 (HTTP-Cookies-6.10.tar.gz) = 4282Yzxc5rXkuHb/z3R4fMXv4HNt1/SHvdc8FPC9cAc= +SIZE (HTTP-Cookies-6.10.tar.gz) = 42448
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: js...@cvs.openbsd.org 2021/05/16 01:40:45 Modified files: lang/go: Makefile distinfo lang/go/pkg: PLIST Log message: Update lang/go to 1.16.4.
powerpc64 bulk build report
Bulk build on powerpc64.ports.openbsd.org Started : Fri May 14 10:12:21 MDT 2021 Finished: Sun May 16 01:37:11 MDT 2021 Duration: 1 Days 15 hours 25 minutes Built using OpenBSD 6.9-current (GENERIC.MP) #197: Thu May 13 12:28:59 MDT 2021 Built 9302 packages Number of packages built each day: May 14: 3419 May 15: 3415 May 16: 2468 Critical path missing pkgs: http://build-failures.rhaalovely.net/powerpc64/2021-05-14/summary.log Build failures: 12 http://build-failures.rhaalovely.net/powerpc64/2021-05-14/devel/p5-MooseX-LogDispatch.log http://build-failures.rhaalovely.net/powerpc64/2021-05-14/games/astromenace.log http://build-failures.rhaalovely.net/powerpc64/2021-05-14/inputmethods/scim-hangul.log http://build-failures.rhaalovely.net/powerpc64/2021-05-14/mail/elm.log http://build-failures.rhaalovely.net/powerpc64/2021-05-14/math/gbc.log http://build-failures.rhaalovely.net/powerpc64/2021-05-14/multimedia/synfigstudio.log http://build-failures.rhaalovely.net/powerpc64/2021-05-14/net/bro.log http://build-failures.rhaalovely.net/powerpc64/2021-05-14/productivity/gnucash.log http://build-failures.rhaalovely.net/powerpc64/2021-05-14/security/gpgme.log http://build-failures.rhaalovely.net/powerpc64/2021-05-14/sysutils/u-boot,aarch64.log http://build-failures.rhaalovely.net/powerpc64/2021-05-14/x11/gnome/calculator.log http://build-failures.rhaalovely.net/powerpc64/2021-05-14/x11/qt5/docs,-html.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/05/16 01:31:06 Modified files: x11/gnome/maps : Makefile Log message: Missing dep on x11/libhandy.
Re: [sparc64] Fix build of x11/gnome/libadwaita
On Sun, May 16, 2021 at 12:20:56AM -0400, Kurt Mosiejczuk wrote: > libadwaita needs ports-gcc on sparc64 to build libadwaita successfully > > ok? OK > > --Kurt > > Index: Makefile > === > RCS file: /cvs/ports/x11/gnome/libadwaita/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- Makefile 14 May 2021 13:51:29 - 1.1.1.1 > +++ Makefile 16 May 2021 03:57:33 - > @@ -16,6 +16,9 @@ SHARED_LIBS += adwaita-1 > # LGPLv2.1+ > PERMIT_PACKAGE= Yes > > +COMPILER=base-clang ports-gcc > +COMPILER_LANGS= c > + > WANTLIB += c cairo fribidi gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 > WANTLIB += graphene-1.0 gtk-4 intl m pango-1.0 > > -- Antoine
Re: [base-gcc/sparc64] Fix build of textproc/gtranslator
On Sat, May 15, 2021 at 11:40:20PM -0400, Kurt Mosiejczuk wrote:
> textproc/gtranslator needs c99 so we need to tell base-gcc to use it.
>
> Fixes build on sparc64
>
> ok?
OK
>
> --Kurt
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/gtranslator/Makefile,v
> retrieving revision 1.87
> diff -u -p -r1.87 Makefile
> --- Makefile 14 May 2021 08:28:54 - 1.87
> +++ Makefile 16 May 2021 03:27:15 -
> @@ -37,4 +37,9 @@ MODGNOME_TOOLS= desktop-file-utils gtk-
>
> DEBUG_PACKAGES= ${BUILD_PACKAGES}
>
> +.include
> +.if !${PROPERTIES:Mclang}
> +CFLAGS +=-std=gnu99
> +.endif
> +
> .include
>
--
Antoine
www/p5-HTTP-Message : Update to 6.31
Hi, Here is a patch for www/p5-HTTP-Message to update to 6.31, it build well and pass all tests on amd64-6.9 system. 32 ports depends on it, I have tested some of it , such as: www/p5-Dancer www/p5-Plack www/p5-Catalyst-Runtime www/p5-HTML-Form did not meet any problems, all build well and pass all tests. wen Index: Makefile === RCS file: /cvs/ports/www/p5-HTTP-Message/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- Makefile3 Jul 2020 21:46:02 - 1.8 +++ Makefile16 May 2021 06:55:56 - @@ -2,9 +2,8 @@ COMMENT = HTTP Style Messages -DISTNAME = HTTP-Message-6.13 +DISTNAME = HTTP-Message-6.31 CATEGORIES = www -REVISION = 0 MAINTAINER = Nigel Taylor Index: distinfo === RCS file: /cvs/ports/www/p5-HTTP-Message/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo7 Sep 2017 19:11:36 - 1.4 +++ distinfo16 May 2021 06:55:56 - @@ -1,2 +1,2 @@ -SHA256 (HTTP-Message-6.13.tar.gz) = 8l84Qo3oUeVmHnLxJEdklIUuswgSNYsH8cOiifb17e0= -SIZE (HTTP-Message-6.13.tar.gz) = 74413 +SHA256 (HTTP-Message-6.31.tar.gz) = 8aBqPRWif/qwb/bUlbN6+U9sIdC+XhG3uheRdKwAado= +SIZE (HTTP-Message-6.31.tar.gz) = 88643
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2021/05/16 01:00:20 Modified files: www/hugo : Makefile distinfo Added files: www/hugo : modules.inc Log message: update www/hugo to 0.83.1 while here moved MODGO_MODULES to modules.inc tested by Ian Darwin (ian at darwinsys.com). "looks good to me" abieber@
