[pkgsrc/trunk]: pkgsrc/graphics/gri Update to 2.12.17. Fixes broken amd64 bui...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/gri Update to 2.12.17. Fixes broken amd64 bui...
From: dholland <dholland%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:32:10 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/29d0fe2635fc
branches:  trunk
changeset: 546527:29d0fe2635fc
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Thu Sep 04 06:43:05 2008 +0000

description:
Update to 2.12.17. Fixes broken amd64 build, among other things.
pkgsrc changes: now uses readline and popt; added destdir support.

Upstream changes (not including for 2.12.17, which doesn't appear to
be posted):

Version 2.12.16 [2007 Jul 20  anniversary of the first moon landing, in 1969]
Bug Fixes

    * Fix Debian bug #130802 ... postscript problem in landscape mode,
      refreshed in gv viewer

    * Fix Debian bug #434010 ... `set page landscape' requires `set
      page size' first, but it should really default to something
      reasonable instead.

Version 2.12.15 [2007 Apr 16 Mawlid, celebration of birthday of Muhammad]
Bug Fixes

    * Fix SourceForge bug #1700978 ... html concept index mostly broken

    * Fix SourceForge bug #1698924 ... box plots show missing data

    * Fix Debian bug #417217 ... will not compile in GCC 4.3

    * Fix SourceForge bug #1698116 ... poorly-positioned name of RHS y-axis

Version 2.12.14 [2007 Jan 08: Coming-of-Age Day (Japan)]
Bug Fixes

    * Fix SourceForge bug #1630768 ... Fix to segfault in clipped
      images (a bug that may have developed after version 2.13.3)

Version 2.12.13 [2006 Nov 06: Constitution Day (Tajikistan)]
Bug Fixes

    * Fix SourceForge bug #1591475 ... Fix to compile in Solaris CC

    * Fix SourceForge bug #1591062 ... Fix to compile in OpenBSD

Version 2.12.12 [2006 July 16: Yellow Pigs Day]
Bug Fixes

    * Fix SourceForge bug #1523033 ... Malloc error (freeing something
      already freed?)

    * Fix SourceForge bug #1523032 ... `create columns from function'
      bug, if there is an existing directory called `tmp'.

    * Fix SourceForge bug #1491105 ... `set x axis labels' had no
      affect for log axes (same for y)

Version 2.12.11 [2006 Mar 30: Hindu New Year]
Bug Fixes

    * Fix SourceForge bug #1449546 ... x axis limits not correctly
      inferred from `set x grid' (same for y).

Version 2.12.10 [2006 Jan 26: Australia Day]
Bug Fixes

    * Fix SourceForge bug #1408259 ... PostScript file contained
      private information. This was fixed by adding new commandline
      arguments `-private' and `-no_private', the former of which (the
      new default) means to not include the user's name, the
      invocation arguments, or the command-file contents (see Invoking
      Gri).

    * Fix SourceForge bug #1285180 ... NaN was mishandled. (The bug
      may have arisen in version 2.12.7 or thereabouts.)

    * Port to the FreeBSD operating system, with help from Christopher
      Illies and Roman Neuhauser.

    * Fix SourceForge bug #1217273 ... missing some version numbers
      within docs

    * Fix SourceForge bug #1196613 ... user-supplied x-axis labels can
      run offscale (fix for y-axis later...)

    * Fix SourceForge bug #1198341 ... x-axis labels incorrectly
      rotated (sometimes)

    * Fix SourceForge bug #1199280 ... warning about `malloc' for RPN
      assignments

    * Fix SourceForge bug #1196115 ... `gri_unpage' and `gri_merge'
      mis-installed

    * Fix SourceForge bug #1153209 ... Emacs mode incompatible with
      new version of `gv' PostScript viewer

      Fix SourceForge bug #1101172 ... `gri -help' incorrectly stated
      meaning of last argument(s)

    * Fix SourceForge bug #835711 ... `draw gri logo' fails.

    * Fix SourceForge bug #1098269 ... problem compiling on AMD64
      machine. (Solution provided by Andreas Jochens, a Debian user.)

    * Fix SourceForge bug #867515 ... problem with junk appearing in images.

    * Fix SourceForge bug #875881 ... problem compiling with gcc
      2.95.3 compiler.

