[pkgsrc/trunk]: pkgsrc/devel/netcdf Changes 3.6.0-p1:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/netcdf Changes 3.6.0-p1:
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:24:43 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/0d6ff0f6ec1c
branches:  trunk
changeset: 489705:0d6ff0f6ec1c
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Feb 25 09:52:47 2005 +0000

description:
Changes 3.6.0-p1:
 Patched version of 3.6.0 to fix potentially serious
 bug described at
 http://www.unidata.ucar.edu/packages/netcdf/docs/known_problems.html#cdf2-bug

Changes 3.6.0:
 Added texinfo source for the documentation.

 Added large file tests to Windows directory in distribution.

 Modified win32 visual studio project files so that m4
 is no longer required to build netcdf under visual studio.

 Modified rules.make to use install instead of cp,
 fixing install problem for cygwin users.

 Modified configure/install stuff to support HP-UX.

 Modified configure/install stuff to support G95.

 In the f90 interface, applied Arnaud Desitter's fixes
 to correct mismatches between scalar and array
 arguments, eliminating (legitimate) complaints by the
 NAGWare f95 compiler.  Also fixed bugs introduced in
 3.6.0-beta5 in the mapped array interfaces.

diffstat:

 devel/netcdf/Makefile         |  11 ++---
 devel/netcdf/distinfo         |  33 +++++++----------
 devel/netcdf/patches/patch-ab |  12 +++---
 devel/netcdf/patches/patch-ac |  31 ++++-----------
 devel/netcdf/patches/patch-ad |  57 ++++++++----------------------
 devel/netcdf/patches/patch-ae |   8 ++--
 devel/netcdf/patches/patch-af |  12 +++---
 devel/netcdf/patches/patch-ag |   6 +-
 devel/netcdf/patches/patch-ah |   8 ++--
 devel/netcdf/patches/patch-ai |   6 +-
 devel/netcdf/patches/patch-aj |  16 --------
 devel/netcdf/patches/patch-ak |  31 ----------------
 devel/netcdf/patches/patch-al |  18 +--------
 devel/netcdf/patches/patch-am |  28 ---------------
 devel/netcdf/patches/patch-an |  24 ++++++-----
 devel/netcdf/patches/patch-ao |  80 -------------------------------------------
 devel/netcdf/patches/patch-ap |  63 ---------------------------------
 17 files changed, 85 insertions(+), 359 deletions(-)

diffs (truncated from 674 to 300 lines):

diff -r 6000707d2cbc -r 0d6ff0f6ec1c devel/netcdf/Makefile
--- a/devel/netcdf/Makefile     Fri Feb 25 09:24:37 2005 +0000
+++ b/devel/netcdf/Makefile     Fri Feb 25 09:52:47 2005 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2005/01/12 15:32:00 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/02/25 09:52:47 adam Exp $
 
-DISTNAME=      netcdf-3.5.0
-PKGREVISION=   2
+DISTNAME=      netcdf-3.6.0-p1
+PKGNAME=       netcdf-3.6.0p1
 CATEGORIES=    devel
 MASTER_SITES=  ftp://www.gfd-dennou.org/arch/netcdf/unidata-mirror/
-EXTRACT_SUFX=  .tar.Z
 
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 HOMEPAGE=      http://www.unidata.ucar.edu/packages/netcdf/index.html
@@ -13,8 +12,8 @@
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK3=                yes
 USE_LANGUAGES=         c c++ fortran
-USE_LIBTOOL=           # defined
-GNU_CONFIGURE=         # defined
+USE_LIBTOOL=           yes
+GNU_CONFIGURE=         yes
 CPPFLAGS+=             -Df2cFortran -Dunix
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6000707d2cbc -r 0d6ff0f6ec1c devel/netcdf/distinfo
--- a/devel/netcdf/distinfo     Fri Feb 25 09:24:37 2005 +0000
+++ b/devel/netcdf/distinfo     Fri Feb 25 09:52:47 2005 +0000
@@ -1,20 +1,15 @@
-$NetBSD: distinfo,v 1.10 2005/02/23 22:24:22 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/02/25 09:52:47 adam Exp $
 
