# HG changeset patch
# User John Donoghue
# Date 1523985725 14400
# Node ID d09fabbfdc1797eec185f655c69b9d14e3444f45
# Parent  8e04902803b9f63f35cdb96de13cbdb94439cfab
of-netcdf: update to 1.0.12

* build_packages.m: update netcdf version

* dist-files.mk: remove ref to of-netcdf-1-fixes.patch

* src/of-netcdf.mk: update version, checksum, update rule

* src/of-netcdf-1-fixes.patch: removed

diff -r 8e04902803b9 -r d09fabbfdc17 build_packages.m
--- a/build_packages.m	Tue Apr 17 12:34:43 2018 -0400
+++ b/build_packages.m	Tue Apr 17 13:22:05 2018 -0400
@@ -49,7 +49,7 @@
   try_install fits-1.0.7.tar.gz
   try_install tsa-4.4.5.tar.gz
   try_install dicom-0.2.1.tar.gz
-  try_install netcdf-1.0.11.tar.gz
+  try_install netcdf-1.0.12.tar.gz
   try_install ltfat-2.2.0.tar.gz
   try_install database-2.4.2.tar.gz
   try_install instrument-control-0.3.0.tar.gz
diff -r 8e04902803b9 -r d09fabbfdc17 dist-files.mk
--- a/dist-files.mk	Tue Apr 17 12:34:43 2018 -0400
+++ b/dist-files.mk	Tue Apr 17 13:22:05 2018 -0400
@@ -496,7 +496,6 @@
   of-miscellaneous-1-fixes.patch \
   of-miscellaneous.mk \
   of-nan.mk \
-  of-netcdf-1-fixes.patch \
   of-netcdf.mk \
   of-nurbs-1-fixes.patch \
   of-nurbs.mk \