Version 2.12.9 [2005 Jan 6: Feast of Epiphany]
Bug Fixes

    * Fix SourceForge bug #1094087 ... `set path to' incorrectly
      parsed colon-separated paths

    * Fix SourceForge bug #1085788 ... `image *=', `image /=', `image
      ^=', and `image _=' all gave incorrect results

    * Fix SourceForge bug #1084123 ... does not compile in fink

    * Fix SourceForge bug #676767 ... on fink systems, `help' does not work

Version 2.12.8 [2004]
Bug Fixes

    * Fix SourceForge bug #1019141 ... `draw arc' ignores the present
      pen color

    * Fix SourceForge bug #997741 ... PostScript broken on images with
      y-axis decreasing, and enclosed by PostScript clipping

    * Fix SourceForge bug #978822 ... documentation wrong on `set path to'

    * Fix SourceForge bug #932203 ... misplaced labels caused by `set
      x axis labels'

    * Fix SourceForge bug #928277 ... `draw polygon' should take `cm'
      and `pt' units

    * Fix SourceForge bug #930259 ... fix `draw arc''s drawing of an
      extra line (thanks for the fix, Wolfgang Voegeli)

    * Fix SourceForge bug #923719 ... `draw curve overlying' ignored
      the effect of `set dash'

    * Fix SourceForge bug #914125 ... offpage points in axes were
      reported as having been drawn by `draw curve'.

    * Fix SourceForge bug #877613 ... `help' (and other commands using
      temporary files) does not work in OSX/Fink version.

    * Fix SourceForge bug #874483 ... `state save' doesn't keep track
      of `dash' settings.

    * Fix SourceForge bug #873245 ... inaccurate times are given in
      the warnings about slow operations on OSX platform (days are
      reported instead of seconds)

    * Fix SourceForge bug #871477 ... the `missing value' feature
      should not be the default. The solution involved adding a new
      command `set missing value none', which is now the default.

Version 2.12.7 [2003 Sep 4]
Bug Fixes

    * Fix SourceForge bug #800022 AKA Debian bug #208589, ... did not
      build on some Debian platforms because it was based on an old
      version of `automake'.

Version 2.12.6 [2003 Sep 1: Labour Day]
New Features

    * Add `age' RPN function, for testing file ages (see age-rpn-operator).

Bug Fixes

    * Fix SourceForge bug #773850 ... bounding-box is increased by
      `draw symbol' even if (rectangular) postscript clipping is
      active.

    * Fix SourceForge bug #760130 ... Solaris cannot compile with
      `C-l' in Makefile.

    * Fix SourceForge bug #743134 ... bounding box not limited by `set
      clip postscript'

    * Fix SourceForge bug #750561 ... during compilation, `make'
      rebuilds HTML docs even if up-to-date

diffstat:

 graphics/gri/Makefile         |    16 +-
 graphics/gri/PLIST            |    45 +-
 graphics/gri/distinfo         |    20 +-
 graphics/gri/patches/patch-aa |    81 +-
 graphics/gri/patches/patch-ab |   125 +-
 graphics/gri/patches/patch-ac |   267 +-
 graphics/gri/patches/patch-ad |    17 -
 graphics/gri/patches/patch-ae |    10 +-
 graphics/gri/patches/patch-af |    13 -
 graphics/gri/patches/patch-ag |  5486 ++++++++++++++++++++++++++++++++++++++++-
 10 files changed, 5575 insertions(+), 505 deletions(-)

diffs (truncated from 6255 to 300 lines):

