Hi,
As discussed earlier [0], print/pdflib is a good candidate for removal,
as our version is 18 years old, we can't distribute a newer pdflib due
to licensing issues.
But before that grace needs to be built without pdflib support. While
here i've updated the port. It now requires pdflib>=5.0 anyway, and
tiff support has been dropped.
It builds and tests show no issues on amd64 and macppc.
Note that it still installs files in ${LOCALBASE}/grace instead of the
more common ${LOCALBASE}/share/grace. I've been conservative, but i'll
rework this if you see this as a severe issue.
Comments/feedback are welcome,
Charlène.
[0] https://marc.info/?l=openbsd-ports&m=158837587706996&w=2
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/grace/Makefile,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 Makefile
--- Makefile 26 Dec 2019 12:05:00 -0000 1.47
+++ Makefile 15 May 2020 15:33:37 -0000
@@ -2,15 +2,15 @@
COMMENT= GRaphing, Advanced Computation and Exploration of data
-DISTNAME= grace-5.1.15
-REVISION= 10
+DISTNAME= grace-5.1.25
CATEGORIES= math
-HOMEPAGE= http://plasma-gate.weizmann.ac.il/Grace/
+HOMEPAGE= https://plasma-gate.weizmann.ac.il/Grace/
# GPL
PERMIT_PACKAGE= Yes
-WANTLIB= c m z
+
+WANTLIB += c fftw jpeg m netcdf png t1 z
GRACE_SITES= ftp://plasma-gate.weizmann.ac.il/pub/ \
ftp://ftp.fu-berlin.de/unix/graphics/ \
@@ -29,13 +29,8 @@ CONFIGURE_ARGS+= --with-bundled-xbae \
LIB_DEPENDS = devel/t1lib \
graphics/jpeg \
graphics/png \
- graphics/tiff \
math/fftw \
- math/netcdf \
- print/pdflib
-
-WANTLIB += jpeg>=62 png>=2 pdf>=2 t1>=5 tiff>=35 fftw>=2 \
- netcdf>=1
+ math/netcdf
FLAVORS= no_x11
FLAVOR?=
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/grace/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo 18 Jan 2015 03:14:27 -0000 1.14
+++ distinfo 15 May 2020 15:33:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (grace-5.1.15.tar.gz) = MVXE+gsmI/F9gpXbJVnR/NkSiQrptdhQnvDvQOnZRDs=
-SIZE (grace-5.1.15.tar.gz) = 2443942
+SHA256 (grace-5.1.25.tar.gz) = dRq5kX7Q9iMgc8GTq6dARgN+GF1zt3urD1rz4/8doqw=
+SIZE (grace-5.1.25.tar.gz) = 2957689
Index: patches/patch-src_editpwin_c
===================================================================
RCS file: /cvs/ports/math/grace/patches/patch-src_editpwin_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_editpwin_c
--- patches/patch-src_editpwin_c 31 Mar 2003 16:58:55 -0000 1.2
+++ patches/patch-src_editpwin_c 15 May 2020 15:33:37 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_editpwin_c,v 1.2 2003/03/31 16:58:55 sturm Exp $
---- src/editpwin.c.orig Wed Aug 21 21:37:59 2002
-+++ src/editpwin.c Thu Mar 6 21:57:56 2003
-@@ -770,15 +770,19 @@ void create_ss_frame(int gno, int setno)
+Index: src/editpwin.c
+--- src/editpwin.c.orig
++++ src/editpwin.c
+@@ -776,15 +776,19 @@ void create_ss_frame(int gno, int setno)
*/
void do_ext_editor(int gno, int setno)
{
Index: patches/patch-src_rstdrv_c
===================================================================
RCS file: patches/patch-src_rstdrv_c
diff -N patches/patch-src_rstdrv_c
--- patches/patch-src_rstdrv_c 8 Jul 2011 20:38:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_rstdrv_c,v 1.1 2011/07/08 20:38:01 naddy Exp $
-
-Fix build with png-1.5.
-
---- src/rstdrv.c.orig Wed Jul 6 11:19:00 2011
-+++ src/rstdrv.c Wed Jul 6 11:19:34 2011
-@@ -54,6 +54,7 @@
-
- #ifdef HAVE_LIBPNG
- # include <png.h>
-+# include <zlib.h>
- #endif
-
- #ifndef NONE_GUI
-@@ -885,7 +886,7 @@ static void rstImagePng(gdImagePtr ihandle, FILE *prst
- return;
- }
-
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_write_struct(&png_ptr, &info_ptr);
- return;
- }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/grace/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST 26 Dec 2019 12:05:00 -0000 1.9
+++ pkg/PLIST 15 May 2020 15:33:37 -0000
@@ -22,13 +22,13 @@ grace/doc/7.1.2.agr
grace/doc/7.1.3.agr
grace/doc/8.2.dat
grace/doc/CHANGES.html
-grace/doc/FAQ.dvi
grace/doc/FAQ.html
+grace/doc/FAQ.pdf
grace/doc/GPL.html
-grace/doc/Tutorial.dvi
grace/doc/Tutorial.html
-grace/doc/UsersGuide.dvi
+grace/doc/Tutorial.pdf
grace/doc/UsersGuide.html
+grace/doc/UsersGuide.pdf
grace/doc/convcal.1
grace/doc/mygraph.png
grace/doc/nohelp.html
@@ -53,6 +53,7 @@ grace/examples/graphs.par
grace/examples/hilo.agr
grace/examples/log.dat
grace/examples/log2.agr
+grace/examples/log2log.agr
grace/examples/logistic.agr
grace/examples/logistic.fit
grace/examples/logit.agr
@@ -93,6 +94,7 @@ grace/fonts/enc/
grace/fonts/enc/CP1251.enc
grace/fonts/enc/IsoLatin1.enc
grace/fonts/enc/IsoLatin2.enc
+grace/fonts/enc/IsoLatin5.enc
grace/fonts/enc/IsoLatin7.enc
grace/fonts/enc/IsoLatin9.enc
grace/fonts/enc/KOI8-R.enc