-SHA1 (netcdf-3.5.0.tar.Z) = e9c5a9847d8ff9b3e1b8a18f5e216f6a1508bce8
-RMD160 (netcdf-3.5.0.tar.Z) = 4313e00fc56273e871c003bfb27c533d4a7f556f
-Size (netcdf-3.5.0.tar.Z) = 1319419 bytes
-SHA1 (patch-ab) = 37bf389e76316b03cc3590a1c13855636907b8a5
-SHA1 (patch-ac) = 8a73893ae7c98dd45d61d795592c57abe76d3fde
-SHA1 (patch-ad) = 85f57ffe815df04a5222924285af791dd12e6f5a
-SHA1 (patch-ae) = e91f8111387c7ca3111e640dcbc16d9bca8ed898
-SHA1 (patch-af) = 42a96275cc048d796452c20c7c6f24ac651e8877
-SHA1 (patch-ag) = 214b7c241bc71e5ebbef1e3f9f8a661acaf05228
-SHA1 (patch-ah) = 11083d7a775ca6199162fe3b14776ca24b5c009a
-SHA1 (patch-ai) = fb8386c47a2b0e2468bf31a424738979c472de94
-SHA1 (patch-aj) = 7721c70d1ec33477a51863626cbfb68e2ed689bb
-SHA1 (patch-ak) = 334ba2656119c9b3682cb6795030a2320c8b6d98
-SHA1 (patch-al) = e34833121ee90a18318948705af40da7a4513afc
-SHA1 (patch-am) = ac8ade3c79380833a1339b7f4c99224e89b231e7
-SHA1 (patch-an) = 5e8e3d13f65664af37ef276d0968b9206de120e9
-SHA1 (patch-ao) = 873ed1497741ed4cc449f19f499f3e55c4d4f6ea
-SHA1 (patch-ap) = 90951e89f433f231d66ffa31f48e8527f24a82c7
+SHA1 (netcdf-3.6.0-p1.tar.gz) = 7e02a62a1abe9c1f00222f44ed44d63def3cc3d2
+RMD160 (netcdf-3.6.0-p1.tar.gz) = f59877c5f1f70b7099f263f0a34c1b1bd12d41d9
+Size (netcdf-3.6.0-p1.tar.gz) = 842025 bytes
+SHA1 (patch-ab) = cbe412d8b7473dcee689b70f3a829109d2237f61
+SHA1 (patch-ac) = 82db04a3ed00b649c4f85ec0f72d1c9242244bfe
+SHA1 (patch-ad) = deadd0acf929a05b54fca49843ef1c4f9c00c9c5
+SHA1 (patch-ae) = 0813f13bb333f46042dac1d86730807bc17cce2e
+SHA1 (patch-af) = c15c86f7bad1959b66062ff43ad319f860f8038e
+SHA1 (patch-ag) = 49b2077ec60c05c32f0fc9f782cf0c6972039989
+SHA1 (patch-ah) = 49eb830457f1544cbd63c82671ef77267d544455
+SHA1 (patch-ai) = b6f3f113e9f952c4041daf1080b56f64590d2a75
+SHA1 (patch-al) = 2157008ecc8cc0f3330a41ee8a646233f19c5dbb
+SHA1 (patch-an) = 4cbf9b83f380d36a58ee3840bcd3e5a27404b58e
diff -r 6000707d2cbc -r 0d6ff0f6ec1c devel/netcdf/patches/patch-ab
--- a/devel/netcdf/patches/patch-ab     Fri Feb 25 09:24:37 2005 +0000
+++ b/devel/netcdf/patches/patch-ab     Fri Feb 25 09:52:47 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2003/03/02 08:26:10 jtb Exp $
+$NetBSD: patch-ab,v 1.4 2005/02/25 09:52:47 adam Exp $
 