diff -r fed2c0207ab1 -r 29d0fe2635fc graphics/gri/Makefile
--- a/graphics/gri/Makefile     Wed Sep 03 21:46:08 2008 +0000
+++ b/graphics/gri/Makefile     Thu Sep 04 06:43:05 2008 +0000
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.32 2007/02/15 14:58:21 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2008/09/04 06:43:05 dholland Exp $
 
-DISTNAME=              gri-2.12.5
-PKGREVISION=   3
+DISTNAME=              gri-2.12.17
 CATEGORIES=            graphics
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=gri/}
-EXTRACT_SUFX=          .tgz
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://gri.sourceforge.net/
 COMMENT=               Language for scientific graphics applications
 
-BUILD_DEPENDS+=                ImageMagick-[0-9]*:../../graphics/ImageMagick
+PKG_DESTDIR_SUPPORT=   user-destdir
 
-BROKEN_IN=             pkgsrc-2006Q4
+BUILD_DEPENDS+=                ImageMagick-[0-9]*:../../graphics/ImageMagick
 
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake gs:run makeinfo perl
-REPLACE_PERL+=         gri_merge gri_unpage
+REPLACE_PERL+=         src/gri_merge src/gri_unpage
 INFO_FILES=            # PLIST
-INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} INFO_DIR=${PREFIX:Q}/${PKGINFODIR:Q}
+INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} PKGINFODIR=${PKGINFODIR:Q}
 
 .include "../../devel/netcdf/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fed2c0207ab1 -r 29d0fe2635fc graphics/gri/PLIST
--- a/graphics/gri/PLIST        Wed Sep 03 21:46:08 2008 +0000
+++ b/graphics/gri/PLIST        Thu Sep 04 06:43:05 2008 +0000
@@ -1,9 +1,17 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/04 14:45:45 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/09/04 06:43:05 dholland Exp $
 bin/gri
-bin/${PKGNAME}
 bin/gri_merge
 bin/gri_unpage
 info/gri.info
+info/gri.info-1
+info/gri.info-2
+info/gri.info-3
+man/man1/gri.1
+man/man1/gri_merge.1
+man/man1/gri_unpage.1
+share/doc/gri/cmdrefcard.ps
+share/doc/gri/license.txt
+share/doc/gri/refcard.ps
 share/doc/html/gri/AboutGriMode.html
 share/doc/html/gri/Acknowledgments.html
 share/doc/html/gri/AdjustingCharacterPosition.html
@@ -217,9 +225,6 @@
 share/doc/html/gri/example6-tiny.png
 share/doc/html/gri/example6.html
 share/doc/html/gri/example6.png
-share/doc/html/gri/example6color-tiny.png
-share/doc/html/gri/example6color.html
-share/doc/html/gri/example6color.png
 share/doc/html/gri/example6histogram-tiny.png
 share/doc/html/gri/example6histogram.html
 share/doc/html/gri/example6histogram.png
@@ -232,6 +237,23 @@
 share/doc/html/gri/example9-tiny.png
 share/doc/html/gri/example9.html
 share/doc/html/gri/example9.png
+share/doc/html/gri/FEM.gri
+share/doc/html/gri/example1.gri
+share/doc/html/gri/example10.gri
+share/doc/html/gri/example10color.gri
+share/doc/html/gri/example11.gri
+share/doc/html/gri/example12.gri
+share/doc/html/gri/example13.gri
+share/doc/html/gri/example2.gri
+share/doc/html/gri/example3.gri
+share/doc/html/gri/example4.gri
+share/doc/html/gri/example5.gri
+share/doc/html/gri/example6.gri
+share/doc/html/gri/example6histogram.gri
+share/doc/html/gri/example7.gri
+share/doc/html/gri/example8.gri
+share/doc/html/gri/example9.gri
+share/doc/html/gri/logo.gri
 share/doc/html/gri/examples
 share/doc/html/gri/index.html
 share/doc/html/gri/linux-install.html
