Updated autoconf patch

3 files changed, 65 insertions, 7 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 395bf920b80e..81927f774971 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.18 2003/10/29 18:40:25 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.19 2003/10/30 18:03:26 usata Exp $
 
 *a2ps-4.13c (27 Sep 2003)
 
@@ -16,6 +16,10 @@
 
 *a2ps-4.13b-r5 (16 Jul 2003)
 
+  31 Oct 2003; Mamoru KOMACHI <usata@gentoo.org>
+  files/a2ps-4.13-autoconf-gentoo.diff:
+  Updated autoconf patch, see #32163
+
   30 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> a2ps-4.13b-r5.ebuild,
   files/a2ps-4.13-autoconf-gentoo.diff:
   Modified a patch to fix undefined macros
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 94ea74a4326e..64ce49080a66 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,9 +1,9 @@
-MD5 3cb7f7cd89272e774ad2c89a19359c3d ChangeLog 2955
+MD5 39890bfce53ad8d4fc58fb6e8ad823d3 ChangeLog 3082
 MD5 ace8354c5ef6feb07640ca561f18cda3 a2ps-4.13b-r4.ebuild 1162
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 9903e6e3352019ea6a18cc911ba208c2 a2ps-4.13c.ebuild 1665
 MD5 150435eb2cf31e9dca6ce2cb3bbf7c32 a2ps-4.13b-r5.ebuild 1666
-MD5 5a704cab2b0467a558bbc2ef843c0b6e files/a2ps-4.13-autoconf-gentoo.diff 808
+MD5 404552b249e258ffb606be0cc60f89d5 files/a2ps-4.13-autoconf-gentoo.diff 2247
 MD5 5a02e00e2362711886e28f0d28b299dd files/a2ps-4.13-stdout.diff 462
 MD5 98bf324f9bbeef13a3a5f875d2f0198f files/digest-a2ps-4.13b-r4 63
 MD5 f848a5dda1b74d4f107212702010331a files/digest-a2ps-4.13b-r5 130
diff --git a/app-text/a2ps/files/a2ps-4.13-autoconf-gentoo.diff b/app-text/a2ps/files/a2ps-4.13-autoconf-gentoo.diff
index 02ab222b2f93..63b381007540 100644
--- a/app-text/a2ps/files/a2ps-4.13-autoconf-gentoo.diff
+++ b/app-text/a2ps/files/a2ps-4.13-autoconf-gentoo.diff
@@ -10,15 +10,69 @@ diff -urN a2ps-4.13.ORIG a2ps-4.13
  AC_OUTPUT(Makefile ogonkify.in
  	   doc/Makefile
  	   m4/Makefile)
-diff -urN a2ps-4.13.ORIG a2ps-4.13
---- a2ps-4.13.ORIG/configure.in	2000-01-07 21:19:55.000000000 +0900
-+++ a2ps-4.13/configure.in	2003-09-16 06:33:29.000000000 +0900
+diff -urN a2ps-4.13.ORIG/configure.in a2ps-4.13/configure.in
+--- a2ps-4.13.ORIG/configure.in	2003-10-28 15:15:26.000000000 +0900
++++ a2ps-4.13/configure.in	2003-10-31 02:50:00.000000000 +0900
 @@ -82,7 +82,7 @@
  AC_TYPE_PID_T
  AC_TYPE_SIGNAL
  AC_STRUCT_TM
 -AC_CHECK_MEMBERS((struct passwd.pw_gecos),,,
-+dnl AC_CHECK_MEMBERS((struct passwd.pw_gecos),,,
++AC_CHECK_MEMBERS([struct passwd.pw_gecos], , ,
  [#if HAVE_PWD_H
  # include <pwd.h>
  #endif])
+@@ -149,7 +149,7 @@
+ # Needed checks for tinyterm.[ch]
+ ad_TINYTERM_CHECKS
+ 
+-AC_CHECK_DECLS((fputs, strlen, strtoul, strtoull))
++AC_CHECK_DECLS([fputs, strlen, strtoul, strtoull])
+ 
+ # Internationalization.
+ AM_GNU_GETTEXT
+@@ -288,7 +288,7 @@
+ # Nice special printers
+ ########################
+ # Look for GV or Ghostview
+-ad_CHECK_PROGS((gv, ghostview))
++ad_CHECK_PROGS(gv ghostview)
+ if test "$COM_gv$COM_ghostview" = "##"; then
+   COM_DISPLAY="#"
+ fi
+@@ -301,7 +301,7 @@
+ ad_CHECK_PROG(gzip,
+ [a2ps works better with gzip.
+ Consider fetching gzip at any ftp site proposing GNU programs])
+-ad_CHECK_PROGS((bzip, bzip2))
++ad_CHECK_PROGS(bzip bzip2)
+ 
+ # DVI delegation
+ ad_CHECK_PROG(dvips)
+@@ -310,7 +310,7 @@
+ ad_CHECK_PROG(convert)
+ 
+ # PDF delegation
+-ad_CHECK_PROGS((acroread, pdf2ps))
++ad_CHECK_PROGS(acroread pdf2ps)
+ COM_acroread4='#'
+ AC_SUBST(COM_acroread4)
+ # If we have acroread, is it a version which supports -shrink etc.?
+@@ -328,7 +328,7 @@
+ fi
+ 
+ # Outputting PDF
+-ad_CHECK_PROGS((distill, ps2pdf))
++ad_CHECK_PROGS(distill ps2pdf)
+ test "$COM_distill$COM_ps2pdf" = "##" && COM_PS2PDF="#"
+ AC_SUBST(COM_PS2PDF)
+ 
+@@ -341,7 +341,7 @@
+ Consider fetching groff at any ftp site proposing GNU programs])
+ 
+ # Texinfo delegation
+-ad_CHECK_PROGS((makeinfo, tex, latex))
++ad_CHECK_PROGS(makeinfo tex latex)
+ COM_TEXI="$COM_tex$COM_makeinfo$COM_dvips"
+ COM_LATEX="$COM_latex$COM_dvips"
+ AC_SUBST(COM_TEXI)