---- macros.make.in.orig        Tue Mar 13 17:42:50 2001
+--- macros.make.in.orig        2004-12-18 16:32:32.000000000 +0000
 +++ macros.make.in
 @@ -29,10 +29,10 @@ CXXCPPFLAGS        = $(CPPFLAGS)
  
@@ -16,8 +16,8 @@
 +F90           = $(LIBTOOL) --mode=compile @F90@
  CFLAGS                = @CFLAGS@
  CXXFLAGS      = @CXXFLAGS@
- FFLAGS                = @FFLAGS@
-@@ -54,11 +54,11 @@ FLIBS              = @FLIBS@
+ FFLAGS                = @FFLAGS@ @IGNORE_FPE@
+@@ -53,11 +53,11 @@ FLIBS              = @FLIBS@
  F90LIBS               = @F90LIBS@
  LIBS          = @LIBS@
  F90LDFLAGS    = $(LDFLAGS)
@@ -34,7 +34,7 @@
  
  
  # Manual pages:
-@@ -69,9 +69,9 @@ MAKEWHATIS_CMD       = @MAKEWHATIS_CMD@
+@@ -68,9 +68,9 @@ MAKEWHATIS_CMD       = @MAKEWHATIS_CMD@
  
  
  # Misc. Utilities:
@@ -42,7 +42,7 @@
 -ARFLAGS               = @ARFLAGS@
 -RANLIB                = @RANLIB@
 +AR            = $(LIBTOOL) --mode=link @CC@
-+ARFLAGS               = -rpath $(LIBDIR) -version-info 3:5
++ARFLAGS               = -rpath $(LIBDIR) -version-info 3:6
 +RANLIB                = echo
  TARFLAGS      = -chf
  
diff -r 6000707d2cbc -r 0d6ff0f6ec1c devel/netcdf/patches/patch-ac
--- a/devel/netcdf/patches/patch-ac     Fri Feb 25 09:24:37 2005 +0000
+++ b/devel/netcdf/patches/patch-ac     Fri Feb 25 09:52:47 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2003/03/02 08:26:10 jtb Exp $
+$NetBSD: patch-ac,v 1.3 2005/02/25 09:52:47 adam Exp $
 
---- rules.make.orig    Thu Feb 27 13:08:11 2003
+--- rules.make.orig    2004-12-17 20:34:48.000000000 +0000
 +++ rules.make
 @@ -55,8 +55,7 @@
  lib:          $(LIBRARY)
@@ -12,28 +12,15 @@
  
  #-------------------------------------------------------------------------------
  # Shared Libraries:
-@@ -115,19 +114,19 @@ sunos5_shared_library:
- # Installation:
+@@ -124,10 +123,10 @@ $(INCDIR)/$(HEADER3):    $(INCDIR) $(HEADER
+       $(INSTALL) $(HEADER3) $@
  
- $(INCDIR)/$(HEADER):  $(INCDIR) $(HEADER)
--      cp $(HEADER) $@
-+      $(BSD_INSTALL_DATA) $(HEADER) $@
- $(INCDIR)/$(HEADER1): $(INCDIR) $(HEADER1)
--      cp $(HEADER1) $@
-+      $(BSD_INSTALL_DATA) $(HEADER1) $@
- $(INCDIR)/$(HEADER2): $(INCDIR) $(HEADER2)
--      cp $(HEADER2) $@
-+      $(BSD_INSTALL_DATA) $(HEADER2) $@
- $(INCDIR)/$(HEADER3): $(INCDIR) $(HEADER3)
--      cp $(HEADER3) $@
-+      $(BSD_INSTALL_DATA) $(HEADER3) $@
+ $(LIBDIR)/$(LIBRARY): $(LIBDIR) $(LIBRARY) FORCE
+-      $(INSTALL) $(LIBRARY) $@
++      $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIBRARY) $@
  