@@ -263,7 +285,6 @@
 share/emacs/site-lisp/gri-mode.el
 share/examples/gri/FEM.gri
 share/examples/gri/FEM.pl
-share/examples/gri/FEM.ps
 share/examples/gri/example1.dat
 share/examples/gri/example1.gri
 share/examples/gri/example1.ps
@@ -292,8 +313,6 @@
 share/examples/gri/example5.ps
 share/examples/gri/example6.gri
 share/examples/gri/example6.ps
-share/examples/gri/example6color.gri
-share/examples/gri/example6color.ps
 share/examples/gri/example6histogram.gri
 share/examples/gri/example6histogram.ps
 share/examples/gri/example6image.dat
@@ -316,16 +335,14 @@
 share/examples/gri/example9a.dat
 share/examples/gri/example9b.dat
 share/examples/gri/logo.gri
-share/examples/gri/logo.ps
 share/examples/gri/model.elements
 share/examples/gri/model.nodes
-share/gri/${PKGVERSION}/gri.cmd
-share/gri/${PKGVERSION}/license.txt
-share/gri/${PKGVERSION}/logo.dat
-share/gri/${PKGVERSION}/startup.msg
-@dirrm share/gri/2.12.5
+share/gri/gri.cmd
+share/gri/logo.dat
+share/gri/startup.msg
 @dirrm share/gri
 @dirrm share/examples/gri
+@dirrm share/doc/gri
 @dirrm share/doc/html/gri/tst_suite
 @dirrm share/doc/html/gri/screenshots
 @dirrm share/doc/html/gri/resources
diff -r fed2c0207ab1 -r 29d0fe2635fc graphics/gri/distinfo
--- a/graphics/gri/distinfo     Wed Sep 03 21:46:08 2008 +0000
+++ b/graphics/gri/distinfo     Thu Sep 04 06:43:05 2008 +0000
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.6 2006/01/31 19:54:43 wiz Exp $
+$NetBSD: distinfo,v 1.7 2008/09/04 06:43:05 dholland Exp $
 
-SHA1 (gri-2.12.5.tgz) = edd4f4a98eb391a30f084699c4e47ff173e5766b
-RMD160 (gri-2.12.5.tgz) = dc4d2bb530ba6f4c758e01e0fed6cb06ab32e1b6
-Size (gri-2.12.5.tgz) = 1250379 bytes
-SHA1 (patch-aa) = b86bce9c8fd91aac20cabaebec4960f7d9cbfc4c
-SHA1 (patch-ab) = 5302c06072690224b05c3a80162cb7b81e4a43bf
-SHA1 (patch-ac) = b5be8b3b2d9c2ff2ea04fe84cbb2b0d8eea1e164
-SHA1 (patch-ad) = ebcc1fdbc4fe52cdcb0f5788acaa637174be4550
-SHA1 (patch-ae) = e0fe02ac90f48b159f397a63ab0d3a27181e99ab
-SHA1 (patch-af) = 7269f38bf3388e0a18bab7f9bc44fd225d51a485
-SHA1 (patch-ag) = 0ecfb6c83468c6aaa94525e57fcf93157053d114
+SHA1 (gri-2.12.17.tar.gz) = b7d277f05dd789505e7679612f2d9a87b74a8054
+RMD160 (gri-2.12.17.tar.gz) = 772f77d78948219db7b2c604a03f488681abc427
+Size (gri-2.12.17.tar.gz) = 1670243 bytes
+SHA1 (patch-aa) = 8c328a245d8c56785a0e749ce77bea70232605c8
+SHA1 (patch-ab) = 184f8a1e87436e20bfc97e6a3d85c312300e4cd0
+SHA1 (patch-ac) = 6351ec4951b4d00508fa2c3406c7d61ba8d81f70
+SHA1 (patch-ae) = f3f25302a8893b3cbe23f909ffd5c8a2782c5b1f
+SHA1 (patch-ag) = 670cd318daadb7419187552a962b33699c212b30
diff -r fed2c0207ab1 -r 29d0fe2635fc graphics/gri/patches/patch-aa
--- a/graphics/gri/patches/patch-aa     Wed Sep 03 21:46:08 2008 +0000
+++ b/graphics/gri/patches/patch-aa     Thu Sep 04 06:43:05 2008 +0000
@@ -1,62 +1,33 @@
-$NetBSD: patch-aa,v 1.2 2003/07/10 08:27:39 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2008/09/04 06:43:06 dholland Exp $
 
