Hi,
Thank you for your effort! I have a few comments and questions.
I see they switched to Gitlab (hence the url changes) and that the
author set it up for continous integration and thus made it compile with
clang.
Why did you bump the major. I tried browsing the history on Gitlab to
see what changed in the API, but couldn't see much. I am sure I missed
something.
Is the gnuplot bump necessary? Why?
Paul
On Tue, Mar 10, 2020 at 10:44:55AM +0900, Yozo TODA wrote:
> (resending this from gmail, because my ISP's mailserver was blocked
> via UCEProtect Level1. I hope this will go through now...)
>
> Dear maintainer Paul Irofti, (Cc: ports@openbsd.org)
> here attached the patch to update libcerf and gnuplot;
> please check and commit this if it's OK?
>
> - updating libcerf 1.11p0 to 1.13
> - the upstream site looks renewed (apps.jcns... to jugit...)
> - I compiled 1.13 successfully with clang, hence removing COMPILER line.
> but I'm not sure it's OK for non-clang architectures...
> - just adding REVISION=0 to gnuplot to get along with libcerf update,
> and verify that this libcerf update works well.
> all demo work.
>
>
> In my environment (following -current, amd64)
> gcc-8 cannot compile for some weeks.
> (some error like "compiler internal error" in the middle of build.)
> So, I cannot rebuild math/maxima. Looking at the build log and Makefile,
> maxima depends on gnuplot depending on libcerf depending on gcc-8.
> That's why I examined libcerf port if it works with clang...
>
> -- yozo.
> Index: libcerf/Makefile
> ===================================================================
> RCS file: /cvs/ports/math/libcerf/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- libcerf/Makefile 12 Jul 2019 20:47:42 -0000 1.5
> +++ libcerf/Makefile 8 Mar 2020 07:08:56 -0000
> @@ -2,16 +2,16 @@
>
> COMMENT = implementation of complex error functions
>
> -V = 1.11
> -DISTNAME = libcerf-${V}
> +V = 1.13
> +DISTNAME = libcerf-v${V}
> +PKGNAME = libcerf-${V}
> EXTRACT_SUFX = .tgz
> CATEGORIES = math
> -MASTER_SITES = http://apps.jcns.fz-juelich.de/src/libcerf/
> -REVISION = 0
> +MASTER_SITES = https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${V}/
>
> -SHARED_LIBS += cerf 2.0 # 1.10
> +SHARED_LIBS += cerf 3.0 # 1.13
>
> -HOMEPAGE = http://apps.jcns.fz-juelich.de/doku/sc/libcerf
> +HOMEPAGE = https://jugit.fz-juelich.de/mlz/libcerf/
>
> MAINTAINER = Paul Irofti <piro...@openbsd.org>
>
> @@ -21,7 +21,5 @@ PERMIT_PACKAGE = Yes
> WANTLIB += c m ${COMPILER_LIBCXX}
>
> MODULES = devel/cmake
> -
> -COMPILER = ports-gcc # imaginary constants are a GNU extension
>
> .include <bsd.port.mk>
> Index: libcerf/distinfo
> ===================================================================
> RCS file: /cvs/ports/math/libcerf/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- libcerf/distinfo 29 Dec 2018 07:48:36 -0000 1.3
> +++ libcerf/distinfo 8 Mar 2020 07:08:56 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libcerf-1.11.tgz) = cBAcrEoNeGMyLU0Gz5XFB6nP1k/JmtGzGoQlIEz9lnI=
> -SIZE (libcerf-1.11.tgz) = 60066
> +SHA256 (libcerf-v1.13.tgz) = 5Gmfga+Diu9bPncgn+yOmCCk9JLVmPtaBwgAhUl2owU=
> +SIZE (libcerf-v1.13.tgz) = 60732
> Index: libcerf/patches/patch-man_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/math/libcerf/patches/patch-man_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-man_CMakeLists_txt
> --- libcerf/patches/patch-man_CMakeLists_txt 28 Dec 2018 16:28:44 -0000
> 1.1
> +++ libcerf/patches/patch-man_CMakeLists_txt 8 Mar 2020 07:08:56 -0000
> @@ -1,4 +1,4 @@
> -$OpenBSD: patch-man_CMakeLists_txt,v 1.1 2018/12/28 16:28:44 pirofti Exp $
> +$OpenBSD$
>
> Manual pages should go under ${PREFIX}/man/ rather than under
> ${PREFIX}/share/man/.
> Index: gnuplot/Makefile
> ===================================================================
> RCS file: /cvs/ports/math/gnuplot/Makefile,v
> retrieving revision 1.75
> diff -u -p -r1.75 Makefile
> --- gnuplot/Makefile 8 Nov 2019 23:29:56 -0000 1.75
> +++ gnuplot/Makefile 8 Mar 2020 07:08:56 -0000
> @@ -4,6 +4,7 @@ COMMENT = command-driven interactive fun
>
> V = 5.2
> PATCHLEVEL = 7
> +REVISION = 0
> DISTNAME = gnuplot-${V}.${PATCHLEVEL}
> CATEGORIES = math graphics
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