- $(LIBDIR)/$(LIBRARY): $(LIBDIR) $(LIBRARY)
--      cp $(LIBRARY) $@
-+      $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA)  $(LIBRARY) $@
- 
- $(BINDIR)/$(PROGRAM): $(BINDIR) $(PROGRAM)
--      cp $(PROGRAM) $@
+ $(BINDIR)/$(PROGRAM): $(BINDIR) $(PROGRAM) FORCE
+-      $(INSTALL) $(PROGRAM) $@
 +      $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROGRAM) $@
  
  $(BINDIR) \
diff -r 6000707d2cbc -r 0d6ff0f6ec1c devel/netcdf/patches/patch-ad
--- a/devel/netcdf/patches/patch-ad     Fri Feb 25 09:24:37 2005 +0000
+++ b/devel/netcdf/patches/patch-ad     Fri Feb 25 09:52:47 2005 +0000
@@ -1,37 +1,32 @@
-$NetBSD: patch-ad,v 1.4 2003/03/02 08:39:19 jtb Exp $
+$NetBSD: patch-ad,v 1.5 2005/02/25 09:52:47 adam Exp $
 
---- Makefile.orig      Tue Feb 27 16:04:32 2001
+--- Makefile.orig      2004-12-18 16:32:58.000000000 +0000
 +++ Makefile
-@@ -27,9 +27,8 @@ PACKING_LIST = \
-               rules.make
- 
+@@ -29,12 +29,11 @@ PACKING_LIST       = \
  
+ # I moved fortran to the bottom of the list, sometimes AIX make get's confused 
+ # if the C library and the fortran library are built in the same second. - Ed
 -all:          libsrc/all      \
--              fortran/all     \
--              f90/all \
 +all:          fortran/all     \
 +              libsrc/all      \
                ncdump/all      \
                ncgen/all       \
-               cxx/all
-@@ -43,7 +42,6 @@ check:               test
+-              cxx/all \
+-              fortran/all     \
+-              f90/all 
++              cxx/all
  
- install:      libsrc/install \
+ test:         fortran/all \
+               libsrc/test \
+@@ -52,7 +51,6 @@ check:               test
+ install:      all \
+               libsrc/install \
                fortran/install \
 -              f90/install \
                ncdump/install \
                ncgen/install \
                cxx/install
-@@ -64,7 +62,7 @@ distclean:   libsrc/distclean \
-               nctest/distclean nc_test/distclean \
-               fortran/distclean f90/distclean nf_test/distclean \
-               ncdump/distclean ncgen/distclean cxx/distclean \
--              clean_macros 
-+              clean_macros
- 
- clean_macros:
-       -cp macros.make.def macros.make
-@@ -162,7 +160,7 @@ subdir_target:
+@@ -167,7 +165,7 @@ subdir_target:
        @echo "Returning to directory `pwd`"
        @echo ""
  
@@ -40,25 +35,3 @@
  whatis:               $(MANDIR)/$(WHATIS)
  $(MANDIR)/$(WHATIS):  $(MANDIR)
        $(MAKEWHATIS_CMD)
-@@ -189,7 +187,7 @@ check_system:      FORCE
-       *) exit 0;; \
-       esac
- 
--# Make a compressed, tar(1) file of the source distribution in the current 
-+# Make a compressed, tar(1) file of the source distribution in the current
- # directory.
- #
- tar.Z:                check_system FORCE
-@@ -225,10 +223,10 @@ ftp:             check_system FORCE
- 
- $(FTPDIR)/$(PACKAGE)-$(VERSION).tar.Z:        $(PACKAGE)-$(VERSION).tar.Z
-       rm -f $@
--      cp $(PACKAGE)-$(VERSION).tar.Z $@ 
-+      cp $(PACKAGE)-$(VERSION).tar.Z $@
-       chmod u+rw,g+rw,o=r $@
- 
--# Make a compressed, tar(1) file of the binary distribution in the 
-+# Make a compressed, tar(1) file of the binary distribution in the
- # appropriate FTP directory.
- #
- binftp:               FORCE
diff -r 6000707d2cbc -r 0d6ff0f6ec1c devel/netcdf/patches/patch-ae
--- a/devel/netcdf/patches/patch-ae     Fri Feb 25 09:24:37 2005 +0000
+++ b/devel/netcdf/patches/patch-ae     Fri Feb 25 09:52:47 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+$NetBSD: patch-ae,v 1.2 2005/02/25 09:52:47 adam Exp $
 
