CVS commit: pkgsrc/devel/hdf

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/hdf
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Sun, 24 Apr 2022 21:50:49 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Apr 24 21:50:48 UTC 2022

Modified Files:
        pkgsrc/devel/hdf: Makefile PLIST distinfo
        pkgsrc/devel/hdf/patches: patch-ao patch-ap patch-ba
            patch-mfhdf_ncgen_ncgen.l
Added Files:
        pkgsrc/devel/hdf/patches: patch-bin_cmakehdf4 patch-hdf_test_tutils.h
Removed Files:
        pkgsrc/devel/hdf/patches: patch-ai patch-aj patch-ar patch-as
            patch-hdf_fmpool_configure.in

Log Message:
hdf: update to 4.2.15

Fix MASTER_SITES and HOMEPAGE.
Fix the build with gfortran 10.
Remove some obsolete patches.
Other changes unknown.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/hdf/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/hdf/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/hdf/distinfo
cvs rdiff -u -r1.8 -r0 pkgsrc/devel/hdf/patches/patch-ai \
    pkgsrc/devel/hdf/patches/patch-aj
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/hdf/patches/patch-ao
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/hdf/patches/patch-ap
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/hdf/patches/patch-ar \
    pkgsrc/devel/hdf/patches/patch-as
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/hdf/patches/patch-ba
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/hdf/patches/patch-bin_cmakehdf4 \
    pkgsrc/devel/hdf/patches/patch-hdf_test_tutils.h
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/hdf/patches/patch-hdf_fmpool_configure.in
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/hdf/patches/patch-mfhdf_ncgen_ncgen.l

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/hdf/Makefile
diff -u pkgsrc/devel/hdf/Makefile:1.41 pkgsrc/devel/hdf/Makefile:1.42
--- pkgsrc/devel/hdf/Makefile:1.41      Wed May  1 12:36:09 2019
+++ pkgsrc/devel/hdf/Makefile   Sun Apr 24 21:50:48 2022
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.41 2019/05/01 12:36:09 bacon Exp $
+# $NetBSD: Makefile,v 1.42 2022/04/24 21:50:48 tnn Exp $
 
-DISTNAME=      HDF4.2r4
-PKGNAME=       hdf-4.2r4
-PKGREVISION=   3
+DISTNAME=      hdf-4.2.15
 CATEGORIES=    devel
-MASTER_SITES=  ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/
-EXTRACT_USING= bsdtar
+MASTER_SITES=  https://support.hdfgroup.org/ftp/HDF/releases/HDF${PKGVERSION_NOREV}/src/
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.hdfgroup.org/products/hdf4/
+HOMEPAGE=      https://support.hdfgroup.org/products/hdf4/
 COMMENT=       NCSA Hierarchical Data Format
 
 USE_LIBTOOL=           yes
@@ -20,11 +18,19 @@ CONFIGURE_ARGS+=    --with-szlib
 # pkgsrc libtool builds shared objects anyway
 #CONFIGURE_ARGS+=      --enable-shared
 
-post-patch:
-       ${MV} -f ${WRKSRC}/mfhdf/ncdump/ncdump.1                \
-       ${WRKSRC}/mfhdf/ncdump/hdfncdump.1
-       ${MV} -f ${WRKSRC}/mfhdf/ncgen/ncgen.1                  \
-       ${WRKSRC}/mfhdf/ncgen/hdfncgen.1
+.include "../../mk/compiler.mk"
+
+.if empty(GFORTRAN_VERSION:M[0-9])
+# gfortran>=10 requires this, earlier compilers don't
+FFLAGS=                        -O -fallow-argument-mismatch
+.endif
+
+# conflicts with devel/netcdf
+post-install:
+       mv ${DESTDIR}${PREFIX}/bin/ncdump ${DESTDIR}${PREFIX}/bin/hdfncdump
+       mv ${DESTDIR}${PREFIX}/bin/ncgen ${DESTDIR}${PREFIX}/bin/hdfncgen
+       mv ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ncdump.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/hdfncdump.1
+       mv ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ncgen.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/hdfncgen.1
 
 do-test:
        @cd ${WRKSRC}/hdf/test && ${SETENV} ${MAKE_ENV} ${MAKE} check

