mips64 bulk build report
bulk build on octeon.ports.openbsd.org started on Mon Dec 21 16:53:50 UTC 2020 finished at Wed Dec 30 20:05:56 UTC 2020 lasted 10D03h12m done with kern.version=OpenBSD 6.8-current (GENERIC.MP) #19: Mon Dec 21 16:13:37 UTC 2020 built packages:8627 Dec 21:2028 Dec 22:1372 Dec 23:576 Dec 24:359 Dec 25:252 Dec 26:474 Dec 27:639 Dec 28:2907 Dec 29:18 Dec 30:1 build failures: 28 http://build-failures.rhaalovely.net/mips64/2020-12-21/cad/netgen.log http://build-failures.rhaalovely.net/mips64/2020-12-21/chinese/libchewing.log http://build-failures.rhaalovely.net/mips64/2020-12-21/chinese/libpinyin.log http://build-failures.rhaalovely.net/mips64/2020-12-21/databases/postgresql-pllua.log http://build-failures.rhaalovely.net/mips64/2020-12-21/devel/coccinelle.log http://build-failures.rhaalovely.net/mips64/2020-12-21/devel/glog.log http://build-failures.rhaalovely.net/mips64/2020-12-21/devel/libexecinfo.log http://build-failures.rhaalovely.net/mips64/2020-12-21/devel/py-unicorn,python3.log http://build-failures.rhaalovely.net/mips64/2020-12-21/emulators/openmsx.log http://build-failures.rhaalovely.net/mips64/2020-12-21/emulators/spike.log http://build-failures.rhaalovely.net/mips64/2020-12-21/games/astromenace.log http://build-failures.rhaalovely.net/mips64/2020-12-21/games/hyperrogue.log http://build-failures.rhaalovely.net/mips64/2020-12-21/geo/gpstk.log http://build-failures.rhaalovely.net/mips64/2020-12-21/inputmethods/scim-fcitx.log http://build-failures.rhaalovely.net/mips64/2020-12-21/lang/STk.log http://build-failures.rhaalovely.net/mips64/2020-12-21/lang/gforth.log http://build-failures.rhaalovely.net/mips64/2020-12-21/lang/librep.log http://build-failures.rhaalovely.net/mips64/2020-12-21/lang/pfe.log http://build-failures.rhaalovely.net/mips64/2020-12-21/math/gbc.log http://build-failures.rhaalovely.net/mips64/2020-12-21/math/lrs.log http://build-failures.rhaalovely.net/mips64/2020-12-21/math/ntl.log http://build-failures.rhaalovely.net/mips64/2020-12-21/plan9/drawterm.log http://build-failures.rhaalovely.net/mips64/2020-12-21/security/botan2.log http://build-failures.rhaalovely.net/mips64/2020-12-21/security/john-jumbo.log http://build-failures.rhaalovely.net/mips64/2020-12-21/shells/ksh93.log http://build-failures.rhaalovely.net/mips64/2020-12-21/sysutils/libvirt.log http://build-failures.rhaalovely.net/mips64/2020-12-21/sysutils/u-boot,aarch64.log http://build-failures.rhaalovely.net/mips64/2020-12-21/x11/e17/elementary.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/12/30 22:13:45 Modified files: lang/kona : Makefile distinfo lang/kona/patches: patch-Makefile Log message: Bugfix update to kona-3.2.0.20201026
Re: [NEW] devel/libdsk and emulators/cpmtools
On 12/30/20 11:51 PM, trondd wrote: But I'd be curious if someone has other images to tesk with as cpmtools does not support everything since systems of te time used a variety of disk formats and sector layots. Tim. Poke. Any CP/M users? Tim. Hello Tim. I am slightly reluctant to give you tips as on where to find binaries from commercial releases. However, having written some code myself that deals with the CP/M format, I would like to share some insight I found and compiled within this document here: https://www.dettus.net/dMagnetic/dMagnetic_datastructures.pdf In addition to this, you can find the code i created from this release (for example): https://www.dettus.net/dMagnetic/dMagnetic_0.29.tar.bz Specifically within the file src/loader/loader_dsk.c. Please have a look, I would love to exchange some notes with you. Thomas Dettbarn
Re: FETCH_PACKAGES, mk.conf and make variable substitution time
On Wed, Dec 30, 2020 at 11:46:25PM +0100, Marc Espie wrote: > There aren't that many specific cases. But they exist and the consequences are subtle breakage in the ports infrastructure code. > Actually, you've got an example of bsd.port.mk dealing with things > for dwz, for instance. > > and the boostrap pseudo-flavor is another instance. I do not get what you're saying, can you elaborate? > This is definitely to be expected and is a design choice. What exactly? That FETCH_PACKAGES only works when passed on the command line? > the alternative would be to insist you install some binary packages before > building anything, and we don't do that. Not sure I follow, alternative to what? Yeah, we do not insist pkg_add'ing things before building other things, but we offer the possibility with FETCH_PACKAGES.
Re: UPDATE: SDL 2.0.14
On 12/30/2020 7:30 AM, Thomas Frohwein wrote: On Mon, Dec 28, 2020 at 04:15:45PM -0500, Brad Smith wrote: On 12/28/2020 11:14 AM, Charlene Wendling wrote: On Sat, 26 Dec 2020 15:03:07 -0500 Brad Smith wrote: On 12/25/2020 3:39 PM, Thomas Frohwein wrote: On Thu, Dec 24, 2020 at 09:48:45PM -0500, Brad Smith wrote: Here is an update to SDL 2.0.14. Tested with a few apps. More testing and feedback welcome. I have a similar diff that I'm testing. A few releases ago, there was an issue with some reverse deps breaking during build. Brad, can you let me know what apps you tested, and if you tested build and/or runtime, so that I can add it into my own list of tests? mpv qemu ffplay blobby taisei supertux Run time testing. I just chose a couple of random games to do some additional run time testing of the video and audio output. I noticed supertux randomly crashes in SDL_BlitCopy upon startup, but that is not new for this release of SDL. Hi, Some testing report: - amd64:i've tested emulators/ppsspp and games/endless-sky without issues, using my logitech dual action - macppc: after building that update, i've built and run tested games/wesnoth and games/blobby and everything is still fine Port-wise, that looks good to me. Thanks. Generally looking good. I did some extensive testing with Brad's diff; see sdl2-testing-2.0.14.txt in attachments for a table of results. Build of emulators/vbam breaks with this update. It can't find KMOD_GUI variable anymore; and no KMOD_META. See vbam.txt attachment. I got a simple diff for the vbam port below that unbreaks this. Just double-checking - did SIMD support change with clang on arm (in Brad's diff)? Due to a couple different issues SIMD support was disabled on ARM.
Re: pylint-3: AttributeError: module '_ast' has no attribute 'Str'
On Wed, Dec 30, 2020 at 06:15:04PM -0500, Daniel Dickman wrote:
> See below for how far I've gotten with that. Please feel free to finish up
> the update and commit when you're happy with it.
Mostly what I have, but I also made tests work and added @pkgpath bits
for the pylint3,-main,python3 -> pylint3 upgrade to work.
I also tried to remove the now obsolete/nonexistent pylint3-gui package
through quirks but it does not work yet; am I missing something or is
this expected when you have old pylint3-gui installed which depends on
old pylint3 and try to upgrade to new pylint3?
$ pkg_info -m | grep pylint
pylint3-1.6.5p3 lint-like code checker for Python code
pylint3-gui-1.6.5p3 GUI for pylint
$ cd /usr/ports/packages/amd64/all/
$ ls
pylint3-2.6.0.tgzquirks-3.506.tgz
$ TRUSTED_PKG_PATH=. doas pkg_add -U pylint3
quirks-3.502->3.506: ok
pylint3-1.6.5p3->2.6.0 forward dependencies:
| Dependency of pylint3-gui-1.6.5p3 on pylint3-=1.6.5 doesn't match
NOT MERGING: can't find update for pylint3-gui-1.6.5p3-> (ok)
Proceed with update anyway ? [y/N/a] n
Read shared items: ok
Obsolete package: pylint3-gui-1.6.5p3 (no longer maintained upstream)
Couldn't find updates for py3-astroid-2.4.2 py3-isort-4.2.15p2
py3-mccabe-0.6.1p2 py3-setuptools-44.1.1v0 py3-six-1.15.0 py3-toml-0.10.2
pylint3-1.6.5p3 pylint3-gui-1.6.5p3 python-3.8.6p0
Couldn't install pylint3-2.6.0
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1117
diff -u -p -r1.1117 Makefile
--- devel/quirks/Makefile 30 Dec 2020 21:43:51 - 1.1117
+++ devel/quirks/Makefile 30 Dec 2020 22:47:46 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.505
+PKGNAME = quirks-3.506
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1133
diff -u -p -r1.1133 Quirks.pm
--- devel/quirks/files/Quirks.pm30 Dec 2020 21:38:58 - 1.1133
+++ devel/quirks/files/Quirks.pm31 Dec 2020 00:03:57 -
@@ -2022,6 +2022,7 @@ my $obsolete_reason = {
'libxml++3' => 5,
'orage' => 3,
'xfce4-statusnotifier' => 3,
+ 'pylint3-gui' => 3,
};
# reasons for obsolete packages
Index: devel/pylint/Makefile
===
RCS file: /cvs/ports/devel/pylint/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- devel/pylint/Makefile 19 Aug 2020 12:25:12 - 1.33
+++ devel/pylint/Makefile 30 Dec 2020 23:54:19 -
@@ -1,14 +1,9 @@
# $OpenBSD: Makefile,v 1.33 2020/08/19 12:25:12 ajacoutot Exp $
-COMMENT-main= lint-like code checker for Python code
-COMMENT-gui= GUI for pylint
+COMMENT = lint-like code checker for Python code
-MODPY_EGG_VERSION= 1.6.5
-REVISION-gui= 3
-REVISION-main= 3
+MODPY_EGG_VERSION =2.6.0
DISTNAME= pylint-${MODPY_EGG_VERSION}
-PKGNAME-main= pylint-${MODPY_EGG_VERSION}
-PKGNAME-gui= pylint-gui-${MODPY_EGG_VERSION}
CATEGORIES=devel
HOMEPAGE= https://www.pylint.org/
@@ -16,34 +11,27 @@ HOMEPAGE= https://www.pylint.org/
# GPL
PERMIT_PACKAGE=Yes
-MULTI_PACKAGES=-main -gui
-
MODULES= lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
-MODPY_PYTEST_ARGS =pylint
-RUN_DEPENDS= devel/py-astroid${MODPY_FLAVOR} \
+RUN_DEPENDS = devel/py-astroid${MODPY_FLAVOR}>=2.4 \
devel/py-isort${MODPY_FLAVOR} \
devel/py-mccabe${MODPY_FLAVOR} \
- devel/py-six${MODPY_FLAVOR}
-RUN_DEPENDS-gui= ${MODPY_TKINTER_DEPENDS} \
- devel/pylint${MODPY_FLAVOR}=${MODPY_EGG_VERSION}
-TEST_DEPENDS= devel/py-logilab-common${MODPY_FLAVOR}>=1.3.0
+ devel/py-six${MODPY_FLAVOR} \
+ textproc/py-toml${MODPY_FLAVOR}
+
+TEST_DEPENDS = devel/py-logilab-common${MODPY_FLAVOR}>=1.3.0
FLAVORS = python3
FLAVOR = python3
-FULLPKGNAME-main= ${PKGNAME-main:S/pylint/pylint3/}
-FULLPKGPATH-main= devel/pylint,-main${MODPY_FLAVOR}
-FULLPKGNAME-gui= ${PKGNAME-gui:S/pylint/pylint3/}
-FULLPKGPATH-gui= devel/pylint,-gui${MODPY_FLAVOR}
+FULLPKGNAME = ${PKGNAME:S/pylint/pylint3/}
post-install:
- rm ${WRKINST}${MODPY_SITEPKG}/pylint/test/unittest_lint.py.orig
-.for i in epylint pylint pylint-gui pyreverse symilar
Re: graphics/blender: missing dependency on libgmpxx.so.3.0
On Wed, Dec 30, 2020 at 05:03:03PM +0100, Fabian Raetz wrote:
> Hi ports,
>
> after installing a fresh copy of OpenBSD, Blender did not start because of
> a missing dependency of libgmpxx.so.3.0. After manually installing gmpxx,
> Blender started.
>
> Thanks for the update to 2.91 :D
>
> Cheers,
> Fabian
Hi Fabian, thanks for the alert. The diff below adds gmp,-cxx
to LIB_DEPENDS and some other changes.
I've restricted the port to amd64 arch and allowed SSE as expected
at minimum.
https://www.blender.org/download/requirements/
Libraries required directly libsndfile,sdl2,opencolorio and openexr
are now part of LIB_DEPENDS in alpha order. gflags is not required
by the build. Also I've removed certain cmake options which are set
automatically and some (RAYOPTIMIZATION) which don't exist anymore.
Build,run tested on amd64.
Any comments/OK's?
Index: Makefile
===
RCS file: /cvs/ports/graphics/blender/Makefile,v
retrieving revision 1.99
diff -u -p -r1.99 Makefile
--- Makefile29 Nov 2020 19:57:01 - 1.99
+++ Makefile30 Dec 2020 19:40:06 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.99 2020/11/29 19:57:01 sthen Exp $
-ONLY_FOR_ARCHS = amd64 i386
+ONLY_FOR_ARCHS = amd64
COMMENT = 3D creation software
@@ -21,9 +21,9 @@ WANTLIB += IlmThread-2_5 Imath-2_5 OpenC
WANTLIB += X11 Xfixes Xi Xrender Xxf86vm avcodec avdevice avformat
WANTLIB += avutil boost_atomic-mt boost_chrono-mt boost_date_time-mt
WANTLIB += boost_filesystem-mt boost_regex-mt boost_system-mt
-WANTLIB += boost_thread-mt c fftw3 freetype jpeg m openal openjp2
-WANTLIB += png potrace sndfile swscale tbb tiff tinyxml util yaml-cpp
-WANTLIB += z
+WANTLIB += boost_thread-mt c fftw3 freetype gmp gmpxx jpeg m openal
+WANTLIB += openjp2 png potrace sndfile swscale tbb tiff tinyxml
+WANTLIB += util yaml-cpp z
MASTER_SITES = https://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/
@@ -39,30 +39,29 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION_
CONFIGURE_ARGS = -DPYTHON_INCLUDE_DIR="${MODPY_INCDIR}" \
-DPYTHON_VERSION=${MODPY_VERSION} \
- -DWITH_CODEC_FFMPEG=ON \
-DWITH_INTERNATIONAL=OFF \
- -DWITH_RAYOPTIMIZATION=OFF \
- -DWITH_OPENCOLORIO=ON \
-DWITH_OPENMP=OFF \
-DWITH_SYSTEM_GLEW=ON \
- -DWITH_CPU_SSE=OFF \
-DWITH_CYCLES_EMBREE=OFF \
-DWITH_JACK=OFF
-BUILD_DEPENDS =devel/gflags \
- math/py-numpy${MODPY_FLAVOR}
-LIB_DEPENDS = graphics/png \
- graphics/jpeg \
- graphics/glew \
- graphics/openexr \
- graphics/tiff \
+BUILD_DEPENDS = math/py-numpy${MODPY_FLAVOR}
+LIB_DEPENDS = audio/libsndfile \
+ audio/openal \
devel/boost \
+ devel/gmp,-cxx \
+ devel/sdl2 \
devel/tbb \
- audio/openal \
- graphics/openjp2 \
graphics/ffmpeg \
+ graphics/glew \
+ graphics/jpeg \
+ graphics/opencolorio \
+ graphics/openexr \
graphics/openimageio \
+ graphics/openjp2 \
+ graphics/png \
graphics/potrace \
+ graphics/tiff \
math/fftw3 \
${MODPY_LIB_DEPENDS}
RUN_DEPENDS = devel/desktop-file-utils \
Re: [SOLVED] New SSL problems with Apache/mod_perl
I finally found the changes in acme-client. I looked at examples/acme-client.conf and in src. Both the same. I sent a diff to tech@ with an addition to the example. If I had seen that, I would have read the acme man pages, first. Thanks for all of the hints. :-} I was just thinking in a different box. Chris Bennett
Re: swig update (was Re: [update] Python 3.8.7)
On Wed, 30 Dec 2020, Stuart Henderson wrote: > On 2020/12/29 23:45, Kurt Mosiejczuk wrote: > > On Tue, Dec 29, 2020 at 07:40:41PM -0500, Daniel Dickman wrote: > > > Here's an update for swig that I've been running with for some time. It > > > will likely benefit from going through a bulk. > > > > I've just kicked off a sparc64 bulk build with this swig update in it. > > Builds are taking a bit over 3 days currently. (So someone with an amd64 > > cluster may beat me to results if they try). > > cvs2svn does not really seem maintained any more, and it doesn't seem > worth the trouble of maintaining multiple versions of swig (and making > devel/subversion even more fiddly than it already is). If anything > comes of https://github.com/mhagger/cvs2svn/issues/9 we can always > bring it back again later. > Thanks for testing Stuart and Kurt. Hopefully this was the only breakage from the swig update? If so that's pretty good news. The funny thing is I do use cvs2svn but haven't fired it up for a few months, but I'd like to keep it in the repo. Can we mark it as BROKEN instead? I've actually been thinking of having a go at getting cvs2svn updated to work under python3. I'll contact mhagger if I make progress on this. Mainly for the cvs2git functionality, not so much for the svn functionality (at least for me). Funnily enough, trying to make some changes to cvs2svn is what inspired me to learn Python many years ago...
Re: pylint-3: AttributeError: module '_ast' has no attribute 'Str'
On Wed, 30 Dec 2020, Klemens Nanni wrote:
> On Sun, Dec 27, 2020 at 10:58:48PM -0500, Daniel Dickman wrote:
> > Yeah, devel/py-astroid is not python 3.8 compatible from what I remember.
> >
> > To fix pylint, you'll need to get py-astroid updated to version 2.1.0 or
> > later.
> I see sthen and you have updated (and fixed) ports for pylint to work
> again, thanks!
>
> Sadly, pylint still complains, probably because our 1.6.5 is way behind
> upstream's latest 2.6.0 release:
> (I'll give the update a try now.)
>
Right, that's expected. The last bit that's needed is the update for
pylint itself.
See below for how far I've gotten with that. Please feel free to finish up
the update and commit when you're happy with it.
Thanks!
Index: Makefile
===
RCS file: /cvs/ports/devel/pylint/Makefile,v
retrieving revision 1.33
diff -u -p -u -r1.33 Makefile
--- Makefile19 Aug 2020 12:25:12 - 1.33
+++ Makefile30 Dec 2020 23:11:21 -
@@ -1,14 +1,10 @@
# $OpenBSD: Makefile,v 1.33 2020/08/19 12:25:12 ajacoutot Exp $
-COMMENT-main= lint-like code checker for Python code
-COMMENT-gui= GUI for pylint
+COMMENT= lint-like code checker for Python code
-MODPY_EGG_VERSION= 1.6.5
-REVISION-gui= 3
-REVISION-main= 3
+MODPY_EGG_VERSION= 2.6.0
DISTNAME= pylint-${MODPY_EGG_VERSION}
-PKGNAME-main= pylint-${MODPY_EGG_VERSION}
-PKGNAME-gui= pylint-gui-${MODPY_EGG_VERSION}
+PKGNAME= pylint-${MODPY_EGG_VERSION}
CATEGORIES=devel
HOMEPAGE= https://www.pylint.org/
@@ -16,35 +12,25 @@ HOMEPAGE= https://www.pylint.org/
# GPL
PERMIT_PACKAGE=Yes
-MULTI_PACKAGES=-main -gui
-
MODULES= lang/python
+FLAVORS = python3
+FLAVOR = python3
+
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS =pylint
-RUN_DEPENDS= devel/py-astroid${MODPY_FLAVOR} \
+RUN_DEPENDS= devel/py-astroid${MODPY_FLAVOR}>=2.4 \
devel/py-isort${MODPY_FLAVOR} \
devel/py-mccabe${MODPY_FLAVOR} \
- devel/py-six${MODPY_FLAVOR}
-RUN_DEPENDS-gui= ${MODPY_TKINTER_DEPENDS} \
- devel/pylint${MODPY_FLAVOR}=${MODPY_EGG_VERSION}
-TEST_DEPENDS= devel/py-logilab-common${MODPY_FLAVOR}>=1.3.0
+ devel/py-six${MODPY_FLAVOR} \
+ textproc/py-toml${MODPY_FLAVOR}
-FLAVORS = python3
-FLAVOR = python3
+TEST_DEPENDS= devel/py-logilab-common${MODPY_FLAVOR}>=1.3.0
-FULLPKGNAME-main= ${PKGNAME-main:S/pylint/pylint3/}
-FULLPKGPATH-main= devel/pylint,-main${MODPY_FLAVOR}
-FULLPKGNAME-gui= ${PKGNAME-gui:S/pylint/pylint3/}
-FULLPKGPATH-gui= devel/pylint,-gui${MODPY_FLAVOR}
-
-post-install:
- rm ${WRKINST}${MODPY_SITEPKG}/pylint/test/unittest_lint.py.orig
-.for i in epylint pylint pylint-gui pyreverse symilar
- mv ${PREFIX}/bin/$i{,${MODPY_BIN_SUFFIX}}
-.endfor
+FULLPKGNAME= ${PKGNAME:S/pylint/pylint3/}
+FULLPKGPATH= devel/pylint${MODPY_FLAVOR}
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/pylint/distinfo,v
retrieving revision 1.8
diff -u -p -u -r1.8 distinfo
--- distinfo26 Mar 2017 11:21:52 - 1.8
+++ distinfo30 Dec 2020 23:11:21 -
@@ -1,2 +1,2 @@
-SHA256 (pylint-1.6.5.tar.gz) = pnOYSo3XjkqLjP3uU1mhMJ2DPPOEBQCPSiSZlKhFZxk=
-SIZE (pylint-1.6.5.tar.gz) = 465578
+SHA256 (pylint-2.6.0.tar.gz) = u0qQjJ2tvDqsGIYFUOhw9Y4aAsnywgT99Wk9c74GEhA=
+SIZE (pylint-2.6.0.tar.gz) = 680289
Index: patches/patch-pylint_test_unittest_lint_py
===
RCS file: patches/patch-pylint_test_unittest_lint_py
diff -N patches/patch-pylint_test_unittest_lint_py
--- patches/patch-pylint_test_unittest_lint_py 26 Mar 2017 11:21:52 -
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-pylint_test_unittest_lint_py,v 1.2 2017/03/26 11:21:52
shadchin Exp $
pylint/test/unittest_lint.py.orig Sun Jan 22 18:51:04 2017
-+++ pylint/test/unittest_lint.py Tue Jan 24 14:26:34 2017
-@@ -512,6 +512,12 @@ class ConfigTC(unittest.TestCase):
- os.environ.pop('PYLINTRC', None)
-
- def test_pylint_home(self):
-+if os.environ['PYLINTHOME']:
-+pylintd = os.environ['PYLINTHOME']
-+reload_module(config)
-+self.assertEqual(config.PYLINT_HOME, pylintd)
-+return
-+
- uhome = os.path.expanduser('~')
- if uhome == '~':
- expected = '.pylint.d'
Index: patches/patch-tests-lint-unittest_lint_py
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/12/30 16:13:54 Modified files: sysutils/ruby-puppet/6: Makefile sysutils/ruby-puppet/6/pkg: PLIST Log message: Remove broken puppetmaster rc.d script Someone on IRC mentioned /etc/rc.d/puppetmaster failing; indeed, Puppet 6 no longer has a "master" subcommand. Note hat we also lack a PuppetDB 6 port (still).
Re: [UPDATE] graphics/opencolorio
On Wed, Dec 30, 2020 at 04:59:56PM +, Stuart Henderson wrote:
> On 2020/12/24 14:45, Dimitri Karamazov wrote:
> > Update opencolorio to 1.1.1
> >
> > Required by graphics/krita and graphics/blender
> > both Build,run tested on amd64.
> >
> > I'm forcing python3 as required by both consumers since
> > python2 doesn't compile with C++17.
> >
> > Any comments/OK's?
> >
> > +V =1.1.1
> > +GH_ACCOUNT = AcademySoftwareFoundation
> > +GH_PROJECT = OpenColorIO
> > +GH_TAGNAME = v${V}
> > +DISTNAME = ${GH_PROJECT:L}-${V}
>
> the version number goes 'backwards' so it needs EPOCH. I suggest this
> as a bit neater (needs distinfo regenerating):
>
> EPOCH = 0
> GH_ACCOUNT =AcademySoftwareFoundation
> GH_PROJECT =OpenColorIO
> GH_TAGNAME =v1.1.1
> PKGNAME = ${DISTNAME:L}
>
> > COMPILER = base-clang ports-gcc base-gcc
>
> base-gcc can go, it will never be used (port uses cmake which is now
> "base-clang ports-gcc", so nothing able to build opencolorio will
> select base-gcc).
>
> > +FLAVORS = python3
> > +FLAVOR = python3
>
> this isn't a py-* port so please use
>
> MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> > CFLAGS = -pthread
>
> please drop, this is bogus in the first place, but not actually used
> anyway (it's all C++ so would be CXXFLAGS)
>
> > @@ -0,0 +1,15 @@
> > +$OpenBSD$
> > +
> > +Avoid assigning field to itself
> > +
>
> Part of upstream commit:
>
> From 0be465feb9ac2d34bd8171f30909b276c1efa996 Mon Sep 17 00:00:00 2001
> From: Bernard Lefebvre <37628108+bernardlefeb...@users.noreply.github.com>
> Date: Fri, 28 Sep 2018 19:11:05 -0400
> Subject: [PATCH] Squashing Adsk contrib/operator rhs (#44) (#580)
>
> rest looks good.
>
> > Index: Makefile
>
> the whole diff was duplicated for some reason?
The text(diff) attachment was not taken kindly by neomutt.
See diff below with all expected changes from Stuart.
Index: Makefile
===
RCS file: /cvs/ports/graphics/opencolorio/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile14 Dec 2020 15:28:14 - 1.12
+++ Makefile30 Dec 2020 18:32:53 -
@@ -2,12 +2,13 @@
COMMENT = color management library
-V =20140911
-DISTNAME = OpenColorIO-$V
-PKGNAME = opencolorio-$V
-REVISION = 4
+EPOCH =0
+GH_ACCOUNT = AcademySoftwareFoundation
+GH_PROJECT = OpenColorIO
+GH_TAGNAME = v1.1.1
+PKGNAME = ${DISTNAME:L}
-SHARED_LIBS += OpenColorIO 1.0 # 1.0
+SHARED_LIBS += OpenColorIO 1.1 # 1.1.1
CATEGORIES = graphics
@@ -20,13 +21,13 @@ PERMIT_PACKAGE =Yes
WANTLIB += m pthread ${COMPILER_LIBCXX} tinyxml yaml-cpp
-COMPILER = base-clang ports-gcc base-gcc
-
-MASTER_SITES = http://deftly.net/
+COMPILER = base-clang ports-gcc
MODULES = devel/cmake \
lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+
BUILD_DEPENDS =devel/boost
LIB_DEPENDS = textproc/tinyxml \
devel/yaml-cpp
@@ -43,8 +44,10 @@ CONFIGURE_ARGS +=-DPYTHON="${MODPY_BIN}
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/OpenColorIO-master
-
-CFLAGS = -pthread
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/cmake/OpenColorIO
+ mv ${PREFIX}/cmake/*.cmake ${PREFIX}/OpenColorIO*.cmake \
+${PREFIX}/lib/cmake/OpenColorIO
+ rm -rf ${PREFIX}/cmake
.include
Index: distinfo
===
RCS file: /cvs/ports/graphics/opencolorio/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo21 Nov 2014 17:25:49 - 1.3
+++ distinfo30 Dec 2020 18:32:53 -
@@ -1,2 +1,2 @@
-SHA256 (OpenColorIO-20140911.tar.gz) =
d1Y6L8peE+SuqhBv/lA5Km70hjRlyszFOuVFmNzlnpQ=
-SIZE (OpenColorIO-20140911.tar.gz) = 13742525
+SHA256 (OpenColorIO-1.1.1.tar.gz) =
ybW53vkH4dr7KeNzNrcC//IsxjBtRFoTsWIbinVMFMg=
+SIZE (OpenColorIO-1.1.1.tar.gz) = 13828483
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt30 Dec 2020 18:32:53 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Fix macro redefined error
+
+--- CMakeLists.txt.orig2018-01-05 12:08:27 UTC
CMakeLists.txt
+@@ -218,8 +222,7 @@ else(USE_EXTERNAL_TINYXML)
+ ## => great news when build staticaly since we do not want another
client project have to link also with tinyxml when he want to use this
Re: [NEW] devel/libdsk and emulators/cpmtools
trondd wrote: > The new ports together allow you to read, write, and manage CP/M disk > images. CPMTools provides the tools for copying, erasing, chaging > permissions and attributes of files as well as tools for creating, > checking, viewing file systems. > > Libdsk adds drivers for different CP/M image types, both real-world and > emulator images. And provides libraries for emulators to access disk > images as drives. > > I've had these locally for over a year when I needed to pull some files > out of some z80pack disk images but haven't used them much since. I recently > saw the CP/M emulator go by ports@ so thought I'd toss these out there > incase someone was interested. > > > Some images can be found here: > https://www.autometer.de/unix4fun/z80pack/ > > But I'd be curious if someone has other images to tesk with as cpmtools > does not support everything since systems of te time used a variety of > disk formats and sector layots. > > Tim. > Poke. Any CP/M users? Tim. libdsk.tgz Description: application/gzip cpmtools.tgz Description: application/gzip
Re: FETCH_PACKAGES, mk.conf and make variable substitution time
On Wed, Dec 30, 2020 at 11:20:20PM +0100, Klemens Nanni wrote: > On Wed, Dec 30, 2020 at 09:30:57PM +, Stuart Henderson wrote: > > Oh wow, quite a deep rabbit hole to go down for this. I went for the > > simple approach: > > > > $ echo $PKG_PATH > > http://ftp.hostserver.de/pub/OpenBSD/snapshots/packages/%a/ > I don't use `-Dsnap' to ensure snapshot packages but rather to fetch > binary packages in the first place when ensuring dependencies during > ports building rather than building everything from source. > > I see how pkg_add(1) "special sequences" in PKG_PATH are much nicer than > the too simple installurl(5), but this is another topic. > > The mail's subject probably should not have mentioned FETCH_PACKAGES as > this issue is really about make(1)/bsd.port.mk(5) internals per se; > quirks/FETCH_PACKAGES is simply one specific case I encountered. > There aren't that many specific cases. Actually, you've got an example of bsd.port.mk dealing with things for dwz, for instance. and the boostrap pseudo-flavor is another instance. This is definitely to be expected and is a design choice. the alternative would be to insist you install some binary packages before building anything, and we don't do that.
Re: pylint-3: AttributeError: module '_ast' has no attribute 'Str'
On Sun, Dec 27, 2020 at 10:58:48PM -0500, Daniel Dickman wrote:
> Yeah, devel/py-astroid is not python 3.8 compatible from what I remember.
>
> To fix pylint, you'll need to get py-astroid updated to version 2.1.0 or
> later.
I see sthen and you have updated (and fixed) ports for pylint to work
again, thanks!
Sadly, pylint still complains, probably because our 1.6.5 is way behind
upstream's latest 2.6.0 release:
(I'll give the update a try now.)
$ pylint-3 -h
Traceback (most recent call last):
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
583, in _build_master
ws.require(__requires__)
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
900, in require
needed = self.resolve(parse_requirements(requirements))
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
791, in resolve
raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (astroid 2.4.2
(/usr/local/lib/python3.8/site-packages),
Requirement.parse('astroid<1.5.0,>=1.4.5'), {'pylint'})
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/usr/local/bin/pylint-3", line 6, in
from pkg_resources import load_entry_point
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
3252, in
def _initialize_master_working_set():
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
3235, in _call_aside
f(*args, **kwargs)
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
3264, in _initialize_master_working_set
working_set = WorkingSet._build_master()
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
585, in _build_master
return cls._build_from_requirements(__requires__)
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
598, in _build_from_requirements
dists = ws.resolve(reqs, Environment())
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
786, in resolve
raise DistributionNotFound(req, requirers)
pkg_resources.DistributionNotFound: The 'astroid<1.5.0,>=1.4.5' distribution
was not found and is required by pylint
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/12/30 15:34:04 Modified files: devel/py-lazy-object-proxy: Makefile Log message: Add setuptools_scm as BUILD_DEPENDS to unbreak build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 15:30:43 Modified files: devel/gflags : Makefile distinfo devel/gflags/pkg: PLIST Log message: update to gflags-2.2.2, from Ashton Fagg (taking maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 15:29:24 Modified files: sysutils/direnv: Makefile distinfo Log message: update to direnv-2.26.0, from Ashton Fagg (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 15:27:27 Modified files: net/gpodder: Makefile distinfo Log message: update to gpodder-3.10.17, from trondd (maintainer)
Re: FETCH_PACKAGES, mk.conf and make variable substitution time
On Wed, Dec 30, 2020 at 09:30:57PM +, Stuart Henderson wrote: > Oh wow, quite a deep rabbit hole to go down for this. I went for the > simple approach: > > $ echo $PKG_PATH > http://ftp.hostserver.de/pub/OpenBSD/snapshots/packages/%a/ I don't use `-Dsnap' to ensure snapshot packages but rather to fetch binary packages in the first place when ensuring dependencies during ports building rather than building everything from source. I see how pkg_add(1) "special sequences" in PKG_PATH are much nicer than the too simple installurl(5), but this is another topic. The mail's subject probably should not have mentioned FETCH_PACKAGES as this issue is really about make(1)/bsd.port.mk(5) internals per se; quirks/FETCH_PACKAGES is simply one specific case I encountered.
Re: [UPDATE] graphics/opencolorio
On 2020/12/30 18:50, Dimitri Karamazov wrote:
> The text(diff) attachment was not taken kindly by neomutt.
>
> See diff below with all expected changes from Stuart.
Thanks. This is OK with me. Any comments Pascal?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/opencolorio/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 14 Dec 2020 15:28:14 - 1.12
> +++ Makefile 30 Dec 2020 18:32:53 -
> @@ -2,12 +2,13 @@
>
> COMMENT =color management library
>
> -V = 20140911
> -DISTNAME = OpenColorIO-$V
> -PKGNAME =opencolorio-$V
> -REVISION = 4
> +EPOCH = 0
> +GH_ACCOUNT = AcademySoftwareFoundation
> +GH_PROJECT = OpenColorIO
> +GH_TAGNAME = v1.1.1
> +PKGNAME =${DISTNAME:L}
>
> -SHARED_LIBS += OpenColorIO 1.0 # 1.0
> +SHARED_LIBS += OpenColorIO 1.1 # 1.1.1
>
> CATEGORIES = graphics
>
> @@ -20,13 +21,13 @@ PERMIT_PACKAGE = Yes
>
> WANTLIB += m pthread ${COMPILER_LIBCXX} tinyxml yaml-cpp
>
> -COMPILER = base-clang ports-gcc base-gcc
> -
> -MASTER_SITES = http://deftly.net/
> +COMPILER = base-clang ports-gcc
>
> MODULES =devel/cmake \
> lang/python
>
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> +
> BUILD_DEPENDS = devel/boost
> LIB_DEPENDS =textproc/tinyxml \
> devel/yaml-cpp
> @@ -43,8 +44,10 @@ CONFIGURE_ARGS += -DPYTHON="${MODPY_BIN}
>
> NO_TEST =Yes
>
> -WRKDIST =${WRKDIR}/OpenColorIO-master
> -
> -CFLAGS = -pthread
> +post-install:
> + ${INSTALL_DATA_DIR} ${PREFIX}/lib/cmake/OpenColorIO
> + mv ${PREFIX}/cmake/*.cmake ${PREFIX}/OpenColorIO*.cmake \
> + ${PREFIX}/lib/cmake/OpenColorIO
> + rm -rf ${PREFIX}/cmake
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/opencolorio/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 21 Nov 2014 17:25:49 - 1.3
> +++ distinfo 30 Dec 2020 18:32:53 -
> @@ -1,2 +1,2 @@
> -SHA256 (OpenColorIO-20140911.tar.gz) =
> d1Y6L8peE+SuqhBv/lA5Km70hjRlyszFOuVFmNzlnpQ=
> -SIZE (OpenColorIO-20140911.tar.gz) = 13742525
> +SHA256 (OpenColorIO-1.1.1.tar.gz) =
> ybW53vkH4dr7KeNzNrcC//IsxjBtRFoTsWIbinVMFMg=
> +SIZE (OpenColorIO-1.1.1.tar.gz) = 13828483
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-CMakeLists_txt 30 Dec 2020 18:32:53 -
> @@ -0,0 +1,25 @@
> +$OpenBSD$
> +
> +Fix macro redefined error
> +
> +--- CMakeLists.txt.orig 2018-01-05 12:08:27 UTC
> CMakeLists.txt
> +@@ -218,8 +222,7 @@ else(USE_EXTERNAL_TINYXML)
> + ## => great news when build staticaly since we do not want another
> client project have to link also with tinyxml when he want to use this project
> + ## => could be problematic if the client project use another
> version of tinyxml... In this case build tinyxml as shared lib with all
> projects could be a solution
> + ## => TODO: so maybe provide a simple cmake way to build 3rdParty
> as shared and auto install with this project ?
> +-set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS
> "-DTIXML_USE_STL -fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
> +-add_definitions(-DTIXML_USE_STL) ## needed to build correctly, and
> also need to be propagated in child projects (client projects)
> ++set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-fPIC
> -fvisibility-inlines-hidden -fvisibility=hidden")
> + list(APPEND EXTERNAL_OBJECTS $)
> + else()
> + find_package(Git REQUIRED) ## in order to apply patch (for
> crossplateform compatibility)
> +@@ -384,7 +387,7 @@ else()
> + set(OCIO_INLINES_HIDDEN OFF)
> + endif()
> +
> +-set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL ${YAML_CPP_COMPILE_FLAGS}
> ${GCC_COMPILE_FLAGS}")
> ++set(EXTERNAL_COMPILE_FLAGS "${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
> +
> + set(EXTERNAL_LINK_FLAGS "")
> + set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
> Index: patches/patch-export_OpenColorIO_OpenColorABI_h_in
> ===
> RCS file: patches/patch-export_OpenColorIO_OpenColorABI_h_in
> diff -N patches/patch-export_OpenColorIO_OpenColorABI_h_in
> --- patches/patch-export_OpenColorIO_OpenColorABI_h_in21 Nov 2014
> 17:25:49 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 15:08:25 Modified files: graphics/opencv: Makefile graphics/opencv/pkg: PLIST-java PLIST-main Log message: OpenCV included both py2 and py3 bindings in one package with an awkward construct (MODPY_VERSION=2.7 and some hand-rolled 3.x pieces). Nothing in ports uses them. Remove the (deprecated) py2 bindings leaving just the py3 ones with a more standard ports setup. ok rsadowski@ (maintainer).
Re: swig update (was Re: [update] Python 3.8.7)
On 2020/12/29 23:45, Kurt Mosiejczuk wrote:
> On Tue, Dec 29, 2020 at 07:40:41PM -0500, Daniel Dickman wrote:
> > Here's an update for swig that I've been running with for some time. It
> > will likely benefit from going through a bulk.
>
> I've just kicked off a sparc64 bulk build with this swig update in it.
> Builds are taking a bit over 3 days currently. (So someone with an amd64
> cluster may beat me to results if they try).
devel/subversion doesn't like swig 4.x:
configure: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <=
SWIG < 4.0.0
stsp, do you need py2 svn bindings for anything? If not I propose
to remove them and cvs2svn.
cvs2svn does not really seem maintained any more, and it doesn't seem
worth the trouble of maintaining multiple versions of swig (and making
devel/subversion even more fiddly than it already is). If anything
comes of https://github.com/mhagger/cvs2svn/issues/9 we can always
bring it back again later.
The py2 bindings used to be needed for trac but I've now switched that
over to the 1.5 devel branch (which is not all that far off 1.6 now)
using py3.
Update path works, e.g.
py-subversion-1.14.0p1+trac-1.4.2p0->py3-subversion-1.14.0p2+trac-1.5.2:
Index: Makefile
===
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2046
diff -u -p -r1.2046 Makefile
--- Makefile30 Dec 2020 15:55:16 - 1.2046
+++ Makefile30 Dec 2020 21:19:02 -
@@ -103,7 +103,6 @@
SUBDIR += cvs20hg
SUBDIR += cvs2cl
SUBDIR += cvs2gitdump
- SUBDIR += cvs2svn
SUBDIR += cvsgraph
SUBDIR += cvslock
SUBDIR += cvsplot
Index: quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1114
diff -u -p -r1.1114 Makefile
--- quirks/Makefile 29 Dec 2020 15:23:42 - 1.1114
+++ quirks/Makefile 30 Dec 2020 21:19:02 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.503
+PKGNAME = quirks-3.504
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1131
diff -u -p -r1.1131 Quirks.pm
--- quirks/files/Quirks.pm 29 Dec 2020 15:23:42 - 1.1131
+++ quirks/files/Quirks.pm 30 Dec 2020 21:51:43 -
@@ -2020,6 +2020,7 @@ my $obsolete_reason = {
'libxml++3' => 5,
'orage' => 3,
'xfce4-statusnotifier' => 3,
+ 'cvs2svn' => 3,
};
# reasons for obsolete packages
Index: subversion/Makefile
===
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.182
diff -u -p -r1.182 Makefile
--- subversion/Makefile 3 Jul 2020 21:12:53 - 1.182
+++ subversion/Makefile 30 Dec 2020 21:19:02 -
@@ -9,19 +9,14 @@ COMMENT-gnome-keyring=GNOME keyring sup
VERSION= 1.14.0
REVISION= 0
-REVISION-python= 1
+REVISION-python= 2
DISTNAME= subversion-${VERSION:S/rc/-rc/}
PKGNAME-main= subversion-${VERSION}
-FULLPKGNAME-main= subversion-${VERSION}${FLAVOR_EXT:S/-python3//}
-FULLPKGPATH-main= devel/subversion,-main${FLAVOR_EXT:S/-python3//:S/-/,/g}
-FULLPKGNAME-perl= p5-SVN-${VERSION}
-FULLPKGPATH-perl= devel/subversion,-perl
-FULLPKGNAME-ruby= ruby${MODRUBY_BINREV}-subversion-${VERSION}
-FULLPKGPATH-ruby= devel/subversion,-ruby
-FULLPKGNAME-ap2= ap2-subversion-${VERSION}
-FULLPKGPATH-ap2= devel/subversion,-ap2
-FULLPKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION}
-FULLPKGPATH-gnome-keyring= devel/subversion,-gnome-keyring
+PKGNAME-perl= p5-SVN-${VERSION}
+PKGNAME-python=py-subversion-${VERSION}
+PKGNAME-ruby= ruby${MODRUBY_BINREV}-subversion-${VERSION}
+PKGNAME-ap2= ap2-subversion-${VERSION}
+PKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION}
MODRUBY_REV ?= 2.7
# Work around for SHARED_LIBS not picking up MODRUBY_BINREV from ruby module
@@ -55,25 +50,14 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=subv
EXTRACT_SUFX= .tar.bz2
PSEUDO_FLAVORS=no_bindings no_ap2 no_perl no_python no_ruby
no_gnome-keyring
-FLAVORS= maintainer_mode python3
+FLAVORS= maintainer_mode
FLAVOR?=
.if ${FLAVOR:Mno_bindings}
FLAVOR += no_perl no_python no_ruby
.endif
-.if ${FLAVOR:Mpython3}
-FULLPKGNAME-python=py3-subversion-${VERSION}
-FULLPKGPATH-python=devel/subversion,python3,-python
-# py-subversion and py3-subversion both install libsvn_swig_py-1;
-# conflict with the other flavour
-PY_CONFLICT= py-subversion-*
-.else
-FULLPKGNAME-python=py-subversion-${VERSION}
-FULLPKGPATH-python=devel/subversion,-python
-PY_CONFLICT=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/12/30 14:43:51 Modified files: devel/quirks : Makefile Log message: Check syntax for all .pm files
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/12/30 14:38:58 Modified files: net: Makefile net/scapy : Makefile net/scapy/pkg : PLIST devel/quirks : Makefile devel/quirks/files: Quirks.pm net/pcapdiff : Makefile Log message: Move scapy to python 3 only Now that base regress is fully converted to using the Python 3 version merge scapy (Python 2) and py3-scapy into scapy (Python 3). OK bluhm sthen
Re: FETCH_PACKAGES, mk.conf and make variable substitution time
On 2020/12/30 21:51, Klemens Nanni wrote: > So the tech@ thread about make.1 improvements stems from an issue I have > with `make package' in devel/quirks and `FETCH_PACKAGES=-Dsnap' in > mk.conf(5): Oh wow, quite a deep rabbit hole to go down for this. I went for the simple approach: $ echo $PKG_PATH http://ftp.hostserver.de/pub/OpenBSD/snapshots/packages/%a/
FETCH_PACKAGES, mk.conf and make variable substitution time
So the tech@ thread about make.1 improvements stems from an issue I have
with `make package' in devel/quirks and `FETCH_PACKAGES=-Dsnap' in
mk.conf(5):
$ cat /etc/mk.conf
SUDO = doas
FETCH_PACKAGES =-Dsnap
PORTS_PRIVSEP = Yes
$ cd /usr/ports/devel/quirks
$ make package
===> Looking for quirks-3.504.tgz in $PKG_PATH - found
cp: /usr/ports/packages/amd64/cache/quirks-3.504.tgz: No such file or
directory
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2114
'/usr/ports/packages/amd64/no-arch/quirks-3.504.tgz': @cd /p/devel/quirks; g...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2605
'_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$(doas -...)
*** Error 2 in /p/devel/quirks
(/usr/ports/infrastructure/mk/bsd.port.mk:2584 'package': @lock=quirks-3.504;
export _LOCKS_HELD=" quirks-3)
Actual bsd.port.mk(5) line with failing cp(1) is 2129:
2114 # The real package
2115
2116 ${_pkg_cookie${_S}}:
2117 @${_PBUILD} install -d ${PACKAGE_REPOSITORY_MODE}
${_PKG_REPO${_S}} ${_TMP_REPO}
2118 . if ${FETCH_PACKAGES:L} != "no" &&
!defined(_TRIED_FETCHING_${_PACKAGE_COOKIE${_S}})
2119 @${_INSTALL_CACHE_REPO}
2120 @cd ${.CURDIR}; gotit=true; for p in ${_pkg${_S}}; do \
2121 if ! ${_PFETCH} ${MAKE} ${_CACHE_REPO}$$p; then \
2122 gotit=false; \
2123 break; \
2124 fi; \
2125 done; \
2126 if $$gotit; then \
2127 for p in ${_pkg${_S}}; do \
2128 s=${_CACHE_REPO}$$p; d=${_PKG_REPO${_S}}$$p; \
2129 ${_PBUILD} ln $$s $$d 2>/dev/null || ${_PBUILD}
cp -p $$s $$d; \
2130 done; \
2131 else \
2132 exec ${MAKE}
_TRIED_FETCHING_${_PACKAGE_COOKIE${_S}}=Yes _internal-package-only
_FETCH_RECURSE_HELPER=No; \
2133 fi
2134 . else
2135 @${_MAKE} ${_PACKAGE_COOKIE_DEPS}
That's because the code ends up with `gotit=true' even though there's
no package, be it fetched or built...
(`make -d c' and `make -d v' plus lots of grepping can help
understanding such scenarios.)
Anyway, quirks is already special, so what about explicitly setting
FETCH_PACKAGES in the port's Makefile:
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1115
diff -u -p -r1.1115 Makefile
--- Makefile30 Dec 2020 08:44:38 - 1.1115
+++ Makefile30 Dec 2020 20:18:32 -
@@ -23,3 +23,6 @@ do-install:
${INSTALL_DATA} ${FILESDIR}/Quirks/ghc.pm
${PERLDIR}/OpenBSD/Quirks/ghc.pm
.include
+
+# build from source regardless of mk.conf(5)
+FETCH_PACKAGES = No
This still fails, but more ugly and later in the `${_CACHE_REPO}${_p}'
(bsd.port.mk line 2101) which is called above via line 2121:
$ make package
===> Looking for quirks-3.504.tgz in $PKG_PATH - Can't find No
found
cp: /usr/ports/packages/amd64/cache/quirks-3.504.tgz: No such file or
directory
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2114
'/usr/ports/packages/amd64/no-arch/quirks-3.504.tgz': @cd /p/devel/quirks; g...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2605
'_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$(doas -...)
*** Error 2 in /p/devel/quirks
(/usr/ports/infrastructure/mk/bsd.port.mk:2584 'package': @lock=quirks-3.504;
export _LOCKS_HELD=" quirks-3)
`FETCH_PACKAGES's value ends up as `pkg-name' argument to pkg_add(1)
("Can't find No") because bsd.port.mk(5) fails to handle this case.
This is because line
2118 . if ${FETCH_PACKAGES:L} != "no" &&
!defined(_TRIED_FETCHING_${_PACKAGE_COOKIE${_S}})
runs with the value of `FETCH_PACKAGES' at parse time, i.e. "-Dsnap"
from /etc/mk.conf, while line
2104 @if ${SETENV} [...] ${PKG_ADD} -I -x -n -q ${_PKG_ADD_FORCE} -r
-D installed -D downgrade ${FETCH_PACKAGES} ${@F}; then \
runs with its value at execution time, i.e. "No" from Makefile.
The only way to reliably build a quirks package is by overwriting
variables on the command line as those are set in stone before Makefiles
are pared and cannot be canged by them:
$ make FETCH_PACKAGES=No package
[...]
Create /usr/ports/packages/amd64/no-arch/quirks-3.504.tgz
Creating package quirks-3.504
Link to /usr/ports/packages/amd64/all/quirks-3.504.tgz
Link to /usr/ports/packages/amd64/ftp/quirks-3.504.tgz
Now this raises questions (for me):
- What is the expected hierarchy for Makefile, bsd.port.mk(5) and
mk.conf(5)? I'd expect Makefile to always have precedence and
actually work as such.
- Is this something worth fixing?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 13:36:27 Modified files: www/trac : Makefile distinfo www/trac/pkg : PLIST Added files: www/trac/patches: patch-trac_util_daemon_py Log message: update to trac-1.5.2, moving to Python 3. This is a development branch but moving closer to a full release; current schedule https://groups.google.com/g/trac-dev/c/qPf4k35rZ9I This removes the deprecated support for Genshi as template engine; some external plugins currently require this and will need to be converted to Jinja2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2020/12/30 13:35:39 Modified files: devel/py-astroid: Makefile distinfo devel/py-astroid/pkg: PLIST Log message: update py-astrod to 2.4.2 while the code compiles under python3, an update to a newer version was needed for the code to actually work with python 3.8. Another update needed to repair pylint.
Re: UPDATE: SDL 2.0.14
On Wed, 30 Dec 2020 05:30:39 -0700
Thomas Frohwein wrote:
> On Mon, Dec 28, 2020 at 04:15:45PM -0500, Brad Smith wrote:
> > On 12/28/2020 11:14 AM, Charlene Wendling wrote:
> > > On Sat, 26 Dec 2020 15:03:07 -0500
> > > Brad Smith wrote:
> > >
> > > > On 12/25/2020 3:39 PM, Thomas Frohwein wrote:
> > > > > On Thu, Dec 24, 2020 at 09:48:45PM -0500, Brad Smith wrote:
> > > > > > Here is an update to SDL 2.0.14.
> > > > > >
> > > > > > Tested with a few apps. More testing and feedback welcome.
> > > > > I have a similar diff that I'm testing. A few releases ago,
> > > > > there was an issue with some reverse deps breaking during
> > > > > build.
> > > > >
> > > > > Brad, can you let me know what apps you tested, and if you
> > > > > tested build and/or runtime, so that I can add it into my own
> > > > > list of tests?
> > > > mpv
> > > > qemu
> > > > ffplay
> > > > blobby
> > > > taisei
> > > > supertux
> > > >
> > > > Run time testing. I just chose a couple of random games to do
> > > > some additional run time
> > > > testing of the video and audio output.
> > > >
> > > > I noticed supertux randomly crashes in SDL_BlitCopy upon
> > > > startup, but that is not new
> > > > for this release of SDL.
> > > >
> > > Hi,
> > >
> > > Some testing report:
> > >
> > > - amd64:i've tested emulators/ppsspp and games/endless-sky
> > > without issues, using my logitech dual action
> > > - macppc: after building that update, i've built and run tested
> > > games/wesnoth and games/blobby and everything is
> > > still fine
> > >
> > > Port-wise, that looks good to me.
> > Thanks.
>
> Generally looking good. I did some extensive testing with Brad's diff;
> see sdl2-testing-2.0.14.txt in attachments for a table of results.
>
> Build of emulators/vbam breaks with this update. It can't find
> KMOD_GUI variable anymore; and no KMOD_META. See vbam.txt attachment.
> I got a simple diff for the vbam port below that unbreaks this.
>
> Just double-checking - did SIMD support change with clang on arm (in
> Brad's diff)?
>
> -# clang can't handle simd asm
> -.if ${MACHINE_ARCH} == "arm"
> -CONFIGURE_ARGS+= --disable-arm-simd
>
> If this is clarified, ok thfr@ for Brad's sdl2 diff.
>
> ok for vbam fix below?
Oh, we still provide vbam while there is mgba around :(
I tested your diff with SDL 2.0.14, it builds fine, ok cwen@
> Index: Makefile
> ===
> RCS file: /cvs/ports/emulators/vbam/Makefile,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile
> --- Makefile 17 Nov 2019 00:14:36 - 1.34
> +++ Makefile 30 Dec 2020 12:23:16 -
> @@ -9,6 +9,7 @@ GH_ACCOUNT = visualboyadvance-m
> GH_PROJECT = ${GH_ACCOUNT}
> GH_TAGNAME = v2.1.4
> PKGNAME =vbam-${GH_TAGNAME:S/v//}
> +REVISION = 0
>
> CATEGORIES = emulators
>
> Index: patches/patch-src_sdl_SDL_cpp
> ===
> RCS file: patches/patch-src_sdl_SDL_cpp
> diff -N patches/patch-src_sdl_SDL_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_sdl_SDL_cpp 30 Dec 2020 12:23:16 -
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +Index: src/sdl/SDL.cpp
> +--- src/sdl/SDL.cpp.orig
> src/sdl/SDL.cpp
> +@@ -876,9 +876,7 @@ void sdlInitVideo()
> +
> + sdlResizeVideo();
> + }
> +-#if defined(KMOD_GUI)
> + #define KMOD_META KMOD_GUI
> +-#endif
> +
> + #define MOD_KEYS (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
> + #define MOD_NOCTRL (KMOD_SHIFT | KMOD_ALT | KMOD_META)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/12/30 11:23:02 Modified files: lang/duktape : Makefile distinfo lang/duktape/patches: patch-src_duk_config_h Log message: Update duktape to 2.6.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/12/30 11:22:06 Modified files: print/t1utils : Makefile distinfo Log message: Update t1utils to 1.42.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/12/30 11:21:26 Modified files: emulators/hatari: Makefile distinfo emulators/hatari/pkg: PLIST Log message: Update hatari to 2.3.1.
Re: opencv drop py2 (was Re: [update] Python 3.8.7)
On Wed Dec 30, 2020 at 01:21:54PM +, Stuart Henderson wrote:
> > > > > sadly this will break packaging for all python ports with shared
> > > > > libraries to the change they made for shared libraries :-(
> > > >
> > > > 3.9 will have the same in the next release.
> > > >
> > > > There are approx 178 ports to fix, they'll just need plist regen and
> > > > bumping (there is already an appropriate variable in python.port.mk).
> > > > I'm working on it.
>
> opencv currently has py2+py3 in a single package, using 2.7
> MODPY_VERSION and manually adding the 3.x parts. This makes it difficult
> to use python.port.mk infrastructure to handle the .so renaming.
>
> Is it OK to drop py2 support from opencv? Upstream say that it's
> deprecated, and nothing in ports is using it (only nomacs and digikam
> use opencv, and neither use Python).
I can confirm nothing in ports uses the opencv-python.
>
> A few other small tweaks to the Makefile to remove some things which
> are set by default anyway (ONLY_FOR_ARCHS is set based on COMPILER
> settings), use consistent .if for arch-specific things, move the
> bsd.port.arch.mk include to the point where it's needed (it has
> side-effects, easier to reason with if it affects a smaller number of
> lines), and fix a typo in COMMENT.
Thanks Stuart for taking care of it. The python part was on my 2021
list.
Package fine and digikam is still happy. OK rsadowski@
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/opencv/Makefile,v
> retrieving revision 1.64
> diff -u -p -r1.64 Makefile
> --- Makefile 23 Dec 2020 18:33:05 - 1.64
> +++ Makefile 30 Dec 2020 13:16:24 -
> @@ -1,16 +1,16 @@
> # $OpenBSD: Makefile,v 1.64 2020/12/23 18:33:05 rsadowski Exp $
>
> -ONLY_FOR_ARCHS = ${GCC4_ARCHS} ${CLANG_ARCHS}
> ONLY_FOR_ARCHS-java =aarch64 amd64 i386
>
> CATEGORIES = graphics devel
> -COMMENT-main = library for computer vision real-time processin
> +COMMENT-main = library for computer vision real-time processing
> COMMENT-java = Java bindings for OpenCV
>
> V = 4.5.1
> GH_ACCOUNT = opencv
> GH_PROJECT = opencv
> GH_TAGNAME = ${V}
> +REVISION = 0
>
> PKGNAME-main = opencv-${V}
> PKGNAME-java = opencv-java-${V}
> @@ -19,8 +19,6 @@ HOMEPAGE = https://www.opencv.org/
>
> MAINTAINER = Rafael Sadowski
>
> -DISTFILES = opencv-{opencv/archive/}${V}${EXTRACT_SUFX}
> -
> .for i in opencv_calib3d opencv_core opencv_features2d \
>opencv_flann opencv_highgui opencv_imgproc opencv_ml opencv_objdetect \
>opencv_photo opencv_stitching opencv_video opencv_imgcodecs \
> @@ -47,18 +45,14 @@ FLAVOR ?=
> # BSDL
> PERMIT_PACKAGE = Yes
>
> -.include
> -
> MODULES =devel/cmake \
> lang/python
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> -BUILD_DEPENDS = lang/python/${MODPY_DEFAULT_VERSION_3} \
> - math/eigen3 \
> - math/py-numpy \
> - math/py-numpy,python3
> +BUILD_DEPENDS = math/eigen3 \
> + math/py-numpy${MODPY_FLAVOR}
>
> -RUN_DEPENDS-main = math/py-numpy \
> - math/py-numpy,python3
> +RUN_DEPENDS-main = math/py-numpy${MODPY_FLAVOR}
>
> RUN_DEPENDS-java = ${MODJAVA_RUN_DEPENDS}
>
> @@ -77,7 +71,7 @@ LIB_DEPENDS-java = ${BUILD_PKGPATH},-mai
>
> # XXX PIE cannot be produced due to problems with inline assembly.
> # Since OpenCV is mostly used as a LIBrary, switch to PIC.
> -.if ${ARCH:Mi386}
> +.if ${MACHINE_ARCH:Mi386}
> CONFIGURE_ENV = CFLAGS="${CFLAGS} -fPIC" \
> CXXFLAGS="${CXXFLAGS} -fPIC"
> .endif
> @@ -96,8 +90,11 @@ CONFIGURE_ARGS = -DBUILD_DOCS=OFF \
> -DBUILD_ITT=OFF \
> -DBUILD_PERF_TESTS=OFF \
> -DBUILD_TESTS=OFF \
> + -DBUILD_opencv_python2=OFF \
> -DINSTALL_PYTHON_EXAMPLES=OFF \
> -DINSTALL_TESTS=OFF \
> + -DOPENCV_SKIP_PYTHON_WARNING=ON \
> + -DPYTHON_DEFAULT_EXECUTABLE=${MODPY_BIN} \
> -DWITH_1394=OFF \
> -DWITH_ADE=OFF \
> -DWITH_CUDA=OFF \
> @@ -107,6 +104,8 @@ CONFIGURE_ARGS = -DBUILD_DOCS=OFF \
> -DWITH_V4L=OFF \
> -DWITH_VTK=OFF
>
> +.include
> +
> .if ${BUILD_PACKAGES:M-java}
> MODULES += java
> MODJAVA_VER =1.8+
> @@ -120,8 +119,6 @@ CONFIG_ADJ_CMD = perl -pi
> .for _l _v in ${SHARED_LIBS}
> CONFIG_ADJ_CMD +=-e 's,lib${_l}.so([^.]),lib${_l}.so.${_v}$$1,g;'
> .endfor
> -
> -SUBST_VARS +=MODPY_DEFAULT_VERSION_3
>
> NO_TEST =Yes
Re: [UPDATE] graphics/opencolorio
On 2020/12/24 14:45, Dimitri Karamazov wrote:
> Update opencolorio to 1.1.1
>
> Required by graphics/krita and graphics/blender
> both Build,run tested on amd64.
>
> I'm forcing python3 as required by both consumers since
> python2 doesn't compile with C++17.
>
> Any comments/OK's?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/opencolorio/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 14 Dec 2020 15:28:14 - 1.12
> +++ Makefile 24 Dec 2020 14:16:03 -
> @@ -2,12 +2,13 @@
>
> COMMENT =color management library
>
> -V = 20140911
> -DISTNAME = OpenColorIO-$V
> -PKGNAME =opencolorio-$V
> -REVISION = 4
> +V = 1.1.1
> +GH_ACCOUNT = AcademySoftwareFoundation
> +GH_PROJECT = OpenColorIO
> +GH_TAGNAME = v${V}
> +DISTNAME = ${GH_PROJECT:L}-${V}
the version number goes 'backwards' so it needs EPOCH. I suggest this
as a bit neater (needs distinfo regenerating):
EPOCH = 0
GH_ACCOUNT =AcademySoftwareFoundation
GH_PROJECT =OpenColorIO
GH_TAGNAME =v1.1.1
PKGNAME = ${DISTNAME:L}
> COMPILER = base-clang ports-gcc base-gcc
base-gcc can go, it will never be used (port uses cmake which is now
"base-clang ports-gcc", so nothing able to build opencolorio will
select base-gcc).
> +FLAVORS =python3
> +FLAVOR = python3
this isn't a py-* port so please use
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> CFLAGS = -pthread
please drop, this is bogus in the first place, but not actually used
anyway (it's all C++ so would be CXXFLAGS)
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +Avoid assigning field to itself
> +
Part of upstream commit:
>From 0be465feb9ac2d34bd8171f30909b276c1efa996 Mon Sep 17 00:00:00 2001
From: Bernard Lefebvre <37628108+bernardlefeb...@users.noreply.github.com>
Date: Fri, 28 Sep 2018 19:11:05 -0400
Subject: [PATCH] Squashing Adsk contrib/operator rhs (#44) (#580)
> +--- src/core/Config.cpp.orig Thu Dec 3 22:17:51 2020
> src/core/Config.cpp Thu Dec 3 22:18:10 2020
> +@@ -330,7 +330,7 @@ OCIO_NAMESPACE_ENTER
> + sanitytext_ = rhs.sanitytext_;
> +
> + cacheids_ = rhs.cacheids_;
> +-cacheidnocontext_ = cacheidnocontext_;
> ++cacheidnocontext_ = rhs.cacheidnocontext_;
> + }
> + return *this;
> + }
> Index: patches/patch-src_core_OCIOYaml_cpp
> ===
> RCS file:
> /cvs/ports/graphics/opencolorio/patches/patch-src_core_OCIOYaml_cpp,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-src_core_OCIOYaml_cpp
> --- patches/patch-src_core_OCIOYaml_cpp 14 Dec 2020 06:26:25 -
> 1.3
> +++ patches/patch-src_core_OCIOYaml_cpp 24 Dec 2020 14:16:03 -
> @@ -3,13 +3,13 @@ $OpenBSD: patch-src_core_OCIOYaml_cpp,v
> Fix the build with newer yaml-cpp.
>
> Index: src/core/OCIOYaml.cpp
> src/core/OCIOYaml.cpp.orig
> -+++ src/core/OCIOYaml.cpp
> -@@ -30,43 +30,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
> +--- src/core/OCIOYaml.cpp.orig Thu Dec 24 17:16:21 2020
> src/core/OCIOYaml.cppThu Dec 24 17:16:43 2020
> +@@ -30,53 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
>
> #include
>
> --#ifndef WINDOWS
> +-#ifndef WIN32
> -
> -// fwd declare yaml-cpp visibility
> -#pragma GCC visibility push(hidden)
> @@ -46,6 +46,16 @@ Index: src/core/OCIOYaml.cpp
> -
> -#endif
> -
> +-#ifdef WIN32
> +-#pragma warning( push )
> +-#pragma warning( disable: 4146 )
> +-#endif
> +-
> #include
> +-
> +-#ifdef WIN32
> +-#pragma warning( pop )
> +-#endif
>
> #include "Logging.h"
> + #include "MathUtils.h"
> Index: patches/patch-src_core_Platform_h
> ===
> RCS file: /cvs/ports/graphics/opencolorio/patches/patch-src_core_Platform_h,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-src_core_Platform_h
> --- patches/patch-src_core_Platform_h 25 Mar 2014 10:33:33 - 1.1.1.1
> +++ patches/patch-src_core_Platform_h 24 Dec 2020 14:16:03 -
> @@ -1,9 +1,9 @@
> $OpenBSD: patch-src_core_Platform_h,v 1.1.1.1 2014/03/25 10:33:33 pascal Exp
> $
> src/core/Platform.h.orig Wed Oct 9 00:59:34 2013
> -+++ src/core/Platform.h Mon Mar 24 22:58:05 2014
> +--- src/core/Platform.h.orig Thu Mar 28 10:42:57 2019
> src/core/Platform.h Thu Dec 3 20:01:17 2020
> @@ -85,7 +85,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
> + // assume linux/unix/posix
>
> - // linux/unix/posix
> #include
> -#if !defined(__FreeBSD__)
> +#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
> Index: pkg/PLIST
>
Re: New SSL problems with Apache/mod_perl
On Wed, Dec 30, 2020 at 03:41:16PM +, Stuart Henderson wrote: > That looks perfectly normal to me. Some machines clear memory at boot > others don't, yours is one that doesn't. This can be quite helpful if > the machine crashes because DDB output usually makes it into there. > OK, that sounds good. Chris
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 08:55:46 Modified files: biology: Makefile Log message: add missing ,python3 for py-biopython (FLAVOR=python3)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 08:55:16 Modified files: devel : Makefile Log message: py-gobject3 is py3-only, drop unflavoured SUBDIR
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 08:52:35 Modified files: net: Makefile Log message: py-cares is py3-only, drop unflavoured SUBDIR
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 08:51:19 Modified files: security/plaso : Makefile Log message: missing MODPY_FLAVOR in py-lz4 RDEP
Re: New SSL problems with Apache/mod_perl
On 2020/12/30 09:36, Chris Bennett wrote: > On Wed, Dec 30, 2020 at 10:45:43AM +, Stuart Henderson wrote: > > On 2020/12/30 01:10, Chris Bennett wrote: > > > On Tue, Dec 29, 2020 at 07:57:58AM -0500, Daniel Jakots wrote: > > > > On Tue, 29 Dec 2020 03:44:03 -0600, Chris Bennett > > > > wrote: > > > > > > > > > dmesg is always a mess (How can I fix that?) > > > > > > > > Hard to give a proper fix when the problem is uncertain. Assuming the > > > > "mess" you're mentioning is that dmesg(8) shows previous boots as well, > > > > you can take /var/run/dmesg.boot. > > > > > > Nope, that file is also a mess. There was a thread a while back > > > mentioning this problem, but I can't remember what advice it gave. > > > > Maybe someone can help if you show an example, it is not clear what > > you mean here. > > > > The last boot is at the end. > /var/run/dmesg.boot That looks perfectly normal to me. Some machines clear memory at boot others don't, yours is one that doesn't. This can be quite helpful if the machine crashes because DDB output usually makes it into there.
Re: New SSL problems with Apache/mod_perl
On Wed, Dec 30, 2020 at 10:45:43AM +, Stuart Henderson wrote: > On 2020/12/30 01:10, Chris Bennett wrote: > > On Tue, Dec 29, 2020 at 07:57:58AM -0500, Daniel Jakots wrote: > > > On Tue, 29 Dec 2020 03:44:03 -0600, Chris Bennett > > > wrote: > > > > > > > dmesg is always a mess (How can I fix that?) > > > > > > Hard to give a proper fix when the problem is uncertain. Assuming the > > > "mess" you're mentioning is that dmesg(8) shows previous boots as well, > > > you can take /var/run/dmesg.boot. > > > > Nope, that file is also a mess. There was a thread a while back > > mentioning this problem, but I can't remember what advice it gave. > > Maybe someone can help if you show an example, it is not clear what > you mean here. > The last boot is at the end. /var/run/dmesg.boot INE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SRBDS_CTRL,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN cpu2: 256KB 64b/line 8-way L2 cache cpu2: smt 0, core 2, package 0 cpu3 at mainbus0: apid 6 (application processor) cpu3: Intel(R) Xeon(R) CPU E3-1270 v6 @ 3.80GHz, 3800.01 MHz, 06-9e-09 cpu3: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SRBDS_CTRL,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN cpu3: 256KB 64b/line 8-way L2 cache cpu3: smt 0, core 3, package 0 cpu4 at mainbus0: apid 1 (application processor) cpu4: Intel(R) Xeon(R) CPU E3-1270 v6 @ 3.80GHz, 3800.00 MHz, 06-9e-09 cpu4: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SRBDS_CTRL,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN cpu4: 256KB 64b/line 8-way L2 cache cpu4: smt 1, core 0, package 0 cpu5 at mainbus0: apid 3 (application processor) cpu5: Intel(R) Xeon(R) CPU E3-1270 v6 @ 3.80GHz, 3800.00 MHz, 06-9e-09 cpu5: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SRBDS_CTRL,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN cpu5: 256KB 64b/line 8-way L2 cache cpu5: smt 1, core 1, package 0 cpu6 at mainbus0: apid 5 (application processor) cpu6: Intel(R) Xeon(R) CPU E3-1270 v6 @ 3.80GHz, 3800.00 MHz, 06-9e-09 cpu6: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SRBDS_CTRL,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN cpu6: 256KB 64b/line 8-way L2 cache cpu6: smt 1, core 2, package 0 cpu7 at mainbus0: apid 7 (application processor) cpu7: Intel(R) Xeon(R) CPU E3-1270 v6 @ 3.80GHz, 3800.00 MHz, 06-9e-09 cpu7: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SRBDS_CTRL,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN cpu7: 256KB 64b/line 8-way L2 cache cpu7: smt 1, core 3, package 0 ioapic0 at mainbus0: apid 2 pa 0xfec0, version 20, 24 pins acpimcfg0 at acpi0 acpimcfg0: addr 0xe000, bus 0-255 acpihpet0 at acpi0: 2399 Hz acpiprt0 at acpi0: bus 0 (PCI0) acpiprt1 at acpi0: bus 1 (PEG0) acpiprt2 at acpi0: bus 2 (PEG1) acpiprt3
graphics/blender: missing dependency on libgmpxx.so.3.0
Hi ports, after installing a fresh copy of OpenBSD, Blender did not start because of a missing dependency of libgmpxx.so.3.0. After manually installing gmpxx, Blender started. Thanks for the update to 2.91 :D Cheers, Fabian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 08:02:41 Modified files: www: Makefile Log message: - SUBDIR += py-qtwebengine + SUBDIR += py-qtwebengine,python3 the ports is FLAVOR=python3; so the change is essentially a noop but it makes it clear that this is using the standard py3 handling
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/12/30 07:37:55 Modified files: math/nlopt : Makefile distinfo Log message: Update to nlopt-2.7.0. from wen heping with tweaks by me
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 07:25:09 Modified files: mail/s-nail: Makefile distinfo Log message: update to s-nail-14.9.20; Steffen Nurpmeso
opencv drop py2 (was Re: [update] Python 3.8.7)
> > > > sadly this will break packaging for all python ports with shared
> > > > libraries to the change they made for shared libraries :-(
> > >
> > > 3.9 will have the same in the next release.
> > >
> > > There are approx 178 ports to fix, they'll just need plist regen and
> > > bumping (there is already an appropriate variable in python.port.mk).
> > > I'm working on it.
opencv currently has py2+py3 in a single package, using 2.7
MODPY_VERSION and manually adding the 3.x parts. This makes it difficult
to use python.port.mk infrastructure to handle the .so renaming.
Is it OK to drop py2 support from opencv? Upstream say that it's
deprecated, and nothing in ports is using it (only nomacs and digikam
use opencv, and neither use Python).
A few other small tweaks to the Makefile to remove some things which
are set by default anyway (ONLY_FOR_ARCHS is set based on COMPILER
settings), use consistent .if for arch-specific things, move the
bsd.port.arch.mk include to the point where it's needed (it has
side-effects, easier to reason with if it affects a smaller number of
lines), and fix a typo in COMMENT.
Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile23 Dec 2020 18:33:05 - 1.64
+++ Makefile30 Dec 2020 13:16:24 -
@@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.64 2020/12/23 18:33:05 rsadowski Exp $
-ONLY_FOR_ARCHS = ${GCC4_ARCHS} ${CLANG_ARCHS}
ONLY_FOR_ARCHS-java = aarch64 amd64 i386
CATEGORIES = graphics devel
-COMMENT-main = library for computer vision real-time processin
+COMMENT-main = library for computer vision real-time processing
COMMENT-java = Java bindings for OpenCV
V =4.5.1
GH_ACCOUNT = opencv
GH_PROJECT = opencv
GH_TAGNAME = ${V}
+REVISION = 0
PKGNAME-main = opencv-${V}
PKGNAME-java = opencv-java-${V}
@@ -19,8 +19,6 @@ HOMEPAGE =https://www.opencv.org/
MAINTAINER = Rafael Sadowski
-DISTFILES =opencv-{opencv/archive/}${V}${EXTRACT_SUFX}
-
.for i in opencv_calib3d opencv_core opencv_features2d \
opencv_flann opencv_highgui opencv_imgproc opencv_ml opencv_objdetect \
opencv_photo opencv_stitching opencv_video opencv_imgcodecs \
@@ -47,18 +45,14 @@ FLAVOR ?=
# BSDL
PERMIT_PACKAGE = Yes
-.include
-
MODULES = devel/cmake \
lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-BUILD_DEPENDS =lang/python/${MODPY_DEFAULT_VERSION_3} \
- math/eigen3 \
- math/py-numpy \
- math/py-numpy,python3
+BUILD_DEPENDS =math/eigen3 \
+ math/py-numpy${MODPY_FLAVOR}
-RUN_DEPENDS-main = math/py-numpy \
- math/py-numpy,python3
+RUN_DEPENDS-main = math/py-numpy${MODPY_FLAVOR}
RUN_DEPENDS-java = ${MODJAVA_RUN_DEPENDS}
@@ -77,7 +71,7 @@ LIB_DEPENDS-java =${BUILD_PKGPATH},-mai
# XXX PIE cannot be produced due to problems with inline assembly.
# Since OpenCV is mostly used as a LIBrary, switch to PIC.
-.if ${ARCH:Mi386}
+.if ${MACHINE_ARCH:Mi386}
CONFIGURE_ENV =CFLAGS="${CFLAGS} -fPIC" \
CXXFLAGS="${CXXFLAGS} -fPIC"
.endif
@@ -96,8 +90,11 @@ CONFIGURE_ARGS = -DBUILD_DOCS=OFF \
-DBUILD_ITT=OFF \
-DBUILD_PERF_TESTS=OFF \
-DBUILD_TESTS=OFF \
+ -DBUILD_opencv_python2=OFF \
-DINSTALL_PYTHON_EXAMPLES=OFF \
-DINSTALL_TESTS=OFF \
+ -DOPENCV_SKIP_PYTHON_WARNING=ON \
+ -DPYTHON_DEFAULT_EXECUTABLE=${MODPY_BIN} \
-DWITH_1394=OFF \
-DWITH_ADE=OFF \
-DWITH_CUDA=OFF \
@@ -107,6 +104,8 @@ CONFIGURE_ARGS =-DBUILD_DOCS=OFF \
-DWITH_V4L=OFF \
-DWITH_VTK=OFF
+.include
+
.if ${BUILD_PACKAGES:M-java}
MODULES += java
MODJAVA_VER = 1.8+
@@ -120,8 +119,6 @@ CONFIG_ADJ_CMD =perl -pi
.for _l _v in ${SHARED_LIBS}
CONFIG_ADJ_CMD += -e 's,lib${_l}.so([^.]),lib${_l}.so.${_v}$$1,g;'
.endfor
-
-SUBST_VARS += MODPY_DEFAULT_VERSION_3
NO_TEST = Yes
# Enable to run the regression tests
Index: pkg/PLIST-java
===
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-java,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-java
--- pkg/PLIST-java 23 Dec 2020 18:33:05 - 1.11
+++ pkg/PLIST-java 30 Dec 2020 13:16:24 -
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-java,v 1.11 2020/12/23 18:33:05 rsadowski Exp $
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/12/30 06:19:06 Modified files: net/zabbix : Makefile distinfo net/zabbix/patches: patch-configure net/zabbix/pkg : PLIST-web Log message: update to 5.0.7; from Mark Patruck
Re: www/syweb broken
On 2020/12/29 18:16, Steven Shockley wrote: > The images in www/syweb are broken due to warnings about deprecated > old-style constructors in PHP 7.x. This patch updates to new-style > constructors. Thanks, committed. I don't suppose this port is very widely used then!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 05:47:56 Modified files: www/syweb : Makefile Added files: www/syweb/patches: patch-htdocs_syweb_class_cache_inc patch-htdocs_syweb_class_graph_inc patch-htdocs_syweb_class_layout_inc patch-htdocs_syweb_class_lexer_inc patch-htdocs_syweb_class_rrdtool_inc patch-htdocs_syweb_class_session_inc patch-htdocs_syweb_class_text_inc patch-htdocs_syweb_class_vars_inc Log message: syweb: adapt for php 7, from Steven Shockley
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 05:46:01 Modified files: www/lighttpd : Makefile distinfo www/lighttpd/patches: patch-doc_lighttpd_8 www/lighttpd/pkg: PFRAG.ldap PFRAG.mysql PLIST Log message: update to lighttpd 1.4.58, from Brad (maintainer)
Re: UPDATE: SDL 2.0.14
On Mon, Dec 28, 2020 at 04:15:45PM -0500, Brad Smith wrote:
> On 12/28/2020 11:14 AM, Charlene Wendling wrote:
> > On Sat, 26 Dec 2020 15:03:07 -0500
> > Brad Smith wrote:
> >
> > > On 12/25/2020 3:39 PM, Thomas Frohwein wrote:
> > > > On Thu, Dec 24, 2020 at 09:48:45PM -0500, Brad Smith wrote:
> > > > > Here is an update to SDL 2.0.14.
> > > > >
> > > > > Tested with a few apps. More testing and feedback welcome.
> > > > I have a similar diff that I'm testing. A few releases ago, there
> > > > was an issue with some reverse deps breaking during build.
> > > >
> > > > Brad, can you let me know what apps you tested, and if you tested
> > > > build and/or runtime, so that I can add it into my own list of
> > > > tests?
> > > mpv
> > > qemu
> > > ffplay
> > > blobby
> > > taisei
> > > supertux
> > >
> > > Run time testing. I just chose a couple of random games to do some
> > > additional run time
> > > testing of the video and audio output.
> > >
> > > I noticed supertux randomly crashes in SDL_BlitCopy upon startup, but
> > > that is not new
> > > for this release of SDL.
> > >
> > Hi,
> >
> > Some testing report:
> >
> > - amd64:i've tested emulators/ppsspp and games/endless-sky
> > without issues, using my logitech dual action
> > - macppc: after building that update, i've built and run tested
> > games/wesnoth and games/blobby and everything is still fine
> >
> > Port-wise, that looks good to me.
> Thanks.
Generally looking good. I did some extensive testing with Brad's diff;
see sdl2-testing-2.0.14.txt in attachments for a table of results.
Build of emulators/vbam breaks with this update. It can't find KMOD_GUI
variable anymore; and no KMOD_META. See vbam.txt attachment. I got a
simple diff for the vbam port below that unbreaks this.
Just double-checking - did SIMD support change with clang on arm (in
Brad's diff)?
-# clang can't handle simd asm
-.if ${MACHINE_ARCH} == "arm"
-CONFIGURE_ARGS+= --disable-arm-simd
If this is clarified, ok thfr@ for Brad's sdl2 diff.
ok for vbam fix below?
Index: Makefile
===
RCS file: /cvs/ports/emulators/vbam/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile17 Nov 2019 00:14:36 - 1.34
+++ Makefile30 Dec 2020 12:23:16 -
@@ -9,6 +9,7 @@ GH_ACCOUNT =visualboyadvance-m
GH_PROJECT = ${GH_ACCOUNT}
GH_TAGNAME = v2.1.4
PKGNAME = vbam-${GH_TAGNAME:S/v//}
+REVISION = 0
CATEGORIES = emulators
Index: patches/patch-src_sdl_SDL_cpp
===
RCS file: patches/patch-src_sdl_SDL_cpp
diff -N patches/patch-src_sdl_SDL_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_sdl_SDL_cpp 30 Dec 2020 12:23:16 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: src/sdl/SDL.cpp
+--- src/sdl/SDL.cpp.orig
src/sdl/SDL.cpp
+@@ -876,9 +876,7 @@ void sdlInitVideo()
+
+ sdlResizeVideo();
+ }
+-#if defined(KMOD_GUI)
+ #define KMOD_META KMOD_GUI
+-#endif
+
+ #define MOD_KEYS (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
+ #define MOD_NOCTRL (KMOD_SHIFT | KMOD_ALT | KMOD_META)
Builds? Runs? FullPkgPath|FullDepends|PkgSpec|Rest|DependsPath|Type|N
thfraudio/adplay|devel/sdl2|||devel/sdl2|0|2
thfrbradgraphics/ffmpeg|devel/sdl2|||devel/sdl2|0|8
thfrx11/wxWidgets|devel/sdl2|||devel/sdl2|0|3
thfraudio/audiality2|devel/sdl2|||devel/sdl2|0|0
thfrbradmultimedia/mpv|devel/sdl2|||devel/sdl2|0|4
thfraudio/faudio|devel/sdl2|||devel/sdl2|0|0
thfrthfraudio/milkytracker|devel/sdl2|||devel/sdl2|0|1
thfraudio/ocp|devel/sdl2|||devel/sdl2|0|6
thfrgraphics/libqrencode|devel/sdl2|||devel/sdl2|2|1
thfrdevel/sdl2-gfx|devel/sdl2|||devel/sdl2|0|0
thfr
devel/sdl2-image|STEM->=2.0.8:devel/sdl2|STEM->=2.0.8||devel/sdl2|0|0
thfrdevel/sdl2-mixer|devel/sdl2|||devel/sdl2|0|7
thfrdevel/sdl2-net|devel/sdl2|||devel/sdl2|0|0
thfrdevel/sdl2-ttf|devel/sdl2|||devel/sdl2|0|0
thfrdevel/smpeg2|devel/sdl2|||devel/sdl2|0|0
thfremulators/advancemame|devel/sdl2|||devel/sdl2|0|0
thfrthfremulators/citra|devel/sdl2|||devel/sdl2|0|1
thfrthfremulators/dolphin|devel/sdl2|||devel/sdl2|0|5
thfremulators/emulationstation|devel/sdl2|||devel/sdl2|0|1
thfremulators/fs-uae|devel/sdl2|||devel/sdl2|0|0
thfrbrademulators/qemu|devel/sdl2|||devel/sdl2|0|11
thfremulators/gsplus|devel/sdl2-image|||devel/sdl2-image|0|0
thfremulators/hatari|devel/sdl2|||devel/sdl2|0|0
can't build emulators/mame|devel/sdl2|||devel/sdl2|0|2
thfremulators/mednafen|devel/sdl2|||devel/sdl2|0|2
thfrthfremulators/mgba|devel/sdl2|||devel/sdl2|0|4
thfremulators/mupen64plus/core|devel/sdl2|||devel/sdl2|0|0
Re: [MAINTAINER] Drop maintainership on www/p5-Mojo
On 2020/12/30 14:00, Manolis Tzanidakis wrote: > Hello, > I'd like to stop being the MAINTAINER of the www/p5-Mojo port. > > I've switched jobs last year and no longer maintain any production > Mojolicious apps. > > Best wishes for the new year to everyone. > Done - thanks for maintaining in the past.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/12/30 05:09:55 Modified files: www/p5-Mojo: Makefile Log message: p5-Mojo: Manolis Tzanidakis drops maintainer
[MAINTAINER] Drop maintainership on www/p5-Mojo
Hello, I'd like to stop being the MAINTAINER of the www/p5-Mojo port. I've switched jobs last year and no longer maintain any production Mojolicious apps. Best wishes for the new year to everyone.
UPDATE: lighttpd 1.4.58
Here is an update to lighttpd 1.4.58.
Changes from 1.4.57
[mod_wolfssl] use wolfSSL TLS version defines
[mod_wolfssl] compile with earlier wolfSSL vers
[tests] collect code for ???die-at-end??? tests
[tests] remove FastCGI test dependency on libfcgi
[core] prefer IPv6+IPv4 func vs IPv4-specific func
[tests] remove FastCGI test dependency on PHP
[core] reuse large mem chunks (fix mem usage) (fixes #3033)
[core] add comment for FastCGI mem use in hctx???rb (#3033)
[mod_proxy] fix sending of initial reqbody chunked
[multiple] fdevent_waitpid() wrapper
[core] sys-time.h ??? localtime_r,gmtime_r macros
[core] http_date.[ch] encapsulate HTTP-date parse
[core] specialized strptime() for HTTP date fmts
[multiple] employ http_date.h, sys-time.h
[core] http_date_timegm() (portable timegm())
buffer_append_path_len() to join paths
[core] inet_ntop_cache ??? sock_addr_cache
[tests] slight speed up checking for server ready
[tests] load required modules in alt .conf tests
[multiple] etag.[ch] ??? http_etag.[ch]; better imp
[core] fix crash after specific err in config file
[core] fix bug in FastCGI uploads (#3033)
[tests] OpenBSD crypt() support limited to bcrypt
[core] http_response_match_if_range()
[mod_webdav] typedef off_t loff_t for FreeBSD
[multiple] chunkqueue_write_chunk()
[build] add GNUMAKEFLAGS=???no-print-directory
[tests] consolidate some tests/ content
[core] fix bug in read retry found by coverity
Index: Makefile
===
RCS file: /home/cvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.159
diff -u -p -u -p -r1.159 Makefile
--- Makefile5 Feb 2020 20:18:19 - 1.159
+++ Makefile28 Dec 2020 21:54:53 -
@@ -2,7 +2,7 @@
COMMENT= secure, fast, compliant, and very flexible web-server
-DISTNAME= lighttpd-1.4.55
+DISTNAME= lighttpd-1.4.58
CATEGORIES=www net
MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/
EXTRACT_SUFX= .tar.xz
@@ -16,7 +16,7 @@ PERMIT_PACKAGE= Yes
WANTLIB= c crypto m pcre ssl z ${MODLUA_WANTLIB}
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER= base-clang ports-gcc base-gcc
MODULES= lang/lua
MODLUA_SA= Yes
@@ -30,7 +30,6 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --libdir="${PREFIX}/lib/lighttpd" \
--with-lua \
--with-openssl \
---without-bzip2 \
--without-libev
CONFIGURE_ENV+=CC_FOR_BUILD="${CC}" \
CFLAGS_FOR_BUILD="${CFLAGS}" \
@@ -45,13 +44,13 @@ FLAVOR?=
.if ${FLAVOR:Mldap}
CONFIGURE_ARGS+= --with-ldap
LIB_DEPENDS+= databases/openldap
-WANTLIB+= lber-2.4 ldap-2.4 sasl2
+WANTLIB+= lber ldap sasl2
.endif
.if ${FLAVOR:Mmysql}
CONFIGURE_ARGS+= --with-mysql
LIB_DEPENDS+= databases/mariadb
-WANTLIB+= mysqlclient pthread ${COMPILER_LIBCXX}
+WANTLIB+= mariadb pthread
.endif
post-extract:
Index: distinfo
===
RCS file: /home/cvs/ports/www/lighttpd/distinfo,v
retrieving revision 1.61
diff -u -p -u -p -r1.61 distinfo
--- distinfo5 Feb 2020 20:18:19 - 1.61
+++ distinfo28 Dec 2020 21:54:59 -
@@ -1,2 +1,2 @@
-SHA256 (lighttpd-1.4.55.tar.xz) = agtQ6cnVzD2eSFkjFcJaLWRYWPhj4czRIFB6MM4h6Sc=
-SIZE (lighttpd-1.4.55.tar.xz) = 765660
+SHA256 (lighttpd-1.4.58.tar.xz) = Jn/v/aE6GQ69znsVFy2L4W2pgAhFfzD93s1ygy0SbQ4=
+SIZE (lighttpd-1.4.58.tar.xz) = 956828
Index: patches/patch-doc_lighttpd_8
===
RCS file: /home/cvs/ports/www/lighttpd/patches/patch-doc_lighttpd_8,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-doc_lighttpd_8
--- patches/patch-doc_lighttpd_817 Sep 2016 20:22:41 - 1.3
+++ patches/patch-doc_lighttpd_826 Oct 2020 05:31:00 -
@@ -1,6 +1,8 @@
$OpenBSD: patch-doc_lighttpd_8,v 1.3 2016/09/17 20:22:41 ajacoutot Exp $
doc/lighttpd.8.origSun Jul 31 08:42:39 2016
-+++ doc/lighttpd.8 Wed Sep 14 20:52:57 2016
+
+Index: doc/lighttpd.8
+--- doc/lighttpd.8.orig
doc/lighttpd.8
@@ -56,7 +56,7 @@ Show a brief help message and exit.
.
.SH FILES
@@ -9,4 +11,4 @@ $OpenBSD: patch-doc_lighttpd_8,v 1.3 201
+${SYSCONFDIR}/lighttpd.conf
The standard location for the configuration file.
.TP 8
- /var/run/lighttpd.pid
+ /run/lighttpd.pid
Index: pkg/PFRAG.ldap
===
RCS file: /home/cvs/ports/www/lighttpd/pkg/PFRAG.ldap,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PFRAG.ldap
--- pkg/PFRAG.ldap 11 Nov 2016 10:23:34 - 1.1
+++ pkg/PFRAG.ldap 27 Oct 2020 07:11:42 -
@@ -1,2 +1,3 @@
@comment $OpenBSD: PFRAG.ldap,v 1.1 2016/11/11 10:23:34 sthen Exp $
-lib/lighttpd/mod_authn_ldap.so
+@so lib/lighttpd/mod_authn_ldap.so
+@so lib/lighttpd/mod_vhostdb_ldap.so
Index: pkg/PFRAG.mysql
[Update] math/nlopt : Update to 2.7.0
Hi, ports@: Here is a patch for math/nlopt update to 2.7.0. It build well and pass all tests on amd64-6.8 system. No other ports depend on it. wen Index: Makefile === RCS file: /cvs/ports/math/nlopt/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile8 Jul 2020 22:57:41 - 1.5 +++ Makefile30 Dec 2020 10:52:38 - @@ -4,10 +4,9 @@ COMMENT = library for nonlinear optimiz GH_ACCOUNT = stevengj GH_PROJECT = nlopt -GH_TAGNAME = v2.6.2 -REVISION = 0 +GH_TAGNAME = v2.7.0 -SHARED_LIBS = nlopt 0.2 # 0.10.0 +SHARED_LIBS = nlopt 0.2 # 0.11.0 CATEGORIES = math Index: distinfo === RCS file: /cvs/ports/math/nlopt/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo18 Apr 2020 23:26:00 - 1.3 +++ distinfo30 Dec 2020 10:52:38 - @@ -1,2 +1,2 @@ -SHA256 (nlopt-2.6.2.tar.gz) = z6WYFzbdYNAQnFNJhMThPGFTFNNYTPHDkqFVv+GjsX4= -SIZE (nlopt-2.6.2.tar.gz) = 2040229 +SHA256 (nlopt-2.7.0.tar.gz) = uIHMKl+s5ROfHFowyvJrfTy0PWnV5CPJ14OS+ZhESZ8= +SIZE (nlopt-2.7.0.tar.gz) = 2045585
Re: New SSL problems with Apache/mod_perl
On 2020/12/30 01:10, Chris Bennett wrote: > On Tue, Dec 29, 2020 at 07:57:58AM -0500, Daniel Jakots wrote: > > On Tue, 29 Dec 2020 03:44:03 -0600, Chris Bennett > > wrote: > > > > > dmesg is always a mess (How can I fix that?) > > > > Hard to give a proper fix when the problem is uncertain. Assuming the > > "mess" you're mentioning is that dmesg(8) shows previous boots as well, > > you can take /var/run/dmesg.boot. > > Nope, that file is also a mess. There was a thread a while back > mentioning this problem, but I can't remember what advice it gave. Maybe someone can help if you show an example, it is not clear what you mean here. On 2020/12/30 01:44, Chris Bennett wrote: > > There should be a second one like this ^ > > > > 0 s:/CN=bennettconstruction.us > >i:/C=US/O=Let's Encrypt/CN=R3 > > 1 s:/C=US/O=Let's Encrypt/CN=R3 > >i:/O=Digital Signature Trust Co./CN=DST Root CA X3 > > I'm not getting: > 1 s:/C=US/O=Let's Encrypt/CN=R3 > i:/O=Digital Signature Trust Co./CN=DST Root CA X3 Yes, I am showing what it *should* look like after I showed how it currently looks. > I lowered the encryption to the most permissive to rule out any problems > with other software being out of date. Didn't help. Might have done that > after sending this thread. This is 100% a certificate chain problem not an encryption problem. > > For Apache you are probably missing setting SSLCertificateChainFile, > > if you're fetching with acme-client then this config option should point > > at a file written with either of these options > > > >domain chain certificate > >domain full chain certificate > > > > So, as far as I can see, there is: > /etc/ssl/cert.pem > /etc/acme/letsencrypt-privkey.pem (I didn't notice this file until > looking at acme-client.conf > Are there any other files I didn't notice? If you don't have a "chain certificate" option in acme-client.conf you'll need to add one. See /etc/examples/acme-client.conf for an example. > > Don't use a manually fetched file for this as it will change from time > > to time. > > OK, didn't know that. Thanks. > > I'll play around with this new info and see what I get. I'll post > whatever works or fails either way. > I'll also do some more reading, but not on the Apache site. I hate to > criticize, but the documentation there just isn't maintained and is very > dated. Actually looking there I see my information is dated :) (still works but not recommended). https://httpd.apache.org/docs/current/mod/mod_ssl.html#sslcertificatechainfile So, instead you should point SSLCertificateFile at a file produced by "domain full chain certificate", SSLCertificateKeyFile at the "domain key" file, and ignore what I said about SSLCertificateChainFile.
Re: [UPDATE] graphics/opencolorio
On Thu Dec 24, 2020 at 02:45:34PM +, Dimitri Karamazov wrote:
> Update opencolorio to 1.1.1
>
> Required by graphics/krita and graphics/blender
> both Build,run tested on amd64.
>
> I'm forcing python3 as required by both consumers since
> python2 doesn't compile with C++17.
>
> Any comments/OK's?
OK rsadowski@, CC'ing maintainer.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/opencolorio/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 14 Dec 2020 15:28:14 - 1.12
> +++ Makefile 24 Dec 2020 14:16:03 -
> @@ -2,12 +2,13 @@
>
> COMMENT =color management library
>
> -V = 20140911
> -DISTNAME = OpenColorIO-$V
> -PKGNAME =opencolorio-$V
> -REVISION = 4
> +V = 1.1.1
> +GH_ACCOUNT = AcademySoftwareFoundation
> +GH_PROJECT = OpenColorIO
> +GH_TAGNAME = v${V}
> +DISTNAME = ${GH_PROJECT:L}-${V}
>
> -SHARED_LIBS += OpenColorIO 1.0 # 1.0
> +SHARED_LIBS += OpenColorIO 1.1 # 1.1.1
>
> CATEGORIES = graphics
>
> @@ -22,11 +23,12 @@ WANTLIB += m pthread ${COMPILER_LIBCXX}
>
> COMPILER = base-clang ports-gcc base-gcc
>
> -MASTER_SITES = http://deftly.net/
> -
> MODULES =devel/cmake \
> lang/python
>
> +FLAVORS =python3
> +FLAVOR = python3
> +
> BUILD_DEPENDS = devel/boost
> LIB_DEPENDS =textproc/tinyxml \
> devel/yaml-cpp
> @@ -43,8 +45,12 @@ CONFIGURE_ARGS += -DPYTHON="${MODPY_BIN}
>
> NO_TEST =Yes
>
> -WRKDIST =${WRKDIR}/OpenColorIO-master
> -
> CFLAGS = -pthread
> +
> +post-install:
> + ${INSTALL_DATA_DIR} ${PREFIX}/lib/cmake/OpenColorIO
> + mv ${PREFIX}/cmake/*.cmake ${PREFIX}/OpenColorIO*.cmake \
> + ${PREFIX}/lib/cmake/OpenColorIO
> + rm -rf ${PREFIX}/cmake
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/opencolorio/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 21 Nov 2014 17:25:49 - 1.3
> +++ distinfo 24 Dec 2020 14:16:03 -
> @@ -1,2 +1,2 @@
> -SHA256 (OpenColorIO-20140911.tar.gz) =
> d1Y6L8peE+SuqhBv/lA5Km70hjRlyszFOuVFmNzlnpQ=
> -SIZE (OpenColorIO-20140911.tar.gz) = 13742525
> +SHA256 (opencolorio-1.1.1.tar.gz) =
> ybW53vkH4dr7KeNzNrcC//IsxjBtRFoTsWIbinVMFMg=
> +SIZE (opencolorio-1.1.1.tar.gz) = 13828483
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-CMakeLists_txt 24 Dec 2020 14:16:03 -
> @@ -0,0 +1,25 @@
> +$OpenBSD$
> +
> +Fix macro redefined error
> +
> +--- CMakeLists.txt.orig 2018-01-05 12:08:27 UTC
> CMakeLists.txt
> +@@ -218,8 +222,7 @@ else(USE_EXTERNAL_TINYXML)
> + ## => great news when build staticaly since we do not want another
> client project have to link also with tinyxml when he want to use this project
> + ## => could be problematic if the client project use another
> version of tinyxml... In this case build tinyxml as shared lib with all
> projects could be a solution
> + ## => TODO: so maybe provide a simple cmake way to build 3rdParty
> as shared and auto install with this project ?
> +-set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS
> "-DTIXML_USE_STL -fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
> +-add_definitions(-DTIXML_USE_STL) ## needed to build correctly, and
> also need to be propagated in child projects (client projects)
> ++set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-fPIC
> -fvisibility-inlines-hidden -fvisibility=hidden")
> + list(APPEND EXTERNAL_OBJECTS $)
> + else()
> + find_package(Git REQUIRED) ## in order to apply patch (for
> crossplateform compatibility)
> +@@ -384,7 +387,7 @@ else()
> + set(OCIO_INLINES_HIDDEN OFF)
> + endif()
> +
> +-set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL ${YAML_CPP_COMPILE_FLAGS}
> ${GCC_COMPILE_FLAGS}")
> ++set(EXTERNAL_COMPILE_FLAGS "${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
> +
> + set(EXTERNAL_LINK_FLAGS "")
> + set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
> Index: patches/patch-export_OpenColorIO_OpenColorABI_h_in
> ===
> RCS file: patches/patch-export_OpenColorIO_OpenColorABI_h_in
> diff -N patches/patch-export_OpenColorIO_OpenColorABI_h_in
> --- patches/patch-export_OpenColorIO_OpenColorABI_h_in21 Nov 2014
> 17:25:49 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/12/30 02:33:10 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.18.205.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/12/30 02:32:56 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.16.45.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/12/30 02:32:41 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py3-botocore-1.19.45.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/12/30 02:25:23 Modified files: net/libproxy : Makefile distinfo net/libproxy/patches: patch-libproxy_CMakeLists_txt patch-libproxy_url_cpp Log message: Update to libproxy-0.4.17.
[Update] devel/ruby-uuid : Update to 2.3.9
Hi, ports@:
Here is a patch for devel/ruby-uuid:
i) Update to 2.3.9
ii) Add missing TEST_DEPENDS
It build well and pass all tests on amd64-6.8 system.
One port depends on it : net/ruby-agcaldav, it build
well with this patch and no test defined.
wen
Index: Makefile
===
RCS file: /cvs/ports/devel/ruby-uuid/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:00 - 1.6
+++ Makefile30 Dec 2020 08:49:50 -
@@ -2,7 +2,7 @@
COMMENT= UUID generator
-DISTNAME= uuid-2.3.8
+DISTNAME= uuid-2.3.9
CATEGORIES=devel
HOMEPAGE= https://github.com/assaf/uuid
@@ -16,6 +16,7 @@ CONFIGURE_STYLE= gem
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= net/ruby-macaddr,${MODRUBY_FLAVOR}
+TEST_DEPENDS= devel/ruby-mocha,${MODRUBY_FLAVOR}
MODRUBY_TEST= rake
Index: distinfo
===
RCS file: /cvs/ports/devel/ruby-uuid/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo19 Jun 2015 14:09:20 - 1.2
+++ distinfo30 Dec 2020 08:49:50 -
@@ -1,2 +1,2 @@
-SHA256 (uuid-2.3.8.gem) = ewQB4PxL7/AIM7c+Uo30VQDM037VGB8vB2jQI16vIj8=
-SIZE (uuid-2.3.8.gem) = 14848
+SHA256 (uuid-2.3.9.gem) = rsDPWSBTzW4HwTwe+UxECrpwXyLrHudns5Yx8nYBJNc=
+SIZE (uuid-2.3.9.gem) = 14848
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2020/12/30 01:44:38 Modified files: devel : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm devel/py-lazy-object-proxy: Makefile distinfo devel/py-lazy-object-proxy/pkg: PLIST Log message: update py-lazy-object-proxy to 1.4.3 so pylint can be repaired while here, make it python3-only too
[Update] devel/p5-Tree-DAG_Node : Update to 1.31
Hi, ports@: Here is a patch for devel/p5-Tree-DAG_Node: i) Update to 1.31 ii) Add RUN_DEPENDS of devel/p5-File-Slurp-Tiny, which I submitted just now. It build well and pass all tests on amd64-6.8 system. Two ports depends on it: graphics/p5-SVG-Graph textproc/p5-XML-Validator-Schema both build well and pass all tests with this patch. wen Index: Makefile === RCS file: /cvs/ports/devel/p5-Tree-DAG_Node/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile3 Jul 2020 21:45:18 - 1.13 +++ Makefile30 Dec 2020 08:27:10 - @@ -4,11 +4,14 @@ COMMENT= superclass for representing nod MODULES= cpan PKG_ARCH= * -DISTNAME= Tree-DAG_Node-1.06 +CPAN_AUTHOR= RSAVAGE +DISTNAME= Tree-DAG_Node-1.31 +EXTRACT_SUFX= .tgz CATEGORIES=devel -REVISION= 0 # Artistic PERMIT_PACKAGE=Yes + +RUN_DEPENDS= devel/p5-File-Slurp-Tiny .include Index: distinfo === RCS file: /cvs/ports/devel/p5-Tree-DAG_Node/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo18 Jan 2015 03:13:37 - 1.6 +++ distinfo30 Dec 2020 08:27:10 - @@ -1,2 +1,2 @@ -SHA256 (Tree-DAG_Node-1.06.tar.gz) = UCVwd03TvxE0X7AoykzdefBNsS7mioJvDETiTaDj2yo= -SIZE (Tree-DAG_Node-1.06.tar.gz) = 32843 +SHA256 (Tree-DAG_Node-1.31.tgz) = HIuml3JWizdYBUJHCXUSxVDv4xUXwyn7Ze73r8zJ0wQ= +SIZE (Tree-DAG_Node-1.31.tgz) = 57977
[NEW] devel/p5-File-Slurp-Tiny
Hi, ports@: Here is a patch to create new port devel/p5-File-Slurp-Tiny, it is required by the update of devel/p5-Tree-DAG_Node. It build well and pass all tests on amd64-6.8 system. wen p5-File-Slurp-Tiny.tar.gz Description: p5-File-Slurp-Tiny.tar.gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2020/12/30 01:32:16 Modified files: devel/py-wrapt : Makefile distinfo devel/py-wrapt/pkg: PLIST Log message: update py-wrapt to 1.11.2 so pylint can be repaired
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/12/30 01:31:00 Modified files: databases/p5-Mojo-Pg: Makefile distinfo Log message: Update to p5-Mojo-Pg-4.22. >From wen heping, looks ok Abel Abraham Camarillo Ojeda (MAINTAINER)
