Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/ncview graphics/ncview: update to 2.1.7.
details: https://anonhg.NetBSD.org/pkgsrc/rev/965900eaa2e1
branches: trunk
changeset: 436741:965900eaa2e1
user: brook <brook%pkgsrc.org@localhost>
date: Sat Aug 08 22:18:27 2020 +0000
description:
graphics/ncview: update to 2.1.7.
2.0: 21 Jan 2010
* ncview now REQUIRES netcdf version 4 with full HDF5 support. I am not
going to maintain two code bases, one of which supports netcdf-4 and
one of which doesn't. If you need a vesion of ncview that works even
without a full netcdf v4/HDF-5 install, use ncview version 1.93h.
* If a udunits library is supplied, ncview now requires that it be the
udunits-2 library. Support for the udunits-1 library has been dropped.
* Many thanks to Magnus Hagdorn for changes to the package that make it
more compatible with GNU standards! All failures in that respect are
mine; Magnus' contributions were exemplary.
1.93d: 13 June 2008
* Thanks to Seth Olsen for contributing the code to sort the variables
menus.
diffstat:
graphics/ncview/Makefile | 47 +++++++++++++++---------
graphics/ncview/PLIST | 7 +--
graphics/ncview/distinfo | 15 ++++---
graphics/ncview/patches/patch-aa | 31 ----------------
graphics/ncview/patches/patch-ab | 29 ---------------
graphics/ncview/patches/patch-configure | 50 +++++++++++++++++++++++++++
graphics/ncview/patches/patch-configure.in | 15 ++++++++
graphics/ncview/patches/patch-m4macros_png.m4 | 37 +++++++++++++++++++
8 files changed, 142 insertions(+), 89 deletions(-)
diffs (287 lines):
diff -r 89747883c4d6 -r 965900eaa2e1 graphics/ncview/Makefile
--- a/graphics/ncview/Makefile Sat Aug 08 22:02:47 2020 +0000
+++ b/graphics/ncview/Makefile Sat Aug 08 22:18:27 2020 +0000
@@ -1,33 +1,44 @@
-# $NetBSD: Makefile,v 1.48 2020/05/22 10:56:12 adam Exp $
+# $NetBSD: Makefile,v 1.49 2020/08/08 22:18:27 brook Exp $
-DISTNAME= ncview-1.92d
-PKGREVISION= 23
-CATEGORIES= graphics
-MASTER_SITES= ftp://cirrus.ucsd.edu/pub/ncview/
+DISTNAME= ncview-2.1.7
+CATEGORIES= graphics
+MASTER_SITES= ftp://cirrus.ucsd.edu/pub/ncview/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://meteora.ucsd.edu/~pierce/ncview_home_page.html
COMMENT= Visual browser for netCDF format files
-
-MAKE_JOBS_SAFE= no
+LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
+USE_TOOLS= pkg-config
-CONFIGURE_ARGS+= --with-netcdf_incdir=${BUILDLINK_PREFIX.netcdf}/include
-CONFIGURE_ARGS+= --with-netcdf_libdir=${BUILDLINK_PREFIX.netcdf}/lib
-CONFIGURE_ARGS+= --with-udunits_incdir=${BUILDLINK_PREFIX.udunits}/include
-CONFIGURE_ARGS+= --with-udunits_libdir=${BUILDLINK_PREFIX.udunits}/lib
+CONFIGURE_ARGS+= --with-udunits2_incdir=${BUILDLINK_PREFIX.udunits}/include
+CONFIGURE_ARGS+= --with-udunits2_libdir=${BUILDLINK_PREFIX.udunits}/lib
+
+INSTALLATION_DIRS+= bin lib/X11/app-defaults libdata/ncview ${PKGMANDIR}/man1
+
+NCMAP_FILES+= 3gauss.ncmap
+NCMAP_FILES+= 3saw.ncmap
+NCMAP_FILES+= bw.ncmap
+NCMAP_FILES+= default.ncmap
+NCMAP_FILES+= detail.ncmap
+NCMAP_FILES+= hotres.ncmap
-INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin \
- MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 \
- NCVIEW_LIB_DIR=${DESTDIR}${PREFIX}/libdata/ncview
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/ncview ${DESTDIR}${PREFIX}/bin/ncview
+ ${INSTALL_DATA} ${WRKSRC}/Ncview-appdefaults ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Ncview
+ ${INSTALL_DATA} ${WRKSRC}/data/SciPlot.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/SciPlot.1
+ ${INSTALL_DATA} ${WRKSRC}/data/ncview.1.sed ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ncview.1
+.for f in ${NCMAP_FILES}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/libdata/ncview/${f}
+.endfor
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+= 2.95.3
-.endif
-
+.include "../../devel/hdf5/buildlink3.mk"
.include "../../devel/netcdf/buildlink3.mk"
+.include "../../devel/netcdf-fortran/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
.include "../../math/udunits/buildlink3.mk"
.include "../../mk/xaw.buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 89747883c4d6 -r 965900eaa2e1 graphics/ncview/PLIST
--- a/graphics/ncview/PLIST Sat Aug 08 22:02:47 2020 +0000
+++ b/graphics/ncview/PLIST Sat Aug 08 22:18:27 2020 +0000
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/08/08 22:18:27 brook Exp $
bin/ncview
lib/X11/app-defaults/Ncview
libdata/ncview/3gauss.ncmap
libdata/ncview/3saw.ncmap
+libdata/ncview/bw.ncmap
libdata/ncview/default.ncmap
libdata/ncview/detail.ncmap
libdata/ncview/hotres.ncmap
-libdata/ncview/nc_overlay.earth.lat-lon.p8deg
-libdata/ncview/nc_overlay.lat-lon-grid.10x30
-libdata/ncview/nc_overlay.lat-lon-grid.20x60
+man/man1/SciPlot.1
man/man1/ncview.1
diff -r 89747883c4d6 -r 965900eaa2e1 graphics/ncview/distinfo
--- a/graphics/ncview/distinfo Sat Aug 08 22:02:47 2020 +0000
+++ b/graphics/ncview/distinfo Sat Aug 08 22:18:27 2020 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 21:34:10 agc Exp $
+$NetBSD: distinfo,v 1.7 2020/08/08 22:18:27 brook Exp $
-SHA1 (ncview-1.92d.tar.gz) = 259b7897dfbd4fa4835c9cc5dcbead5796659458
-RMD160 (ncview-1.92d.tar.gz) = 8e5f2e2ac6de9eded47f7d83de9087142588d412
-SHA512 (ncview-1.92d.tar.gz) = 71dc6e805779003119bec4a3858178aeb3dee6d42230ac98835365e394d1582801e2076ff044415b59cee934fe9038c491c4c0aeaa9b8ac2e27887762db7613c
-Size (ncview-1.92d.tar.gz) = 833480 bytes
-SHA1 (patch-aa) = 77ce989232b1a926e7cdfbbbe9e0e22f653bfb23
-SHA1 (patch-ab) = 1294a99091e6d0aca8f3c13d813905bfb23e14c7
+SHA1 (ncview-2.1.7.tar.gz) = fa94e608ba0fe81f5357e5d34dedfc1351847c81
+RMD160 (ncview-2.1.7.tar.gz) = 3862bad211f468d121c02a99e72b34bf81bb9cb7
+SHA512 (ncview-2.1.7.tar.gz) = c39b26e8453f91865e8483abc6ee25d804150dd03ad21469c0e22a60b41f182c108678e22eb86652b66e8ca0997b5f533b2542593f793d673eeeab73b81eaef7
+Size (ncview-2.1.7.tar.gz) = 1280624 bytes
+SHA1 (patch-configure) = 66bcf1b450f8744903ad46a271b0218e19790100
+SHA1 (patch-configure.in) = e3a5695725938f8ece94cc154ced8259f8e2bee8
+SHA1 (patch-m4macros_png.m4) = ddfe55f8a77af60cca5f5908c25ad6ed904581f5
diff -r 89747883c4d6 -r 965900eaa2e1 graphics/ncview/patches/patch-aa
--- a/graphics/ncview/patches/patch-aa Sat Aug 08 22:02:47 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/09 23:41:34 jtb Exp $
-
---- configure.orig Thu Nov 16 18:08:36 2000
-+++ configure
-@@ -1229,7 +1229,7 @@
-
- # It would also be nice to do this for all -L options, not just this one.
- if test -n "$x_libraries"; then
-- X_LIBS="$X_LIBS -L$x_libraries"
-+ X_LIBS="$X_LIBS -R$x_libraries -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
- case "`(uname -sr) 2>/dev/null`" in
-@@ -1764,7 +1764,7 @@
-
- # Check for libraries that X11R6 Xt/Xaw programs need.
- ac_save_LDFLAGS="$LDFLAGS"
-- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -R$x_libraries -L$x_libraries"
- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
- # check for ICE first), but we must link in the order -lSM -lICE or
- # we get undefined symbols. So assume we have SM if we have ICE.
-@@ -2462,7 +2462,7 @@
- if test $do_udunits = true; then
- DO_UDUNITS_LINE="INC_UDUNITS = -DINC_UDUNITS"
- DO_UDUNITS_INCDIR="UDUNITSINCDIR = -I$UDUNITS_INCDIR"
-- DO_UDUNITS_LIBDIR="UDUNITSLIBDIR = -L$UDUNITS_LIBDIR"
-+ DO_UDUNITS_LIBDIR="UDUNITSLIBDIR = -Wl,-R$UDUNITS_LIBDIR -L$UDUNITS_LIBDIR"
- DO_UDUNITS_LIBNAME="UDUNITSLIB = -l$UDUNITS_LIBNAME"
- else
- echo "************************************************************************"
diff -r 89747883c4d6 -r 965900eaa2e1 graphics/ncview/patches/patch-ab
--- a/graphics/ncview/patches/patch-ab Sat Aug 08 22:02:47 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2010/02/03 22:37:56 joerg Exp $
-
---- Makefile.in.orig 2002-06-03 21:03:52.000000000 +0000
-+++ Makefile.in
-@@ -8,7 +8,7 @@
- ################################################################
- NETCDFINCDIR = -I@NETCDF_INCDIR@
- NETCDFLIB = -l@NETCDF_LIBNAME@
--NETCDFLIBDIR = -L@NETCDF_LIBDIR@
-+NETCDFLIBDIR = -Wl,-R@NETCDF_LIBDIR@ -L@NETCDF_LIBDIR@
-
- ################################################################
- ## If you DON'T want the udunits support, which will format
-@@ -43,7 +43,7 @@ MANDIR = @prefix@/man/man1
- ## files will be kept and installed. Comment this line out if
- ## no such directory will be specified.
- #####################################################################
--NCVIEW_LIB_DIR = @prefix@/lib/ncview
-+NCVIEW_LIB_DIR = @prefix@/libdata/ncview
-
- ######################################################################
- ## If needed, *add* here the names of any additional include or library
-@@ -144,5 +144,5 @@ install:: ncview ncview.1 $(COLORMAPS) N
- @echo "Installing manual in directory $(MANDIR)"
- @echo "--------------------------------------------------------"
- if test ! -d $(MANDIR); then mkdir -p $(MANDIR); fi; $(INSTALL) $(INSTMANFLAGS) ncview.1 $(MANDIR)/ncview.1
-- /bin/sh ./install-appdef "$(INSTALL) $(INSTMANFLAGS)"
-+ if test ! -d ${DESTDIR}@prefix@/lib/X11/app-defaults; then mkdir -p ${DESTDIR}@prefix@/lib/X11/app-defaults; fi; $(INSTALL) $(INSTDATFLAGS) Ncview ${DESTDIR}@prefix@/lib/X11/app-defaults
-
diff -r 89747883c4d6 -r 965900eaa2e1 graphics/ncview/patches/patch-configure
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ncview/patches/patch-configure Sat Aug 08 22:18:27 2020 +0000
@@ -0,0 +1,50 @@
+$NetBSD: patch-configure,v 1.1 2020/08/08 22:18:27 brook Exp $
+
+Using == with test is not portable; replace with =.
+
+Use pkg-config to define compiler flags for libpng.
+
+--- configure.orig 2020-08-07 23:28:40.807171000 +0000
++++ configure
+@@ -4218,7 +4218,7 @@ else
+ $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
+ fi
+
+-if test "x$no_x" == "xyes"; then
++if test "x$no_x" = "xyes"; then
+ echo "------------------------------------------------------------------------------------"
+ echo "Error, the X libraries and development headers must be installed for ncview to work!"
+ echo "------------------------------------------------------------------------------------"
+@@ -5496,6 +5496,10 @@ fi
+
+
+ fi
++if test x$PNG_INCDIR = x; then
++ PNG_INC_PRESENT=yes
++ PNG_CPPFLAGS=`pkg-config --cflags-only-I libpng`
++else
+ PNG_INC_PRESENT=no
+ if test x$PNG_INCDIR != x; then
+ PNG_INC_PRESENT=yes
+@@ -5504,6 +5508,7 @@ else
+ echo "** Could not find the png.h file, so -frames support will not be included **"
+ echo "** Install the PNG library (and development headers) to fix this **"
+ fi
++fi
+ PNG_LIBNAME=libpng.so
+
+ # Check whether --with-png_libdir was given.
+@@ -5708,6 +5713,13 @@ if test $PNG_INC_PRESENT = yes; then
+
+ $as_echo "#define HAVE_PNG 1" >>confdefs.h
+
++ else
++ PNG_PRESENT=yes
++ PNG_LIBS=`pkg-config --libs-only-l libpng`
++ PNG_LDFLAGS=`pkg-config --libs libpng`
++
++$as_echo "#define HAVE_PNG 1" >>confdefs.h
++
+ fi
+ fi
+
diff -r 89747883c4d6 -r 965900eaa2e1 graphics/ncview/patches/patch-configure.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ncview/patches/patch-configure.in Sat Aug 08 22:18:27 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.in,v 1.1 2020/08/08 22:18:27 brook Exp $
+
+Using == with test is not portable; replace with =.
+
+--- configure.in.orig 2020-08-07 15:08:28.220236050 +0000
++++ configure.in
+@@ -39,7 +39,7 @@ AC_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE([ncview],[ncview_version])
+
+ AC_PATH_X
+-if test "x$no_x" == "xyes"; then
++if test "x$no_x" = "xyes"; then
+ echo "------------------------------------------------------------------------------------"
+ echo "Error, the X libraries and development headers must be installed for ncview to work!"
+ echo "------------------------------------------------------------------------------------"
diff -r 89747883c4d6 -r 965900eaa2e1 graphics/ncview/patches/patch-m4macros_png.m4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ncview/patches/patch-m4macros_png.m4 Sat Aug 08 22:18:27 2020 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-m4macros_png.m4,v 1.1 2020/08/08 22:18:27 brook Exp $
+
+Use pkg-config to define compiler flags for libpng.
+
+--- m4macros/png.m4.orig 2016-03-20 17:45:53.000000000 +0000
++++ m4macros/png.m4
+@@ -56,6 +56,10 @@ if test x$PNG_INCDIR = x; then
+ AC_CHECK_HEADER( /sw/include/png.h, PNG_INCDIR=/sw/include )
+ fi
+ dnl
++if test x$PNG_INCDIR = x; then
++ PNG_INC_PRESENT=yes
++ PNG_CPPFLAGS=`pkg-config --cflags-only-I libpng`
++else
+ PNG_INC_PRESENT=no
+ if test x$PNG_INCDIR != x; then
+ PNG_INC_PRESENT=yes
+@@ -64,6 +68,7 @@ else
+ echo "** Could not find the png.h file, so -frames support will not be included **"
+ echo "** Install the PNG library (and development headers) to fix this **"
+ fi
++fi
+ dnl =================================================================================
+ dnl check for png lib directory
+ dnl
+@@ -107,6 +112,11 @@ if test $PNG_INC_PRESENT = yes; then
+ PNG_LIBS=-l$PNG_LIBNAME
+ PNG_LDFLAGS="-L$PNG_LIBDIR $PNG_LIBS"
+ AC_DEFINE([HAVE_PNG],1,[Define if you have PNG library])
++ else
++ PNG_PRESENT=yes
++ PNG_LIBS=`pkg-config --libs-only-l libpng`
++ PNG_LDFLAGS=`pkg-config --libs libpng`
++ AC_DEFINE([HAVE_PNG],1,[Define if you have PNG library])
+ fi
+ fi
+ dnl
Home |
Main Index |
Thread Index |
Old Index