move piglit to python3
piglit is a consumer of python2 numpy. because newer versions of numpy are
python3-only, the diff below proposes to move piglit from python2 to
python3 so numpy can be updated.
By moving to python3 we can also get rid of the py-subprocess32
dependency.
I don't know too much about piglit but I was able to run "piglit run
sanity results" on my amd64 box.
The one nice thing about moving from py2 to py3 is that "make
update-plist" repairs some of the odd substitutions that are in the
current PLIST. So a bunch of the PLIST changes below are just due to:
"co${MODPY_PY_PREFIX}" -> "copy-"
ok?
Index: Makefile
===
RCS file: /cvs/ports/graphics/piglit/Makefile,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile
--- Makefile26 Aug 2020 03:23:40 - 1.11
+++ Makefile11 Oct 2020 04:55:15 -
@@ -4,7 +4,7 @@ COMMENT = automated OpenGL and OpenCL te
ONLY_FOR_ARCHS = amd64 i386
DISTNAME = piglit-20190208
-REVISION = 4
+REVISION = 5
GH_ACCOUNT = mesa3d
GH_PROJECT = piglit
@@ -26,12 +26,11 @@ COMPILER = base-clang ports-gcc base-gc
MODULES = devel/cmake \
lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-RUN_DEPENDS = devel/py-six \
- devel/py-subprocess32 \
- math/py-numpy \
- www/py-mako
+RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
+ math/py-numpy${MODPY_FLAVOR} \
+ www/py-mako${MODPY_FLAVOR}
BUILD_DEPENDS =${RUN_DEPENDS}
LIB_DEPENDS = graphics/waffle \
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/piglit/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST 12 Feb 2019 02:26:40 - 1.2
+++ pkg/PLIST 11 Oct 2020 04:55:22 -
@@ -720,7 +720,7 @@ lib/piglit/bin/
@bin lib/piglit/bin/clip-plane-transformation
@bin lib/piglit/bin/clipflat
@bin lib/piglit/bin/compressedteximage
-@bin lib/piglit/bin/co${MODPY_PY_PREFIX}pixels
+@bin lib/piglit/bin/copy-pixels
@bin lib/piglit/bin/copy_buffer_coherency
@bin lib/piglit/bin/copybuffersubdata
@bin lib/piglit/bin/copypixels-draw-sync
@@ -774,7 +774,7 @@ lib/piglit/bin/
@bin lib/piglit/bin/early-z
@bin lib/piglit/bin/egl-configless-context
@bin lib/piglit/bin/egl-context-priority
-@bin lib/piglit/bin/egl-co${MODPY_PY_PREFIX}buffers
+@bin lib/piglit/bin/egl-copy-buffers
@bin lib/piglit/bin/egl-create-context-core-profile
@bin lib/piglit/bin/egl-create-context-default-major-version-gl
@bin lib/piglit/bin/egl-create-context-default-major-version-gles
@@ -1373,7 +1373,7 @@ lib/piglit/bin/
@bin lib/piglit/bin/glx-buffer-age
@bin lib/piglit/bin/glx-close-display
@bin lib/piglit/bin/glx-context-flush-control
-@bin lib/piglit/bin/glx-co${MODPY_PY_PREFIX}sub-buffer
+@bin lib/piglit/bin/glx-copy-sub-buffer
@bin lib/piglit/bin/glx-create-context-core-profile
@bin lib/piglit/bin/glx-create-context-current-no-framebuffer
@bin lib/piglit/bin/glx-create-context-default-major-version
@@ -1726,90 +1726,96 @@ lib/piglit/bin/
@bin lib/piglit/bin/zero-tex-coord
lib/piglit/framework/
lib/piglit/framework/__init__.py
-lib/piglit/framework/__init__.pyc
+${MODPY_COMMENT}lib/piglit/framework/${MODPY_PYCACHE}/
+lib/piglit/framework/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}dmesg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}driver_classifier.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}grouptools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}monitoring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}profile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}results.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}status.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/${MODPY_PYCACHE}wflinfo.${MODPY_PYC_MAGIC_TAG}pyc
lib/piglit/framework/backends/
lib/piglit/framework/backends/__init__.py
-lib/piglit/framework/backends/__init__.pyc
+${MODPY_COMMENT}lib/piglit/framework/backends/${MODPY_PYCACHE}/
+lib/piglit/framework/backends/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/backends/${MODPY_PYCACHE}abstract.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/backends/${MODPY_PYCACHE}compression.${MODPY_PYC_MAGIC_TAG}pyc
+lib/piglit/framework/backends/${MODPY_PYC
Re: update py-kiwisolver to 1.2.0
On Sat 10/10/2020 18:00, Daniel Dickman wrote: > Note that kiwisolver 1.2.0 is now python3-only so diff below includes > a quirks diff as well. > > kiwisolver is only used by py-matplotlib which still seems to work with > the update below. > > ok? OK bket@
update pcbasic to 2.0.2 for python3 support
pcbasic uses numpy and numpy has gone python3 only.
in order to update numpy we need consumers like pcbasic to move to
python3.
diff below updates pcbasic to v2.0.2 which is advertized to support
python3.
ok?
(p.s. I note that pcbasic 2.0.3 does away with the numpy dependency, so
another choice could be to do an update to the newer version if you
wanted).
Index: Makefile
===
RCS file: /cvs/ports/lang/pcbasic/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile12 Jul 2019 20:47:21 - 1.4
+++ Makefile11 Oct 2020 04:25:45 -
@@ -1,8 +1,13 @@
# $OpenBSD: Makefile,v 1.4 2019/07/12 20:47:21 sthen Exp $
-MODPY_EGG_VERSION =2.0.1
COMMENT = free, cross-platform emulator for GW-BASIC family (PC-BASIC)
-DISTNAME = pcbasic-${MODPY_EGG_VERSION}
+
+MODPY_EGG_VERSION =2.0.2
+GH_ACCOUNT = robhagemans
+GH_PROJECT = pcbasic
+GH_TAGNAME = v${MODPY_EGG_VERSION}
+DISTNAME = pcbasic-${MODPY_EGG_VERSION}
+
CATEGORIES = lang
HOMEPAGE = http://www.pc-basic.org/
@@ -11,24 +16,13 @@ MAINTAINER =Brian Callahan https://github.com/robhagemans/pcbasic/releases/download/v${MODPY_EGG_VERSION}/
-
MODULES = lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
MODPY_SETUPTOOLS = Yes
-RUN_DEPENDS = devel/py-parallel \
- devel/py-serial \
+RUN_DEPENDS = devel/py-parallel${MODPY_FLAVOR} \
+ devel/py-serial${MODPY_FLAVOR} \
devel/sdl2-gfx \
- math/py-numpy
-
-post-extract:
- @gunzip -o ${WRKSRC}/doc/pcbasic.1 \
- ${WRKSRC}/doc/pcbasic.1.gz
-
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/doc/pcbasic.1 ${PREFIX}/man/man1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pcbasic
- ${INSTALL_DATA} ${WRKSRC}/doc/PC-BASIC_documentation.{html,pdf} \
- ${PREFIX}/share/doc/pcbasic
+ math/py-numpy${MODPY_FLAVOR}
.include
Index: distinfo
===
RCS file: /cvs/ports/lang/pcbasic/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo11 Dec 2018 20:56:11 - 1.2
+++ distinfo11 Oct 2020 04:25:45 -
@@ -1,2 +1,2 @@
-SHA256 (pcbasic-2.0.1.tar.gz) = PqAn+PsYBH5UN28bap4tc01wfq/zLx4L98OJC8dolBs=
-SIZE (pcbasic-2.0.1.tar.gz) = 3690546
+SHA256 (pcbasic-2.0.2.tar.gz) = E0TCQk0AiI7/JaoZ7kDqDT7QHNFksSn7XZKL9WYp5yg=
+SIZE (pcbasic-2.0.2.tar.gz) = 3846170
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/pcbasic/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST 11 Dec 2018 20:56:11 - 1.2
+++ pkg/PLIST 11 Oct 2020 04:25:45 -
@@ -9,168 +9,189 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pcbasic/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pcbasic/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/pcbasic/__main__.py
-lib/python${MODPY_VERSION}/site-packages/pcbasic/__main__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}guard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/
lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}basicevents.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}clock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}codepage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/pytho
update apache-ant to 1.10.9
This update includes a fix for CVE-2020-11979.
To summarize, the fix for CVE-2020-1945 that was done in ant 1.10.8 did
not work as intended so a new release of ant was made to try again.
Diff below includes a quirks update.
The consumers of ant were compile tested with the update below:
editors/libreoffice
graphics/opencv
math/rstudio
textproc/link-grammar
ok?
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1060
diff -u -p -u -r1.1060 Makefile
--- devel/quirks/Makefile 10 Oct 2020 18:45:00 - 1.1060
+++ devel/quirks/Makefile 11 Oct 2020 03:33:56 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.452
+PKGNAME = quirks-3.453
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1078
diff -u -p -u -r1.1078 Quirks.pm
--- devel/quirks/files/Quirks.pm10 Oct 2020 18:45:00 - 1.1078
+++ devel/quirks/files/Quirks.pm11 Oct 2020 03:33:56 -
@@ -1997,7 +1997,7 @@ my $cve = {
'databases/postgresql,-main' => 'postgresql-client-<10.6',
'databases/postgresql,-server' => 'postgresql-server-<10.6',
'databases/sqlite3' => 'sqlite3-<3.25.3',
- 'devel/apache-ant' => 'apache-ant-<1.10.8',
+ 'devel/apache-ant' => 'apache-ant-<1.10.9',
'devel/git,-main' => 'git-<2.26.2',
'devel/git,-svn' => 'git-svn-<2.26.2',
'devel/git,-x11' => 'git-x11-<2.26.2',
Index: devel/apache-ant/Makefile
===
RCS file: /cvs/ports/devel/apache-ant/Makefile,v
retrieving revision 1.48
diff -u -p -u -r1.48 Makefile
--- devel/apache-ant/Makefile 14 Jul 2020 18:08:49 - 1.48
+++ devel/apache-ant/Makefile 11 Oct 2020 03:33:56 -
@@ -2,7 +2,7 @@
COMMENT=build tool for java applications
-DISTNAME= apache-ant-1.10.8
+DISTNAME= apache-ant-1.10.9
CATEGORIES=devel
HOMEPAGE= http://ant.apache.org/
Index: devel/apache-ant/distinfo
===
RCS file: /cvs/ports/devel/apache-ant/distinfo,v
retrieving revision 1.23
diff -u -p -u -r1.23 distinfo
--- devel/apache-ant/distinfo 14 Jul 2020 18:08:49 - 1.23
+++ devel/apache-ant/distinfo 11 Oct 2020 03:33:56 -
@@ -1,2 +1,2 @@
-SHA256 (apache-ant-1.10.8-bin.tar.bz2) =
RcHpmSs93KovRytb5+qAT1YDir4oWMZEjoZCsTQjCX4=
-SIZE (apache-ant-1.10.8-bin.tar.bz2) = 5392297
+SHA256 (apache-ant-1.10.9-bin.tar.bz2) =
h3xUtCFdwXKCHmNCeYFig2zShgKFSNsCKCLM/dnyaKk=
+SIZE (apache-ant-1.10.9-bin.tar.bz2) = 5405131
Index: devel/apache-ant/pkg/PLIST
===
RCS file: /cvs/ports/devel/apache-ant/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -u -r1.21 PLIST
--- devel/apache-ant/pkg/PLIST 14 Jul 2020 18:08:49 - 1.21
+++ devel/apache-ant/pkg/PLIST 11 Oct 2020 03:33:56 -
@@ -293,6 +293,7 @@ share/doc/java/ant/api/org/apache/tools/
share/doc/java/ant/api/org/apache/tools/ant/ProjectHelper.html
share/doc/java/ant/api/org/apache/tools/ant/ProjectHelperRepository.html
share/doc/java/ant/api/org/apache/tools/ant/PropertyHelper.Delegate.html
+share/doc/java/ant/api/org/apache/tools/ant/PropertyHelper.PropertyEnumerator.html
share/doc/java/ant/api/org/apache/tools/ant/PropertyHelper.PropertyEvaluator.html
share/doc/java/ant/api/org/apache/tools/ant/PropertyHelper.PropertySetter.html
share/doc/java/ant/api/org/apache/tools/ant/PropertyHelper.html
sparc64 bulk build report
Bulk build on sparc64-0.ports.openbsd.org Started : Wed Oct 7 15:09:08 MDT 2020 Finished: Sat Oct 10 21:26:03 MDT 2020 Duration: 3 Days 6 hours 17 minutes Built using OpenBSD 6.8 (GENERIC.MP) #490: Sun Oct 4 20:52:40 MDT 2020 Built 9756 packages Number of packages built each day: Oct 7: 5565 Oct 8: 2582 Oct 9: 1192 Oct 10: 417 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2020-10-07/summary.log Build failures: 11 http://build-failures.rhaalovely.net/sparc64/2020-10-07/games/fs2open.log http://build-failures.rhaalovely.net/sparc64/2020-10-07/games/odamex.log http://build-failures.rhaalovely.net/sparc64/2020-10-07/graphics/inkscape.log http://build-failures.rhaalovely.net/sparc64/2020-10-07/graphics/mypaint.log http://build-failures.rhaalovely.net/sparc64/2020-10-07/graphics/openimageio.log http://build-failures.rhaalovely.net/sparc64/2020-10-07/lang/ocaml-camlp5.log http://build-failures.rhaalovely.net/sparc64/2020-10-07/productivity/gnucash.log http://build-failures.rhaalovely.net/sparc64/2020-10-07/sysutils/libvirt.log http://build-failures.rhaalovely.net/sparc64/2020-10-07/www/purritobin.log http://build-failures.rhaalovely.net/sparc64/2020-10-07/x11/grantlee-qt5.log http://build-failures.rhaalovely.net/sparc64/2020-10-07/x11/picom.log Recurrent failures: failures/games/fs2open.log failures/graphics/inkscape.log failures/graphics/mypaint.log failures/productivity/gnucash.log failures/sysutils/libvirt.log New failures: +failures/games/odamex.log +failures/graphics/openimageio.log +failures/lang/ocaml-camlp5.log Resolved failures: Packages newly built: +archivers/minizip +graphics/cairomm16 +graphics/fna3d +graphics/gimp/resynthesizer +lang/python/3.9 +lang/python/3.9,-gdbm +lang/python/3.9,-idle +lang/python/3.9,-main +lang/python/3.9,-tests +lang/python/3.9,-tkinter +sysutils/gamin,-python Packages not built this time: -devel/py-gobject3,-common -devel/py-gobject3,-main -devel/py-gobject3,python3,-common -devel/py-gobject3,python3,-main -devel/py-notify -editors/py-qscintilla -editors/py-qscintilla,-common -editors/py-qscintilla,-main -editors/py-qscintilla,python3,-common -editors/py-qscintilla,python3,-main -games/instead-launcher -graphics/openimageio -lang/ocaml-camlp5 -lang/ruby/2.5 -lang/ruby/2.5,-gdbm -lang/ruby/2.5,-main -lang/ruby/2.5,-ri_docs -security/gnupg,card,ldap -security/gnupg2 -security/py-passlib -textproc/py-nltk -textproc/py-numpydoc
Re: [sparc64/base-gcc] Fix build of graphics/fna3d
On Sat, Oct 10, 2020 at 04:36:00PM -0600, Thomas Frohwein wrote: > On Fri, Oct 09, 2020 at 06:47:21PM -0400, Kurt Mosiejczuk wrote: > > graphics/fna3d needs to be told to use ports-gcc on base-gcc arches in > > order to build successfully. > > ok? > ok thfr > I'm wondering if I missed something when I studied the build logs on > amd64 that could have caught this earlier. amd64 build log attached. > /usr/ports/pobj/fna3d-20.09/FNA/lib/FNA3D/src/FNA3D_Image.c:32:32: warning: > unknown warning group '-Wunused-but-set-variable', ignored > [-Wunknown-warning-option] > #pragma GCC diagnostic ignored "-Wunused-but-set-variable" I don't think this would have stood out to you. I wouldn't blame you for ignoring it. /usr/obj/ports/fna3d-20.09/FNA/lib/FNA3D/src/stb_image.h:939: error: thread-local storage not supported for this target /usr/obj/ports/fna3d-20.09/FNA/lib/FNA3D/src/stb_image.h:1076: error: thread-local storage not supported for this target /usr/obj/ports/fna3d-20.09/FNA/lib/FNA3D/src/stb_image.h:1076: error: thread-local storage not supported for this target /usr/obj/ports/fna3d-20.09/FNA/lib/FNA3D/src/FNA3D_Image.c:190: warning: expected [error|warning|ignored] after '#pragma GCC diagnostic' ninja: build stopped: subcommand failed. cwen pointed out it was the lack of thread-local storage in base-gcc that is the real culprit. I've seen other failed builds that complained about "expected error|warning|ignored" so that's what told me we needed ports-gcc. --Kurt
Re: [sparc64/base-gcc] Fix build of graphics/fna3d
On Fri, Oct 09, 2020 at 06:47:21PM -0400, Kurt Mosiejczuk wrote:
> graphics/fna3d needs to be told to use ports-gcc on base-gcc arches in
> order to build successfully.
>
> ok?
ok thfr
I'm wondering if I missed something when I studied the build logs on
amd64 that could have caught this earlier. amd64 build log attached.
>
> cc maintainer
>
> --Kurt
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/fna3d/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile 5 Oct 2020 16:05:26 - 1.1.1.1
> +++ Makefile 9 Oct 2020 22:42:05 -
> @@ -20,6 +20,9 @@ WANTLIB += SDL2 mojoshader
> MASTER_SITES = https://github.com/FNA-XNA/FNA/releases/download/${V}/
> EXTRACT_SUFX = .zip
>
> +COMPILER = base-clang ports-gcc
> +COMPILER_LANGS = c
> +
> MODULES =devel/cmake
>
> LIB_DEPENDS =devel/sdl2 \
===> Cleaning for fna3d-20.09
===> fna3d-20.09 depends on: cmake-* -> cmake-3.17.2p0v0
===> fna3d-20.09 depends on: ninja->=1.5.1 -> ninja-1.10.0
===> fna3d-20.09 depends on: gmake-* -> gmake-4.3
===> fna3d-20.09 depends on: unzip-* -> unzip-6.0p13
===> fna3d-20.09 depends on: sdl2-* -> sdl2-2.0.12
===> fna3d-20.09 depends on: mojoshader-* -> mojoshader-1303
===> Verifying specs: SDL2 mojoshader
===> found SDL2.0.8 mojoshader.1.0
===> Checking files for fna3d-20.09
`/usr/ports/distfiles/fna-2009.zip' is up to date.
>> (SHA256) fna-2009.zip: OK
===> Extracting for fna3d-20.09
===> Patching for fna3d-20.09
===> Applying OpenBSD patch patch-CMakeLists_txt
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2020/10/05 16:05:26 thfr Exp $
|
|set correct library version
|disable bundled mojoshader in favor of the one from ports
|
|Index: CMakeLists.txt
|--- CMakeLists.txt.orig
|+++ CMakeLists.txt
--
Patching file CMakeLists.txt using Plan A...
Hunk #1 succeeded at 3.
Hunk #2 succeeded at 13.
Hunk #3 succeeded at 97.
Hunk #4 succeeded at 109.
Hunk #5 succeeded at 144.
done
===> Compiler link: clang -> /usr/bin/clang
===> Compiler link: clang++ -> /usr/bin/clang++
===> Compiler link: cc -> /usr/bin/cc
===> Compiler link: c++ -> /usr/bin/c++
===> Generating configure for fna3d-20.09
/usr/bin/perl /usr/ports/infrastructure/bin/pkg_subst -DLIBFNA3D_VERSION=0.0
-DMODCMAKE_BUILD_SUFFIX=-release.cmake -DLIBFNA3D_VERSION=0.0 -DARCH=amd64
-DBASE_PKGPATH=graphics/fna3d -DFLAVOR_EXT= -DFULLPKGNAME=fna3d-20.09
-DHOMEPAGE=https://github.com/FNA-XNA/FNA3D -DLOCALBASE=/usr/local
-DLOCALSTATEDIR=/var -DMACHINE_ARCH=amd64 -DMAINTAINER=Thomas\ Frohwein\
\ -DPREFIX=/usr/local -DRCDIR=/etc/rc.d -DSYSCONFDIR=/etc
-DTRUEPREFIX=/usr/local -DX11BASE=/usr/X11R6 -DPKGSTEM=fna3d -i -B
/usr/ports/pobj/fna3d-20.09
/usr/ports/pobj/fna3d-20.09/FNA/lib/FNA3D/CMakeLists.txt
===> Configuring for fna3d-20.09
-- The C compiler identification is Clang 10.0.1
-- Check for working C compiler: /usr/ports/pobj/fna3d-20.09/bin/cc
-- Check for working C compiler: /usr/ports/pobj/fna3d-20.09/bin/cc - works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Detecting C compile features
-- Detecting C compile features - done
-- no TARGET SDL2::SDL2, or SDL2, using variables
-- Configuring done
-- Generating done
CMake Warning:
Manually-specified variables were not used by the project:
CMAKE_SKIP_INSTALL_ALL_DEPENDENCY
-- Build files have been written to: /usr/ports/pobj/fna3d-20.09/build-amd64
===> Building for fna3d-20.09
[1/9] /usr/ports/pobj/fna3d-20.09/bin/cc -DFNA3D_DRIVER_OPENGL
-DFNA3D_DRIVER_VULKAN -DFNA3D_EXPORTS -DMOJOSHADER_DEPTH_CLIPPING
-DMOJOSHADER_EFFECT_SUPPORT -DMOJOSHADER_FLIP_RENDERTARGET
-DMOJOSHADER_NO_VERSION_INCLUDE -DMOJOSHADER_USE_SDL_STDLIB
-DMOJOSHADER_XNA4_VERTEX_TEXTURES -DSUPPORT_PROFILE_ARB1=0
-DSUPPORT_PROFILE_ARB1_NV=0 -DSUPPORT_PROFILE_BYTECODE=0
-DSUPPORT_PROFILE_D3D=0 -DSUPPORT_PROFILE_HLSL=0 -DSUPPORT_PROFILE_METAL=0
-I/usr/local/include -I/usr/X11R6/include
-I/usr/ports/pobj/fna3d-20.09/FNA/lib/FNA3D/src
-I/usr/ports/pobj/fna3d-20.09/FNA/lib/FNA3D/include
-I/usr/ports/pobj/fna3d-20.09/FNA/lib/FNA3D/Vulkan-Headers/include
-I/usr/local/include/SDL2 -O2 -pipe -DNDEBUG -fPIC -std=gnu99 -Wall
-Wno-strict-aliasing -pedantic -MD -MT
CMakeFiles/FNA3D.dir/src/FNA3D_Driver_D3D11.c.o -MF
CMakeFiles/FNA3D.dir/src/FNA3D_Driver_D3D11.c.o.d -o
CMakeFiles/FNA3D.dir/src/FNA3D_Driver_D3D11.c.o -c
/usr/ports/pobj/fna3d-20.09/FNA/lib/FNA3D/src/FNA3D_Driver_D3D11.c
[2/9] /usr/ports/pobj/fna3d-20.09/bin/cc -DFNA3D_DRIVER_OPENGL
-DFNA3D_DRIVER_VULKAN -DFNA3D_EXPORTS -DMOJOSHADER_DEPTH_CLIPPING
-DMOJOSHADER_EFFECT_SUPPORT -DMOJOSHADER_FLIP_RENDERTARGET
-DMOJOSHADER_NO_VERSION_INCLUDE -DMOJOSHADER_USE_SDL_STDLIB
-DMOJOSHADER_XNA4_VERTEX_TEXTURES -DSUPPORT_PROFILE_ARB1=0
-DSUPPORT_PROFILE_ARB1_NV=0 -DSUPPORT_PROFIL
update py-kiwisolver to 1.2.0
Note that kiwisolver 1.2.0 is now python3-only so diff below includes
a quirks diff as well.
kiwisolver is only used by py-matplotlib which still seems to work with
the update below.
ok?
Index: devel/Makefile
===
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2023
diff -u -p -u -r1.2023 Makefile
--- devel/Makefile 10 Oct 2020 18:45:00 - 1.2023
+++ devel/Makefile 10 Oct 2020 21:48:42 -
@@ -1529,7 +1529,6 @@
SUBDIR += py-jupyter_client,python3
SUBDIR += py-jupyter_core,python3
SUBDIR += py-kitchen,python3
- SUBDIR += py-kiwisolver
SUBDIR += py-kiwisolver,python3
SUBDIR += py-lazy-object-proxy
SUBDIR += py-lazy-object-proxy,python3
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1060
diff -u -p -u -r1.1060 Makefile
--- devel/quirks/Makefile 10 Oct 2020 18:45:00 - 1.1060
+++ devel/quirks/Makefile 10 Oct 2020 21:48:42 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.452
+PKGNAME = quirks-3.453
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1078
diff -u -p -u -r1.1078 Quirks.pm
--- devel/quirks/files/Quirks.pm10 Oct 2020 18:45:00 - 1.1078
+++ devel/quirks/files/Quirks.pm10 Oct 2020 21:48:42 -
@@ -491,6 +491,7 @@ my $stem_extensions = {
'py-construct' => 'py3-construct',
'py-sane' => 'py3-sane',
'py-zmq' => 'py3-zmq',
+ 'py-kiwisolver' => 'py3-kiwisolver',
};
my $obsolete_reason = {
Index: devel/py-kiwisolver/Makefile
===
RCS file: /cvs/ports/devel/py-kiwisolver/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- devel/py-kiwisolver/Makefile3 Jul 2020 21:12:46 - 1.4
+++ devel/py-kiwisolver/Makefile10 Oct 2020 21:48:43 -
@@ -2,10 +2,9 @@
COMMENT = fast implementation of the Cassowary constraint solver
-MODPY_EGG_VERSION =1.0.1
+MODPY_EGG_VERSION =1.2.0
DISTNAME = kiwisolver-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = devel
@@ -19,6 +18,6 @@ MODPY_PI =Yes
MODPY_SETUPTOOLS = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
.include
Index: devel/py-kiwisolver/distinfo
===
RCS file: /cvs/ports/devel/py-kiwisolver/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- devel/py-kiwisolver/distinfo18 Oct 2018 13:56:12 - 1.1.1.1
+++ devel/py-kiwisolver/distinfo10 Oct 2020 21:48:43 -
@@ -1,2 +1,2 @@
-SHA256 (kiwisolver-1.0.1.tar.gz) = zjvl1SC00sPl7rTNLvYrm5q4rGtv7bqg45zbb1BkQng=
-SIZE (kiwisolver-1.0.1.tar.gz) = 31618
+SHA256 (kiwisolver-1.2.0.tar.gz) = JHgAJgzTgWDDYtIR3K9O0PeBavte/lZUR0iyHWrW0X8=
+SIZE (kiwisolver-1.2.0.tar.gz) = 52090
Index: devel/py-kiwisolver/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-kiwisolver/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- devel/py-kiwisolver/pkg/PLIST 18 Oct 2018 13:56:12 - 1.1.1.1
+++ devel/py-kiwisolver/pkg/PLIST 10 Oct 2020 21:48:43 -
@@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/10/18 13:56:12 bket Exp $
+@conflict py-kiwisolver-*
+@pkgpath devel/py-kiwisolver
lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/kiwisolver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/kiwisolver.so
+@so lib/python${MODPY_VERSION}/site-packages/kiwisolver.so
NEW: Duf-0.4.0
Hello, This is my first GO port so this could be very wrong, anyway, this is Duf a cute "df" with some nice features: https://github.com/muesli/duf OK? Comments? Cheers.- -- - gonzalo duf.tgz Description: Binary data
Re: remove sysutils/py-metlog
On Sat, Oct 10, 2020 at 10:57:23AM -0400, Daniel Dickman wrote: > As pointed out by bket@, py-metlog is not maintained since 2013 and has > been superceded by heka-py. heka-py itself has also been deprecated, with > no updates since 2014. > > py-metlog is preventing numpy from being updated since it is python2 only. > > ok to remove sysutils/py-metlog? There are no consumers of py-metlog in > the tree anymore (the initial commit said it was needed by something > firefox-related back in 2012?) oh definitely, i remember importing it for firefox-sync at that time... in the Attic it goes :) So many dead mozilla projects..
Re: remove sysutils/py-metlog
On Sat, Oct 10, 2020 at 10:57:23AM -0400, Daniel Dickman wrote:
> As pointed out by bket@, py-metlog is not maintained since 2013 and has
> been superceded by heka-py. heka-py itself has also been deprecated, with
> no updates since 2014.
> py-metlog is preventing numpy from being updated since it is python2 only.
> ok to remove sysutils/py-metlog? There are no consumers of py-metlog in
> the tree anymore (the initial commit said it was needed by something
> firefox-related back in 2012?)
ok kmos
--Kurt
> quirks and top level Makefile diff that would go along with the
> removal are shown below.
>
> Index: sysutils/Makefile
> ===
> RCS file: /cvs/ports/sysutils/Makefile,v
> retrieving revision 1.578
> diff -u -p -u -r1.578 Makefile
> --- sysutils/Makefile 8 Oct 2020 23:12:03 - 1.578
> +++ sysutils/Makefile 10 Oct 2020 14:47:54 -
> @@ -268,7 +268,6 @@
> SUBDIR += py-joblib
> SUBDIR += py-lockfile
> SUBDIR += py-lockfile,python3
> - SUBDIR += py-metlog
> SUBDIR += py-packaging
> SUBDIR += py-packaging,python3
> SUBDIR += py-parallel-ssh
> Index: devel/quirks/Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1058
> diff -u -p -u -r1.1058 Makefile
> --- devel/quirks/Makefile 8 Oct 2020 23:12:03 - 1.1058
> +++ devel/quirks/Makefile 10 Oct 2020 14:47:54 -
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-3.450
> +PKGNAME =quirks-3.451
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> Index: devel/quirks/files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1076
> diff -u -p -u -r1.1076 Quirks.pm
> --- devel/quirks/files/Quirks.pm 8 Oct 2020 23:12:03 - 1.1076
> +++ devel/quirks/files/Quirks.pm 10 Oct 2020 14:47:54 -
> @@ -1863,6 +1863,7 @@ my $obsolete_reason = {
> # 6.9
> 'py-notify' => 3,
> 'glimpse' => 3,
> + 'py-metlog' => 3,
> };
>
> # reasons for obsolete packages
>
Re: remove sysutils/py-metlog
On Sat 10/10/2020 10:57, Daniel Dickman wrote: > As pointed out by bket@, py-metlog is not maintained since 2013 and has > been superceded by heka-py. heka-py itself has also been deprecated, with > no updates since 2014. > > py-metlog is preventing numpy from being updated since it is python2 only. > > ok to remove sysutils/py-metlog? There are no consumers of py-metlog in > the tree anymore (the initial commit said it was needed by something > firefox-related back in 2012?) > > quirks and top level Makefile diff that would go along with the > removal are shown below. OK bket@ :-)
remove sysutils/py-metlog
As pointed out by bket@, py-metlog is not maintained since 2013 and has
been superceded by heka-py. heka-py itself has also been deprecated, with
no updates since 2014.
py-metlog is preventing numpy from being updated since it is python2 only.
ok to remove sysutils/py-metlog? There are no consumers of py-metlog in
the tree anymore (the initial commit said it was needed by something
firefox-related back in 2012?)
quirks and top level Makefile diff that would go along with the
removal are shown below.
Index: sysutils/Makefile
===
RCS file: /cvs/ports/sysutils/Makefile,v
retrieving revision 1.578
diff -u -p -u -r1.578 Makefile
--- sysutils/Makefile 8 Oct 2020 23:12:03 - 1.578
+++ sysutils/Makefile 10 Oct 2020 14:47:54 -
@@ -268,7 +268,6 @@
SUBDIR += py-joblib
SUBDIR += py-lockfile
SUBDIR += py-lockfile,python3
- SUBDIR += py-metlog
SUBDIR += py-packaging
SUBDIR += py-packaging,python3
SUBDIR += py-parallel-ssh
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1058
diff -u -p -u -r1.1058 Makefile
--- devel/quirks/Makefile 8 Oct 2020 23:12:03 - 1.1058
+++ devel/quirks/Makefile 10 Oct 2020 14:47:54 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.450
+PKGNAME = quirks-3.451
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1076
diff -u -p -u -r1.1076 Quirks.pm
--- devel/quirks/files/Quirks.pm8 Oct 2020 23:12:03 - 1.1076
+++ devel/quirks/files/Quirks.pm10 Oct 2020 14:47:54 -
@@ -1863,6 +1863,7 @@ my $obsolete_reason = {
# 6.9
'py-notify' => 3,
'glimpse' => 3,
+ 'py-metlog' => 3,
};
# reasons for obsolete packages
Re: make py-construct, py-sane, py-zmq python3 only
On Sat, 10 Oct 2020, Bjorn Ketelaars wrote: > Please note that py-zmq has several consumers: > > All except sysutils/py-metlog are already py3-only. sysutils/py-metlog is > currently py2-only, has no consumers, has been superseded by heka-py and is no > longer maintained [0]. I would be in favour of removing py-metlog. > > After sysutils/py-metlog has been removed, OK bket@ > > [0] https://github.com/mozilla-services/metlog-py > Apparently I had a typo and searched for py-zqm which explains why I missed this :-( I'm also in favour of deleting py-metlog. Let me send out a dedicated email to propose the removal.
UPDATE: Pinugs - Switched to boost::signals2
Switched to boost::signals2
Index: Makefile
===
RCS file: /cvs/ports/games/pingus/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile12 Jul 2019 20:46:22 - 1.22
+++ Makefile10 Oct 2020 09:39:47 -
@@ -3,7 +3,7 @@
COMMENT= free Lemmings-like game
DISTNAME= pingus-0.7.6
-REVISION= 5
+REVISION= 6
CATEGORIES=games x11
EXTRACT_SUFX= .tar.bz2
@@ -15,16 +15,16 @@ MASTER_SITES= ${MASTER_SITE_GOOGLECODE:=
PERMIT_PACKAGE=Yes
WANTLIB += GL SDL X11 Xi c iconv m png pthread z
-WANTLIB += SDL_mixer>=3 SDL_image>=2 boost_signals ${COMPILER_LIBCXX}
+WANTLIB += SDL_mixer>=3 SDL_image>=2 ${COMPILER_LIBCXX}
MODULES= devel/scons
COMPILER = base-clang ports-gcc
+BUILD_DEPENDS= devel/boost
LIB_DEPENDS= converters/libiconv \
devel/sdl-mixer \
- devel/sdl-image \
- devel/boost
+ devel/sdl-image
NO_TEST= Yes
Index: patches/patch-SConscript
===
RCS file: /cvs/ports/games/pingus/patches/patch-SConscript,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-SConscript
--- patches/patch-SConscript22 Oct 2018 21:18:50 - 1.2
+++ patches/patch-SConscript10 Oct 2020 09:39:47 -
@@ -1,4 +1,7 @@
$OpenBSD: patch-SConscript,v 1.2 2018/10/22 21:18:50 naddy Exp $
+
+Switched to boost::signals2
+
Index: SConscript
--- SConscript.orig
+++ SConscript
@@ -10,7 +13,7 @@ Index: SConscript
self.opts.Add('LINKFLAGS', 'Linker Compiler flags', [])
self.opts.Add(BoolVariable('with_opengl','Build with OpenGL
support', True))
-@@ -182,7 +181,7 @@ class Project:
+@@ -182,14 +181,13 @@ class Project:
else:
self.reports += " * XInput support: yes\n"
self.conf.env.Append(CPPDEFINES = [('HAVE_XINPUT', 1)])
@@ -19,3 +22,12 @@ Index: SConscript
self.conf.env.Append(optional_sources =
['src/engine/input/xinput/xinput_driver.cpp',
'src/engine/input/xinput/xinput_device.cpp'])
+ def configure_boost(self):
+-if not self.conf.CheckLibWithHeader('boost_signals',
'boost/signals.hpp', 'c++'):
+-if not self.conf.CheckLibWithHeader('boost_signals-mt',
'boost/signals.hpp', 'c++'):
+-self.fatal_error += " * library 'boost_signals' not found\n"
++if not self.conf.CheckHeader('boost/signals2.hpp', '<>', 'c++'):
++self.fatal_error += " * library 'boost_signals2' not found\n"
+
+ def configure_png(self):
+ if self.conf.CheckMyProgram('pkg-config'):
Index: patches/patch-src_editor_button_hpp
===
RCS file: patches/patch-src_editor_button_hpp
diff -N patches/patch-src_editor_button_hpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_editor_button_hpp 10 Oct 2020 09:39:47 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/editor/button.hpp
+--- src/editor/button.hpp.orig
src/editor/button.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_BUTTON_HPP
+ #define HEADER_PINGUS_EDITOR_BUTTON_HPP
+
+-#include
++#include
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -48,7 +48,7 @@ class Button : public GUI::RectComponent (public)
+ void enable() { enabled = true; }
+ void disable() { enabled = false; }
+
+- boost::signal on_click;
++ boost::signals2::signal on_click;
+
+ private:
+ Button (const Button&);
Index: patches/patch-src_editor_checkbox_hpp
===
RCS file: patches/patch-src_editor_checkbox_hpp
diff -N patches/patch-src_editor_checkbox_hpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_editor_checkbox_hpp 10 Oct 2020 09:39:47 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/editor/checkbox.hpp
+--- src/editor/checkbox.hpp.orig
src/editor/checkbox.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_CHECKBOX_HPP
+ #define HEADER_PINGUS_EDITOR_CHECKBOX_HPP
+
+-#include
++#include
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -40,7 +40,7 @@ class Checkbox : public GUI::RectComponent (public)
+ bool is_checked() const { return checked; }
+ void on_primary_button_press(int x, int y);
+
+- boost::signal on_change;
++ boost::signals2::signal on_change;
+
+ private:
+ Checkbox (const Checkbox&);
Index: patches/patch-src_editor_combobox_hpp
===
RCS file: patches/patch-src_editor_combobox_hpp
diff -N patches/patch-src_editor_combobox_hpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_editor_combobox_hpp 10 Oct 2020 09:39:47 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Sw
Re: UPDATE: Pinugs - Switched to boost::signals2
On 2020/10/10 12:49, Jeremie Courreges-Anglas wrote: > On Sat, Oct 10 2020, Brad Smith wrote: > > Switched to boost::signals2 > > What is the rationale? Just mentioning "Switched to boost::signals2" > in the mail subject, in the mail body and in the patches comments > doesn't help at all. It's removed in boost >=1.69 > Why should others waste time trying to guess/find informations you > already have? That is a fair question.
[update] games/an 0.95 -> 1.2
Hi,
Here is an update for an to 1.2. This is a rewrite with several
bugfixes, icu support and less bloat (the library has been
removed).
I don't have much to say port-wise, changes are trivial - i took the
opportunity to reorder the Makefile per Makefile.template since it
doesn't affect much the diff readability. Also, i've zapped some of
our hooks since upstream's Makefile has now friendlier targets.
This has been tested on amd64, macppc (with clang and gcc there)
successfully.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/games/an/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 20:46:14 - 1.20
+++ Makefile7 Oct 2020 13:18:39 -
@@ -2,31 +2,32 @@
COMMENT= fast anagram generator
-V= 0.95
+V= 1.2
DISTNAME= an_${V}.orig
PKGNAME= an-${V}
CATEGORIES=games
-MASTER_SITES= ${MASTER_SITE_DEBIAN:=main/a/an/}
-# GPL - LGPL
+# GPLv2+
PERMIT_PACKAGE=Yes
-WANTLIB= c
+HOMEPAGE= https://salsa.debian.org/pm/an
-WRKDIST= ${WRKDIR}/an-${V}
+WANTLIB= c icudata icui18n icuuc
+
+MASTER_SITES= ${MASTER_SITE_DEBIAN:=main/a/an/}
+
+LIB_DEPENDS= textproc/icu4c,-main
+
+FAKE_FLAGS=DESTDIR=${WRKINST}${PREFIX}
NO_TEST= Yes
+USE_GMAKE= Yes
+
+WRKDIST= ${WRKDIR}/an-${V}
+
pre-configure:
@perl -pi -e 's,/usr/dict/words,/usr/share/dict/words,g' \
${WRKSRC}/an.6
-
-do-build:
- cd ${WRKBUILD} && \
- ${CC} ${CFLAGS} an.c gan_qsort.c -o an ${LDFLAGS}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/an ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKBUILD}/an.6 ${PREFIX}/man/man6
.include
Index: distinfo
===
RCS file: /cvs/ports/games/an/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo18 Jan 2015 03:13:55 - 1.5
+++ distinfo7 Oct 2020 13:18:39 -
@@ -1,2 +1,2 @@
-SHA256 (an_0.95.orig.tar.gz) = ESZt0eNHWU2Y+N/R4UHYtPvgZ3UlQtDpPEIsR4n5KVw=
-SIZE (an_0.95.orig.tar.gz) = 47829
+SHA256 (an_1.2.orig.tar.gz) = uBqNt0zf3znmyn3XUs9HIkNdL7f7OhuXHU9PrlFC2ys=
+SIZE (an_1.2.orig.tar.gz) = 14231
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile 7 Oct 2020 13:18:39 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -16,10 +16,10 @@
+ #51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+-INSTALLDIR := $(DESTDIR)/usr/games
+-MANDIR := $(DESTDIR)/usr/share/man/man6
++INSTALLDIR := $(DESTDIR)/bin
++MANDIR := $(DESTDIR)/man/man6
+
+-CC:=gcc
++CC?=gcc
+ INSTALL:=install
+
+ CFLAGS += $(shell icu-config --cflags)
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/an/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 15 Sep 2004 00:46:08 - 1.3
+++ pkg/PLIST 7 Oct 2020 13:18:39 -
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:46:08 espie Exp $
-bin/an
+@bin bin/an
@man man/man6/an.6
Re: UPDATE: Pinugs - Switched to boost::signals2
On Sat, Oct 10 2020, Brad Smith wrote: > Switched to boost::signals2 What is the rationale? Just mentioning "Switched to boost::signals2" in the mail subject, in the mail body and in the patches comments doesn't help at all. Why should others waste time trying to guess/find informations you already have? -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[Update] databases/p5-SQL-Translator : Update to 1.62
Hi, Here is a patch for databases/p5-SQL-Translator to update o 1.62. It build well and pass all tests on amd64-current system. There are 4 ports depends on databases/p5-SQL-Translator: databases/p5-DBICx-Sugar databases/p5-DBICx-TestDatabase www/p5-CatalystX-SimpleLogin These three ports build well and pass all tests. Some tests failed in current databases/p5-DBIx-Class, it should been update to 0.082842, then only 2 tests failed not caused by this patch. Cheers ! wen Index: Makefile === RCS file: /cvs/ports/databases/p5-SQL-Translator/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile12 Jul 2019 20:43:58 - 1.17 +++ Makefile10 Oct 2020 07:16:13 - @@ -2,7 +2,7 @@ COMMENT = SQL DDL transformations and more -DISTNAME = SQL-Translator-0.11021 +DISTNAME = SQL-Translator-1.62 CATEGORIES = databases MODULES = cpan databases/postgresql PKG_ARCH = * Index: distinfo === RCS file: /cvs/ports/databases/p5-SQL-Translator/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo21 Apr 2015 02:38:50 - 1.7 +++ distinfo10 Oct 2020 07:16:13 - @@ -1,2 +1,2 @@ -SHA256 (SQL-Translator-0.11021.tar.gz) = ZMs4qfeDZ7wRU1mpmQA7vrPDLMdbuoMG7BqTj8RBv9E= -SIZE (SQL-Translator-0.11021.tar.gz) = 438222 +SHA256 (SQL-Translator-1.62.tar.gz) = Cs1P+aw6L41dZxmarALNwSfgOIjkecUce73CG4XBziQ= +SIZE (SQL-Translator-1.62.tar.gz) = 411750
回复: [Update] databases/p5-DBIx-Class : Update to 0.082842
From my previous submit, databases/p5-SQL-Abstract-Classic had been added
into
ports and databases/p5-Catalyst-Model-DBIC-Schema had been updated, so I
re-generate
the patch, include afresh1@ tweak.
wen
发件人: owner-po...@openbsd.org 代表 wen heping
发送时间: 2020年7月27日 15:57
收件人: afre...@openbsd.org ; ports@openbsd.org
主题: [Update] databases/p5-DBIx-Class : Update to 0.082842
Hi, all:
Here is a patch for databases/p5-DBIx-Class to update 0.082842.
It build well and run well. 2 tests failed in total of 314 tests.(while
currently
there are 7 tests failed in total 308 tests)
There are 16 ports depends on databases/p5-DBIx-Class, 2 of them build but
failed tests, others build well and pass all tests :
1) audio/squeezecenter: Actually I did not test it, because in my memory,
the version of squeezecenter is too old and there are many tests failed.
2) security/p5-Catalyst-Plugin-Authentication-Store-DBIC: also its test
failure
is caused by the deprecation version of Catalyst. And this port could be removed
after we update Catalyst.
One new port should be added before this patch:
databases/p5-SQL-Abstract-Classic,
which I submitted yesterday.
Cheers !
wen
Index: Makefile
===
RCS file: /cvs/ports/databases/p5-DBIx-Class/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile3 Jul 2020 21:44:36 - 1.25
+++ Makefile10 Oct 2020 07:04:42 -
@@ -2,22 +2,20 @@
COMMENT = extensible and flexible object relational mapper
-MODULES = cpan databases/postgresql databases/mariadb
+MODULES = cpan
PKG_ARCH = *
-DISTNAME = DBIx-Class-0.082820
+DISTNAME = DBIx-Class-0.082842
CATEGORIES = databases devel
-REVISION = 2
MAINTAINER = Andrew Fresh
-# Artistic
+# Perl
PERMIT_PACKAGE = Yes
CONFIGURE_ARGS = --skipdeps
RUN_DEPENDS = databases/p5-DBI>=1.57 \
- databases/p5-Data-Page>=2.00 \
- databases/p5-SQL-Abstract>=1.81 \
+ databases/p5-SQL-Abstract-Classic>=1.91 \
devel/p5-Class-Accessor-Grouped>=0.10012 \
devel/p5-Class-C3-Componentised>=1.0009 \
devel/p5-Class-Inspector>=1.24 \
@@ -28,7 +26,7 @@ RUN_DEPENDS = databases/p5-DBI>=1.57 \
devel/p5-Hash-Merge>=0.12 \
devel/p5-MRO-Compat>=0.12 \
devel/p5-Module-Find>=0.07 \
- devel/p5-Moo>=2.000 \
+ devel/p5-Moo>=2.0 \
devel/p5-Path-Class>=0.18 \
devel/p5-Scope-Guard>=0.03 \
devel/p5-Sub-Name>=0.04 \
@@ -42,42 +40,45 @@ TEST_DEPENDS = databases/p5-DBD-SQLite>=
devel/p5-Test-Warn>=0.21
# Optional depends to avoid skipping tests
-TEST_DEPENDS +=converters/p5-JSON-Any \
- devel/p5-Getopt-Long-Descriptive \
- devel/p5-Module-Pluggable \
- devel/p5-Sys-SigAction \
- math/p5-Math-Base36 \
- textproc/p5-Text-CSV \
+TEST_DEPENDS +=converters/p5-Cpanel-JSON-XS \
+ converters/p5-JSON \
+ converters/p5-JSON-Any \
+ converters/p5-JSON-DWIW \
+ converters/p5-JSON-XS \
databases/p5-Class-DBI \
- databases/p5-SQL-Translator>=0.11018
-
-TEST_DEPENDS +=devel/p5-DateTime-Format-MySQL \
- devel/p5-DateTime-Format-Pg \
+ databases/p5-SQL-Translator>=0.11018 \
+ devel/p5-DateTime>=0.55 \
+ devel/p5-DateTime-Format-MySQL \
+ devel/p5-DateTime-Format-Pg>=0.16004 \
devel/p5-DateTime-Format-SQLite \
- devel/p5-DateTime-Format-Strptime \
- devel/p5-Time-Piece-MySQL
-
-TEST_DEPENDS +=devel/p5-Moose \
- devel/p5-MooseX-Types \
- devel/p5-MooseX-Types-LoadableClass \
- devel/p5-MooseX-Types-Path-Class
+ devel/p5-DateTime-Format-Strptime>=1.2 \
+ devel/p5-Getopt-Long-Descriptive>=0.081 \
+ devel/p5-Moose>=0.98 \
+ devel/p5-MooseX-Types>=0.21 \
+ devel/p5-MooseX-Types-LoadableClass>=0.011 \
+ devel/p5-MooseX-Types-Path-Class>=0.05 \
+ devel/p5-Time-Piece-MySQL \
+ math/p5-Math-Base36>=0.07 \
+ textproc/p5-Text-CSV>=1.16
# More tests can be enabled by porting
# * p5-Class-DBI-Plugin-DeepAbstractSearch
-# * p5-Cpanel-JSON-XS
# * p5-MooseX-Types-JSON
+# * p5-Test-Moose
MAKE_ENV = RELEASE_TESTING=Yes \
TEST_POD=Yes
DATABASE = dbix_class_test
+MODULES += databases/postgresql
MODPOSTGRESQL_TEST_DBNAME =${DATABASE}
MAKE_ENV +=DBICTEST_PG_DSN='dbi:Pg:dbname=${DATABASE}' \
DBICTEST_PG_USER=${USER} \
DBICTEST_PG_PASS=1
