update texinfo to 4.12

9 files changed, 46 insertions, 46 deletions

diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index a96b5723fd1..7648cdeae2a 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.71 2008/05/21 12:30:16 tnn Exp $
+# $NetBSD: Makefile,v 1.72 2008/09/01 17:53:47 christos Exp $
 
-DISTNAME=		texinfo-4.11
+DISTNAME=		texinfo-4.12
 PKGNAME=		g${DISTNAME}
-PKGREVISION=		1
+#PKGREVISION=		1
 CATEGORIES=		devel sysutils
 MASTER_SITES=		${MASTER_SITE_GNU:=texinfo/}
-EXTRACT_SUFX=		.tar.bz2
+EXTRACT_SUFX=		.tar.gz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/texinfo/texinfo.html
diff --git a/devel/gtexinfo/PLIST.locale b/devel/gtexinfo/PLIST.locale
index 75bd8898e31..c9e93f2fd3c 100644
--- a/devel/gtexinfo/PLIST.locale
+++ b/devel/gtexinfo/PLIST.locale
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST.locale,v 1.4 2008/01/30 08:19:24 obache Exp $
+@comment $NetBSD: PLIST.locale,v 1.5 2008/09/01 17:53:47 christos Exp $
 share/locale/cs/LC_MESSAGES/texinfo.mo
 share/locale/da/LC_MESSAGES/texinfo.mo
 share/locale/de/LC_MESSAGES/texinfo.mo
 share/locale/de_AT/LC_MESSAGES/texinfo.mo
 share/locale/eo/LC_MESSAGES/texinfo.mo
+share/locale/es/LC_MESSAGES/texinfo.mo
 share/locale/fr/LC_MESSAGES/texinfo.mo
 share/locale/he/LC_MESSAGES/texinfo.mo
 share/locale/hr/LC_MESSAGES/texinfo.mo
@@ -11,7 +12,6 @@ share/locale/hu/LC_MESSAGES/texinfo.mo
 share/locale/ja/LC_MESSAGES/texinfo.mo
 share/locale/nb/LC_MESSAGES/texinfo.mo
 share/locale/nl/LC_MESSAGES/texinfo.mo
-share/locale/no/LC_MESSAGES/texinfo.mo
 share/locale/pl/LC_MESSAGES/texinfo.mo
 share/locale/ro/LC_MESSAGES/texinfo.mo
 share/locale/ru/LC_MESSAGES/texinfo.mo
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo
index f79d1b5c60b..86351e4b1ad 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.30 2008/03/05 22:26:46 jlam Exp $
+$NetBSD: distinfo,v 1.31 2008/09/01 17:53:47 christos Exp $
 
-SHA1 (texinfo-4.11.tar.bz2) = 915a42e1278860b0fa64e4ef9d5ad4488d3b23a0
-RMD160 (texinfo-4.11.tar.bz2) = d07dbc50f98dd8f9f4088b58781abdebfb7f5781
-Size (texinfo-4.11.tar.bz2) = 1659601 bytes
-SHA1 (patch-aa) = eae1ca11ad9ce1df98d3df43893c80eb8809e56c
-SHA1 (patch-ab) = 464d9ca66dd0ba5c09e9cbd2dbc19d0a8156eb9b
-SHA1 (patch-ac) = 5550c4797cbaec7f133c8fc35fc15f96dc7bc77f
-SHA1 (patch-aj) = daab8068ee204ddcdca01d72879d099c38e931c3
-SHA1 (patch-ak) = 92daf86e90d6c3c4c5c1c83200371d19049ac65b
-SHA1 (patch-am) = 7d20c085b7d4219d323a690874f1a88796186c90
+SHA1 (texinfo-4.12.tar.gz) = 1587ef35b68ea5d0f7a6801a86977d8b825e2f1b
+RMD160 (texinfo-4.12.tar.gz) = fe234ffd863bd08c145dce4a071b73b5580a33e7
+Size (texinfo-4.12.tar.gz) = 2476832 bytes
+SHA1 (patch-aa) = fac09ee96b34435ea02d85765b68246cbe4d4c75
+SHA1 (patch-ab) = c2be57386d1dfd610de5fad423be0fa11036ffda
+SHA1 (patch-ac) = b5b2ecbff959fb435de77fc73c555903ef7ba271
+SHA1 (patch-aj) = 8a215583bab47628a350cfb3874eef4930d255e9
+SHA1 (patch-ak) = 51a4b155fa6a3bd0c30c9ec2c6007cd4ee69248c
+SHA1 (patch-am) = 8f2681eb2d3a36375399671fd14bcd943516493e
diff --git a/devel/gtexinfo/patches/patch-aa b/devel/gtexinfo/patches/patch-aa
index 2fe0201cfb7..e9669f60fd7 100644
--- a/devel/gtexinfo/patches/patch-aa
+++ b/devel/gtexinfo/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.15 2008/01/30 08:19:25 obache Exp $
+$NetBSD: patch-aa,v 1.16 2008/09/01 17:53:47 christos Exp $
 
---- util/Makefile.in.orig	2007-09-10 02:37:45.000000000 +0200
-+++ util/Makefile.in
-@@ -385,7 +385,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- util/Makefile.in.orig	2008-04-18 10:34:58.000000000 +0300
++++ util/Makefile.in	2008-09-01 19:48:06.000000000 +0300
+@@ -426,7 +426,7 @@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -bin_SCRIPTS = texi2dvi texi2pdf pdftexi2dvi
 +bin_SCRIPTS = texi2dvi
