pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/netcdf Changes 4.1.3:
details: https://anonhg.NetBSD.org/pkgsrc/rev/cb8580abf0e1
branches: trunk
changeset: 600433:cb8580abf0e1
user: adam <adam%pkgsrc.org@localhost>
date: Wed Mar 07 16:11:29 2012 +0000
description:
Changes 4.1.3:
* Stop looking for xdr if --disable-dap is used.
* Don't try to run (some) fortran configure tests on machines with no fortran.
* Allow nccopy to rechunk with chunksizes larger than current dimension lengths.
diffstat:
devel/netcdf/Makefile | 18 ++--
devel/netcdf/PLIST | 22 +++++-
devel/netcdf/distinfo | 22 +---
devel/netcdf/patches/patch-aa | 12 ---
devel/netcdf/patches/patch-ab | 49 ------------
devel/netcdf/patches/patch-ac | 27 ------
devel/netcdf/patches/patch-ad | 37 ---------
devel/netcdf/patches/patch-ae | 21 -----
devel/netcdf/patches/patch-af | 38 ---------
devel/netcdf/patches/patch-ag | 22 -----
devel/netcdf/patches/patch-ah | 13 ---
devel/netcdf/patches/patch-ai | 31 -------
devel/netcdf/patches/patch-al | 13 ---
devel/netcdf/patches/patch-an | 90 ++++++++++++----------
devel/netcdf/patches/patch-configure | 15 +++
devel/netcdf/patches/patch-nc_test4_run_bm_ar4.sh | 15 +++
16 files changed, 114 insertions(+), 331 deletions(-)
diffs (truncated from 597 to 300 lines):
diff -r aff5acc05c0d -r cb8580abf0e1 devel/netcdf/Makefile
--- a/devel/netcdf/Makefile Wed Mar 07 15:56:32 2012 +0000
+++ b/devel/netcdf/Makefile Wed Mar 07 16:11:29 2012 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2010/07/30 10:36:24 asau Exp $
+# $NetBSD: Makefile,v 1.31 2012/03/07 16:11:29 adam Exp $
-DISTNAME= netcdf-3.6.0-p1
-PKGNAME= netcdf-3.6.0p1
-PKGREVISION= 2
+DISTNAME= netcdf-4.1.3
CATEGORIES= devel
-MASTER_SITES= ftp://www.gfd-dennou.org/arch/netcdf/unidata-mirror/
+MASTER_SITES= http://www.unidata.ucar.edu/downloads/netcdf/ftp/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.unidata.ucar.edu/software/netcdf/index.html
@@ -12,13 +10,13 @@
PKG_DESTDIR_SUPPORT= user-destdir
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_LANGUAGES= c c++ fortran77
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} \
- exec_prefix=${DESTDIR}${PREFIX}
-CPPFLAGS+= -Df2cFortran -Dunix
-MAKE_JOBS_SAFE= no
+CONFIGURE_ARGS+= --disable-f90
+CONFIGURE_ARGS+= --disable-examples
+CONFIGURE_ARGS+= --disable-netcdf-4
+
+INFO_FILES= yes
.include "../../mk/bsd.pkg.mk"
diff -r aff5acc05c0d -r cb8580abf0e1 devel/netcdf/PLIST
--- a/devel/netcdf/PLIST Wed Mar 07 15:56:32 2012 +0000
+++ b/devel/netcdf/PLIST Wed Mar 07 16:11:29 2012 +0000
@@ -1,14 +1,32 @@
-@comment $NetBSD: PLIST,v 1.5 2006/11/11 22:46:14 rillig Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/03/07 16:11:29 adam Exp $
+bin/nc-config
+bin/nccopy
bin/ncdump
bin/ncgen
+bin/ncgen3
include/ncvalues.h
include/netcdf.h
include/netcdf.hh
include/netcdf.inc
include/netcdfcpp.h
+info/netcdf-c.info
+info/netcdf-c.info-1
+info/netcdf-c.info-2
+info/netcdf-cxx.info
+info/netcdf-f77.info
+info/netcdf-f77.info-1
+info/netcdf-f77.info-2
+info/netcdf-f90.info
+info/netcdf-install.info
+info/netcdf-tutorial.info
+info/netcdf.info
lib/libnetcdf.la
lib/libnetcdf_c++.la
+lib/libnetcdff.la
+lib/pkgconfig/netcdf.pc
+man/man1/nccopy.1
man/man1/ncdump.1
man/man1/ncgen.1
+man/man1/ncgen3.1
man/man3/netcdf.3
-man/man3/netcdf.3f
+man/man3/netcdf_f77.3
diff -r aff5acc05c0d -r cb8580abf0e1 devel/netcdf/distinfo
--- a/devel/netcdf/distinfo Wed Mar 07 15:56:32 2012 +0000
+++ b/devel/netcdf/distinfo Wed Mar 07 16:11:29 2012 +0000
@@ -1,16 +1,8 @@
-$NetBSD: distinfo,v 1.14 2009/10/06 00:52:28 dmcmahill Exp $
+$NetBSD: distinfo,v 1.15 2012/03/07 16:11:29 adam Exp $
-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-aa) = c8ecb2b6d6bb7c7573b56531530d4e43e9b383e6
-SHA1 (patch-ab) = 74b40940c888f661b122f2498b94662118e88f80
-SHA1 (patch-ac) = 82db04a3ed00b649c4f85ec0f72d1c9242244bfe
-SHA1 (patch-ad) = deadd0acf929a05b54fca49843ef1c4f9c00c9c5
-SHA1 (patch-ae) = 73e17b16250cd93eb971e0bda356069f20c5b45e
-SHA1 (patch-af) = c15c86f7bad1959b66062ff43ad319f860f8038e
-SHA1 (patch-ag) = 49b2077ec60c05c32f0fc9f782cf0c6972039989
-SHA1 (patch-ah) = 49eb830457f1544cbd63c82671ef77267d544455
-SHA1 (patch-ai) = b6f3f113e9f952c4041daf1080b56f64590d2a75
-SHA1 (patch-al) = 2157008ecc8cc0f3330a41ee8a646233f19c5dbb
-SHA1 (patch-an) = 4cbf9b83f380d36a58ee3840bcd3e5a27404b58e
+SHA1 (netcdf-4.1.3.tar.gz) = e600322478276f51612e17cca3cda38489003f81
+RMD160 (netcdf-4.1.3.tar.gz) = ac07f570873bba89a49cb2eb2275a40cbc8e502b
+Size (netcdf-4.1.3.tar.gz) = 11097157 bytes
+SHA1 (patch-an) = b3d3cf17c177779d18a2d3fcc3cb7186b3cc8374
+SHA1 (patch-configure) = b1ea50699ad3c7510e123a9f40d02683700af40c
+SHA1 (patch-nc_test4_run_bm_ar4.sh) = 1580189e460444b1169ef9d400570852e6afd90e
diff -r aff5acc05c0d -r cb8580abf0e1 devel/netcdf/patches/patch-aa
--- a/devel/netcdf/patches/patch-aa Wed Mar 07 15:56:32 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/10/06 00:52:28 dmcmahill Exp $
-
-Fix for gcc-4.4.1
-
---- cxx/ncvalues.cpp.orig 2004-11-17 20:13:30.000000000 +0000
-+++ cxx/ncvalues.cpp 2009-10-05 17:05:41.000000000 +0000
-@@ -9,4 +9,5 @@
-
- #include <iostream>
-+#include <cstring>
-
- #include "ncvalues.h"
diff -r aff5acc05c0d -r cb8580abf0e1 devel/netcdf/patches/patch-ab
--- a/devel/netcdf/patches/patch-ab Wed Mar 07 15:56:32 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2009/06/30 00:07:13 joerg Exp $
-
---- macros.make.in.orig 2004-12-18 16:32:32.000000000 +0000
-+++ macros.make.in
-@@ -29,10 +29,10 @@ CXXCPPFLAGS = $(CPPFLAGS)
-
-
- # Compilation:
--CC = @CC@
--CXX = @CXX@
--FC = @FC@
--F90 = @F90@
-+CC = $(LIBTOOL) --mode=compile @CC@
-+CXX = $(LIBTOOL) --mode=compile @CXX@
-+FC = $(LIBTOOL) --mode=compile @FC@
-+F90 = $(LIBTOOL) --mode=compile @F90@
- CFLAGS = @CFLAGS@
- CXXFLAGS = @CXXFLAGS@
- FFLAGS = @FFLAGS@ @IGNORE_FPE@
-@@ -53,11 +53,11 @@ FLIBS = @FLIBS@
- F90LIBS = @F90LIBS@
- LIBS = @LIBS@
- F90LDFLAGS = $(LDFLAGS)
--LINK.c = $(CC) -o $@ $(CFLAGS) $(LDFLAGS)
--LINK.cxx = $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS)
--LINK.F = $(FC) -o $@ $(FFLAGS) $(FLDFLAGS)
--LINK.f = $(FC) -o $@ $(FFLAGS) $(FLDFLAGS)
--LINK.F90 = $(F90) -o $@ $(F90FLAGS) $(F90LDFLAGS)
-+LINK.c = $(LIBTOOL) --mode=link @CC@ -o $@ $(CFLAGS) $(LDFLAGS)
-+LINK.cxx = $(LIBTOOL) --mode=link @CXX@ -o $@ $(CXXFLAGS) $(LDFLAGS)
-+LINK.F = $(LIBTOOL) --mode=link @FC@ -o $@ $(FFLAGS) $(FLDFLAGS)
-+LINK.f = $(LIBTOOL) --mode=link @FC@ -o $@ $(FFLAGS) $(FLDFLAGS)
-+LINK.F90 = $(LIBTOOL) --mode=link @F90@ -o $@ $(F90FLAGS) $(F90LDFLAGS)
-
-
- # Manual pages:
-@@ -68,9 +68,9 @@ MAKEWHATIS_CMD = @MAKEWHATIS_CMD@
-
-
- # Misc. Utilities:
--AR = @AR@
--ARFLAGS = @ARFLAGS@
--RANLIB = @RANLIB@
-+AR = $(LIBTOOL) --mode=link @CC@
-+ARFLAGS = -rpath $(prefix)/lib -version-info 3:6
-+RANLIB = echo
- TARFLAGS = -chf
-
-
diff -r aff5acc05c0d -r cb8580abf0e1 devel/netcdf/patches/patch-ac
--- a/devel/netcdf/patches/patch-ac Wed Mar 07 15:56:32 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/02/25 09:52:47 adam Exp $
-
---- rules.make.orig 2004-12-17 20:34:48.000000000 +0000
-+++ rules.make
-@@ -55,8 +55,7 @@
- lib: $(LIBRARY)
-
- $(LIBRARY): $(LIB_OBJS) FORCE
-- $(AR) $(ARFLAGS) $@ $(LIB_OBJS)
-- $(RANLIB) $@
-+ $(AR) $(ARFLAGS) -o $(.TARGET:.a=.la) $(LIB_OBJS:.o=.lo)
-
- #-------------------------------------------------------------------------------
- # Shared Libraries:
-@@ -124,10 +123,10 @@ $(INCDIR)/$(HEADER3): $(INCDIR) $(HEADER
- $(INSTALL) $(HEADER3) $@
-
- $(LIBDIR)/$(LIBRARY): $(LIBDIR) $(LIBRARY) FORCE
-- $(INSTALL) $(LIBRARY) $@
-+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIBRARY) $@
-
- $(BINDIR)/$(PROGRAM): $(BINDIR) $(PROGRAM) FORCE
-- $(INSTALL) $(PROGRAM) $@
-+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROGRAM) $@
-
- $(BINDIR) \
- $(INCDIR) \
diff -r aff5acc05c0d -r cb8580abf0e1 devel/netcdf/patches/patch-ad
--- a/devel/netcdf/patches/patch-ad Wed Mar 07 15:56:32 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2005/02/25 09:52:47 adam Exp $
-
---- Makefile.orig 2004-12-18 16:32:58.000000000 +0000
-+++ Makefile
-@@ -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 \
-+all: fortran/all \
-+ libsrc/all \
- ncdump/all \
- ncgen/all \
-- cxx/all \
-- fortran/all \
-- f90/all
-+ cxx/all
-
- 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
-@@ -167,7 +165,7 @@ subdir_target:
- @echo "Returning to directory `pwd`"
- @echo ""
-
--install: whatis
-+install:
- whatis: $(MANDIR)/$(WHATIS)
- $(MANDIR)/$(WHATIS): $(MANDIR)
- $(MAKEWHATIS_CMD)
diff -r aff5acc05c0d -r cb8580abf0e1 devel/netcdf/patches/patch-ae
--- a/devel/netcdf/patches/patch-ae Wed Mar 07 15:56:32 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2006/11/11 22:46:14 rillig Exp $
-
---- fortran/Makefile.orig 2004-12-18 18:08:01.000000000 +0000
-+++ fortran/Makefile
-@@ -69,14 +69,14 @@ PACKING_LIST = \
- #
-
-
--all: $(LIBRARY) $(MANUAL)
-+all: $(LIB_OBJS) $(MANUAL)
-
- test: ftest FORCE
- ./ftest
-
-
- install: $(INCDIR)/$(HEADER) \
-- $(MANDIR)/man3f/$(MANUAL)
-+ $(MANDIR)/man3/$(MANUAL)
-
- uninstall:
- -rm -f $(INCDIR)/$(HEADER)
diff -r aff5acc05c0d -r cb8580abf0e1 devel/netcdf/patches/patch-af
--- a/devel/netcdf/patches/patch-af Wed Mar 07 15:56:32 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-af,v 1.2 2005/02/25 09:52:47 adam Exp $
-
---- libsrc/Makefile.orig 2004-12-18 18:08:01.000000000 +0000
-+++ libsrc/Makefile
-@@ -7,7 +7,7 @@ include ../macros.make
-
- INCLUDES = -I.
-
--LIBRARY = libnetcdf.a
-+LIBRARY = libnetcdf.la
- ld_netcdf = -L. -lnetcdf
-
- HEADER = netcdf.h
-@@ -54,7 +54,23 @@ PACKING_LIST = \
- t_ncxx.c \
- t_ncx.c install-sh
-
--LIB_OBJS = $(LIB_CSRCS:.c=.o)
-+FLIB_OBJS = \
-+ ../fortran/fort-attio.o \
-+ ../fortran/fort-control.o \
-+ ../fortran/fort-dim.o \
-+ ../fortran/fort-genatt.o \
-+ ../fortran/fort-geninq.o \
-+ ../fortran/fort-genvar.o \
-+ ../fortran/fort-lib.o \
-+ ../fortran/fort-misc.o \
-+ ../fortran/fort-v2compat.o \
-+ ../fortran/fort-vario.o \
Home |
Main Index |
Thread Index |
Old Index