Re: [UPDATE] audio/ncspot to 0.1.2
On Sat, Feb 08, 2020 at 12:09:47AM +0100, Björn Ketelaars wrote:
> On Fri 07/02/2020 20:16, Henrik Friedrichsen wrote:
> > Attached diff updates audio/ncspot to 0.1.2.
> >
> > OK?
>
> Is there a reason for dropping the license markers after
> MODCARGO_CRATES? If I'm not mistaken, these markers should be generated
> using 'make modcargo-gen-crates-licenses'.
>
'make modcargo-gen-crates-licenses' should generate them, but... Cargo.lock
format changed recently, and 'make modcargo-gen-crates-licenses' is broken with
the new format.
Henrik, could you try with the following diff ?
diff 6821f85e625acb4795498d6bad849cd0ce9645f5 /home/semarie/repos/openbsd/ports
blob - 77a89fa307c42326d5cf314cd37a95606cbfe295
file + devel/cargo/cargo.port.mk
--- devel/cargo/cargo.port.mk
+++ devel/cargo/cargo.port.mk
@@ -226,7 +226,7 @@ _modcargo-metadata:
# modcargo-gen-crates will output crates list from Cargo.lock file.
modcargo-gen-crates: extract
- @awk '/"checksum / { print "MODCARGO_CRATES += " $$2 " " $$3 }' \
+ @awk '/^name = / { n=$$3; gsub("\"", "", n); } /^version = / { v=$$3;
gsub("\"", "", v); print "MODCARGO_CRATES += " n " " v; }' \
<${MODCARGO_CARGOTOML:toml=lock}
# modcargo-gen-crates-licenses will try to grab license information from
downloaded crates.
--
Sebastien Marie
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/02/07 21:35:56 Modified files: games/stockfish: Makefile distinfo Added files: games/stockfish/patches: patch-src_Makefile Removed files: games/stockfish/patches: patch-Makefile Log message: Update to stockfish-11 Release notes: https://github.com/official-stockfish/Stockfish/commit/c3483fa9a7d7c0ffa9fcc32b467ca844cfb63790 ok cwen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/02/07 18:42:57 Modified files: converters/p5-Cpanel-JSON-XS: Makefile distinfo Log message: update p5-Cpanel-JSON-XS to 4.19
Re: [UPDATE] audio/ncspot to 0.1.2
On Fri 07/02/2020 20:16, Henrik Friedrichsen wrote: > Attached diff updates audio/ncspot to 0.1.2. > > OK? Is there a reason for dropping the license markers after MODCARGO_CRATES? If I'm not mistaken, these markers should be generated using 'make modcargo-gen-crates-licenses'. The update itself works for me (tested on amd64).
Re: [update] databases/redis-5.0.7
On 2020/02/07 16:43, Daniel Jakots wrote:
> On Fri, 7 Feb 2020 16:34:10 -0500, Daniel Jakots wrote:
>
> > On Thu, 6 Feb 2020 19:00:19 +0100, Charlene Wendling
> > wrote:
> >
> > > Below is the original diff with an additional patch to fix that. I
> > > did run the tests and it's still fine.
> >
> > Tested this diff as it seems to be the latest full diff. It works fine
> > for me. ok danj@
>
> I just noticed sentinel.conf was updated. Shouldn't we apply the same
> change for it than we do for redis.conf?
Makes sense.
I would like DEBUG_PACKAGES=${BUILD_PACKAGES} too, and removing the
warning comment that the test suite takes a long time (I can think of
things with *much* longer tests that don't have this), though that
can be done after the update.
So:
i386builds OK tests OK
macppc builds OK tests OK
amd64 builds OK tests OK
armv7 fail (no regression, in-tree fails too)
I've also tested with an existing rspamd db on amd64.
A sparc64 test would be good but I'm feeling positive about the update..
Re: Update: devel/gmp needs testing on other archs
On 2020/02/07 22:18, Christian Weisgerber wrote:
> On 2020-02-04, Jeremie Courreges-Anglas wrote:
>
> > It fails to package though, because of an installed (gmp-6.1.2p3) vs
> > built packages mismatch. My brain is unavail right now, so I'll let you
> > sort this out. :)
>
> The problem is that the LIB_DEPENDS resolves to a package spec of
> gmp-*. We could tighten it with something like this:
>
> LIB_DEPENDS-cxx=${BASE_PKGPATH},-main>=${VERSION} \
> ${MODGCC4_CPPLIBDEP}
>
> Or even more specific:
>
> LIB_DEPENDS-cxx=${FULLPKGNAME-main}:${BASE_PKGPATH},-main \
> ${MODGCC4_CPPLIBDEP}
>
> Seems odd in that you would want this for just about every
> MULTI_PACKAGES port with a dependent subpackage, but at the same
> time it isn't used in the ports tree.
>
> I don't know.
Did something change with this? I ran into this with some other port
recently but I'm sure it didn't happen in the past.
Re: Update: devel/gmp needs testing on other archs
On 2020-02-04, Jeremie Courreges-Anglas wrote:
> It fails to package though, because of an installed (gmp-6.1.2p3) vs
> built packages mismatch. My brain is unavail right now, so I'll let you
> sort this out. :)
The problem is that the LIB_DEPENDS resolves to a package spec of
gmp-*. We could tighten it with something like this:
LIB_DEPENDS-cxx=${BASE_PKGPATH},-main>=${VERSION} \
${MODGCC4_CPPLIBDEP}
Or even more specific:
LIB_DEPENDS-cxx=${FULLPKGNAME-main}:${BASE_PKGPATH},-main \
${MODGCC4_CPPLIBDEP}
Seems odd in that you would want this for just about every
MULTI_PACKAGES port with a dependent subpackage, but at the same
time it isn't used in the ports tree.
I don't know.
--
Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/02/07 15:16:20 Modified files: x11/kde4/py-kde: Makefile x11/py-qt5 : Makefile geo/qgis : Makefile Log message: Update dependecy on py-sip version and bump
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/02/07 15:10:23 Modified files: devel/py-sip : Makefile distinfo devel/py-sip/patches: patch-configure_py Log message: Revert update of py-sip, which caused breakage in x11/py-qt5 Issue found by sthen@ OK sthen@
Re: [update] databases/redis-5.0.7
On Fri, 7 Feb 2020 16:34:10 -0500, Daniel Jakots wrote: > On Thu, 6 Feb 2020 19:00:19 +0100, Charlene Wendling > wrote: > > > Below is the original diff with an additional patch to fix that. I > > did run the tests and it's still fine. > > Tested this diff as it seems to be the latest full diff. It works fine > for me. ok danj@ I just noticed sentinel.conf was updated. Shouldn't we apply the same change for it than we do for redis.conf? Index: patches/patch-sentinel_conf === RCS file: /cvs/ports/databases/redis/patches/patch-sentinel_conf,v retrieving revision 1.6 diff -u -p -r1.6 patch-sentinel_conf --- patches/patch-sentinel_conf 2 Sep 2018 11:08:51 - 1.6 +++ patches/patch-sentinel_conf 7 Feb 2020 21:43:06 - @@ -2,7 +2,25 @@ $OpenBSD: patch-sentinel_conf,v 1.6 2018 Index: sentinel.conf --- sentinel.conf.orig +++ sentinel.conf -@@ -167,7 +167,7 @@ sentinel failover-timeout mymaster 18 +@@ -21,14 +21,14 @@ + port 26379 + + # By default Redis Sentinel does not run as a daemon. Use 'yes' if you need it. +-# Note that Redis will write a pid file in /var/run/redis-sentinel.pid when ++# Note that Redis will write a pid file in /var/run/redis/redis-sentinel.pid when + # daemonized. + daemonize no + + # When running daemonized, Redis Sentinel writes a pid file in +-# /var/run/redis-sentinel.pid by default. You can specify a custom pid file ++# /var/run/redis/redis-sentinel.pid by default. You can specify a custom pid file + # location here. +-pidfile /var/run/redis-sentinel.pid ++pidfile /var/run/redis/redis-sentinel.pid + + # Specify the log file name. Also the empty string can be used to force + # Sentinel to log on the standard output. Note that if you use standard +@@ -182,7 +182,7 @@ sentinel failover-timeout mymaster 18 # # Example: # @@ -11,7 +29,7 @@ Index: sentinel.conf # CLIENTS RECONFIGURATION SCRIPT # -@@ -192,7 +192,7 @@ sentinel failover-timeout mymaster 18 +@@ -207,7 +207,7 @@ sentinel failover-timeout mymaster 18 # # Example: # Full diff available at https://chown.me/iota/ports/redis.diff if it helps.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/02/07 14:39:42 Modified files: www/varnish: Makefile distinfo www/varnish/pkg: PLIST Log message: Update to varnish 6.3.2 Fixes an assert possibly being triggered through a TLS proxy over PROXY 2, causing varnish to restart and its cache to be flushed. No potential for remote code execution or data leaks. http://varnish-cache.org/security/VSV5.html#vsv5
Re: [update] databases/redis-5.0.7
On Thu, 6 Feb 2020 19:00:19 +0100, Charlene Wendling wrote: > Below is the original diff with an additional patch to fix that. I did > run the tests and it's still fine. Tested this diff as it seems to be the latest full diff. It works fine for me. ok danj@ Cheers, Daniel
Re: UPDATE: devel/ninja
Hi,
On Thu, 6 Feb 2020 21:45:47 +0100
Rafael Sadowski wrote:
> Hi ports@,
>
> Ninja 0.10.0 was released a while ago. Here is a link to the notes:
>
> https://groups.google.com/forum/#!msg/ninja-build/piOltAhywFA/zPfkrTtRCwAJ
>
> The new version comes with Fortran support. Maybe we can finally get
> rid of all the "USE_NINJA=No". This is a job for someone who's
> interested. Volunteers come forward :)
>
> This diff needs a hand full of OKs from persons in charge of the
> bulks.
Ninja is built with ports-gcc on base-gcc archs, but i've found that
the environment is not passed in the "do-test" hook, so tests are built
with base-gcc, and fail with:
cc1plus: error: unrecognized command line option "-fdiagnostics-color"
I've tweaked your Makefile diff to pass the test environment.
On powerpc, it builds and tests are passing [0]. I can't test bulk on
macppc within a reasonable timeframe, but i'll fix stuff with it, so
i'll report back if any issue arise.
Charlène.
[0] https://bin.charlenew.xyz/ninja.powerpc.log
Index: Makefile
===
RCS file: /cvs/ports/devel/ninja/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- Makefile20 Dec 2019 15:51:26 - 1.29
+++ Makefile7 Feb 2020 21:02:03 -
@@ -9,10 +9,10 @@ COMMENT = small build system with a foc
GH_ACCOUNT = ninja-build
GH_PROJECT = ninja
-GH_TAGNAME = v1.9.0
-REVISION = 0
+GH_TAGNAME = v1.10.0
CATEGORIES = devel
+
HOMEPAGE = https://ninja-build.org/
# Apache License v2.0
@@ -56,7 +56,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/misc/zsh-completion ${PREFIX}/share/ninja
do-test:
- @cd ${WRKSRC} && ./ninja ninja_test \
+ @cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} ./ninja ninja_test \
&& ./ninja_test --gtest_filter=MyTest.Name
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/ninja/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo22 Jun 2019 20:23:04 - 1.11
+++ distinfo7 Feb 2020 21:02:03 -
@@ -1,2 +1,2 @@
-SHA256 (ninja-1.9.0.tar.gz) = XX7HWCj40/0aDC8xtbDOp4DN/hAxNZIoxCjBpIv81bk=
-SIZE (ninja-1.9.0.tar.gz) = 190860
+SHA256 (ninja-1.10.0.tar.gz) = OBAxiwhIlDX478GcBVJegKmTr1pVuqDf6uBGWp1F+Z8=
+SIZE (ninja-1.10.0.tar.gz) = 210313
Index: patches/patch-src_build_cc
===
RCS file: /cvs/ports/devel/ninja/patches/patch-src_build_cc,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_build_cc
--- patches/patch-src_build_cc 20 Dec 2019 15:51:26 - 1.1
+++ patches/patch-src_build_cc 7 Feb 2020 21:02:03 -
@@ -6,7 +6,7 @@ by using a set of pointers.
Index: src/build.cc
--- src/build.cc.orig
+++ src/build.cc
-@@ -348,9 +348,8 @@ bool Plan::AddSubTarget(Node* node, Node* dependent, s
+@@ -382,9 +382,8 @@ void Plan::EdgeWanted(const Edge* edge) {
Edge* Plan::FindWork() {
if (ready_.empty())
return NULL;
@@ -18,7 +18,7 @@ Index: src/build.cc
return edge;
}
-@@ -372,7 +371,7 @@ void Plan::ScheduleWork(map::iterator wan
+@@ -406,7 +405,7 @@ void Plan::ScheduleWork(map::iterator wan
pool->RetrieveReadyEdges(_);
} else {
pool->EdgeScheduled(*edge);
Index: patches/patch-src_build_h
===
RCS file: /cvs/ports/devel/ninja/patches/patch-src_build_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_build_h
--- patches/patch-src_build_h 20 Dec 2019 15:51:26 - 1.1
+++ patches/patch-src_build_h 7 Feb 2020 21:02:03 -
@@ -6,12 +6,12 @@ by using a set of pointers.
Index: src/build.h
--- src/build.h.orig
+++ src/build.h
-@@ -103,7 +103,7 @@ struct Plan { (private)
+@@ -122,7 +122,7 @@ struct Plan { (private)
/// we want for the edge.
map want_;
- set ready_;
+ deque ready_;
- /// Total number of edges that have commands (not phony).
- int command_edges_;
+ Builder* builder_;
+
Re: UPDATE: lang/apl 1.7 => 1.8
On 2020-01-23 5:15 PM, Brian Callahan wrote: On 2019-12-30 3:02 PM, Brian Callahan wrote: Hi ports -- I submitted this some time ago without any response. Updated to account for new ports changes. OK? ~Brian Ping. I know APL isn't a particularly popular language, but it would be nice to get this update in. Diff attached here. Added debug packages too; this takes just long enough to build on my machine that it seems worth it. ~Brian I have one positive test report. Anything else or should I just go ahead and commit the update? ~Brian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/07 13:53:14 Modified files: devel/py-sip : Makefile Log message: more capslock in the warning comment, maybe it will make it easier to see
Re: UPDATE devel/py-jupyter_core-4.6.1
On Fri 07/02/2020 21:28, Björn Ketelaars wrote:
> Diff below brings py-jupyter_core to 4.6.1, which is needed for a
> pending update of www/jupyter-notebook. Changelog can be found at
> https://github.com/jupyter/jupyter_core/blob/4.6.1/docs/changelog.rst
>
> Changes to the port:
> - Follow Makefile.template
> - Remove ipython as TDEP, which is not needed
> - Add py-nose as TDEP
>
> Testing:
> - 'make test' runs successfully for both python2 and python3
> - Run tested on amd64 with jupyter-notebook from ports and an update
> hereof
>
> Comments/OK?
Oops, forgot to use '--relative' with git, new diff below.
diff --git Makefile Makefile
index 4962a3be9c3..b057b6fe65f 100644
--- Makefile
+++ Makefile
@@ -2,29 +2,26 @@
COMMENT = Jupyter core package
-MODPY_EGG_VERSION =4.4.0
+MODPY_EGG_VERSION =4.6.1
DISTNAME = jupyter_core-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = devel
HOMEPAGE = https://jupyter.org/
-RUN_DEPENDS = devel/py-traitlets${MODPY_FLAVOR}
-TEST_DEPENDS = devel/ipython${MODPY_FLAVOR}>=5.1.0 \
- devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2
-
# BSD
PERMIT_PACKAGE = Yes
MODULES = lang/python
-
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS =jupyter_core
-PORTHOME = ${WRKDIR}
+
+RUN_DEPENDS = devel/py-traitlets${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
+ devel/py-nose$(MODPY_FLAVOR)
FLAVORS = python3
FLAVOR ?=
@@ -33,6 +30,8 @@ FLAVOR ?=
TEST_DEPENDS +=devel/py-mock
.endif
+PORTHOME = ${WRKDIR}
+
post-install:
mv ${PREFIX}/bin/jupyter{,${MODPY_BIN_SUFFIX}}
mv ${PREFIX}/bin/jupyter-migrate{,${MODPY_BIN_SUFFIX}}
diff --git distinfo distinfo
index 534a6e1d7d5..f92949f9480 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (jupyter_core-4.4.0.tar.gz) =
unB1SqaAMAMGxpl5ASj2+9jDBu5ZJ5dsvkitrPJAwLc=
-SIZE (jupyter_core-4.4.0.tar.gz) = 63613
+SHA256 (jupyter_core-4.6.1.tar.gz) =
oYPg7C6Pat3fYrCj/GoiN+PgBW04HlNtPnx+zDBn4kQ=
+SIZE (jupyter_core-4.6.1.tar.gz) = 66693
diff --git patches/patch-jupyter_core_command_py
patches/patch-jupyter_core_command_py
index 4acbeb5f540..ef58670679e 100644
--- patches/patch-jupyter_core_command_py
+++ patches/patch-jupyter_core_command_py
@@ -1,7 +1,8 @@
$OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13 14:46:43 shadchin Exp
$
jupyter_core/command.py.orig Tue Sep 13 18:22:49 2016
-+++ jupyter_core/command.pyThu Sep 29 17:04:28 2016
-@@ -77,7 +77,13 @@ def list_subcommands():
+Index: jupyter_core/command.py
+--- jupyter_core/command.py.orig
jupyter_core/command.py
+@@ -84,7 +84,13 @@ def list_subcommands():
if sys.platform.startswith('win'):
# remove file-extension on Windows
name = os.path.splitext(name)[0]
@@ -16,10 +17,11 @@ $OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13
14:46:43 shadchin Exp $
# build a set of subcommand strings, excluding subcommands whose parents
are defined
subcommands = set()
# Only include `jupyter-foo-bar` if `jupyter-foo` is not already present
-@@ -182,6 +188,8 @@ def main():
+@@ -245,7 +251,8 @@ def main():
sys.exit("subcommand is required")
-
- command = 'jupyter-' + subcommand
+
+ command = _jupyter_abspath(subcommand)
+-
+if sys.version_info.major == 3 and not command.endswith('-3'):
+command += '-3'
try:
diff --git patches/patch-jupyter_core_tests_test_command_py
patches/patch-jupyter_core_tests_test_command_py
index 2e56ec9a998..722657c8cd4 100644
--- patches/patch-jupyter_core_tests_test_command_py
+++ patches/patch-jupyter_core_tests_test_command_py
@@ -2,7 +2,7 @@ $OpenBSD: patch-jupyter_core_tests_test_command_py,v 1.2
2018/12/29 11:50:35 mar
Index: jupyter_core/tests/test_command.py
--- jupyter_core/tests/test_command.py.orig
+++ jupyter_core/tests/test_command.py
-@@ -98,16 +98,20 @@ def test_subcommand_not_found():
+@@ -99,20 +99,24 @@ def test_subcommand_not_found():
@patch.object(sys, 'argv', [__file__] + sys.argv[1:])
def test_subcommand_list(tmpdir):
@@ -21,12 +21,17 @@ Index: jupyter_core/tests/test_command.py
'jupyterstuff',
'jupyter-yo-eyropa-ganymyde-callysto'):
-b.join(cmd).write('')
++b.join(cmd + cmd_sufx).write('')
+ c = tmpdir.mkdir("c")
+ for cmd in ('jupyter-baz',
+ 'jupyter-bop'):
+-c.join(cmd).write('')
+b.join(cmd + cmd_sufx).write('')
path = os.pathsep.join(map(str, [a, b]))
-
-@@ -121,13 +125,17 @@ def test_subcommand_list(tmpdir):
- ]
+
+@@ -132,13 +136,17 @@ def test_subcommand_list(tmpdir):
+ ]
def
UPDATE www/jupyter-notebook-6.0.3
Diff below updates jupyter-notebook to 6.0.3. Changelog can be found at
https://jupyter-notebook.readthedocs.io/en/stable/changelog.html.
Noticeable change is that upstream dropped support for python 2.
Changes to the port:
- Drop FLAVOR and set MODPY_VERSION
- Update dependencies
- Drop post-install bits as it is no longer necessary to add a suffix to
jupyter-notebook and its tools
- Set @conflict- and @pkgpath-marker in PLIST
Testing:
- 'make test' runs successfully
- Run tested on amd64 in an existing jupyter-notebook environment
Comments/OK?
diff --git Makefile Makefile
index ad0314ebf9e..80b5d16b0c7 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@
COMMENT = web-based notebook for interactive computing
-MODPY_EGG_VERSION =5.7.8
+MODPY_EGG_VERSION =6.0.3
DISTNAME = notebook-${MODPY_EGG_VERSION}
PKGNAME = jupyter-notebook-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = www devel
@@ -18,14 +17,12 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-
-FLAVORS = python3
-FLAVOR ?=
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
RUN_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
devel/py-ipython_genutils${MODPY_FLAVOR} \
- devel/py-jupyter_client${MODPY_FLAVOR}>=5.2.0 \
- devel/py-jupyter_core${MODPY_FLAVOR}>=4.4.0 \
+ devel/py-jupyter_client${MODPY_FLAVOR}>=5.3.4 \
+ devel/py-jupyter_core${MODPY_FLAVOR}>=4.6.1 \
devel/py-nbconvert${MODPY_FLAVOR} \
devel/py-nbformat${MODPY_FLAVOR} \
devel/py-send2trash${MODPY_FLAVOR} \
@@ -34,7 +31,7 @@ RUN_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
sysutils/py-prometheus_client${MODPY_FLAVOR} \
www/py-jinja2${MODPY_FLAVOR} \
www/py-terminado${MODPY_FLAVOR}>=0.8.1 \
- www/py-tornado${MODPY_FLAVOR}>=4.1,<7
+ www/py-tornado${MODPY_FLAVOR}>=5.0
TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR} \
devel/py-nose${MODPY_FLAVOR} \
@@ -45,20 +42,6 @@ TEST_DEPENDS =
devel/py-coverage${MODPY_FLAVOR} \
# XXX once we have a port of pandoc, we can make docs.
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS += devel/py-futures \
- net/py-ipaddress
-TEST_DEPENDS +=devel/py-mock
-.else
-PKGNAME =
jupyter-notebook${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
-.endif
-
-post-install:
- mv ${PREFIX}/bin/jupyter-bundlerextension{,${MODPY_BIN_SUFFIX}}
- mv ${PREFIX}/bin/jupyter-nbextension{,${MODPY_BIN_SUFFIX}}
- mv ${PREFIX}/bin/jupyter-notebook{,${MODPY_BIN_SUFFIX}}
- mv ${PREFIX}/bin/jupyter-serverextension{,${MODPY_BIN_SUFFIX}}
-
# XXX exclude selenium tests as recommended, and exclude tests that use
# send2trash as they error out with "Trashing on system internal mounts is not
# supported".
diff --git distinfo distinfo
index bf6347fa525..995e6fb7c94 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (notebook-5.7.8.tar.gz) = Vz4K5lDF12sYtuVkum0hvzIdAIR94dIVtBistk8Fbrg=
-SIZE (notebook-5.7.8.tar.gz) = 13371684
+SHA256 (notebook-6.0.3.tar.gz) = R6kJKXXJ55Za2gC5og8M9jfQAdtg0kHUefU8C+EXrUg=
+SIZE (notebook-6.0.3.tar.gz) = 14048151
diff --git pkg/PLIST pkg/PLIST
index 3cb8f27e809..21cb03ef3e0 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST,v 1.6 2019/05/10 11:36:55 bket Exp $
-bin/jupyter-bundlerextension${MODPY_BIN_SUFFIX}
-bin/jupyter-nbextension${MODPY_BIN_SUFFIX}
-bin/jupyter-notebook${MODPY_BIN_SUFFIX}
-bin/jupyter-serverextension${MODPY_BIN_SUFFIX}
+@conflict jupyter-notebook3-*
+@pkgpath www/jupyter-notebook,python3
+bin/jupyter-bundlerextension
+bin/jupyter-nbextension
+bin/jupyter-notebook
+bin/jupyter-serverextension
lib/python${MODPY_VERSION}/site-packages/notebook/
lib/python${MODPY_VERSION}/site-packages/notebook-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/notebook-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -24,7 +26,6 @@
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}config_manager
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}jstest.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}metrics.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}nbextensions.${MODPY_PYC_MAGIC_TAG}pyc
UPDATE devel/py-jupyter_client-5.3.4
Enclosed diff brings py-jupyer_client to 5.3.4, which is needed for a
pending update of jupyter-notebook. Changelog can be found at
https://github.com/jupyter/jupyter_client/blob/5.3.4/docs/changelog.rst.
Changes to the port:
- Follow Makefile.template
- Update dependencies
Testing:
- 'make test' fails TestKernelManager.test_signal_kernel_subprocesses
for both python2 and python3. I do not understand why this test fails.
On python3 all other tests are OK. Python2 fails one other tests
because of 'too many open files'
- Run tested on amd64 with jupyter-notebook from ports and an update
hereof
Comments/OK?
diff --git Makefile Makefile
index 824719ebdc3..39baa98de92 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@
COMMENT = Jupyter protocol implementation and client libraries
-MODPY_EGG_VERSION =5.2.4
+MODPY_EGG_VERSION =5.3.4
DISTNAME = jupyter_client-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = devel
@@ -20,24 +19,25 @@ MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS =jupyter_client
-PORTHOME = ${WRKDIR}
-FLAVORS = python3
-FLAVOR ?=
-
-RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR} \
- devel/py-jupyter_core${MODPY_FLAVOR}>=4.3.0 \
+RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR}>=2.1 \
+ devel/py-jupyter_core${MODPY_FLAVOR}>=4.6.0 \
devel/py-traitlets${MODPY_FLAVOR} \
- net/py-zmq${MODPY_FLAVOR} \
- www/py-tornado${MODPY_FLAVOR}
-TEST_DEPENDS = devel/ipython${MODPY_FLAVOR}>=5.1.0 \
- devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2 \
+ net/py-zmq${MODPY_FLAVOR}>=13 \
+ www/py-tornado${MODPY_FLAVOR}>=4.1
+TEST_DEPENDS = devel/ipython${MODPY_FLAVOR} \
+ devel/py-ipykernel${MODPY_FLAVOR} \
shells/bash
+FLAVORS = python3
+FLAVOR ?=
+
.if !${FLAVOR:Mpython3}
TEST_DEPENDS +=devel/py-mock
.endif
+PORTHOME = ${WRKDIR}
+
post-install:
mv ${PREFIX}/bin/jupyter-kernel{,${MODPY_BIN_SUFFIX}}
mv ${PREFIX}/bin/jupyter-kernelspec{,${MODPY_BIN_SUFFIX}}
diff --git distinfo distinfo
index 8763b398bf6..6d67b9dab73 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (jupyter_client-5.2.4.tar.gz) =
tfnLBhBcHS0wcZ21/7PqZ9pgkZ+2jervpYPezNiBNVE=
-SIZE (jupyter_client-5.2.4.tar.gz) = 273397
+SHA256 (jupyter_client-5.3.4.tar.gz) =
YOb67BAx1j31fxzGce1nPc7Q7UIPQ3fqM9s3scGIuRA=
+SIZE (jupyter_client-5.3.4.tar.gz) = 275850
diff --git patches/patch-jupyter_client_connect_py
patches/patch-jupyter_client_connect_py
index 3f522511b9f..84d90a98954 100644
--- patches/patch-jupyter_client_connect_py
+++ patches/patch-jupyter_client_connect_py
@@ -9,10 +9,10 @@ Index: jupyter_client/connect.py
import warnings
+import sys
from getpass import getpass
+ from contextlib import contextmanager
- import zmq
-@@ -137,7 +138,7 @@ def write_connection_file(fname=None, shell_port=0, io
- with open(fname, 'w') as f:
+@@ -141,7 +142,7 @@ def write_connection_file(fname=None, shell_port=0, io
+ with secure_write(fname) as f:
f.write(json.dumps(cfg, indent=2))
-if hasattr(stat, 'S_ISVTX'):
UPDATE devel/py-jupyter_core-4.6.1
Diff below brings py-jupyter_core to 4.6.1, which is needed for a
pending update of www/jupyter-notebook. Changelog can be found at
https://github.com/jupyter/jupyter_core/blob/4.6.1/docs/changelog.rst
Changes to the port:
- Follow Makefile.template
- Remove ipython as TDEP, which is not needed
- Add py-nose as TDEP
Testing:
- 'make test' runs successfully for both python2 and python3
- Run tested on amd64 with jupyter-notebook from ports and an update
hereof
Comments/OK?
diff --git devel/py-jupyter_core/Makefile devel/py-jupyter_core/Makefile
index 4962a3be9c3..b057b6fe65f 100644
--- devel/py-jupyter_core/Makefile
+++ devel/py-jupyter_core/Makefile
@@ -2,29 +2,26 @@
COMMENT = Jupyter core package
-MODPY_EGG_VERSION =4.4.0
+MODPY_EGG_VERSION =4.6.1
DISTNAME = jupyter_core-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = devel
HOMEPAGE = https://jupyter.org/
-RUN_DEPENDS = devel/py-traitlets${MODPY_FLAVOR}
-TEST_DEPENDS = devel/ipython${MODPY_FLAVOR}>=5.1.0 \
- devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2
-
# BSD
PERMIT_PACKAGE = Yes
MODULES = lang/python
-
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS =jupyter_core
-PORTHOME = ${WRKDIR}
+
+RUN_DEPENDS = devel/py-traitlets${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
+ devel/py-nose$(MODPY_FLAVOR)
FLAVORS = python3
FLAVOR ?=
@@ -33,6 +30,8 @@ FLAVOR ?=
TEST_DEPENDS +=devel/py-mock
.endif
+PORTHOME = ${WRKDIR}
+
post-install:
mv ${PREFIX}/bin/jupyter{,${MODPY_BIN_SUFFIX}}
mv ${PREFIX}/bin/jupyter-migrate{,${MODPY_BIN_SUFFIX}}
diff --git devel/py-jupyter_core/distinfo devel/py-jupyter_core/distinfo
index 534a6e1d7d5..f92949f9480 100644
--- devel/py-jupyter_core/distinfo
+++ devel/py-jupyter_core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jupyter_core-4.4.0.tar.gz) =
unB1SqaAMAMGxpl5ASj2+9jDBu5ZJ5dsvkitrPJAwLc=
-SIZE (jupyter_core-4.4.0.tar.gz) = 63613
+SHA256 (jupyter_core-4.6.1.tar.gz) =
oYPg7C6Pat3fYrCj/GoiN+PgBW04HlNtPnx+zDBn4kQ=
+SIZE (jupyter_core-4.6.1.tar.gz) = 66693
diff --git devel/py-jupyter_core/patches/patch-jupyter_core_command_py
devel/py-jupyter_core/patches/patch-jupyter_core_command_py
index 4acbeb5f540..ef58670679e 100644
--- devel/py-jupyter_core/patches/patch-jupyter_core_command_py
+++ devel/py-jupyter_core/patches/patch-jupyter_core_command_py
@@ -1,7 +1,8 @@
$OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13 14:46:43 shadchin Exp
$
jupyter_core/command.py.orig Tue Sep 13 18:22:49 2016
-+++ jupyter_core/command.pyThu Sep 29 17:04:28 2016
-@@ -77,7 +77,13 @@ def list_subcommands():
+Index: jupyter_core/command.py
+--- jupyter_core/command.py.orig
jupyter_core/command.py
+@@ -84,7 +84,13 @@ def list_subcommands():
if sys.platform.startswith('win'):
# remove file-extension on Windows
name = os.path.splitext(name)[0]
@@ -16,10 +17,11 @@ $OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13
14:46:43 shadchin Exp $
# build a set of subcommand strings, excluding subcommands whose parents
are defined
subcommands = set()
# Only include `jupyter-foo-bar` if `jupyter-foo` is not already present
-@@ -182,6 +188,8 @@ def main():
+@@ -245,7 +251,8 @@ def main():
sys.exit("subcommand is required")
-
- command = 'jupyter-' + subcommand
+
+ command = _jupyter_abspath(subcommand)
+-
+if sys.version_info.major == 3 and not command.endswith('-3'):
+command += '-3'
try:
diff --git
devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py
devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py
index 2e56ec9a998..722657c8cd4 100644
--- devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py
+++ devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py
@@ -2,7 +2,7 @@ $OpenBSD: patch-jupyter_core_tests_test_command_py,v 1.2
2018/12/29 11:50:35 mar
Index: jupyter_core/tests/test_command.py
--- jupyter_core/tests/test_command.py.orig
+++ jupyter_core/tests/test_command.py
-@@ -98,16 +98,20 @@ def test_subcommand_not_found():
+@@ -99,20 +99,24 @@ def test_subcommand_not_found():
@patch.object(sys, 'argv', [__file__] + sys.argv[1:])
def test_subcommand_list(tmpdir):
@@ -21,12 +21,17 @@ Index: jupyter_core/tests/test_command.py
'jupyterstuff',
'jupyter-yo-eyropa-ganymyde-callysto'):
-b.join(cmd).write('')
++b.join(cmd + cmd_sufx).write('')
+ c = tmpdir.mkdir("c")
+ for cmd in ('jupyter-baz',
+ 'jupyter-bop'):
+-c.join(cmd).write('')
+b.join(cmd + cmd_sufx).write('')
Re: [base-gcc] Unbreak cad/qrouter
On Fri, 7 Feb 2020 18:04:36 + Stuart Henderson wrote: > On 2020/02/07 18:44, Charlene Wendling wrote: > > + #ifdef TCL_QROUTER > > ++/* XXX needed for va_list with base-gcc */ > > not just the ancient base-gcc, current versions too - clang is the > odd one out here. I removed base-gcc to mention only GCC instead. > > ++#include > > + void tcl_printf(FILE *, const char *, ...); > > + void tcl_stdflush(FILE *); > > + void tcl_vprintf(FILE *, const char *, va_list); > > > Index: Makefile === RCS file: /cvs/ports/cad/qrouter/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile3 Feb 2020 22:21:57 - 1.5 +++ Makefile7 Feb 2020 19:10:48 - @@ -2,6 +2,7 @@ COMMENT = multi-level, over-the-cell maze router for VLSI design DISTNAME = qrouter-1.4.74 +REVISION = 0 EXTRACT_SUFX = .tgz CATEGORIES = cad Index: patches/patch-qrouter_h === RCS file: /cvs/ports/cad/qrouter/patches/patch-qrouter_h,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-qrouter_h --- patches/patch-qrouter_h 3 Feb 2020 22:21:57 - 1.2 +++ patches/patch-qrouter_h 7 Feb 2020 19:10:48 - @@ -12,3 +12,12 @@ Index: qrouter.h typedef int (*__compar_fn_t)(const void*, const void*); #endif +@@ -530,6 +530,8 @@ NETgetnettoroute(int order); + introute_net_ripup(NET net, u_char graphdebug, u_char onlybreak); + + #ifdef TCL_QROUTER ++/* XXX needed for va_list with GCC */ ++#include + void tcl_printf(FILE *, const char *, ...); + void tcl_stdflush(FILE *); + void tcl_vprintf(FILE *, const char *, va_list);
[UPDATE] audio/ncspot to 0.1.2
Attached diff updates audio/ncspot to 0.1.2.
OK?
Index: Makefile
===
RCS file: /cvs/ports/audio/ncspot/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile15 Jan 2020 20:35:02 - 1.3
+++ Makefile7 Feb 2020 19:13:41 -
@@ -6,8 +6,7 @@ COMMENT = ncurses Spotify client
GH_ACCOUNT = hrkfdn
GH_PROJECT = ncspot
-GH_TAGNAME = v0.1.1
-REVISION = 1
+GH_TAGNAME = v0.1.2
CATEGORIES = audio
@@ -28,336 +27,385 @@ NO_TEST = Yes
CONFIGURE_STYLE = cargo
DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
-MODCARGO_CRATES += adler32 1.0.4 # Zlib
-MODCARGO_CRATES += aes 0.3.2 # MIT OR Apache-2.0
-MODCARGO_CRATES += aes-ctr 0.3.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += aes-soft0.3.3 # MIT OR Apache-2.0
-MODCARGO_CRATES += aesni 0.6.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += aho-corasick0.7.6 # Unlicense/MIT
-MODCARGO_CRATES += alga0.9.2 # Apache-2.0
-MODCARGO_CRATES += alsa0.2.2 # Apache-2.0/MIT
-MODCARGO_CRATES += alsa-sys0.1.2 # MIT
-MODCARGO_CRATES += ansi_term 0.11.0 # MIT
-MODCARGO_CRATES += approx 0.3.2 # Apache-2.0
-MODCARGO_CRATES += arc-swap0.4.4 # Apache-2.0/MIT
-MODCARGO_CRATES += array-macro 1.0.4 # MIT/Apache-2.0
-MODCARGO_CRATES += arrayref0.3.5 # BSD-2-Clause
-MODCARGO_CRATES += arrayvec0.5.1 # MIT/Apache-2.0
-MODCARGO_CRATES += atty0.2.13 # MIT
-MODCARGO_CRATES += autocfg 0.1.7 # Apache-2.0/MIT
-MODCARGO_CRATES += backtrace 0.3.40 # MIT/Apache-2.0
-MODCARGO_CRATES += backtrace-sys 0.1.32 # MIT/Apache-2.0
-MODCARGO_CRATES += base64 0.10.1 # MIT/Apache-2.0
-MODCARGO_CRATES += base64 0.9.3 # MIT/Apache-2.0
-MODCARGO_CRATES += bindgen 0.51.1 # BSD-3-Clause
-MODCARGO_CRATES += bit-set 0.5.1 # MIT/Apache-2.0
-MODCARGO_CRATES += bit-vec 0.5.1 # MIT/Apache-2.0
-MODCARGO_CRATES += bitflags0.3.3 # MIT/Apache-2.0
-MODCARGO_CRATES += bitflags0.9.1 # MIT/Apache-2.0
-MODCARGO_CRATES += bitflags1.2.1 # MIT/Apache-2.0
-MODCARGO_CRATES += blake2b_simd0.5.9 # MIT
-MODCARGO_CRATES += block 0.1.6 # MIT
-MODCARGO_CRATES += block-buffer0.7.3 # MIT OR Apache-2.0
-MODCARGO_CRATES += block-cipher-trait 0.6.2 # MIT OR Apache-2.0
-MODCARGO_CRATES += block-padding 0.1.5 # MIT OR Apache-2.0
-MODCARGO_CRATES += byte-tools 0.3.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += byteorder 1.3.2 # Unlicense OR MIT
-MODCARGO_CRATES += bytes 0.4.12 # MIT
-MODCARGO_CRATES += c2-chacha 0.2.3 # MIT/Apache-2.0
-MODCARGO_CRATES += cc 1.0.47 # MIT/Apache-2.0
-MODCARGO_CRATES += cexpr 0.3.6 # Apache-2.0/MIT
-MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0
-MODCARGO_CRATES += chrono 0.4.9 # MIT/Apache-2.0
-MODCARGO_CRATES += clang-sys 0.28.1 # Apache-2.0
-MODCARGO_CRATES += clap2.33.0 # MIT
-MODCARGO_CRATES += clipboard 0.5.0 # MIT / Apache-2.0
-MODCARGO_CRATES += clipboard-win 2.2.0 # MIT
-MODCARGO_CRATES += cloudabi0.0.3 # BSD-2-Clause
-MODCARGO_CRATES += constant_time_eq0.1.4 # CC0-1.0
-MODCARGO_CRATES += cookie 0.12.0 # MIT/Apache-2.0
-MODCARGO_CRATES += cookie_store0.7.0 # MIT/Apache-2.0
-MODCARGO_CRATES += core-foundation 0.6.4 # MIT / Apache-2.0
-MODCARGO_CRATES += core-foundation-sys 0.5.1 # MIT / Apache-2.0
-MODCARGO_CRATES += core-foundation-sys 0.6.2 # MIT / Apache-2.0
-MODCARGO_CRATES += coreaudio-rs0.9.1 # MIT/Apache-2.0
-MODCARGO_CRATES += coreaudio-sys 0.2.3 # MIT
-MODCARGO_CRATES += cpal0.8.2 # Apache-2.0
-MODCARGO_CRATES += crc32fast 1.2.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += crossbeam-channel 0.3.9 # MIT/Apache-2.0 AND
BSD-2-Clause
-MODCARGO_CRATES += crossbeam-channel 0.4.0 # MIT/Apache-2.0 AND
BSD-2-Clause
-MODCARGO_CRATES += crossbeam-deque 0.7.2 # MIT/Apache-2.0
-MODCARGO_CRATES += crossbeam-epoch 0.8.0 # MIT/Apache-2.0
-MODCARGO_CRATES += crossbeam-queue 0.1.2 # MIT/Apache-2.0
-MODCARGO_CRATES += crossbeam-utils 0.6.6 # MIT/Apache-2.0
-MODCARGO_CRATES += crossbeam-utils 0.7.0 # MIT/Apache-2.0
-MODCARGO_CRATES += crypto-mac 0.7.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += ctr 0.3.2 # MIT OR Apache-2.0
-MODCARGO_CRATES += cursive 0.13.0 # MIT
-MODCARGO_CRATES += darling 0.10.2 # MIT
-MODCARGO_CRATES += darling 0.9.0 # MIT
-MODCARGO_CRATES += darling_core0.10.2 # MIT
-MODCARGO_CRATES += darling_core0.9.0 # MIT
-MODCARGO_CRATES += darling_macro 0.10.2 # MIT
-MODCARGO_CRATES += darling_macro
Re: [base-gcc] Unbreak security/opensc
On Fri, Feb 07, 2020 at 09:24:52AM +0100, Charlene Wendling wrote: > > http://build-failures.rhaalovely.net/sparc64/2020-02-01/security/opensc.log > The last update brought back `-Werror', so i took the matter upstream > [0] to avoid that in the future, port flags will be on top priority now. > I have not backported the `--enable-pedantic' change because it is > built without it by default. REVISION bump seems not needed as this > diff just changes the CFLAGS order and only overrides `-Werror'. > Comments/feedback are welcome :) > Charlène. > [0] https://github.com/OpenSC/OpenSC/pull/1933 It fixed it on the current sparc64 build. ok kmos --Kurt
Re: [base-gcc] Unbreak cad/qrouter
On 2020/02/07 18:44, Charlene Wendling wrote: > + #ifdef TCL_QROUTER > ++/* XXX needed for va_list with base-gcc */ not just the ancient base-gcc, current versions too - clang is the odd one out here. > ++#include > + void tcl_printf(FILE *, const char *, ...); > + void tcl_stdflush(FILE *); > + void tcl_vprintf(FILE *, const char *, va_list); >
Re: [base-gcc] Unbreak cad/qrouter
On Fri, 7 Feb 2020 17:20:53 + Stuart Henderson wrote: > On 2020/02/07 10:08, Charlene Wendling wrote: > > Hi, > > > > The latest version of cad/qrouter is broken in the current sparc64 > > bulk: > > > > > cc -O2 -pipe -Wno-return-type -O2 -pipe -Wno-return-type > > > -I/usr/X11R6/include -fPIC -DPA CKAGE_NAME=\"\" > > > -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" > > > -DPACKAGE_STRING=\"\" -DPAC KAGE_BUGREPORT=\"\" > > > -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 > > > -DHAVE_PUTENV=1 - DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 > > > -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB _H=1 > > > -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 > > > -DHAVE_INTTYPES_H=1 -DHAVE_ST DINT_H=1 -DHAVE_UNISTD_H=1 > > > -DHAVE_SYS_MMAN_H=1 -DTCL_QROUTER=1 -DVERSION=\"1.4\" -DREVISI > > > ON=\"74\" -DUSE_TCL_STUBS -DUSE_TK_STUBS \ > > > -DQROUTER_PATH=\"/usr/local/share/qrouter\" > > > -I/usr/local/include/tk8.5 -I/usr/loc al/include/tcl8.5 -c > > > point.c -o point.o In file included from point.c:13: qrouter.h: > > > 535: error: expected declaration specifiers or '...' before > > > 'va_list' > > > > It's a missing include happening because upstream does not put > > includes in their header files to start with (imvho that's bad), > > since several C files want qrouter.h, adding the include there > > reduces the number of patches needed. > > > > With the below diff, it builds fine on powerpc [0]. REVISION bump is > > not needed, as i made the change to target GCC specifically, and > > this version has never been built on base-gcc archs. > > > > Comments/feedback are welcome, > > > > Charlène. > > > > [0] https://bin.charlenew.xyz/qrouter.log > > > > > > Index: patches/patch-qrouter_h > > === > > RCS file: /cvs/ports/cad/qrouter/patches/patch-qrouter_h,v > > retrieving revision 1.2 > > diff -u -p -u -p -r1.2 patch-qrouter_h > > --- patches/patch-qrouter_h 3 Feb 2020 22:21:57 - > > 1.2 +++ patches/patch-qrouter_h 7 Feb 2020 09:03:36 - > > @@ -12,3 +12,13 @@ Index: qrouter.h > > typedef int (*__compar_fn_t)(const void*, const void*); > > #endif > > > > +@@ -530,6 +530,9 @@ NETgetnettoroute(int order); > > + introute_net_ripup(NET net, u_char graphdebug, u_char > > onlybreak); > > + > > + #ifdef TCL_QROUTER > > ++#if !defined(__clang__) && defined(__OpenBSD__) > > ++#include /* needed for va_list with base-gcc */ > > ++#endif > > I don't see why it should be conditional.. I changed it below, it builds fine on amd64 and powerpc (it was quite like this before the patches were removed anyway). > Can you send it upstream please? > (https://github.com/RTimothyEdwards/qrouter/) Alessandro, i prefer not sending a PR just for that include given you opened an issue, is it possible for you to change it please, with that added? -- Index: Makefile === RCS file: /cvs/ports/cad/qrouter/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile3 Feb 2020 22:21:57 - 1.5 +++ Makefile7 Feb 2020 17:31:50 - @@ -2,6 +2,7 @@ COMMENT = multi-level, over-the-cell maze router for VLSI design DISTNAME = qrouter-1.4.74 +REVISION = 0 EXTRACT_SUFX = .tgz CATEGORIES = cad Index: patches/patch-qrouter_h === RCS file: /cvs/ports/cad/qrouter/patches/patch-qrouter_h,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-qrouter_h --- patches/patch-qrouter_h 3 Feb 2020 22:21:57 - 1.2 +++ patches/patch-qrouter_h 7 Feb 2020 17:31:50 - @@ -12,3 +12,12 @@ Index: qrouter.h typedef int (*__compar_fn_t)(const void*, const void*); #endif +@@ -530,6 +530,8 @@ NETgetnettoroute(int order); + introute_net_ripup(NET net, u_char graphdebug, u_char onlybreak); + + #ifdef TCL_QROUTER ++/* XXX needed for va_list with base-gcc */ ++#include + void tcl_printf(FILE *, const char *, ...); + void tcl_stdflush(FILE *); + void tcl_vprintf(FILE *, const char *, va_list);
Re: [base-gcc] Unbreak cad/qrouter
On 2020/02/07 10:08, Charlene Wendling wrote: > Hi, > > The latest version of cad/qrouter is broken in the current sparc64 bulk: > > > cc -O2 -pipe -Wno-return-type -O2 -pipe -Wno-return-type > > -I/usr/X11R6/include -fPIC -DPA CKAGE_NAME=\"\" > > -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" > > -DPAC KAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 > > -DHAVE_SETENV=1 -DHAVE_PUTENV=1 - DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 > > -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB _H=1 > > -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 > > -DHAVE_INTTYPES_H=1 -DHAVE_ST DINT_H=1 -DHAVE_UNISTD_H=1 > > -DHAVE_SYS_MMAN_H=1 -DTCL_QROUTER=1 -DVERSION=\"1.4\" -DREVISI > > ON=\"74\" -DUSE_TCL_STUBS -DUSE_TK_STUBS \ > > -DQROUTER_PATH=\"/usr/local/share/qrouter\" > > -I/usr/local/include/tk8.5 -I/usr/loc al/include/tcl8.5 -c point.c -o > > point.o > > In file included from point.c:13: qrouter.h:535: error: > > expected declaration specifiers or '...' before 'va_list' > > It's a missing include happening because upstream does not put includes > in their header files to start with (imvho that's bad), since several C > files want qrouter.h, adding the include there reduces the number of > patches needed. > > With the below diff, it builds fine on powerpc [0]. REVISION bump is > not needed, as i made the change to target GCC specifically, and this > version has never been built on base-gcc archs. > > Comments/feedback are welcome, > > Charlène. > > [0] https://bin.charlenew.xyz/qrouter.log > > > Index: patches/patch-qrouter_h > === > RCS file: /cvs/ports/cad/qrouter/patches/patch-qrouter_h,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 patch-qrouter_h > --- patches/patch-qrouter_h 3 Feb 2020 22:21:57 - 1.2 > +++ patches/patch-qrouter_h 7 Feb 2020 09:03:36 - > @@ -12,3 +12,13 @@ Index: qrouter.h > typedef int (*__compar_fn_t)(const void*, const void*); > #endif > > +@@ -530,6 +530,9 @@ NETgetnettoroute(int order); > + introute_net_ripup(NET net, u_char graphdebug, u_char onlybreak); > + > + #ifdef TCL_QROUTER > ++#if !defined(__clang__) && defined(__OpenBSD__) > ++#include /* needed for va_list with base-gcc */ > ++#endif I don't see why it should be conditional.. Can you send it upstream please? (https://github.com/RTimothyEdwards/qrouter/)
Re: [base-gcc] Unbreak cad/qrouter
On Fri, Feb 07, 2020 at 10:08:29AM +0100, Charlene Wendling wrote: > The latest version of cad/qrouter is broken in the current sparc64 bulk: > > cc -O2 -pipe -Wno-return-type -O2 -pipe -Wno-return-type > > -I/usr/X11R6/include -fPIC -DPA CKAGE_NAME=\"\" > > -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" > > -DPAC KAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 > > -DHAVE_SETENV=1 -DHAVE_PUTENV=1 - DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 > > -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB _H=1 > > -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 > > -DHAVE_INTTYPES_H=1 -DHAVE_ST DINT_H=1 -DHAVE_UNISTD_H=1 > > -DHAVE_SYS_MMAN_H=1 -DTCL_QROUTER=1 -DVERSION=\"1.4\" -DREVISI > > ON=\"74\" -DUSE_TCL_STUBS -DUSE_TK_STUBS \ > > -DQROUTER_PATH=\"/usr/local/share/qrouter\" > > -I/usr/local/include/tk8.5 -I/usr/loc al/include/tcl8.5 -c point.c -o > > point.o > > In file included from point.c:13: qrouter.h:535: error: > > expected declaration specifiers or '...' before 'va_list' > It's a missing include happening because upstream does not put includes > in their header files to start with (imvho that's bad), since several C > files want qrouter.h, adding the include there reduces the number of > patches needed. > With the below diff, it builds fine on powerpc [0]. REVISION bump is > not needed, as i made the change to target GCC specifically, and this > version has never been built on base-gcc archs. > Comments/feedback are welcome, > Charlène. > [0] https://bin.charlenew.xyz/qrouter.log This fixes it on the bulk build. ok kmos --Kurt > > Index: patches/patch-qrouter_h > === > RCS file: /cvs/ports/cad/qrouter/patches/patch-qrouter_h,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 patch-qrouter_h > --- patches/patch-qrouter_h 3 Feb 2020 22:21:57 - 1.2 > +++ patches/patch-qrouter_h 7 Feb 2020 09:03:36 - > @@ -12,3 +12,13 @@ Index: qrouter.h > typedef int (*__compar_fn_t)(const void*, const void*); > #endif > > +@@ -530,6 +530,9 @@ NETgetnettoroute(int order); > + introute_net_ripup(NET net, u_char graphdebug, u_char onlybreak); > + > + #ifdef TCL_QROUTER > ++#if !defined(__clang__) && defined(__OpenBSD__) > ++#include /* needed for va_list with base-gcc */ > ++#endif > + void tcl_printf(FILE *, const char *, ...); > + void tcl_stdflush(FILE *); > + void tcl_vprintf(FILE *, const char *, va_list); >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/07 09:57:04 Log message: import security/cfssl, from Karlis Mikelsons with tweaks, ok'd a while ago by abieber@ CFSSL is CloudFlare's PKI/TLS swiss army knife. It is both a command line tool and an HTTP API server for signing, verifying, and bundling TLS certificates. Status: Vendor Tag: sthen Release Tags: sthen_20200207 N ports/security/cfssl/Makefile N ports/security/cfssl/distinfo N ports/security/cfssl/pkg/DESCR N ports/security/cfssl/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/07 09:57:26 Modified files: security : Makefile Log message: +cfssl
pledge net/ngircd
Hello ports@,
this patch adds pledge() to net/ngircd. Tested on amd64 with ngircd
running with TLS. Unfortunately the promises can't be further reduced
since this would break /rehash (i.e. reloading the config) later. But
this is better than nothing.
Index: Makefile
===
RCS file: /cvs/ports/net/ngircd/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile12 Jul 2019 20:48:34 - 1.18
+++ Makefile7 Feb 2020 14:15:32 -
@@ -4,6 +4,8 @@ COMMENT = lightweight irc server
DISTNAME = ngircd-25
+REVISION = 0
+
CATEGORIES = net
HOMEPAGE = https://ngircd.barton.de/
Index: patches/patch-src_ngircd_ngircd_c
===
RCS file: /cvs/ports/net/ngircd/patches/patch-src_ngircd_ngircd_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_ngircd_ngircd_c
--- patches/patch-src_ngircd_ngircd_c 3 Dec 2014 10:32:18 - 1.4
+++ patches/patch-src_ngircd_ngircd_c 7 Feb 2020 14:15:32 -
@@ -1,7 +1,18 @@
$OpenBSD: patch-src_ngircd_ngircd_c,v 1.4 2014/12/03 10:32:18 jasper Exp $
src/ngircd/ngircd.c.orig Mon Jul 14 13:26:07 2014
-+++ src/ngircd/ngircd.cTue Dec 2 20:05:31 2014
-@@ -563,7 +563,7 @@ Setup_FDStreams(int fd)
+Index: src/ngircd/ngircd.c
+--- src/ngircd/ngircd.c.orig
src/ngircd/ngircd.c
+@@ -259,6 +259,9 @@ main(int argc, const char *argv[])
+ exit(1);
+ }
+
++ if ( pledge("stdio inet dns rpath proc getpw", NULL) == -1)
++ err(1, "pledge");
++
+ /* Initialize modules, part II: these functions are eventually
+* called with already dropped privileges ... */
+ Channel_Init();
+@@ -563,7 +566,7 @@ Setup_FDStreams(int fd)
#if !defined(SINGLE_USER_OS)
/**
@@ -10,7 +21,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1.
*
* @param uid User ID
* @param gid Group ID
-@@ -587,7 +587,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
+@@ -587,7 +590,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
}
#endif
@@ -19,7 +30,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1.
if (!pwd)
return false;
-@@ -703,11 +703,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+@@ -703,11 +706,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
if (Conf_UID == 0) {
pwd = getpwuid(0);
Log(LOG_INFO,
Index: patches/patch-src_ngircd_proc_c
===
RCS file: patches/patch-src_ngircd_proc_c
diff -N patches/patch-src_ngircd_proc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_ngircd_proc_c 7 Feb 2020 14:15:32 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: src/ngircd/proc.c
+--- src/ngircd/proc.c.orig
src/ngircd/proc.c
+@@ -76,6 +76,9 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc
+ return -1;
+ case 0:
+ /* New child process: */
++ /* XXX no PAM, fork only for DNS */
++ if (pledge("stdio dns", NULL) == -1)
++ err(1, "pledge");
+ #ifdef HAVE_ARC4RANDOM_STIR
+ arc4random_stir();
+ #endif
Re: [update patch] stockfish 10 -> 11
Hi Martin --
On 2020-02-07 5:08 AM, Martin Ziemer wrote:
This patch updates stockfish from 10 to 11.
I tested it for three games on amd64 only.
I posted a diff for this a couple weeks ago; I will commit that version
soon.
https://marc.info/?l=openbsd-ports=158007739212537=2
~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/stockfish/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.7
+++ Makefile7 Feb 2020 09:49:21 -
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2019/07/12 20:46:25 sthen Exp $
-V = 10
+V =11
COMMENT = open source chess engine
-DISTNAME = stockfish-${V}-src
+DISTNAME = sf_${V}
PKGNAME = stockfish-${V}
EXTRACT_SUFX =.zip
CATEGORIES = games
@@ -15,7 +15,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} c m
-MASTER_SITES = https://stockfish.s3.amazonaws.com/
+MASTER_SITES = https://github.com/official-stockfish/Stockfish/archive/
# C++11
COMPILER =base-clang ports-gcc
@@ -43,9 +43,9 @@ MAKE_ENV =ARCH=general-32
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/src
+WRKDIST = ${WRKDIR}/Stockfish-${DISTNAME}/src
pre-configure:
- sed -i 's,-O3,${CXXFLAGS},g' ${WRKSRC}/Makefile
+ sed -i 's,-O3,${CXXFLAGS},g' ${WRKDIST}/Makefile
.include
Index: distinfo
===
RCS file: /cvs/ports/games/stockfish/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo30 Nov 2018 19:54:29 - 1.3
+++ distinfo7 Feb 2020 09:49:21 -
@@ -1,2 +1,2 @@
-SHA256 (stockfish-10-src.zip) = Kb0B50BwmKqehRuC9upL8rRtJukHWkiiacseQMWCoHM=
-SIZE (stockfish-10-src.zip) = 174377
+SHA256 (sf_11.zip) = 1ghZaqX5uwaSJFrxAdK+Wi7CWmMriMQCr3PgeWFwVLU=
+SIZE (sf_11.zip) = 179371
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/02/07 06:08:47 Modified files: www/puppetboard: Makefile distinfo Log message: Update 1.1.0 -> 2.0.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/02/07 06:08:02 Modified files: databases/py-puppetdb: Makefile distinfo Log message: Update 1.2.0 -> 2.0.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/02/07 06:04:46 Modified files: audio/py-acoustid: Makefile distinfo audio/py-acoustid/pkg: PLIST Log message: Update to py-acoustid-1.1.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/02/07 06:02:19 Modified files: devel/cbindgen : Makefile distinfo Log message: Update to cbingen 0.13.0, required to build m-c since #1612092
Re: UPDATE security/go-siphash-1.2.1
On 2020/02/06 22:33, George Rosamond wrote:
>
> GH_ACCOUNT = dchest
> GH_PROJECT = siphash
> -GH_TAGNAME = v1.0.0
> +GH_TAGNAME = v1.2.1
> DISTNAME = go-siphash
> PKGNAME =${DISTNAME}-${GH_TAGNAME:S/^v//}
...
> -SHA256 (go-siphash.tar.gz) = CgUm4aCZCOGFeLbzRkgz4DIY8vKnQt5YEy8ptmIuM5s=
> -SIZE (go-siphash.tar.gz) = 4462
> +SHA256 (go-siphash.tar.gz) = kMXoumK2Sy927VjIfdUEVhcWEASb71H9cbxZPBdE+tI=
> +SIZE (go-siphash.tar.gz) = 10729
The current distname is bogus. Should use
-DISTNAME = go-siphash
-PKGNAME = ${DISTNAME}-${GH_TAGNAME:S/^v//}
+PKGNAME = go-${DISTNAME}
> -HOMEPAGE = https://github.com/dchest/siphash
> +HOMEPAGE = https://github.com/dchest/siphash/
This line can be removed as it's set automatically by GO_*.
(Also the standard format for github is to not use trailing /,
e.g. see the links from https://github.com/dchest)
>
> MAINTAINER = Sean Levy
>
> Index: go-siphash//distinfo
> ===
> RCS file: /cvs/ports/security/go-siphash/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- go-siphash//distinfo 29 Aug 2017 16:59:02 - 1.1.1.1
> +++ go-siphash//distinfo 7 Feb 2020 03:31:49 -
> @@ -1,2 +1,2 @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/02/07 05:52:51 Modified files: databases/ruby-hiera-eyaml: Makefile distinfo Log message: update 3.1.1 -> 3.2.0
Re: UPDATE fonts/go-fonts-20191214
On 2020/02/06 22:14, George Rosamond wrote:
> Update for fonts/go-fonts to 20191214.
nak - there has been no change to the fonts since 2017.
$ diff -r go-fonts-{2017*,2019*}/fake-amd64/usr/local/share/fonts/go
Re: Update devel/scons
On 2020/02/06 15:53, Chris Cappuccio wrote: > Stuart Henderson [s...@spacehopper.org] wrote: > > > > Wouldn't they just do the same they've done with Java when their license > > changed (i.e. make people install it themselves)? Or keep on providing the > > old binaries themselves but not force the no-longer-supported command line > > flags so it works for distribution packagers.. > > > > (Of course I would very much support them switching to something that > > isn't mongodb...) > > They package the full UniFi controller software in their own products > (Cloud Key, UDM) so it needs to be replaced > I don't think anyone is asking them to update their own distros, just that they don't force command line flags which don't work on newer versions.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/02/07 05:36:26 Modified files: math/maxima: Makefile distinfo math/maxima/pkg: PLIST Log message: Update to Maxima 5.43.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/02/07 05:31:37 Modified files: databases/puppetdb5: Makefile distinfo Log message: Update 5.2.11 -> 5.2.12
Re: update games/taisei 1.0 -> 1.3.1
On 07/02/2020 11:33, Charlene Wendling wrote:
On Fri, 7 Feb 2020 09:27:34 +0100
Solene Rapenne wrote:
On Fri, Feb 07, 2020 at 08:55:09AM +0100, Benoit Lecocq wrote:
On 06/02/2020 19:14, Charlene Wendling wrote:
Ping :)
Works fine on amd64, ok benoit@
ok solene@
I found that git error in the install step, but I'm not sure it's
important to patch it out.
[1/4] Generating version information with a custom command.
fatal: not a git repository (or any parent up to mount point /)
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not
set).
Command '['git', 'describe', '--dirty', '--match', 'v[0-9]*[!asz]']'
returned non-zero exit status 128.
Warning: git not found or not a git repository; using fallback version
v1.3.1
Well, i think we should :)
I added an extra patch because -Dversion_fallback does not override the
git calls, and hardcoded the version string to upstream supplied VERSION
to have some consistent naming. It's not really needed because the
fallback is by default what is in WRKSRC/meson.build, but in case
upstream forget to bump the version in this file, it still helps.
...
[1/4] Generating version information with a custom command.
git external calls disabled
Warning: git not found or not a git repository; using fallback version
v1.3.1
...
ok benoit@
Index: Makefile
===
RCS file: /cvs/ports/games/taisei/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.6
+++ Makefile7 Feb 2020 10:27:59 -
@@ -1,33 +1,52 @@
# $OpenBSD: Makefile,v 1.6 2019/07/12 20:46:25 sthen Exp $
+# Requires OpenGL>=3.3, only usable on archs that support
+# modern video cards
+ONLY_FOR_ARCHS = amd64 aarch64 i386
+
COMMENT = clone of the touhou games
-V = 1.0a
-DISTNAME = taisei-$V
-REVISION = 3
+VERSION = v1.3.1
+DISTNAME = taisei-${VERSION}
+PKGNAME = taisei-${VERSION:S/^v//}
CATEGORIES = games
-HOMEPAGE = http://taisei-project.org/
+HOMEPAGE = https://taisei-project.org/
# MIT
+# Soundtrack: CC-BY 4.0 / Photos: PD and CC-0
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread
+WANTLIB += SDL2 SDL2_mixer c crypto freetype m opusfile png webpdecoder
WANTLIB += z
-GH_ACCOUNT = laochailan
-GH_PROJECT = taisei
-GH_TAGNAME = v$V
+MASTER_SITES=
https://github.com/taisei-project/taisei/releases/download/${VERSION}/
+
+EXTRACT_SUFX= .tar.xz
+
+MODULES = devel/meson \
+ lang/python
+
+MODPY_RUNDEP = No
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-CFLAGS += -fgnu89-inline
-MODULES = devel/cmake
RUN_DEPENDS = devel/desktop-file-utils \
+ misc/shared-mime-info \
x11/gtk+3,-guic
-LIB_DEPENDS = audio/freealut \
- audio/openal \
- devel/sdl-ttf \
- graphics/png
+
+LIB_DEPENDS = audio/opusfile \
+ devel/sdl2>=2.0.5 \
+ devel/sdl2-mixer>=2.0.4 \
+ graphics/libwebp>=0.5 \
+ graphics/png>=1.5.0
+
+# Don't include docs
+# Don't zip the ressources, it avoids using archivers/libzip
+# Don't call git(1), use upstream version as version string
+CONFIGURE_ARGS += -Ddocs=false \
+ -Denable_zip=false \
+ -Dversion_fallback=${VERSION}
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/taisei/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo22 Aug 2015 09:38:07 - 1.1.1.1
+++ distinfo7 Feb 2020 10:27:59 -
@@ -1,2 +1,2 @@
-SHA256 (taisei-1.0a.tar.gz) = FWHITJ/YucepG4ZL38B/uBG7baXFTPMqK2vWPeX48/8=
-SIZE (taisei-1.0a.tar.gz) = 91854864
+SHA256 (taisei-v1.3.1.tar.xz) = hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU=
+SIZE (taisei-v1.3.1.tar.xz) = 70763196
Index: patches/patch-scripts_taiseilib_version_py
===
RCS file: patches/patch-scripts_taiseilib_version_py
diff -N patches/patch-scripts_taiseilib_version_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-scripts_taiseilib_version_py 7 Feb 2020 10:27:59 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: scripts/taiseilib/version.py
+--- scripts/taiseilib/version.py.orig
scripts/taiseilib/version.py
+@@ -62,6 +62,9 @@ def get(*, rootdir=None, fallback=None, args=common.de
+ rootdir = pathlib.Path(__file__).parent
+
+ try:
++# XXX do not call git, use port-provided fallback instead
++raise subprocess.SubprocessError("git external calls
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/02/07 05:06:32 Modified files: audio/p5-Ogg-Vorbis-Header: Makefile distinfo audio/p5-Ogg-Vorbis-Header/pkg: PLIST Added files: audio/p5-Ogg-Vorbis-Header/patches: patch-lib_Ogg_Vorbis_Header_pm Removed files: audio/p5-Ogg-Vorbis-Header/patches: patch-Header_pm Log message: Update to p5-Ogg-Vorbis-Header-0.10.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/02/07 04:42:09 Modified files: sysutils/ioping: Makefile distinfo Log message: Update to ioping 1.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2020/02/07 04:31:55 Modified files: www/buku : Makefile distinfo www/buku/pkg : PLIST Log message: Update to buku 4.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/02/07 04:00:56 Modified files: sysutils/facter: Makefile distinfo Log message: Update 3.14.6 -> 3.14.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/02/07 04:00:20 Modified files: devel/leatherman: Makefile distinfo Log message: update 1.9.1 -> 1.10.0
Re: update games/taisei 1.0 -> 1.3.1
On Fri, 7 Feb 2020 09:27:34 +0100
Solene Rapenne wrote:
> On Fri, Feb 07, 2020 at 08:55:09AM +0100, Benoit Lecocq wrote:
> >
> >
> > On 06/02/2020 19:14, Charlene Wendling wrote:
> > > Ping :)
> >
> > Works fine on amd64, ok benoit@
> >
>
> ok solene@
>
> I found that git error in the install step, but I'm not sure it's
> important to patch it out.
>
> [1/4] Generating version information with a custom command.
> fatal: not a git repository (or any parent up to mount point /)
> Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not
> set).
> Command '['git', 'describe', '--dirty', '--match', 'v[0-9]*[!asz]']'
> returned non-zero exit status 128.
> Warning: git not found or not a git repository; using fallback version
> v1.3.1
>
Well, i think we should :)
I added an extra patch because -Dversion_fallback does not override the
git calls, and hardcoded the version string to upstream supplied VERSION
to have some consistent naming. It's not really needed because the
fallback is by default what is in WRKSRC/meson.build, but in case
upstream forget to bump the version in this file, it still helps.
Index: Makefile
===
RCS file: /cvs/ports/games/taisei/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.6
+++ Makefile7 Feb 2020 10:27:59 -
@@ -1,33 +1,52 @@
# $OpenBSD: Makefile,v 1.6 2019/07/12 20:46:25 sthen Exp $
+# Requires OpenGL>=3.3, only usable on archs that support
+# modern video cards
+ONLY_FOR_ARCHS = amd64 aarch64 i386
+
COMMENT = clone of the touhou games
-V =1.0a
-DISTNAME = taisei-$V
-REVISION = 3
+VERSION = v1.3.1
+DISTNAME = taisei-${VERSION}
+PKGNAME = taisei-${VERSION:S/^v//}
CATEGORIES = games
-HOMEPAGE = http://taisei-project.org/
+HOMEPAGE = https://taisei-project.org/
# MIT
+# Soundtrack: CC-BY 4.0 / Photos: PD and CC-0
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread
+WANTLIB += SDL2 SDL2_mixer c crypto freetype m opusfile png webpdecoder
WANTLIB += z
-GH_ACCOUNT = laochailan
-GH_PROJECT = taisei
-GH_TAGNAME = v$V
+MASTER_SITES=
https://github.com/taisei-project/taisei/releases/download/${VERSION}/
+
+EXTRACT_SUFX= .tar.xz
+
+MODULES = devel/meson \
+ lang/python
+
+MODPY_RUNDEP = No
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-CFLAGS += -fgnu89-inline
-MODULES = devel/cmake
RUN_DEPENDS = devel/desktop-file-utils \
+ misc/shared-mime-info \
x11/gtk+3,-guic
-LIB_DEPENDS = audio/freealut \
- audio/openal \
- devel/sdl-ttf \
- graphics/png
+
+LIB_DEPENDS = audio/opusfile \
+ devel/sdl2>=2.0.5 \
+ devel/sdl2-mixer>=2.0.4 \
+ graphics/libwebp>=0.5 \
+ graphics/png>=1.5.0
+
+# Don't include docs
+# Don't zip the ressources, it avoids using archivers/libzip
+# Don't call git(1), use upstream version as version string
+CONFIGURE_ARGS += -Ddocs=false \
+ -Denable_zip=false \
+ -Dversion_fallback=${VERSION}
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/games/taisei/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo22 Aug 2015 09:38:07 - 1.1.1.1
+++ distinfo7 Feb 2020 10:27:59 -
@@ -1,2 +1,2 @@
-SHA256 (taisei-1.0a.tar.gz) = FWHITJ/YucepG4ZL38B/uBG7baXFTPMqK2vWPeX48/8=
-SIZE (taisei-1.0a.tar.gz) = 91854864
+SHA256 (taisei-v1.3.1.tar.xz) = hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU=
+SIZE (taisei-v1.3.1.tar.xz) = 70763196
Index: patches/patch-scripts_taiseilib_version_py
===
RCS file: patches/patch-scripts_taiseilib_version_py
diff -N patches/patch-scripts_taiseilib_version_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-scripts_taiseilib_version_py 7 Feb 2020 10:27:59 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: scripts/taiseilib/version.py
+--- scripts/taiseilib/version.py.orig
scripts/taiseilib/version.py
+@@ -62,6 +62,9 @@ def get(*, rootdir=None, fallback=None, args=common.de
+ rootdir = pathlib.Path(__file__).parent
+
+ try:
++# XXX do not call git, use port-provided fallback instead
++raise subprocess.SubprocessError("git external calls disabled")
++
+ version_str = subprocess.check_output(
+ shlex.split('git describe --dirty --match v[0-9]*[!asz]'),
+
Re: [NEW] py-cftime and py-netcdf4 [resend]
On Wed, Jan 29, 2020 at 01:03:12PM +0100, Martin Reindl wrote: > Hello, > > I already sent this some time ago and even got feedback from sthen and kmos, > but then these two ports kind of dozed of a bit. > > As a reminder: > py-cftime: time and date handling utility functions from netcdf4-python > py-netcdf4: Python interface to the netCDF C library > > In the meantime, I've made these 2 ports python3 only and fixed tests for > py-cftime: > > py-cftime 'make test' on arm64: 595 passed, 1 skipped in 799.15 seconds > py-netcdf4 'make test' on arm64: Ran 91 tests in 1506.073s > > Comments? OK to import? Friendly Ping. -m
[update patch] stockfish 10 -> 11
This patch updates stockfish from 10 to 11.
I tested it for three games on amd64 only.
Index: Makefile
===
RCS file: /cvs/ports/games/stockfish/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile12 Jul 2019 20:46:25 - 1.7
+++ Makefile7 Feb 2020 09:49:21 -
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2019/07/12 20:46:25 sthen Exp $
-V =10
+V =11
COMMENT = open source chess engine
-DISTNAME = stockfish-${V}-src
+DISTNAME = sf_${V}
PKGNAME = stockfish-${V}
EXTRACT_SUFX = .zip
CATEGORIES = games
@@ -15,7 +15,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} c m
-MASTER_SITES = https://stockfish.s3.amazonaws.com/
+MASTER_SITES = https://github.com/official-stockfish/Stockfish/archive/
# C++11
COMPILER = base-clang ports-gcc
@@ -43,9 +43,9 @@ MAKE_ENV =ARCH=general-32
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/src
+WRKDIST = ${WRKDIR}/Stockfish-${DISTNAME}/src
pre-configure:
- sed -i 's,-O3,${CXXFLAGS},g' ${WRKSRC}/Makefile
+ sed -i 's,-O3,${CXXFLAGS},g' ${WRKDIST}/Makefile
.include
Index: distinfo
===
RCS file: /cvs/ports/games/stockfish/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo30 Nov 2018 19:54:29 - 1.3
+++ distinfo7 Feb 2020 09:49:21 -
@@ -1,2 +1,2 @@
-SHA256 (stockfish-10-src.zip) = Kb0B50BwmKqehRuC9upL8rRtJukHWkiiacseQMWCoHM=
-SIZE (stockfish-10-src.zip) = 174377
+SHA256 (sf_11.zip) = 1ghZaqX5uwaSJFrxAdK+Wi7CWmMriMQCr3PgeWFwVLU=
+SIZE (sf_11.zip) = 179371
Re: [base-gcc] Unbreak security/opensc
On Fri, Feb 07, 2020 at 09:24:52AM +0100, Charlene Wendling wrote: > I have not backported the `--enable-pedantic' change because it is > built without it by default. REVISION bump seems not needed as this > diff just changes the CFLAGS order and only overrides `-Werror'. Seems safe but if in doubt, just bump it; it doesn't cost anything and avoids headaches for sure. > Comments/feedback are welcome :) Looks good to me, thanks for fixing it upstream right away. OK kn
Re: UPDATE: net/profanity
On Fri, Feb 07, 2020 at 06:40:54AM +0100, Rafael Sadowski wrote: > Simple update to the latest stable version 0.8.0. Changelog: > https://profanity-im.github.io/blog/post/release-080/ > Quick test on amd64. > Feedback, OK? Hi Rafael, Just quick feedback to say it also build/install/run OK for me on amd64. Thanks for the update. Also nice to have +share/profanity/themes/solarized-dark :) Thanks, -- clematis (0x7e96fd2400fe7b59)
Re: NEW: www/p5-Plack-App-URLMux
On 06/02/2020 22:52, Mikolaj Kucharski wrote: On Mon, Jan 27, 2020 at 05:56:52AM +, Mikolaj Kucharski wrote: On Sun, Jan 26, 2020 at 02:31:24PM -0800, Andrew Hewus Fresh wrote: On Thu, Jan 16, 2020 at 11:01:40PM +, Mikolaj Kucharski wrote: Hi, Kind reminder. Port reattached for convenience. Remove "cpan" from CATEGORIES and then OK afresh1@ New port attached with cpan removed from CATEGORIES. Ping. Port re-attached for convenience. ok benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/02/07 02:35:30 Modified files: security : Makefile Log message: unhook -qt5 flavor for qtkeychain
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/02/07 02:36:07 Modified files: security/exploitdb: Makefile distinfo security/exploitdb/pkg: PLIST Log message: Update to 2020-02-07
[base-gcc] Unbreak cad/qrouter
Hi, The latest version of cad/qrouter is broken in the current sparc64 bulk: > cc -O2 -pipe -Wno-return-type -O2 -pipe -Wno-return-type > -I/usr/X11R6/include -fPIC -DPA CKAGE_NAME=\"\" > -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" > -DPAC KAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 > -DHAVE_SETENV=1 -DHAVE_PUTENV=1 - DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 > -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB _H=1 > -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 > -DHAVE_INTTYPES_H=1 -DHAVE_ST DINT_H=1 -DHAVE_UNISTD_H=1 > -DHAVE_SYS_MMAN_H=1 -DTCL_QROUTER=1 -DVERSION=\"1.4\" -DREVISI > ON=\"74\" -DUSE_TCL_STUBS -DUSE_TK_STUBS \ > -DQROUTER_PATH=\"/usr/local/share/qrouter\" > -I/usr/local/include/tk8.5 -I/usr/loc al/include/tcl8.5 -c point.c -o > point.o > In file included from point.c:13: qrouter.h:535: error: > expected declaration specifiers or '...' before 'va_list' It's a missing include happening because upstream does not put includes in their header files to start with (imvho that's bad), since several C files want qrouter.h, adding the include there reduces the number of patches needed. With the below diff, it builds fine on powerpc [0]. REVISION bump is not needed, as i made the change to target GCC specifically, and this version has never been built on base-gcc archs. Comments/feedback are welcome, Charlène. [0] https://bin.charlenew.xyz/qrouter.log Index: patches/patch-qrouter_h === RCS file: /cvs/ports/cad/qrouter/patches/patch-qrouter_h,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-qrouter_h --- patches/patch-qrouter_h 3 Feb 2020 22:21:57 - 1.2 +++ patches/patch-qrouter_h 7 Feb 2020 09:03:36 - @@ -12,3 +12,13 @@ Index: qrouter.h typedef int (*__compar_fn_t)(const void*, const void*); #endif +@@ -530,6 +530,9 @@ NETgetnettoroute(int order); + introute_net_ripup(NET net, u_char graphdebug, u_char onlybreak); + + #ifdef TCL_QROUTER ++#if !defined(__clang__) && defined(__OpenBSD__) ++#include /* needed for va_list with base-gcc */ ++#endif + void tcl_printf(FILE *, const char *, ...); + void tcl_stdflush(FILE *); + void tcl_vprintf(FILE *, const char *, va_list);
Re: update games/taisei 1.0 -> 1.3.1
On Fri, Feb 07, 2020 at 08:55:09AM +0100, Benoit Lecocq wrote: > > > On 06/02/2020 19:14, Charlene Wendling wrote: > > Ping :) > > Works fine on amd64, ok benoit@ > ok solene@ I found that git error in the install step, but I'm not sure it's important to patch it out. [1/4] Generating version information with a custom command. fatal: not a git repository (or any parent up to mount point /) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set). Command '['git', 'describe', '--dirty', '--match', 'v[0-9]*[!asz]']' returned non-zero exit status 128. Warning: git not found or not a git repository; using fallback version v1.3.1
[base-gcc] Unbreak security/opensc
Hi,
> http://build-failures.rhaalovely.net/sparc64/2020-02-01/security/opensc.log
The last update brought back `-Werror', so i took the matter upstream
[0] to avoid that in the future, port flags will be on top priority now.
I have not backported the `--enable-pedantic' change because it is
built without it by default. REVISION bump seems not needed as this
diff just changes the CFLAGS order and only overrides `-Werror'.
Comments/feedback are welcome :)
Charlène.
[0] https://github.com/OpenSC/OpenSC/pull/1933
Index: Makefile
===
RCS file: /cvs/ports/security/opensc/Makefile,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 Makefile
--- Makefile30 Jan 2020 07:15:08 - 1.54
+++ Makefile7 Feb 2020 08:06:56 -
@@ -44,6 +44,9 @@ FAKE_FLAGS= mandir="${PREFIX}/man/" \
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.15
+# Allow building with base-gcc
+CFLAGS += -Wno-error
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
${SUBST_CMD} -c -m ${NONBINMODE} -o ${BINOWN} -g ${BINGRP} \
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/security/opensc/patches/patch-configure_ac,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-configure_ac
--- patches/patch-configure_ac 30 Jan 2020 07:15:08 - 1.10
+++ patches/patch-configure_ac 7 Feb 2020 08:06:56 -
@@ -4,7 +4,8 @@ Fix version string
libdl is not required on OpenBSD
-Remove -Werror so it builds with gcc
+Put port supplied CFLAGS on top priority so it builds with gcc by
+supplying `-Wno-error' (upstreamed, can be removed for opensc > 0.20.0)
Index: configure.ac
--- configure.ac.orig
@@ -61,3 +62,13 @@ Index: configure.ac
AM_CONDITIONAL([ENABLE_FUZZING], [test "${enable_fuzzing}" = "yes"])
AM_CONDITIONAL([ENABLE_SHARED], [test "${enable_shared}" = "yes"])
AS_IF([test "${enable_shared}" = "yes"], [AC_DEFINE([ENABLE_SHARED], [1],
[Enable shared libraries])])
+@@ -1071,7 +1045,8 @@ if test "${enable_pedantic}" = "yes"; then
+ CFLAGS="${CFLAGS} -pedantic"
+ fi
+ if test "${enable_strict}" = "yes"; then
+- CFLAGS="${CFLAGS} -Wall -Wextra -Wno-unused-parameter -Werror"
++ # XXX This can be removed with opensc > 0.20.0 (upstreamed)
++ CFLAGS="-Wall -Wextra -Wno-unused-parameter -Werror ${CFLAGS}"
+ fi
+
+ AC_CONFIG_FILES([