- 
- # Use `ginstall-info' in the definition of PROGRAMS and in dependencies
- # because automake generates an install-info target in every Makefile (a
+ AM_CPPFLAGS = \
+   -I$(top_srcdir)				\
+   -I$(top_srcdir)/gnulib/lib			\
diff --git a/devel/gtexinfo/patches/patch-ab b/devel/gtexinfo/patches/patch-ab
index d0e555075f4..5e241186162 100644
--- a/devel/gtexinfo/patches/patch-ab
+++ b/devel/gtexinfo/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2008/01/30 08:19:25 obache Exp $
+$NetBSD: patch-ab,v 1.12 2008/09/01 17:53:47 christos Exp $
 
---- info/Makefile.in.orig	2007-09-10 02:37:45.000000000 +0200
-+++ info/Makefile.in
-@@ -391,7 +391,8 @@ AM_CPPFLAGS = \
+--- info/Makefile.in.orig	2008-04-18 10:34:57.000000000 +0300
++++ info/Makefile.in	2008-09-01 19:43:58.000000000 +0300
+@@ -439,7 +439,8 @@
    -I$(top_builddir)/gnulib/lib			\
    -DLOCALEDIR=\"$(localedir)\" 			\
    -DINFODIR=\"$(infodir)\"			\
diff --git a/devel/gtexinfo/patches/patch-ac b/devel/gtexinfo/patches/patch-ac
index 32dfc670c82..9370da08888 100644
--- a/devel/gtexinfo/patches/patch-ac
+++ b/devel/gtexinfo/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2008/01/30 08:19:25 obache Exp $
+$NetBSD: patch-ac,v 1.11 2008/09/01 17:53:47 christos Exp $
 
---- info/filesys.h.orig	2007-07-01 21:20:29.000000000 +0000
-+++ info/filesys.h
-@@ -78,7 +78,7 @@ extern int is_dir_name (char *filename);
+--- info/filesys.h.orig	2007-07-02 00:20:29.000000000 +0300
++++ info/filesys.h	2008-09-01 19:43:58.000000000 +0300
+@@ -78,7 +78,7 @@
  
  /* The default value of INFOPATH. */
  #if !defined (DEFAULT_INFOPATH)
diff --git a/devel/gtexinfo/patches/patch-aj b/devel/gtexinfo/patches/patch-aj
index aaa7b69b52b..9ebe8117d1e 100644
--- a/devel/gtexinfo/patches/patch-aj
+++ b/devel/gtexinfo/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.6 2008/01/30 08:19:25 obache Exp $
+$NetBSD: patch-aj,v 1.7 2008/09/01 17:53:47 christos Exp $
 
---- configure.ac.orig	2007-09-10 02:36:29.000000000 +0200
-+++ configure.ac
-@@ -130,7 +130,7 @@ AM_CONDITIONAL(TOOLS_ONLY, [[test "x$too
+--- configure.ac.orig	2008-04-17 20:54:16.000000000 +0300
++++ configure.ac	2008-09-01 19:43:58.000000000 +0300
+@@ -130,7 +130,7 @@
  # rather ncurses.  So we check for it.
  TERMLIBS=
  # Check for termlib before termcap because Solaris termcap needs libucb.
diff --git a/devel/gtexinfo/patches/patch-ak b/devel/gtexinfo/patches/patch-ak
index 0a779f933a4..ba56e1fb565 100644
--- a/devel/gtexinfo/patches/patch-ak
+++ b/devel/gtexinfo/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.4 2008/01/30 08:19:25 obache Exp $
+$NetBSD: patch-ak,v 1.5 2008/09/01 17:53:47 christos Exp $
 
---- configure.orig	2007-09-10 02:37:46.000000000 +0200
-+++ configure
-@@ -15966,7 +15966,7 @@ fi
+--- configure.orig	2008-04-18 10:34:58.000000000 +0300
++++ configure	2008-09-01 19:45:16.000000000 +0300
+@@ -15947,7 +15947,7 @@
  # rather ncurses.  So we check for it.
  TERMLIBS=
  # Check for termlib before termcap because Solaris termcap needs libucb.
 -TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo"
 +TERMLIB_VARIANTS="curses termlib termcap terminfo ncurses"
  for termlib in ${TERMLIB_VARIANTS}; do
-   as_ac_Lib=`echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
+   as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
diff --git a/devel/gtexinfo/patches/patch-am b/devel/gtexinfo/patches/patch-am
index 134f2818de5..77e170f0625 100644
--- a/devel/gtexinfo/patches/patch-am
+++ b/devel/gtexinfo/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1 2008/01/30 08:19:26 obache Exp $
+$NetBSD: patch-am,v 1.2 2008/09/01 17:53:47 christos Exp $
 
---- util/texi2dvi.orig	2007-09-10 00:36:30.000000000 +0000
-+++ util/texi2dvi
-@@ -1037,7 +1037,7 @@ uncomment_iftex='s/^@c texi2dvi//'
+--- util/texi2dvi.orig	2008-04-17 21:45:49.000000000 +0300
++++ util/texi2dvi	2008-09-01 19:43:58.000000000 +0300
+@@ -1094,7 +1094,7 @@
  # main info output, the user asked to run TeX, not makeinfo.
  run_makeinfo ()
  {