CVS commit: pkgsrc/graphics/ncview

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/ncview
From: "Brook Milligan" <brook%netbsd.org@localhost>
Date: Sat, 8 Aug 2020 22:18:27 +0000

Module Name:    pkgsrc
Committed By:   brook
Date:           Sat Aug  8 22:18:27 UTC 2020

Modified Files:
        pkgsrc/graphics/ncview: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/ncview/patches: patch-configure patch-configure.in
            patch-m4macros_png.m4
Removed Files:
        pkgsrc/graphics/ncview/patches: patch-aa patch-ab

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/graphics/ncview/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/ncview/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/ncview/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/graphics/ncview/patches/patch-aa
cvs rdiff -u -r1.3 -r0 pkgsrc/graphics/ncview/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/ncview/patches/patch-configure \
    pkgsrc/graphics/ncview/patches/patch-configure.in \
    pkgsrc/graphics/ncview/patches/patch-m4macros_png.m4

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

Modified files:

Index: pkgsrc/graphics/ncview/Makefile
diff -u pkgsrc/graphics/ncview/Makefile:1.48 pkgsrc/graphics/ncview/Makefile:1.49
--- pkgsrc/graphics/ncview/Makefile:1.48        Fri May 22 10:56:12 2020
+++ pkgsrc/graphics/ncview/Makefile     Sat Aug  8 22:18:27 2020
@@ -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-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
 
-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
-
-INSTALL_MAKE_FLAGS+=   BINDIR=${DESTDIR}${PREFIX}/bin \
-                       MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 \
-                       NCVIEW_LIB_DIR=${DESTDIR}${PREFIX}/libdata/ncview
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=             2.95.3
-.endif
+NCMAP_FILES+=          3gauss.ncmap
+NCMAP_FILES+=          3saw.ncmap
+NCMAP_FILES+=          bw.ncmap
+NCMAP_FILES+=          default.ncmap
+NCMAP_FILES+=          detail.ncmap
+NCMAP_FILES+=          hotres.ncmap
+
+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
 
+.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"

Index: pkgsrc/graphics/ncview/PLIST
diff -u pkgsrc/graphics/ncview/PLIST:1.2 pkgsrc/graphics/ncview/PLIST:1.3
--- pkgsrc/graphics/ncview/PLIST:1.2    Sun Jun 14 17:59:23 2009
+++ pkgsrc/graphics/ncview/PLIST        Sat Aug  8 22:18:27 2020
@@ -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

Index: pkgsrc/graphics/ncview/distinfo
diff -u pkgsrc/graphics/ncview/distinfo:1.6 pkgsrc/graphics/ncview/distinfo:1.7
--- pkgsrc/graphics/ncview/distinfo:1.6 Tue Nov  3 21:34:10 2015
+++ pkgsrc/graphics/ncview/distinfo     Sat Aug  8 22:18:27 2020
@@ -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

Added files:

Index: pkgsrc/graphics/ncview/patches/patch-configure
diff -u /dev/null pkgsrc/graphics/ncview/patches/patch-configure:1.1
--- /dev/null   Sat Aug  8 22:18:27 2020
+++ pkgsrc/graphics/ncview/patches/patch-configure      Sat Aug  8 22:18:27 2020
@@ -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
+ 
Index: pkgsrc/graphics/ncview/patches/patch-configure.in
diff -u /dev/null pkgsrc/graphics/ncview/patches/patch-configure.in:1.1
--- /dev/null   Sat Aug  8 22:18:27 2020
+++ pkgsrc/graphics/ncview/patches/patch-configure.in   Sat Aug  8 22:18:27 2020
@@ -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 "------------------------------------------------------------------------------------"
Index: pkgsrc/graphics/ncview/patches/patch-m4macros_png.m4
diff -u /dev/null pkgsrc/graphics/ncview/patches/patch-m4macros_png.m4:1.1
--- /dev/null   Sat Aug  8 22:18:27 2020
+++ pkgsrc/graphics/ncview/patches/patch-m4macros_png.m4        Sat Aug  8 22:18:27 2020
@@ -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

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

Home | Main Index | Thread Index | Old Index