From d2b54dcf1193bd159c32adfbe488b3d72da36fe4 Mon Sep 17 00:00:00 2001
From: seb <seb>
Date: Sat, 2 Aug 2003 13:20:15 +0000
Subject: Convert to USE_NEW_TEXINFO.

---
 math/gsl/Makefile         |  5 +++--
 math/gsl/PLIST            |  4 +---
 math/gsl/distinfo         |  4 ++--
 math/gsl/patches/patch-aa | 27 ++++++++++++++++++++++++---
 4 files changed, 30 insertions(+), 10 deletions(-)

(limited to 'math')

diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index e060ff5cb15..0dfbbe4eb91 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/02 22:28:05 jtb Exp $
+# $NetBSD: Makefile,v 1.12 2003/08/02 13:20:15 seb Exp $
 
 DISTNAME=		gsl-1.3
 CATEGORIES=		math devel
@@ -11,8 +11,9 @@ COMMENT=		The GNU Scientific Library
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+USE_NEW_TEXINFO=	yes
+INFO_FILES=		gsl-ref.info
 
 TEST_TARGET=		check
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gsl/PLIST b/math/gsl/PLIST
index 1855e6403a8..793318c62dc 100644
--- a/math/gsl/PLIST
+++ b/math/gsl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/02/17 01:01:38 jtb Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/08/02 13:20:16 seb Exp $
 bin/gsl-config
 bin/gsl-histogram
 bin/gsl-randist
@@ -209,7 +209,6 @@ include/gsl/gsl_vector_uint.h
 include/gsl/gsl_vector_ulong.h
 include/gsl/gsl_vector_ushort.h
 include/gsl/gsl_version.h
-@unexec /usr/bin/install-info --delete --info-dir=%D/info %D/info/gsl-ref.info
 info/gsl-ref.info
 info/gsl-ref.info-1
 info/gsl-ref.info-10
@@ -234,7 +233,6 @@ info/gsl-ref.info-6
 info/gsl-ref.info-7
 info/gsl-ref.info-8
 info/gsl-ref.info-9
-@exec /usr/bin/install-info --info-dir=%D/info %D/info/gsl-ref.info
 lib/libgsl.a
 lib/libgsl.la
 lib/libgsl.so
diff --git a/math/gsl/distinfo b/math/gsl/distinfo
index 8363acfc108..12438f3bd2d 100644
--- a/math/gsl/distinfo
+++ b/math/gsl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2003/02/17 01:01:38 jtb Exp $
+$NetBSD: distinfo,v 1.9 2003/08/02 13:20:16 seb Exp $
 
 SHA1 (gsl-1.3.tar.gz) = ecde676adb997adbd507a7a7974bb7f6f69f9d87
 Size (gsl-1.3.tar.gz) = 2052026 bytes
-SHA1 (patch-aa) = af794d95720e2192b0b860bc5c08cebf8935a23c
+SHA1 (patch-aa) = a8965df1a505aa43254025e4b03779b5896594c1
diff --git a/math/gsl/patches/patch-aa b/math/gsl/patches/patch-aa
index 6927ff8ede3..86bee3fb8dd 100644
--- a/math/gsl/patches/patch-aa
+++ b/math/gsl/patches/patch-aa
@@ -1,8 +1,29 @@
-$NetBSD: patch-aa,v 1.4 2001/07/05 18:04:51 jtb Exp $
+$NetBSD: patch-aa,v 1.5 2003/08/02 13:20:17 seb Exp $
 
---- configure.orig	Thu Jul  5 19:03:46 2001
+--- configure.orig	2002-12-18 22:32:51.000000000 +0000
 +++ configure
-@@ -6753,7 +6753,7 @@
+@@ -939,13 +939,13 @@ echo "configure:939: checking for workin
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
+-   MAKEINFO=makeinfo
+-   echo "$ac_t""found" 1>&6
+-else
+-   MAKEINFO="$missing_dir/missing makeinfo"
+-   echo "$ac_t""missing" 1>&6
+-fi
++#if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
++#   MAKEINFO=makeinfo
++#   echo "$ac_t""found" 1>&6
++#else
++#   MAKEINFO="$missing_dir/missing makeinfo"
++#   echo "$ac_t""missing" 1>&6
++#fi
+ 
+ 
+ 
+@@ -7652,7 +7652,7 @@ esac
  # Now restore our (possibly augmented) CFLAGS.
  CFLAGS="$save_cflags"
  GSL_CFLAGS="-I$includedir"
-- 
cgit v1.2.3