From 6a7a64eac324d656ca87af5e2be2e97f43448a63 Mon Sep 17 00:00:00 2001 From: dholland Date: Tue, 16 Sep 2008 22:47:41 +0000 Subject: Update to 2.12.18. Changes from 2.12.17 (properly part of the previous update) included for reference. Version 2.12.18 [2008 Sep 8 International Literacy Day] Bug Fixes * Improve security of temporary-file handling. * Fix SourceForge bug #1985862 ... SVG output had axis linewidth equal to curve line width. Version 2.12.17 [2008 May 29 Oak Apple Day (England)] New Features * Add GNU readline support so that interactive mode will have history, command editing, etc. Bug Fixes * Fix SourceForge bug #1913577 ... superscripts did not end correctly, if preceeded by an inline `{}' block. * Fix SourceForge bug #1761562 ... y axis name printed upside down, for log axes in which user specified a high values at the bottom end of the axis --- graphics/gri/Makefile | 4 ++-- graphics/gri/distinfo | 12 ++++++------ graphics/gri/patches/patch-ac | 19 +++++++------------ graphics/gri/patches/patch-ag | 27 +++++++++++++++++---------- 4 files changed, 32 insertions(+), 30 deletions(-) (limited to 'graphics/gri') diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile index 3554f57671b..97918d4f409 100644 --- a/graphics/gri/Makefile +++ b/graphics/gri/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.33 2008/09/04 06:43:05 dholland Exp $ +# $NetBSD: Makefile,v 1.34 2008/09/16 22:47:41 dholland Exp $ -DISTNAME= gri-2.12.17 +DISTNAME= gri-2.12.18 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gri/} diff --git a/graphics/gri/distinfo b/graphics/gri/distinfo index 02382922f27..314ef06858d 100644 --- a/graphics/gri/distinfo +++ b/graphics/gri/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.7 2008/09/04 06:43:05 dholland Exp $ +$NetBSD: distinfo,v 1.8 2008/09/16 22:47:41 dholland Exp $ -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 (gri-2.12.18.tar.gz) = 978f7ebcff13bbc830b90a5d58b01acbf0321057 +RMD160 (gri-2.12.18.tar.gz) = fbf66ac8c40010749c40ed96bf5f6b0086cfa0e9 +Size (gri-2.12.18.tar.gz) = 1672471 bytes SHA1 (patch-aa) = 8c328a245d8c56785a0e749ce77bea70232605c8 SHA1 (patch-ab) = 184f8a1e87436e20bfc97e6a3d85c312300e4cd0 -SHA1 (patch-ac) = 6351ec4951b4d00508fa2c3406c7d61ba8d81f70 +SHA1 (patch-ac) = b5bf77c1e0c94b8dd5eaef28890e1b7e7972ece2 SHA1 (patch-ae) = f3f25302a8893b3cbe23f909ffd5c8a2782c5b1f -SHA1 (patch-ag) = 670cd318daadb7419187552a962b33699c212b30 +SHA1 (patch-ag) = 5980890ff8dd23dd259b79a5de2e3148dde383fa diff --git a/graphics/gri/patches/patch-ac b/graphics/gri/patches/patch-ac index b0f7d42d2ee..7a1adc7b48d 100644 --- a/graphics/gri/patches/patch-ac +++ b/graphics/gri/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2008/09/04 06:43:06 dholland Exp $ +$NetBSD: patch-ac,v 1.3 2008/09/16 22:47:41 dholland Exp $ ---- doc/Makefile.in.orig 2008-05-29 07:56:19.000000000 -0400 -+++ doc/Makefile.in 2008-09-04 02:29:22.000000000 -0400 +--- doc/Makefile.in.orig 2008-09-08 12:35:24.000000000 -0400 ++++ doc/Makefile.in 2008-09-16 18:35:52.000000000 -0400 @@ -179,31 +179,13 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -41,7 +41,7 @@ $NetBSD: patch-ac,v 1.2 2008/09/04 06:43:06 dholland Exp $ RM = rm -f # REFCARD = refcard # CMD_REFCARD = cmdrefcard -@@ -821,7 +803,7 @@ html-install: +@@ -822,7 +804,7 @@ html-install: $(INSTALL_DATA) $(srcdir)/examples/*.gri $(EXAMPLES_DIR) $(INSTALL_DATA) $(srcdir)/examples/e*.ps $(EXAMPLES_DIR) $(INSTALL_SCRIPT) $(srcdir)/examples/FEM.pl $(EXAMPLES_DIR) @@ -50,21 +50,16 @@ $NetBSD: patch-ac,v 1.2 2008/09/04 06:43:06 dholland Exp $ # Sun Jun 8 11:40:52 UTC 2003 [Dan Kelley] # This is commented-out because it's not used. Later it will be deleted. -@@ -892,11 +874,12 @@ all-local: refcard.ps cmdrefcard.ps - - install-data-local: - ${MAKE} html-install -+ $(MKDIR_P) $(DOC_DIR) - $(INSTALL) -m 644 $(srcdir)/../license.txt $(DOC_DIR) +@@ -898,7 +880,7 @@ install-data-local: # This is handled by gri.spec [2003-may-31 Dan Kelley] @OS_IS_LINUX_REDHAT_FALSE@ $(INSTALL_DATA) refcard.ps $(DOC_DIR) @OS_IS_LINUX_REDHAT_FALSE@ $(INSTALL_DATA) cmdrefcard.ps $(DOC_DIR) - mkdir -m 755 -p $(MAN_DIR) -+ $(MKDIR_P) $(MAN_DIR) ++ $(MKDIR_P) $(MAN_DIR) cat $(srcdir)/../doc/$(gri_manpage_name) | sed -e s,VERSION,${PACKAGE_VERSION}, > tmp $(INSTALL_DATA) tmp $(MAN_DIR)/gri.1 $(RM) tmp -@@ -904,7 +887,7 @@ install-data-local: +@@ -906,7 +888,7 @@ install-data-local: # they are supposed to go, at least on linux/redhat systems [2003-jun-8 Dan Kelley] $(INSTALL_DATA) $(srcdir)/../doc/gri_merge.1-skel $(MAN_DIR)/gri_merge.1 $(INSTALL_DATA) $(srcdir)/../doc/gri_unpage.1-skel $(MAN_DIR)/gri_unpage.1 diff --git a/graphics/gri/patches/patch-ag b/graphics/gri/patches/patch-ag index 7688dfe0373..c354b312f17 100644 --- a/graphics/gri/patches/patch-ag +++ b/graphics/gri/patches/patch-ag @@ -1,12 +1,12 @@ -$NetBSD: patch-ag,v 1.4 2008/09/04 06:43:06 dholland Exp $ +$NetBSD: patch-ag,v 1.5 2008/09/16 22:47:41 dholland Exp $ ---- configure.orig 2008-09-04 01:47:33.000000000 -0400 -+++ configure 2008-09-04 01:47:35.000000000 -0400 +--- configure.orig 2008-09-08 12:35:26.000000000 -0400 ++++ configure 2008-09-16 18:38:15.000000000 -0400 @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.61 for gri 2.12.17. -+# Generated by GNU Autoconf 2.62 for gri 2.12.17. +-# Generated by GNU Autoconf 2.61 for gri 2.12.18. ++# Generated by GNU Autoconf 2.62 for gri 2.12.18. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -610,7 +610,7 @@ $NetBSD: patch-ag,v 1.4 2008/09/04 06:43:06 dholland Exp $ @@ -1406,10 +1493,10 @@ test -n "$ac_init_help" && exit $ac_stat if $ac_init_version; then cat <<\_ACEOF - gri configure 2.12.17 + gri configure 2.12.18 -generated by GNU Autoconf 2.61 +generated by GNU Autoconf 2.62 @@ -623,7 +623,7 @@ $NetBSD: patch-ag,v 1.4 2008/09/04 06:43:06 dholland Exp $ @@ -1420,7 +1507,7 @@ This file contains any messages produced running configure, to aid debugging if configure makes a mistake. - It was created by gri $as_me 2.12.17, which was + It was created by gri $as_me 2.12.18, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.62. Invocation command line was @@ -4667,7 +4667,7 @@ $NetBSD: patch-ag,v 1.4 2008/09/04 06:43:06 dholland Exp $ @@ -6848,7 +7135,7 @@ exec 6>&1 # values after options handling. ac_log=" - This file was extended by gri $as_me 2.12.17, which was + This file was extended by gri $as_me 2.12.18, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.62. Invocation command line was @@ -4706,7 +4706,7 @@ $NetBSD: patch-ag,v 1.4 2008/09/04 06:43:06 dholland Exp $ -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ - gri config.status 2.12.17 + gri config.status 2.12.18 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.62, @@ -5372,7 +5372,14 @@ $NetBSD: patch-ag,v 1.4 2008/09/04 06:43:06 dholland Exp $ ;; esac -@@ -7556,7 +7795,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/ +@@ -7550,13 +7789,13 @@ echo "$as_me: executing $ac_file command + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. +- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -- cgit v1.2.3