diff -r 8e04902803b9 -r d09fabbfdc17 src/of-netcdf-1-fixes.patch
--- a/src/of-netcdf-1-fixes.patch	Tue Apr 17 12:34:43 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-diff --git a/src/configure.base b/src/configure.base
-index 176e152..ae67f7a 100644
---- a/src/configure.base
-+++ b/src/configure.base
-@@ -53,106 +53,6 @@ test -z "$MKOCTFILE" &&	AC_MSG_WARN([no mkoctfile found on path])
- AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config)
- test -z "$OCTAVE_CONFIG" &&	AC_MSG_WARN([no octave-config found on path])
- 
--AC_SUBST(ver)
--AC_SUBST(subver)
--AC_SUBST(mpath)
--AC_SUBST(opath)
--AC_SUBST(xpath)
--AC_SUBST(altpath)
--AC_SUBST(altmpath)
--AC_SUBST(altopath)
--
--AC_ARG_WITH(path, 
--	[  --with-path             install path prefix],
--	[ path=$withval ])
--AC_ARG_WITH(mpath,
--	[  --with-mpath            override path for m-files],
--	[mpath=$withval])
--AC_ARG_WITH(opath,
--	[  --with-opath            override path for oct-files],
--	[opath=$withval])
--AC_ARG_WITH(xpath,
--	[  --with-xpath            override path for executables],
--	[xpath=$withval])
--AC_ARG_WITH(altpath, 
--	[  --with-altpath          alternative functions install path prefix],
--	[ altpath=$withval ])
--AC_ARG_WITH(altmpath,
--	[  --with-altmpath         override path for alternative m-files],
--	[altmpath=$withval])
--AC_ARG_WITH(altopath,
--	[  --with-altopath         override path for alternative oct-files],
--	[altopath=$withval])	
--
--if test -n "$path" ; then
--   test -z "$mpath" && mpath=$path 
--   test -z "$opath" && opath=$path/oct 
--   test -z "$xpath" && xpath=$path/bin
--   test -z "$altpath" && altpath=$path-alternatives
--fi
--
--if test -n "$altpath" ; then
--   test -z "$altmpath" && altmpath=$altpath 
--   test -z "$altopath" && altopath=$altpath/oct 
--fi
--
--dnl Don't query if path/ver are given in the configure environment
--#if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$altmpath" || test -z "$altopath" || test -z "$ver" ; then
--if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$ver" ; then
--   dnl Construct program to get mkoctfile version and local install paths
--   cat > conftest.cc <<EOF
--#include <octave/config.h>
--#include <octave/version.h>
--#include <octave/defaults.h>
--
--#define INFOV "\nINFOV=" OCTAVE_VERSION "\n"
--
--#define INFOH "\nINFOH=" OCTAVE_CANONICAL_HOST_TYPE "\n"
--
--#ifdef OCTAVE_LOCALVERFCNFILEDIR
--# define INFOM "\nINFOM=" OCTAVE_LOCALVERFCNFILEDIR "\n"
--#else
--# define INFOM "\nINFOM=" OCTAVE_LOCALFCNFILEPATH "\n"
--#endif
--
--#ifdef OCTAVE_LOCALVEROCTFILEDIR
--# define INFOO "\nINFOO=" OCTAVE_LOCALVEROCTFILEDIR "\n"
--#else
--# define INFOO "\nINFOO=" OCTAVE_LOCALOCTFILEPATH  "\n"
--#endif
--
--#ifdef OCTAVE_LOCALVERARCHLIBDIR
--# define INFOX "\nINFOX=" OCTAVE_LOCALVERARCHLIBDIR  "\n"
--#else
--# define INFOX "\nINFOX=" OCTAVE_LOCALARCHLIBDIR  "\n"
--#endif
--
--const char *infom = INFOM;
--const char *infoo = INFOO;
--const char *infox = INFOX;
--const char *infoh = INFOH;
--const char *infov = INFOV;
--EOF
--
--   dnl Compile program perhaps with a special version of mkoctfile
--   $MKOCTFILE conftest.cc || AC_MSG_ERROR(Could not run $MKOCTFILE)
--
--   dnl Strip the config info from the compiled file
--   eval `strings conftest.o | grep "^INFO.=" | sed -e "s,//.*$,,"`
--   rm -rf conftest*
--
--   dnl set the appropriate variables if they are not already set
--   ver=`echo $INFOV | sed -e "s/\.//" -e "s/\..*$//"`
--   subver=`echo $INFOV | sed -e "[s/^[^.]*[.][^.]*[.]//]"`
--   alt_mbase=`echo $INFOM | sed -e "[s,\/[^\/]*$,,]"`
--   alt_obase=`echo $INFOO | sed -e "[s,/site.*$,/site,]"`
--   test -z "$mpath" && mpath=$INFOM/octave-forge
--   test -z "$opath" && opath=$INFOO/octave-forge
--   test -z "$xpath" && xpath=$INFOX
--   test -z "$altmpath" && altmpath=$alt_mbase/octave-forge-alternatives/m
--   test -z "$altopath" && altopath=$alt_obase/octave-forge-alternatives/oct/$INFOH
--fi
--
- dnl *******************************************************************
- 
- dnl Get LDFLAGS and CPPFLAGS set by user
-@@ -348,23 +248,10 @@ dnl AC_CHECK_LIB([netcdf], [nc_set_chunk_cache], , [AC_MSG_ERROR(nc_set_chunk_ca
- 
- CONFIGURE_OUTPUTS="Makeconf"
- STATUS_MSG="
--octave commands will install into the following directories:
--   m-files:   $mpath
--   oct-files: $opath
--   binaries:  $xpath
--alternatives:
--   m-files:   $altmpath
--   oct-files: $altopath
--
--shell commands will install into the following directories:
--   binaries:  $bindir
--   man pages: $mandir
--   libraries: $libdir
--   headers:   $includedir
--
- octave-forge is configured with
-    octave:        $OCTAVE (version $OCTAVE_VERSION)
-    mkoctfile:	  $MKOCTFILE for Octave $subver
-    octave-config: $OCTAVE_CONFIG for Octave $subver
-+   nc-config:     $NC_CONFIG
-    netCDF compiler flags: $NETCDF_CFLAGS
-    netCDF libraries: $NETCDF_LIBS"
diff -r 8e04902803b9 -r d09fabbfdc17 src/of-netcdf.mk
--- a/src/of-netcdf.mk	Tue Apr 17 12:34:43 2018 -0400
+++ b/src/of-netcdf.mk	Tue Apr 17 13:22:05 2018 -0400
@@ -3,10 +3,10 @@
 
 PKG             := of-netcdf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.11
-$(PKG)_CHECKSUM := 904b15a7f22b0b4adb49d54500d196389e732f95
+$(PKG)_VERSION  := 1.0.12
+$(PKG)_CHECKSUM := 81245738de96385d1b073715859e5c00bdeede31
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := netcdf
+$(PKG)_SUBDIR   := netcdf-$($(PKG)_VERSION)
 $(PKG)_FILE     := netcdf-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     := netcdf
@@ -16,12 +16,9 @@
 endif
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/' | \
-    $(SED) -n 's,.*title="netcdf-\([0-9][^"]*\).tar.gz".*,\1,p' | \
-    head -1
+    $(OCTAVE_FORGE_PKG_UPDATE)
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)/src' && source ./autogen.sh
     $(OCTAVE_FORGE_PKG_BUILD)
 endef