Index: pkgsrc/devel/hdf/PLIST
diff -u pkgsrc/devel/hdf/PLIST:1.6 pkgsrc/devel/hdf/PLIST:1.7
--- pkgsrc/devel/hdf/PLIST:1.6  Thu Dec 10 17:10:14 2009
+++ pkgsrc/devel/hdf/PLIST      Sun Apr 24 21:50:48 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/12/10 17:10:14 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/04/24 21:50:48 tnn Exp $
 bin/gif2hdf
 bin/h4cc
 bin/h4fc
@@ -26,6 +26,7 @@ bin/r8tohdf
 bin/ristosds
 bin/vmake
 bin/vshow
+include/hdf/H4api_adpt.h
 include/hdf/atom.h
 include/hdf/bitvect.h
 include/hdf/cdeflate.h
@@ -51,6 +52,7 @@ include/hdf/hchunks.h
 include/hdf/hcomp.h
 include/hdf/hcompi.h
 include/hdf/hconv.h
+include/hdf/hdatainfo.h
 include/hdf/hdf.f90
 include/hdf/hdf.h
 include/hdf/hdf.inc
@@ -67,6 +69,7 @@ include/hdf/htags.h
 include/hdf/linklist.h
 include/hdf/local_nc.h
 include/hdf/mfan.h
+include/hdf/mfdatainfo.h
 include/hdf/mffunc.f90
 include/hdf/mffunc.inc
 include/hdf/mfgr.h
@@ -85,4 +88,93 @@ lib/libmfhdf.la
 man/man1/hdf.1
 man/man1/hdfncdump.1
 man/man1/hdfncgen.1