---- configure.in.orig
-+++ configure.in
-@@ -274,56 +274,14 @@
- dnl   in one of several places, so check
- dnl   several locations, reporting location
- dnl   if found.
--AC_MSG_CHECKING(for netcdf library)
+--- configure.ac~      2008-03-16 10:18:52.000000000 -0400
++++ configure.ac       2008-09-04 01:45:01.000000000 -0400
+@@ -302,28 +302,13 @@ GRI_DETERMINE_ENDIAN
+ 
+ AC_CHECK_HEADERS(unistd.h)
+ 
+-
+-dnl Check for netcdf library.  It might be in one of several places,
+-dnl so check several locations, reporting the location if found.
 -define(CHECK_FOR_NETCDF, [
--    if test -d /opt/netcdf/include ; then
--      #
--      # Solaris often has it here
--      CXXFLAGS="$CXXFLAGS -I/opt/netcdf/include"
--        LIBS="$LIBS -L/opt/netcdf/lib -lnetcdf"
--      if test $gri_cv_is_sun = yes ; then
+-  AC_MSG_CHECKING(for netcdf library)
+-  for d in /opt/netcdf /usr/local /usr; do
+-      if test -f $d/include/netcdf.h; then
+-       AM_CXXFLAGS="$AM_CXXFLAGS -I$d/include"
+-       EXTRA_CFLAGS_TEMPLATE="$EXTRA_CFLAGS_TEMPLATE -I$d/include"
+-       DEFS="$DEFS -I$d/include"
+-       LIBS="$LIBS -L$d/lib -lnetcdf"
+-       if test $gri_cv_is_sun = yes ; then
 -          LIBS="$LIBS -lnsl"
--      fi
--      AC_DEFINE(HAVE_LIBNETCDF)
--        echo "yes (in /opt/netcdf/include/netcdf.h and /opt/netcdf/lib/libnetcdf.a)"
--    else
--      if test -f /usr/local/include/netcdf.h ; then
--          CXXFLAGS="$CPPFLAGS -I/usr/local/include"
--          LIBS="$LIBS -L/usr/local/lib -lnetcdf"
--            if test $gri_cv_is_sun = yes ; then
--              LIBS="$LIBS -lnsl"
--          fi
--          AC_DEFINE(HAVE_LIBNETCDF)
--            echo "yes (in /usr/local/include/netcdf.h and /usr/local/lib/libnetcdf.a)"
--      else
--          #
--          # Linux/debian often has it here.
--          if test -f /usr/include/netcdf.h ; then
--                CXXFLAGS="$CPPFLAGS -I/usr/include/netcdf"
--                LIBS="$LIBS -L/usr/lib/netcdf -lnetcdf"
--                if test $gri_cv_is_sun = yes ; then
--                    LIBS="$LIBS -lnsl"
--                fi
--                AC_DEFINE(HAVE_LIBNETCDF)
--                echo "yes (in /usr/include/netcdf.h and /usr/lib/libnetcdf.a)"
--            else
--              if test -f /boot/home/lib/netcdf ; then
--                  CXXFLAGS="$CPPFLAGS -I/boot/home/include/netcdf"
--                  LIBS="$LIBS -L/boot/home/lib/netcdf -lnetcdf"
--                    if test $gri_cv_is_sun = yes ; then
--                      LIBS="$LIBS -lnsl"
--                  fi
--                    echo "yes (in /boot/home/netcdf)"
--                  AC_DEFINE(HAVE_LIBNETCDF)
--              else
--                  echo "no"
--              fi
--            fi
--        fi
--    fi
+-       fi
+-       AC_DEFINE(HAVE_LIBNETCDF)
+-       AC_MSG_RESULT(yes, in $d/include/netcdf.h and $d/lib/libnetcdf.a)
+-      fi
+-  done
+-  AC_MSG_RESULT(done)
 -])dnl
 -dnl
 -CHECK_FOR_NETCDF
