Attachment 184691 Details for Bug 220994 – Patch to update science/h5utils to version 1.13

[patch] Patch to update science/h5utils to version 1.13

h5utils.diff (text/plain), 4.90 KB, created by Klaus Aehlig on 2017-07-25 06:39:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2017-07-25 06:39:49 UTC

Size: 4.90 KB

patch

obsolete

>diff -ruN h5utils.orig/Makefile h5utils/Makefile
>--- h5utils.orig/Makefile	2017-07-25 08:36:13.755925000 +0200
>+++ h5utils/Makefile	2017-07-25 08:36:18.670650000 +0200
>@@ -2,17 +2,15 @@
> # $FreeBSD: head/science/h5utils/Makefile 442050 2017-05-30 02:56:43Z sunpoet $
> 
> PORTNAME=	h5utils
>-PORTVERSION=	1.12.1
>-PORTREVISION=	7
>+PORTVERSION=	1.13
> CATEGORIES=	science
>-MASTER_SITES=	http://ab-initio.mit.edu/${PORTNAME}/
> 
> MAINTAINER=	aehlig@linta.de
> COMMENT=	Set of utilities for visualization and conversion of HDF5 format
> 
> LICENSE=	MIT GPLv2
> LICENSE_COMB=	multi
>-LICENSE_FILE=	${WRKSRC}/LICENSE
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> GNU_CONFIGURE=	YES
> CFLAGS +=	-L${LOCALBASE}/lib -I${LOCALBASE}/include -lpthread
>@@ -22,4 +20,11 @@
> 		libpng.so:graphics/png \
> 		libmatheval.so:devel/libmatheval
> 
>+USES=		autoreconf
>+GNU_CONFIGURE=	yes
>+
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	stevengj
>+
> .include <bsd.port.mk>
>diff -ruN h5utils.orig/distinfo h5utils/distinfo
>--- h5utils.orig/distinfo	2017-07-25 08:36:13.756072000 +0200
>+++ h5utils/distinfo	2017-07-25 08:36:18.670806000 +0200
>@@ -1,2 +1,3 @@
>-SHA256 (h5utils-1.12.1.tar.gz) = 7290290ca5d5d4451d757a70c86baaa70d23a28edb09c951b6b77c22b924a38d
>-SIZE (h5utils-1.12.1.tar.gz) = 156785
>+TIMESTAMP = 1500963131
>+SHA256 (stevengj-h5utils-1.13_GH0.tar.gz) = 894849f6d107b224bb1694029ad7d469695b0a6f47b564fe16c40f3d20c0b452
>+SIZE (stevengj-h5utils-1.13_GH0.tar.gz) = 113735
>diff -ruN h5utils.orig/files/patch-configure.ac h5utils/files/patch-configure.ac
>--- h5utils.orig/files/patch-configure.ac	1970-01-01 01:00:00.000000000 +0100
>+++ h5utils/files/patch-configure.ac	2017-07-25 08:36:18.670322000 +0200
>@@ -0,0 +1,11 @@
>+--- configure.ac.orig	2017-07-25 06:31:48 UTC
>++++ configure.ac
>+@@ -68,7 +68,7 @@ AC_CHECK_LIB(matheval, evaluator_get_var
>+ 
>+ if test $H5MATH = yes; then
>+ 	MORE_H5UTILS="h5math\$(EXEEXT) $MORE_H5UTILS"
>+-	MORE_H5UTILS_MANS="h5math.1 $MORE_H5UTILS_MANS"
>++	MORE_H5UTILS_MANS="doc/man/h5math.1 $MORE_H5UTILS_MANS"
>+ else
>+ 	AC_MSG_WARN([can't find libmatheval: won't be able to compile h5math])
>+ fi
>diff -ruN h5utils.orig/files/patch-writepng.c h5utils/files/patch-writepng.c
>--- h5utils.orig/files/patch-writepng.c	2017-07-25 08:36:13.755650000 +0200
>+++ h5utils/files/patch-writepng.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,42 +0,0 @@
>-$NetBSD: patch-writepng.c,v 1.1 2011/02/01 09:05:31 wiz Exp $
>-
>-Fix build with png-1.5.
>-
>---- writepng.c.orig	2009-06-12 20:58:50.000000000 +0000
>-+++ writepng.c
>-@@ -240,6 +240,8 @@ void writepng(char *filename,
>-      double skewsin = sin(skew), skewcos = cos(skew);
>-      REAL minoverlay = 0, maxoverlay = 0;
>-      png_byte mask_byte;
>-+     png_colorp palette = NULL;
>-+
>- 
>-      /* we must use direct color for translucent overlays */
>-      if (overlay)
>-@@ -309,7 +311,7 @@ void writepng(char *filename,
>-      }
>-      /* Set error handling.  REQUIRED if you aren't supplying your own *
>-       * error hadnling functions in the png_create_write_struct() call. */
>--     if (setjmp(png_ptr->jmpbuf)) {
>-+     if (setjmp(png_jmpbuf(png_ptr))) {
>- 	  /* If we get here, we had a problem reading the file */
>- 	  fclose(fp);
>- 	  png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
>-@@ -334,8 +336,6 @@ void writepng(char *filename,
>- 		       PNG_INTERLACE_NONE,
>- 		       PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
>-      else {
>--	  png_colorp palette;
>--
>- 	  png_set_IHDR(png_ptr, info_ptr, width, height, 8 /* bit_depth */ ,
>- 		       PNG_COLOR_TYPE_PALETTE,
>- 		       PNG_INTERLACE_NONE,
>-@@ -434,7 +434,7 @@ void writepng(char *filename,
>-      png_write_end(png_ptr, info_ptr);
>- 
>-      /* if you malloced the palette, free it here */
>--     free(info_ptr->palette);
>-+     free(palette);
>- 
>-      /* if you allocated any text comments, free them here */
>- 
>diff -ruN h5utils.orig/pkg-descr h5utils/pkg-descr
>--- h5utils.orig/pkg-descr	2017-07-25 08:36:13.756219000 +0200
>+++ h5utils/pkg-descr	2017-07-25 08:36:18.670963000 +0200
>@@ -6,4 +6,4 @@
> required by other free visualization software (e.g. plain text, Vis5d,
> and VTK).
> 
>-WWW: http://ab-initio.mit.edu/wiki/index.php/H5utils
>+WWW: https://github.com/stevengj/h5utils
>diff -ruN h5utils.orig/pkg-plist h5utils/pkg-plist
>--- h5utils.orig/pkg-plist	2017-07-25 08:36:13.755776000 +0200
>+++ h5utils/pkg-plist	2017-07-25 08:36:18.670490000 +0200
>@@ -8,6 +8,8 @@
> man/man1/h5topng.1.gz
> man/man1/h5totxt.1.gz
> man/man1/h5tovtk.1.gz
>+%%DATADIR%%/colormaps/BrBG
>+%%DATADIR%%/colormaps/RdBu
> %%DATADIR%%/colormaps/autumn
> %%DATADIR%%/colormaps/bluered
> %%DATADIR%%/colormaps/bone
>@@ -19,6 +21,7 @@
> %%DATADIR%%/colormaps/green
> %%DATADIR%%/colormaps/hot
> %%DATADIR%%/colormaps/hsv
>+%%DATADIR%%/colormaps/inferno
> %%DATADIR%%/colormaps/jet
> %%DATADIR%%/colormaps/lines
> %%DATADIR%%/colormaps/pink
>@@ -26,6 +29,7 @@
> %%DATADIR%%/colormaps/spring
> %%DATADIR%%/colormaps/summer
> %%DATADIR%%/colormaps/vga
>+%%DATADIR%%/colormaps/viridis
> %%DATADIR%%/colormaps/winter
> %%DATADIR%%/colormaps/yarg
> %%DATADIR%%/colormaps/yellow

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 220994: 184691