-man/man1/hdfunpac.1
+share/hdf4_examples/README
+share/hdf4_examples/c/AN_create_annotation.c
+share/hdf4_examples/c/AN_get_annotation_info.c
+share/hdf4_examples/c/AN_read_annotation.c
+share/hdf4_examples/c/GR_create_and_write_image.c
+share/hdf4_examples/c/GR_get_attribute.c
+share/hdf4_examples/c/GR_image_info.c
+share/hdf4_examples/c/GR_modify_image.c
+share/hdf4_examples/c/GR_read_chunks.c
+share/hdf4_examples/c/GR_read_image.c
+share/hdf4_examples/c/GR_read_palette.c
+share/hdf4_examples/c/GR_set_attribute.c
+share/hdf4_examples/c/GR_write_chunks.c
+share/hdf4_examples/c/GR_write_palette.c
+share/hdf4_examples/c/SD_alter_sds_values.c
+share/hdf4_examples/c/SD_chunking_example.c
+share/hdf4_examples/c/SD_compress_sds.c
+share/hdf4_examples/c/SD_create_sds.c
+share/hdf4_examples/c/SD_dimscale_vs_sds.c
+share/hdf4_examples/c/SD_find_sds_by_name.c
+share/hdf4_examples/c/SD_get_attr.c
+share/hdf4_examples/c/SD_get_info.c
+share/hdf4_examples/c/SD_mv_sds_to_external.c
+share/hdf4_examples/c/SD_read_from_sds.c
+share/hdf4_examples/c/SD_read_subsets.c
+share/hdf4_examples/c/SD_set_attr.c
+share/hdf4_examples/c/SD_set_get_dim_info.c
+share/hdf4_examples/c/SD_unlimited_sds.c
+share/hdf4_examples/c/SD_write_slab.c
+share/hdf4_examples/c/SD_write_to_sds.c
+share/hdf4_examples/c/VD_create_onefield_vdatas.c
+share/hdf4_examples/c/VD_create_vdatas.c
+share/hdf4_examples/c/VD_get_vdata_info.c
+share/hdf4_examples/c/VD_locate_vdata.c
+share/hdf4_examples/c/VD_read_from_vdata.c
+share/hdf4_examples/c/VD_read_mixed_vdata.c
+share/hdf4_examples/c/VD_set_get_vdata_attr.c
+share/hdf4_examples/c/VD_write_mixed_vdata.c
+share/hdf4_examples/c/VD_write_mixed_vdata_struct.c
+share/hdf4_examples/c/VD_write_to_vdata.c
+share/hdf4_examples/c/VG_add_sds_to_vgroup.c
+share/hdf4_examples/c/VG_create_vgroup.c
+share/hdf4_examples/c/VG_get_vgroup_info.c
+share/hdf4_examples/c/VG_insert_vdatas_to_vgroup.c
+share/hdf4_examples/c/VG_set_get_vgroup_attr.c
+share/hdf4_examples/c/VG_vgroup_contents.c
+share/hdf4_examples/c/run-c-ex.sh
+share/hdf4_examples/fortran/AN_create_annotation.f
+share/hdf4_examples/fortran/AN_get_annotation_info.f
+share/hdf4_examples/fortran/AN_read_annotation.f
+share/hdf4_examples/fortran/GR_create_and_write_image.f
+share/hdf4_examples/fortran/GR_get_attribute.f
+share/hdf4_examples/fortran/GR_image_info.f
+share/hdf4_examples/fortran/GR_modify_image.f
+share/hdf4_examples/fortran/GR_read_image.f
+share/hdf4_examples/fortran/GR_read_palette.f
+share/hdf4_examples/fortran/GR_set_attribute.f
+share/hdf4_examples/fortran/GR_write_palette.f
+share/hdf4_examples/fortran/SD_alter_sds_values.f
+share/hdf4_examples/fortran/SD_chunking_example.f
+share/hdf4_examples/fortran/SD_compress_sds.f
+share/hdf4_examples/fortran/SD_create_sds.f
+share/hdf4_examples/fortran/SD_dimscale_vs_sds.f
+share/hdf4_examples/fortran/SD_find_sds_by_name.f
+share/hdf4_examples/fortran/SD_get_attr.f
+share/hdf4_examples/fortran/SD_get_info.f
+share/hdf4_examples/fortran/SD_mv_sds_to_external.f
+share/hdf4_examples/fortran/SD_read_from_sds.f
+share/hdf4_examples/fortran/SD_read_subsets.f
+share/hdf4_examples/fortran/SD_set_attr.f
+share/hdf4_examples/fortran/SD_set_get_dim_info.f
+share/hdf4_examples/fortran/SD_unlimited_sds.f
+share/hdf4_examples/fortran/SD_write_slab.f
+share/hdf4_examples/fortran/SD_write_to_sds.f
+share/hdf4_examples/fortran/VD_create_onefield_vdatas.f
+share/hdf4_examples/fortran/VD_create_vdatas.f
+share/hdf4_examples/fortran/VD_get_vdata_info.f
+share/hdf4_examples/fortran/VD_locate_vdata.f
+share/hdf4_examples/fortran/VD_read_from_vdata.f
+share/hdf4_examples/fortran/VD_read_mixed_vdata.f
+share/hdf4_examples/fortran/VD_write_mixed_vdata.f
+share/hdf4_examples/fortran/VD_write_to_vdata.f
+share/hdf4_examples/fortran/VG_add_sds_to_vgroup.f
+share/hdf4_examples/fortran/VG_create_vgroup.f
+share/hdf4_examples/fortran/VG_get_vgroup_info.f
+share/hdf4_examples/fortran/VG_insert_vdatas_to_vgroup.f
+share/hdf4_examples/fortran/VG_set_get_vgroup_attr.f
+share/hdf4_examples/fortran/VG_vgroup_contents.f
+share/hdf4_examples/fortran/run-fortran-ex.sh
+share/hdf4_examples/run-all-ex.sh

Index: pkgsrc/devel/hdf/distinfo
diff -u pkgsrc/devel/hdf/distinfo:1.16 pkgsrc/devel/hdf/distinfo:1.17
--- pkgsrc/devel/hdf/distinfo:1.16      Tue Oct 26 10:14:50 2021
+++ pkgsrc/devel/hdf/distinfo   Sun Apr 24 21:50:48 2022
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:14:50 nia Exp $
+$NetBSD: distinfo,v 1.17 2022/04/24 21:50:48 tnn Exp $
 