-+
 +AC_CHECK_LIB(netcdf, nc_open, HAVE_LIBNETCDF="YES", HAVE_LIBNETCDF="")
 +[
 +if test -n "$HAVE_LIBNETCDF" ; then
@@ -65,5 +36,5 @@
 +fi
 +]
  
- dnl gri3 AC_CHECK_LIB(m,sin)
- dnl gri3 AC_CHECK_LIB(popt,poptGetNextOpt,[
+ dnl use this??
+ dnl AC_SUBST(EXTRA_CXXFLAGS)
diff -r fed2c0207ab1 -r 29d0fe2635fc graphics/gri/patches/patch-ab
--- a/graphics/gri/patches/patch-ab     Wed Sep 03 21:46:08 2008 +0000
+++ b/graphics/gri/patches/patch-ab     Thu Sep 04 06:43:05 2008 +0000
@@ -1,103 +1,28 @@
-$NetBSD: patch-ab,v 1.2 2003/07/10 08:27:39 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2008/09/04 06:43:06 dholland Exp $
 
---- Makefile.in.orig
-+++ Makefile.in
-@@ -6,6 +6,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- LIBS = @LIBS@
- EXTRA_OBJS = @EXTRA_OBJS@
- EXTRA_LIBS = @EXTRA_LIBS@
-@@ -19,12 +20,15 @@
- DEFS = -DVERSION=\"$(VERSION)\" -DDEFAULT_GRI_DIR=\"$(libdir)\" $(HAVE_LINUX) @DEFS@
- CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@
--CXXFLAGS = -g @CXXFLAGS@
-+CXXFLAGS = @CXXFLAGS@
- EXTRA_CFLAGS = @EXTRA_CFLAGS@ $(LINUX_EXTRA_CFLAGS)
- EXTRA_CFLAGS_TEMPLATE = @EXTRA_CFLAGS_TEMPLATE@ $(LINUX_EXTRA_CFLAGS)
-+LDFLAGS = @LDFLAGS@
-+
- prefix = @prefix@
- bindir = $(prefix)/bin
- libdir = $(prefix)/share/gri/$(VERSION)
-+elispdir = $(prefix)/share/emacs/site-lisp
- #### End of system configuration section. ####
+--- src/Makefile.in~   2008-05-29 07:56:19.000000000 -0400
++++ src/Makefile.in    2008-09-04 01:39:29.000000000 -0400
+@@ -785,18 +785,18 @@ startup.msg-tmp: $(the_startup_file)
+ all-local: gri.cmd startup.msg-tmp
  
- OBJS = G_string.o GriColor.o GriPath.o GriState.o assert.o chopword.o \
-@@ -39,7 +43,7 @@
- while.o write.o
- 
- gri: $(OBJS) $(EXTRA_OBJS)
--      $(CXX) -o gri $(OBJS) $(EXTRA_OBJS) $(LIBS) $(EXTRA_LIBS)
-+      $(CXX) -o gri $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS)
-
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/postfix Updated mail/postfix to 2.5.5
Next by Date: [pkgsrc/trunk]: pkgsrc/www/loggerhead Import loggerhead-1.6.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/postfix Updated mail/postfix to 2.5.5
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/loggerhead Import loggerhead-1.6.
Indexes:
Home | Main Index | Thread Index | Old Index