---- fortran/Makefile.orig      Sun Sep 27 19:52:28 1998
-+++ fortran/Makefile   Sun Sep 27 19:56:28 1998
-@@ -68,7 +68,7 @@
+--- fortran/Makefile.orig      2004-12-18 18:08:01.000000000 +0000
++++ fortran/Makefile
+@@ -69,7 +69,7 @@ PACKING_LIST = \
  #
  
  
diff -r 6000707d2cbc -r 0d6ff0f6ec1c devel/netcdf/patches/patch-af
--- a/devel/netcdf/patches/patch-af     Fri Feb 25 09:24:37 2005 +0000
+++ b/devel/netcdf/patches/patch-af     Fri Feb 25 09:52:47 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/01/14 20:28:54 frueauf Exp $
+$NetBSD: patch-af,v 1.2 2005/02/25 09:52:47 adam Exp $
 
---- libsrc/Makefile.orig       Mon Dec  8 23:04:42 1997
-+++ libsrc/Makefile    Sun Sep 27 20:23:07 1998
-@@ -7,7 +7,7 @@
+--- libsrc/Makefile.orig       2004-12-18 18:08:01.000000000 +0000
++++ libsrc/Makefile
+@@ -7,7 +7,7 @@ include ../macros.make
  
  INCLUDES = -I.
  
@@ -11,9 +11,9 @@
  ld_netcdf     = -L. -lnetcdf
  
  HEADER        = netcdf.h
-@@ -54,7 +54,23 @@
+@@ -54,7 +54,23 @@ PACKING_LIST = \
        t_ncxx.c \
-       t_ncx.c
+       t_ncx.c install-sh
  
 -LIB_OBJS = $(LIB_CSRCS:.c=.o)
 +FLIB_OBJS = \
diff -r 6000707d2cbc -r 0d6ff0f6ec1c devel/netcdf/patches/patch-ag
--- a/devel/netcdf/patches/patch-ag     Fri Feb 25 09:24:37 2005 +0000
+++ b/devel/netcdf/patches/patch-ag     Fri Feb 25 09:52:47 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.2 2003/03/02 08:26:10 jtb Exp $
+$NetBSD: patch-ag,v 1.3 2005/02/25 09:52:47 adam Exp $
 
---- ncdump/Makefile.orig       Thu Feb 27 13:28:14 2003
+--- ncdump/Makefile.orig       2004-12-18 18:08:01.000000000 +0000
 +++ ncdump/Makefile
 @@ -16,7 +16,7 @@ PACKING_LIST = $(c_sources) $(headers) d
-                 test0.cdl ncdump.1 Makefile
+                 test0.cdl ncdump.1 Makefile install-sh
  MANUAL                = ncdump.1
  
 -lib_netcdf    = ../libsrc/libnetcdf.a
diff -r 6000707d2cbc -r 0d6ff0f6ec1c devel/netcdf/patches/patch-ah
--- a/devel/netcdf/patches/patch-ah     Fri Feb 25 09:24:37 2005 +0000
+++ b/devel/netcdf/patches/patch-ah     Fri Feb 25 09:52:47 2005 +0000
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated netcdf to 3.6.0p1
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/nasm Changes 0.98.39:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated netcdf to 3.6.0p1
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/nasm Changes 0.98.39:
Indexes:
Home | Main Index | Thread Index | Old Index