-BLAKE2s (HDF4.2r4.tar.gz) = f4a3d8769280b953447317e4c03ea001e71d4b940caaaae02c399708a2b112db
-SHA512 (HDF4.2r4.tar.gz) = 184166a79154bbae4e4efa888042d3b1d398e0b35f6bca680a598bbfc137122b4109da9db6ae45c0caea02a0bd64c2d6a6459ba88f411a3f62edc5de57e83e0a
-Size (HDF4.2r4.tar.gz) = 3914118 bytes
-SHA1 (patch-ai) = 3b85a0d32ca8e7d4065bf09960de2769c12740cd
-SHA1 (patch-aj) = f1f64d19b4346da5b18c2d80c93f929a96b56b70
-SHA1 (patch-ao) = cf461ca847ddef05c4876fe3527beda3242ee2f2
-SHA1 (patch-ap) = 18a209229a60742a73c720d55f558949285351f2
-SHA1 (patch-ar) = 5fbb6e8c56ccf05db0217e9551a0c72ecd9f5c06
-SHA1 (patch-as) = b4fa7cd3bcafd75c9bfc045c2849bde21becd2de
-SHA1 (patch-ba) = 33e79d38ce68540308445f709f5cbafb1b917d05
-SHA1 (patch-hdf_fmpool_configure.in) = 78c80e18fdc931476c36fc451a36dc93cc254484
-SHA1 (patch-mfhdf_ncgen_ncgen.l) = a2d5a5de6a1491582d73dad291fdb0ffa40b7e9a
+BLAKE2s (hdf-4.2.15.tar.bz2) = ff1c7833d9b0c21f46e437a3071bf376a3f5783ea2c91e5b8afb96d56360e223
+SHA512 (hdf-4.2.15.tar.bz2) = 7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9
+Size (hdf-4.2.15.tar.bz2) = 3647900 bytes
+SHA1 (patch-ao) = 1d17fef8c7b10670a1a82fd41aacf5761684a693
+SHA1 (patch-ap) = 6587f64f688d39aac99dad9d445d388f555f8aff
+SHA1 (patch-ba) = e1bc12d455a0b85c93ea8cab9f0b39621b349980
+SHA1 (patch-bin_cmakehdf4) = 13c1f36d72f6fc780c61591ac4623a07421217dc
+SHA1 (patch-hdf_test_tutils.h) = 98d99e153f33cfaa1fc24321c993b734f9dba9ab
+SHA1 (patch-mfhdf_ncgen_ncgen.l) = 721f73cb5b219922fdc096b7f7fe1e9c8db5e9cc

Index: pkgsrc/devel/hdf/patches/patch-ao
diff -u pkgsrc/devel/hdf/patches/patch-ao:1.7 pkgsrc/devel/hdf/patches/patch-ao:1.8
--- pkgsrc/devel/hdf/patches/patch-ao:1.7       Thu Feb 24 16:25:38 2005
+++ pkgsrc/devel/hdf/patches/patch-ao   Sun Apr 24 21:50:48 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.7 2005/02/24 16:25:38 adam Exp $
+$NetBSD: patch-ao,v 1.8 2022/04/24 21:50:48 tnn Exp $
 
---- hdf/src/hdfi.h.orig        2005-01-25 03:36:44.000000000 +0000
+--- hdf/src/hdfi.h.orig        2020-03-03 17:40:50.000000000 +0000
 +++ hdf/src/hdfi.h
-@@ -147,6 +147,8 @@
+@@ -95,6 +95,8 @@
   * Define options for each platform
   *-------------------------------------------------------------------------*/
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.7 2005/02/24 16:25
  /*
   * Meaning of each defined macros (not completed yet)
   *
-@@ -1386,6 +1388,71 @@ typedef long              hdf_pint_t;   
+@@ -1115,6 +1117,71 @@ typedef long              hdf_pint_t;   
  
  #endif /* IA64 */
  
