- Removed old patches.

2008-05-29 16:04:31 +00:00 · 2008-05-29 16:04:31 +00:00 · 081cc7fda8
commit 081cc7fda8
parent fb26cce1cc
11 changed files with 3 additions and 576 deletions
--- a/a2ps-4.13-bison.patch
+++ b/a2ps-4.13-bison.patch
@ -1,29 +0,0 @@
--- a2ps-4.13/src/parsessh.y.bison	2004-01-06 10:27:42.352903527 +0000
-+++ a2ps-4.13/src/parsessh.y	2004-01-06 10:28:14.328105348 +0000
-@@ -242,7 +242,7 @@
- /*		Dealing with the inessential informations		*/
- /************************************************************************/
- requirement :
-	  tREQUIRES tA2PS tSTRING { $$ = $3 ; } ;
-+	  tREQUIRES tA2PS tSTRING { $$ = $3 ; }
- 	| tREQUIRES tA2PS tVERSION tSTRING { $$ = $4 ; } ;
- 
- documentation :
-@@ -267,7 +267,7 @@
- authors : tWRITTEN tBY tSTRING	{ $$ = $3 ; };
- 
- version :
-	  tVERSION tIS tSTRING 	{ $$ = $3 ; };
-+	  tVERSION tIS tSTRING 	{ $$ = $3 ; }
- 	| tVERSION tSTRING 	{ $$ = $2 ; };
- 
- /************************************************************************/
-@@ -717,7 +717,7 @@
- 	  /* Only one */
- 	  $$ = words_new ("Closing: Strings", "Closing: Regexps", 2, 2);
- 	  words_add_regex ($$, $1);
-	};
-+	}
- 	| tCLOSERS operators_def tCLOSERS
- 	{
- 	  /* Several, comma separated, between () */
--- a/a2ps-4.13-flex.patch
+++ b/a2ps-4.13-flex.patch
@ -1,73 +0,0 @@
--- a2ps-4.13/lib/Makefile.in.flex	Wed Feb  9 09:33:01 2000
-+++ a2ps-4.13/lib/Makefile.in	Thu Apr 27 19:00:20 2000
-@@ -100,7 +100,7 @@
- INTLDEPS = @INTLDEPS@
- INTLLIBS = @INTLLIBS@
- INTLOBJS = @INTLOBJS@
-LEX = @LEX@
-+LEX = @LEX@ -CFe
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBOBJS = @LIBOBJS@
- LIBTOOL = @LIBTOOL@
--- a2ps-4.13/lib/fonts.l.flex	Wed Dec 15 18:27:01 1999
-+++ a2ps-4.13/lib/fonts.l	Thu Apr 27 19:00:20 2000
-@@ -178,7 +178,7 @@
- 
- %}
- 
-%option yylineno
-+/* %option yylineno */
- %option prefix="afm"
- %option outfile="lex.yy.c"
- 
-@@ -524,7 +524,7 @@
-   const char * filename;
-   FILE * stream;
- 
-  yylineno = 0;
-+  /* yylineno = 0; */
- 
-   /* Find its AFM file: first resolve its font file name */
-   filename = fonts_map_resolve_alias (job->fonts_map, font->key);
--- a2ps-4.13/src/Makefile.in.flex	Wed Feb  9 09:34:18 2000
-+++ a2ps-4.13/src/Makefile.in	Thu Apr 27 19:00:20 2000
-@@ -100,7 +100,7 @@
- INTLDEPS = @INTLDEPS@
- INTLLIBS = @INTLLIBS@
- INTLOBJS = @INTLOBJS@
-LEX = @LEX@
-+LEX = @LEX@ -CFe
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBOBJS = @LIBOBJS@
- LIBTOOL = @LIBTOOL@
-@@ -154,7 +154,7 @@
- BUILT_SOURCES = parsessh.h
- 
- YFLAGS = -dtv
-LEX = @LEX@
-+LEX = @LEX@ -CFe
- # I don't really understand why I have to put srcdir here, but
- # it is needed for yacc and lex files (seems related to #line, but
- # I really don't understand why)...
--- a2ps-4.13/src/lexps.l.flex	Mon Feb  7 17:05:43 2000
-+++ a2ps-4.13/src/lexps.l	Thu Apr 27 19:00:20 2000
-@@ -35,7 +35,7 @@
- void pslex_initialize PARAMS ((void));
- %}
- 
-%option yylineno
-+/* %option yylineno */
- %option prefix="ps"
- %option outfile="lex.yy.c"
- 
--- a2ps-4.13/Makefile.in.flex	Wed Feb  9 09:32:25 2000
-+++ a2ps-4.13/Makefile.in	Thu Apr 27 19:00:20 2000
-@@ -100,7 +100,7 @@
- INTLDEPS = @INTLDEPS@
- INTLLIBS = @INTLLIBS@
- INTLOBJS = @INTLOBJS@
-LEX = @LEX@
-+LEX = @LEX@ -CFe
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBOBJS = @LIBOBJS@
- LIBTOOL = @LIBTOOL@
--- a/a2ps-4.13-malloc.patch
+++ b/a2ps-4.13-malloc.patch
@ -1,11 +0,0 @@
--- a2ps-4.13/lib/path-concat.c.malloc	2004-03-02 11:27:49.000000000 +0000
-+++ a2ps-4.13/lib/path-concat.c	2004-03-02 11:28:14.000000000 +0000
-@@ -31,7 +31,7 @@
- #endif
- #include <sys/types.h>
- 
-char *malloc ();
-+#include <stdlib.h>
- 
- #ifndef DIRECTORY_SEPARATOR
- # define DIRECTORY_SEPARATOR '/'
--- a/a2ps-4.13-varargs.patch
+++ b/a2ps-4.13-varargs.patch
@ -1,45 +0,0 @@
--- a2ps-4.13/lib/printlen.c.orig	Fri Jun  1 16:38:21 2001
-+++ a2ps-4.13/lib/printlen.c	Fri Jun  1 16:38:28 2001
-@@ -28,14 +28,15 @@
- unsigned long strtoul ();
- 
- static int
-int_printflen (const char *format, va_list *args)
-+int_printflen (const char *format, va_list args)
- {
-   const char *cp;
-   int total_width = 0;
-   int width = 0;
-   va_list ap;
- 
-  memcpy (&ap, args, sizeof (va_list));
-+  __va_copy(ap, args);
-+  /* memcpy (&ap, args, sizeof (va_list)); */
- 
-   for (cp = format ; *cp ; cp++)
-     {
-@@ -99,7 +100,7 @@
- int
- vprintflen (const char *format,  va_list args)
- {
-  return int_printflen (format, &args);
-+  return int_printflen (format, args);
- }
- 
- int
--- a2ps-4.13/lib/title.c.orig	Fri Jun  1 16:19:04 2001
-+++ a2ps-4.13/lib/title.c	Fri Jun  1 16:20:16 2001
-@@ -83,11 +83,13 @@
-   VA_START (args, format);
- 
-   len = vprintflen (format, args);
-+  va_end(args);
-   if (format [strlen (format) - 1] == '\n')
-     len --;
-   if (center_p)
-     for (padding = 0 ; padding < 79 - len ; padding += 2)
-       putc (' ', stream);
-+  VA_START (args, format);
- # if HAVE_VPRINTF || _LIBC
-   vfprintf (stream, format, args);
- # else
--- a/a2ps-includes.patch
+++ b/a2ps-includes.patch
@ -1,61 +0,0 @@
--- a2ps-4.13/src/sheets-map.l.includes	2000-02-04 21:07:47.000000000 +0000
-+++ a2ps-4.13/src/sheets-map.l	2004-09-07 16:06:27.575891868 +0100
-@@ -40,6 +40,7 @@
- 
- #define MAX_INCLUDE_DEPTH 10
- static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
-+static int lineno_stack[MAX_INCLUDE_DEPTH];
- static char *filename_stack[MAX_INCLUDE_DEPTH];
- static int include_stack_ptr;
- static char *yyfilename;
-@@ -93,7 +94,7 @@
- white         [[:space:]]+
- key           [-a-zA-Z0-9_]+:
- comment       #.*
-include       include([^)]+)
-+include       include\([^)]+\)
- %%
- 
- {key}         token_val = xstrndup (yytext, yyleng - 1); return tKEY;
-@@ -102,7 +103,7 @@
- {white}       ;
- {comment}     ;
- {include}     {	/* Kill the closing paren and pass the file name. */
-                yytext[yyleng] = '\0';
-+                yytext[yyleng-1] = '\0';
-                 yy_include_push (yytext + strlen ("include("));
-               }
- 
-@@ -210,11 +211,13 @@
-     error (1, 0, _("too many includes"));
- 
-   include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
-  filename_stack[include_stack_ptr++] = file;
-+  lineno_stack[include_stack_ptr] = yylineno;
-+  filename_stack[include_stack_ptr++] = yyfilename;
- 
-   message (msg_file, (stderr, "%s:%d: includes %s\n",
- 		      yyfilename, yylineno, file));
- 
-+  yyfilename = file;
-   yyin = xrfopen (yyfilename);
- 
-   yy_switch_to_buffer (yy_create_buffer (yyin, YY_BUF_SIZE));
-@@ -227,8 +230,8 @@
- {
-   fclose (yyin);
-   yy_delete_buffer (YY_CURRENT_BUFFER);
-  free (yyfilename);
-   yyfilename = filename_stack[include_stack_ptr];
-+  yylineno = lineno_stack[include_stack_ptr];
-   yy_switch_to_buffer (include_stack[include_stack_ptr]);
-   message (msg_file, (stderr, "Back to file `%s'.\n", yyfilename));
- }
-@@ -254,6 +257,7 @@
- yy_close (void)
- {
-   fclose (yyin);
-+  free (yyfilename);
- }
- 
- int
--- a/a2ps-netscape.patch
+++ b/a2ps-netscape.patch
@ -1,31 +0,0 @@
--- a2ps-4.13/etc/a2ps_cfg.in.netscape	2005-02-02 16:22:36.000000000 +0000
-+++ a2ps-4.13/etc/a2ps_cfg.in	2005-02-02 16:40:06.431499603 +0000
-@@ -265,7 +265,8 @@
- @COM_PSUTILS@@COM_dvips@   fi
- 
- ########## HTML files
-# Pass HTML to Netscape, hoping that there is an Netscape running...
-+# Pass HTML to Mozilla, hoping that there is a Mozilla running...
-+# (Previously had used Netscape.  Following comments refer to Netscape:)
- # Tricks:
- # 1. Netscape can't output on stdout, hence use a tmp file (#f0)
- # 2. openfile refuses relative paths, so prepend cwd (%d) when relative
-@@ -274,14 +275,14 @@
- #    loaded page (not that of openfile).  So run Netscape twice.
- # 4. It asks the user if s/he wants to replace an existing output file,
- #    so rm before.
-@COM_PSUTILS@Delegation: Netscape html:ps    \
-+@COM_PSUTILS@Delegation: Mozilla html:ps    \
- @COM_PSUTILS@  rm -f #f0; \
- @COM_PSUTILS@  if echo '$f' | grep '^/' >/dev/null 2>&1; then \
-@COM_PSUTILS@    ${NETSCAPE:-netscape} -noraise -remote 'openfile($f)'; \
-+@COM_PSUTILS@    ${MOZILLA:-mozilla} -noraise -remote 'openfile($f)'; \
- @COM_PSUTILS@  else \
-@COM_PSUTILS@    ${NETSCAPE:-netscape} -noraise -remote 'openfile(%d/$f)'; \
-+@COM_PSUTILS@    ${MOZILLA:-mozilla} -noraise -remote 'openfile(%d/$f)'; \
- @COM_PSUTILS@  fi && \
-@COM_PSUTILS@  ${NETSCAPE:-netscape} -noraise -remote 'saveas(#f0,postscript)' && \
-+@COM_PSUTILS@  ${MOZILLA:-mozilla} -noraise -remote 'saveas(#f0,postscript)' && \
- @COM_PSUTILS@  #{del.psselect} #f0 | #{del.psnup}
- 
- ########## MetaFont / MetaPost files
--- a/a2ps-psset.patch
+++ b/a2ps-psset.patch
@ -1,11 +0,0 @@
--- a2ps-4.13/contrib/psset.in.psset	2006-10-06 13:12:03.000000000 +0100
-+++ a2ps-4.13/contrib/psset.in	2006-10-06 13:12:09.000000000 +0100
-@@ -241,7 +241,7 @@
- # spaces with a `\' too...
- pspagedevicelen=`echo "$pspagedevice" | wc -l`
- pspagedevice=`echo "$pspagedevice" | \
- sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^/\\\\\\/"`
-+ sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^ /\\\\\\ /"`
- 
- case $at in
-   0) # Insert last in the Setup, so that we win over other requests.
--- a/a2ps-shell.patch
+++ b/a2ps-shell.patch
@ -1,15 +0,0 @@
--- a2ps-4.13/src/select.c.shell	2004-07-29 16:43:08.178940204 +0100
-+++ a2ps-4.13/src/select.c	2004-07-29 16:43:09.328722698 +0100
-@@ -148,8 +148,10 @@
-   command = ALLOCA (char, (2
- 			   + strlen (job->file_command)
- 			   + ustrlen (filename)));
-  sprintf (command, "%s %s", job->file_command, (const char *) filename);
-  message (msg_tool, (stderr, "Reading pipe: `%s'\n", command));
-+  setenv ("filename", (const char *) filename, 1);
-+  sprintf (command, "%s \"${filename}\"", job->file_command);
-+  message (msg_tool, (stderr, "Reading pipe: `%s' [filename=%s]\n", command,
-+	   (const char *) filename));
-   file_out = popen (command, "r");
- 
-   /* Check for failure */
--- a/a2ps-tmpdir.patch
+++ b/a2ps-tmpdir.patch
@ -1,58 +0,0 @@
--- a2ps-4.13/contrib/psmandup.in.tmpdir	1999-10-24 14:06:42.000000000 +0100
-+++ a2ps-4.13/contrib/psmandup.in	2006-08-08 14:52:22.000000000 +0100
-@@ -36,7 +36,7 @@
- message=
- psselect=${PSSELECT:-psselect}
- psset=${PSSET:-psset}
-tmpdir=/tmp/$program.$$
-+tmpdir=$(mktemp -d /tmp/$program.XXXXXX)
- 
- # These two must be kept in synch.  They are opposed.
- verbose=echo
--- a2ps-4.13/contrib/fixps.in.tmpdir	2000-02-21 08:16:15.000000000 +0000
-+++ a2ps-4.13/contrib/fixps.in	2006-08-08 14:53:36.000000000 +0100
-@@ -38,7 +38,6 @@
- run_gs=0
- # What action to perform: fixps, cat, check, and gs
- task=fixps
-tmpdir=/tmp/$program.$$
- verbose=echo
- 
- # The version/usage strings
-@@ -183,6 +182,7 @@
-       exit 1;;
- esac
- 
-+tmpdir=$(mktemp -d /tmp/$program.XXXXXX)
- if test -n "$debug"; then
-   # Set -x now if debugging
-   set -x
-@@ -191,7 +191,6 @@
-   trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
- fi
- 
-mkdir $tmpdir
- fixps_sed=$tmpdir/fixps.sed
- 
- # If printing from stdin, save into a tmp file
--- a2ps-4.13/contrib/pdiff.in.tmpdir	1999-10-24 16:07:51.000000000 +0100
-+++ a2ps-4.13/contrib/pdiff.in	2006-08-08 14:52:22.000000000 +0100
-@@ -34,7 +34,7 @@
- diff_options='-u'
- file=
- output=
-tmpdir=/tmp/$program.$$
-+tmpdir=$(mktemp -d /tmp/$program.XXXXXX)
- verbose=echo
- wdiff_prog=${WDIFF:-wdiff}
- wdiff_options='-w[wd- -x-wd] -y{wd+ -z+wd}'
--- a2ps-4.13/contrib/pdiff.in.tmpdir	1999-10-24 16:07:51.000000000 +0100
-+++ a2ps-4.13/contrib/pdiff.in	2007-02-28 13:30:36.000000000 +0000
-@@ -67,6 +67,7 @@
- 
- help="Try \`$program --help' for more information."
- 
-+trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
- 
- # Parse command line arguments.
- option_without_arguments='vhsqDlw'
--- a/a2ps-underquoted.patch
+++ b/a2ps-underquoted.patch
@ -1,208 +0,0 @@
--- a2ps-4.13/m4/c-bs-a.m4.underquoted	2004-12-07 15:48:56.317799029 +0000
-+++ a2ps-4.13/m4/c-bs-a.m4	2004-12-07 15:49:09.240315913 +0000
-@@ -2,7 +2,7 @@
- 
- dnl From Paul Eggert.
- 
-AC_DEFUN(AC_C_BACKSLASH_A,
-+AC_DEFUN([AC_C_BACKSLASH_A],
- [
-   AC_CACHE_CHECK([whether backslash-a works in strings], ac_cv_c_backslash_a,
-    [AC_TRY_COMPILE([],
-@@ -22,7 +22,7 @@
-   fi
- ])
- 
-AC_DEFUN(jm_PREREQ_QUOTEARG,
-+AC_DEFUN([jm_PREREQ_QUOTEARG],
- [
-   AC_CHECK_FUNCS(isascii mbrtowc)
-   AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h)
--- a2ps-4.13/m4/error.m4.underquoted	2004-12-07 15:49:21.559948942 +0000
-+++ a2ps-4.13/m4/error.m4	2004-12-07 15:49:28.235666455 +0000
-@@ -1,7 +1,7 @@
- dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
- dnl FIXME: Migrate into libit
- 
-AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
-+AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
- [AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
-  [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
-               am_cv_lib_error_at_line=yes,
--- a2ps-4.13/m4/obstack.m4.underquoted	2004-12-07 15:49:39.826439920 +0000
-+++ a2ps-4.13/m4/obstack.m4	2004-12-07 15:49:49.827518954 +0000
-@@ -1,7 +1,7 @@
- dnl From Jim Meyering.
- dnl FIXME: migrate into libit.
- 
-AC_DEFUN(AM_FUNC_OBSTACK,
-+AC_DEFUN([AM_FUNC_OBSTACK],
- [AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
-  [AC_TRY_LINK([#include "obstack.h"],
- 	      [struct obstack *mem;obstack_free(mem,(char *) 0)],
--- a2ps-4.13/m4/libtool.m4.underquoted	2004-12-07 15:50:24.793804138 +0000
-+++ a2ps-4.13/m4/libtool.m4	2004-12-07 15:52:28.530057547 +0000
-@@ -22,7 +22,7 @@
- ## the same distribution terms that you use for the rest of that program.
- 
- # serial 40 AC_PROG_LIBTOOL
-AC_DEFUN(AC_PROG_LIBTOOL,
-+AC_DEFUN([AC_PROG_LIBTOOL],
- [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
- 
- # Save cache, so that ltconfig can load it
-@@ -52,7 +52,7 @@
- exec 5>>./config.log
- ])
- 
-AC_DEFUN(AC_LIBTOOL_SETUP,
-+AC_DEFUN([AC_LIBTOOL_SETUP],
- [AC_PREREQ(2.13)dnl
- AC_REQUIRE([AC_ENABLE_SHARED])dnl
- AC_REQUIRE([AC_ENABLE_STATIC])dnl
-@@ -132,16 +132,16 @@
- ])
- 
- # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-+AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
- 
- # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
- 
- # AC_ENABLE_SHARED - implement the --enable-shared flag
- # Usage: AC_ENABLE_SHARED[(DEFAULT)]
- #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
- #   `yes'.
-AC_DEFUN(AC_ENABLE_SHARED, [dnl
-+AC_DEFUN([AC_ENABLE_SHARED], [dnl
- define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
- AC_ARG_ENABLE(shared,
- changequote(<<, >>)dnl
-@@ -167,14 +167,14 @@
- ])
- 
- # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_ENABLE_SHARED(no)])
- 
- # AC_ENABLE_STATIC - implement the --enable-static flag
- # Usage: AC_ENABLE_STATIC[(DEFAULT)]
- #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
- #   `yes'.
-AC_DEFUN(AC_ENABLE_STATIC, [dnl
-+AC_DEFUN([AC_ENABLE_STATIC], [dnl
- define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
- AC_ARG_ENABLE(static,
- changequote(<<, >>)dnl
-@@ -200,7 +200,7 @@
- ])
- 
- # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_DISABLE_STATIC], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_ENABLE_STATIC(no)])
- 
- 
-@@ -208,7 +208,7 @@
- # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
- #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
- #   `yes'.
-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
-+AC_DEFUN([AC_ENABLE_FAST_INSTALL], [dnl
- define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
- AC_ARG_ENABLE(fast-install,
- changequote(<<, >>)dnl
-@@ -234,11 +234,11 @@
- ])
- 
- # AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_DISABLE_FAST_INSTALL], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_ENABLE_FAST_INSTALL(no)])
- 
- # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AC_PROG_LD,
-+AC_DEFUN([AC_PROG_LD],
- [AC_ARG_WITH(gnu-ld,
- [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
- test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-@@ -308,7 +308,7 @@
- AC_PROG_LD_GNU
- ])
- 
-AC_DEFUN(AC_PROG_LD_GNU,
-+AC_DEFUN([AC_PROG_LD_GNU],
- [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
- [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
- if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-@@ -319,7 +319,7 @@
- ])
- 
- # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AC_PROG_NM,
-+AC_DEFUN([AC_PROG_NM],
- [AC_MSG_CHECKING([for BSD-compatible nm])
- AC_CACHE_VAL(ac_cv_path_NM,
- [if test -n "$NM"; then
-@@ -353,7 +353,7 @@
- ])
- 
- # AC_CHECK_LIBM - check for math library
-AC_DEFUN(AC_CHECK_LIBM,
-+AC_DEFUN([AC_CHECK_LIBM],
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- LIBM=
- case "$lt_target" in
-@@ -378,7 +378,7 @@
- # '${top_builddir}/' (note the single quotes!) if your package is not
- # flat, and, if you're not using automake, define top_builddir as
- # appropriate in the Makefiles.
-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-   case "$enable_ltdl_convenience" in
-   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-   "") enable_ltdl_convenience=yes
-@@ -397,7 +397,7 @@
- # flat, and, if you're not using automake, define top_builddir as
- # appropriate in the Makefiles.
- # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-   AC_CHECK_LIB(ltdl, main,
-   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-   [if test x"$enable_ltdl_install" = xno; then
-@@ -418,13 +418,13 @@
- ])
- 
- dnl old names
-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
-+AC_DEFUN([AM_PROG_LIBTOOL], [indir([AC_PROG_LIBTOOL])])dnl
-+AC_DEFUN([AM_ENABLE_SHARED], [indir([AC_ENABLE_SHARED], $@)])dnl
-+AC_DEFUN([AM_ENABLE_STATIC], [indir([AC_ENABLE_STATIC], $@)])dnl
-+AC_DEFUN([AM_DISABLE_SHARED], [indir([AC_DISABLE_SHARED], $@)])dnl
-+AC_DEFUN([AM_DISABLE_STATIC], [indir([AC_DISABLE_STATIC], $@)])dnl
-+AC_DEFUN([AM_PROG_LD], [indir([AC_PROG_LD])])dnl
-+AC_DEFUN([AM_PROG_NM], [indir([AC_PROG_NM])])dnl
- 
- dnl This is just to silence aclocal about the macro not being used
- ifelse([AC_DISABLE_FAST_INSTALL])dnl
--- a2ps-4.13/m4/lex.m4.underquoted	2004-12-07 15:53:11.815755409 +0000
-+++ a2ps-4.13/m4/lex.m4	2004-12-07 15:53:20.523085631 +0000
-@@ -3,7 +3,7 @@
- 
- dnl AM_PROG_LEX
- dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
-AC_DEFUN(AM_PROG_LEX,
-+AC_DEFUN([AM_PROG_LEX],
- [AC_REQUIRE([AM_MISSING_HAS_RUN])
- AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex])
- AC_PROG_LEX
--- a/a2ps.spec
+++ b/a2ps.spec
@ -20,11 +20,8 @@ Source0: http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz
 Source1: ftp://ftp.enst.fr/pub/unix/a2ps/i18n-fonts-0.1.tar.gz
 Patch0: a2ps-4.13-conf.patch
 Patch1: a2ps-4.13-etc.patch
-#Patch2: a2ps-4.13-flex.patch
 Patch3: a2ps-4.13-security.patch
 Patch4: a2ps-4.13-glibcpaper.patch
-#Patch5: a2ps-4.13-varargs.patch
-#Patch6: a2ps-tmpdir.patch
 Patch7: a2ps-sort.patch
 Patch8: a2ps-iso5-minus.patch
 Patch9: a2ps-perl.patch
@ -37,17 +34,10 @@ Patch14: a2ps-4.13b-encoding.patch
 Patch15: a2ps-4.13b-tilde.patch
 Patch17: a2ps-4.13-euckr.patch
 Patch18: a2ps-4.13-gnusource.patch
-#Patch19: a2ps-4.13-bison.patch
 Patch20: a2ps-4.13-hebrew.patch
-#Patch21: a2ps-4.13-malloc.patch
-#Patch22: a2ps-shell.patch
-#Patch23: a2ps-includes.patch
-#Patch24: a2ps-underquoted.patch
 Patch26: a2ps-make-fonts-map.patch
-#Patch27: a2ps-netscape.patch
 Patch28: a2ps-wdiff.patch
 Patch29: a2ps-U.patch
-#Patch30: a2ps-psset.patch
 Patch31: a2ps-mb.patch
 Patch34: a2ps-external-libtool.patch
 Patch35: a2ps-4.14-texinfo-nodes.patch
@ -114,11 +104,8 @@ the emacs-%{name} package to use emacs-%{name} with GNU Emacs.
 # add /etc/a2ps in directories searched for config files
 %patch1 -p1 -b .etc 

-#%patch2 -p1
 %patch3 -p1 -b .security
 %patch4 -p1 -b .glibcpaper
-#%patch5 -p1
-#%patch6 -p1 -b .tmpdir
 %patch7 -p1 -b .sort
 %patch8 -p1 -b .iso5-minus
 %patch9 -p1 -b .perl
@ -142,24 +129,9 @@ the emacs-%{name} package to use emacs-%{name} with GNU Emacs.
 # Prevent strsignal segfaulting (bug #104970).
 %patch18 -p1 -b .gnusource

-# Fix problems in .y file spotted by stricter bison.
-#%patch19 -p1 -b .bison
-
 # Hebrew support (bug #113191).
 %patch20 -p1 -b .hebrew

-# Prevent "error: conflicting types for 'malloc'".
-#%patch21 -p1 -b .malloc
-
-# Use environment variable to pass filenames to shell (bug #128647).
-#%patch22 -p1 -b .shell
-
-# Apply patch from bug #122699 to fix "too many includes" error.
-#%patch23 -p1 -b .includes
-
-# Fixed m4 files.
-#%patch24 -p1 -b .underquoted
-
 # Use external libtool (bug #225235).
 %patch34 -p1 -b .external-libtool

@ -167,18 +139,12 @@ the emacs-%{name} package to use emacs-%{name} with GNU Emacs.
 # Michal Jaegermann.
 %patch26 -p1 -b .make-fonts-map

-# Don't try to run netscape.  Run mozilla instead (bug #121393).
-#%patch27 -p1 -b .netscape
-
 # Make pdiff default to not requiring wdiff (bug #68537).
 %patch28 -p1 -b .wdiff

 # Make pdiff use diff(1) properly (bug #156916).
 %patch29 -p1 -b .U

-# Fixed psset sed expression (bug #209613).
-#%patch30 -p1 -b .psset
-
 # Fixed multibyte handling (bug #212154).
 %patch31 -p1 -b .mb

@ -322,6 +288,9 @@ exit 0
 %{emacs_lispdir}/*.el

 %changelog
+* Thu May 29 2008 Tim Waugh <twaugh@redhat.com>
+- Removed old patches.
+
 * Sun May 18 2008 Patrice Dumas <pertusus@free.fr> 4.14-4
 - remove dots in node names, patch from Vitezslav Crhonek (bug #445971)