@@ -52,7 +52,7 @@ $NetBSD: patch-ao,v 1.7 2005/02/24 16:25
 +typedef int               intf;     /* size of INTEGERs in Fortran compiler */
 +typedef float             float32;
 +typedef double            float64;
-+#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__)
++#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__aarch64__)
 +typedef long              hdf_pint_t;   /* an integer the same size as a pointer */
 +#else
 +typedef int               hdf_pint_t;   /* an integer the same size as a pointer */

Index: pkgsrc/devel/hdf/patches/patch-ap
diff -u pkgsrc/devel/hdf/patches/patch-ap:1.3 pkgsrc/devel/hdf/patches/patch-ap:1.4
--- pkgsrc/devel/hdf/patches/patch-ap:1.3       Thu Dec 10 17:10:14 2009
+++ pkgsrc/devel/hdf/patches/patch-ap   Sun Apr 24 21:50:48 2022
@@ -1,13 +1,13 @@
-$NetBSD: patch-ap,v 1.3 2009/12/10 17:10:14 drochner Exp $
+$NetBSD: patch-ap,v 1.4 2022/04/24 21:50:48 tnn Exp $
 
---- hdf/src/hconv.h.orig       2007-09-07 19:17:23.000000000 +0200
+--- hdf/src/hconv.h.orig       2020-03-03 17:40:50.000000000 +0000
 +++ hdf/src/hconv.h
-@@ -63,7 +63,7 @@
+@@ -59,7 +59,7 @@
  /* CONSTANT DEFINITIONS                                                      */
  /*****************************************************************************/
  /* Generally Big-Endian machines */
--#if !defined(VMS) && !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && 
!defined(__x86_64__)
+-#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__)
 +#if BYTE_ORDER == BIG_ENDIAN
- #   if !defined(UNICOS)
  #       define UI8_IN     DFKnb1b   /* Unsigned Integer, 8 bits */
  #       define UI8_OUT    DFKnb1b
+ #       define SI16_IN    DFKnb2b   /* S = Signed */

Index: pkgsrc/devel/hdf/patches/patch-ba
diff -u pkgsrc/devel/hdf/patches/patch-ba:1.4 pkgsrc/devel/hdf/patches/patch-ba:1.5
--- pkgsrc/devel/hdf/patches/patch-ba:1.4       Sun Oct 27 20:31:21 2013
+++ pkgsrc/devel/hdf/patches/patch-ba   Sun Apr 24 21:50:48 2022
@@ -1,27 +1,13 @@
-$NetBSD: patch-ba,v 1.4 2013/10/27 20:31:21 joerg Exp $
+$NetBSD: patch-ba,v 1.5 2022/04/24 21:50:48 tnn Exp $
 
---- configure.orig     2009-01-21 02:44:10.000000000 +0000
+--- configure.orig     2020-03-03 17:40:50.000000000 +0000
 +++ configure
-@@ -5057,7 +5057,12 @@ fi
- 
-           done
-           ;;
--        -[lLR]*)
-+        -R*)
-+          ac_arg="-Wl,$ac_arg"
-+          shift
-+          set X $ac_arg "$@"
-+          ;;
-+        -[lLR]*|-Wl*)
-             ac_exists=false
-   for ac_i in $ac_cv_f77_libs; do
-     if test x"$ac_arg" = x"$ac_i"; then
-@@ -7515,6 +7515,8 @@ case "$host" in
-   mips*-sgi-irix4*)     BAR="irix4"       ;;
+@@ -24808,6 +24808,8 @@ done
+ case "$host" in
    *-linux*)             BAR="linux"       ;;
    *-freebsd*)           BAR="fbsd"        ;;
-+  *-netbsd*)          BAR="fbsd"        ;;
-+  *-dragonfly*)               BAR="fbsd"        ;;
-   ia64-*-*)             BAR="ia64"        ;;
++  *-netbsd*)           BAR="fbsd"        ;;
++  *-dragonfly*)           BAR="fbsd"        ;;
    *-ibm-aix*)           BAR="aix"         ;;
-   i386-*-solaris2*)     BAR="solarisx86"  ;;
+   sparc64-*-solaris2*)  BAR="solaris64"   ;;
+   *-*-solaris2*)        BAR="solaris"     ;;

Index: pkgsrc/devel/hdf/patches/patch-mfhdf_ncgen_ncgen.l
diff -u pkgsrc/devel/hdf/patches/patch-mfhdf_ncgen_ncgen.l:1.1 pkgsrc/devel/hdf/patches/patch-mfhdf_ncgen_ncgen.l:1.2
--- pkgsrc/devel/hdf/patches/patch-mfhdf_ncgen_ncgen.l:1.1      Wed Jan  4 11:17:56 2017
+++ pkgsrc/devel/hdf/patches/patch-mfhdf_ncgen_ncgen.l  Sun Apr 24 21:50:48 2022
@@ -1,14 +1,14 @@
-$NetBSD: patch-mfhdf_ncgen_ncgen.l,v 1.1 2017/01/04 11:17:56 jperkin Exp $
+$NetBSD: patch-mfhdf_ncgen_ncgen.l,v 1.2 2022/04/24 21:50:48 tnn Exp $
 
 Ensure the local yywrap is used.
 
---- mfhdf/ncgen/ncgen.l.orig   2003-12-10 21:15:54.000000000 +0000
+--- mfhdf/ncgen/ncgen.l.orig   2020-03-03 17:40:50.000000000 +0000
 +++ mfhdf/ncgen/ncgen.l
-@@ -22,6 +22,7 @@ extern void yyerror();
+@@ -17,6 +17,7 @@ void expand_escapes();
  #include <ctype.h>
  #include <limits.h>
  #include "ncgentab.h"
 +#undef yywrap
  %}
  
- escquote      \\\"
+ escquote    \\\"

Added files:

Index: pkgsrc/devel/hdf/patches/patch-bin_cmakehdf4
diff -u /dev/null pkgsrc/devel/hdf/patches/patch-bin_cmakehdf4:1.1
--- /dev/null   Sun Apr 24 21:50:48 2022
+++ pkgsrc/devel/hdf/patches/patch-bin_cmakehdf4        Sun Apr 24 21:50:48 2022
@@ -0,0 +1,13 @@
+$NetBSD: patch-bin_cmakehdf4,v 1.1 2022/04/24 21:50:48 tnn Exp $
+
+--- bin/cmakehdf4.orig 2020-03-03 17:40:50.000000000 +0000
++++ bin/cmakehdf4
+@@ -29,7 +29,7 @@ exit_code=0
+ # and should have invoked as "$srcdir/bin/$progname" or
+ # "bin/$progname". So, by striping bin/$program from $0,
+ # we can find $srcdir.
+-if [ $0 == bin/$progname ]; then
++if [ $0 = bin/$progname ]; then
+     srcdir="."        # current directory
+ else
+     # $0 is $srdir/bin/$progname
Index: pkgsrc/devel/hdf/patches/patch-hdf_test_tutils.h
diff -u /dev/null pkgsrc/devel/hdf/patches/patch-hdf_test_tutils.h:1.1
--- /dev/null   Sun Apr 24 21:50:48 2022
+++ pkgsrc/devel/hdf/patches/patch-hdf_test_tutils.h    Sun Apr 24 21:50:48 2022
@@ -0,0 +1,13 @@
+$NetBSD: patch-hdf_test_tutils.h,v 1.1 2022/04/24 21:50:48 tnn Exp $
+
+--- hdf/test/tutils.h.orig     2020-03-03 17:40:50.000000000 +0000
++++ hdf/test/tutils.h
+@@ -114,7 +114,7 @@ if(ret == FAIL) {printf("*** UNEXPECTED 
+ #define H4_SKIPPED()       {puts(" -SKIP-");fflush(stdout);}
+ 
+ /* Definition for JPEG tests */
+-#ifdef DEC_ALPHA
++#if defined(DEC_ALPHA) || defined(__alpha__)
+ #define JPEG_FUZZ 13
+ #else
+ #define JPEG_FUZZ 1

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index