[arch-commits] CVS update of extra/office/a2ps (11 files)

Jan de Groot jgc at archlinux.org
Fri Apr 27 16:18:27 EDT 2007


    Date: Friday, April 27, 2007 @ 16:18:27
  Author: jgc
    Path: /home/cvs-extra/extra/office/a2ps

   Added: 4.13c-gcc34.patch (1.1) a2ps-4.13-fixcachecheck.patch (1.1)
          a2ps-4.13-manpage-chmod.patch (1.1)
          a2ps-4.13-select-freebsd.patch (1.1) a2ps-4.13c-fixps.patch (1.1)
          a2ps-4.13c-psmandup.diff (1.1) a2ps-4.13c-psset.patch (1.1)
          a2ps-4.13c-stdarg.patch (1.1)
Modified: PKGBUILD (1.11 -> 1.12)
 Removed: a2ps-4.13b-autoconf-fixes.patch (1.1) a2ps-4.13b.patch (1.1)

upgpkg: a2ps 4.13c-1
Update to 4.13c, retrieved from gentoo distfiles. Add their patches too to fix several bugs and security issues. Merge with a2ps-lprng, we have a splitup libcups now


---------------------------------+
 4.13c-gcc34.patch               |   12 
 PKGBUILD                        |   50 ++-
 a2ps-4.13-fixcachecheck.patch   |   16 +
 a2ps-4.13-manpage-chmod.patch   |   12 
 a2ps-4.13-select-freebsd.patch  |   57 +++
 a2ps-4.13b-autoconf-fixes.patch |  563 --------------------------------------
 a2ps-4.13b.patch                |   12 
 a2ps-4.13c-fixps.patch          |   19 +
 a2ps-4.13c-psmandup.diff        |   19 +
 a2ps-4.13c-psset.patch          |   11 
 a2ps-4.13c-stdarg.patch         |   74 ++++
 11 files changed, 253 insertions(+), 592 deletions(-)


Index: extra/office/a2ps/4.13c-gcc34.patch
diff -u /dev/null extra/office/a2ps/4.13c-gcc34.patch:1.1
--- /dev/null	Fri Apr 27 16:18:27 2007
+++ extra/office/a2ps/4.13c-gcc34.patch	Fri Apr 27 16:18:26 2007
@@ -0,0 +1,12 @@
+--- a2ps-4.13/lib/path-concat.c	2002-03-04 13:46:25.000000000 -0500
++++ a2ps-4.13/lib/path-concat_.c	2004-04-13 01:47:03.596895984 -0400
+@@ -31,7 +31,8 @@
+ #endif
+ #include <sys/types.h>
+ 
+-char *malloc ();
++/* Commented out by Tamran to work with gcc 3.4 */
++/* char *malloc (); */
+ 
+ #ifndef DIRECTORY_SEPARATOR
+ # define DIRECTORY_SEPARATOR '/'
Index: extra/office/a2ps/PKGBUILD
diff -u extra/office/a2ps/PKGBUILD:1.11 extra/office/a2ps/PKGBUILD:1.12
--- extra/office/a2ps/PKGBUILD:1.11	Tue Jul 11 14:51:37 2006
+++ extra/office/a2ps/PKGBUILD	Fri Apr 27 16:18:26 2007
@@ -1,29 +1,45 @@
-# $Id: PKGBUILD,v 1.11 2006/07/11 18:51:37 andyrtr Exp $
+# $Id: PKGBUILD,v 1.12 2007/04/27 20:18:26 jgc Exp $
 # Maintainer: eric <eric at archlinux.org>
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=a2ps
-pkgver=4.13b
-pkgrel=3
+pkgver=4.13c
+pkgrel=1
 pkgdesc="a2ps is an Any to PostScript filter"
 arch=(i686 x86_64)
+license=('GPL')
 depends=('ghostscript' 'psutils' 'imagemagick' 'perl')
-source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz \
-	$pkgname-$pkgver.patch \
-	a2ps-4.13b-autoconf-fixes.patch)
+replaces=('a2ps-lprng')
+provides=('a2ps-lprng')
+source=(http://www.archlinux.org/~jgc/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        http://www.archlinux.org/~jgc/${pkgname}/${pkgname}-4.13c-ja_nls.patch.gz
+	4.13c-gcc34.patch
+	a2ps-4.13-fixcachecheck.patch
+	a2ps-4.13-manpage-chmod.patch
+	a2ps-4.13-select-freebsd.patch
+	a2ps-4.13c-fixps.patch
+	a2ps-4.13c-psmandup.diff
+	a2ps-4.13c-psset.patch
+	a2ps-4.13c-stdarg.patch)
 url="http://www.inf.enst.fr/~demaille/a2ps/"
-md5sums=('0c8e0c31b08c14f7a7198ce967eb3281' 'b5c70ec605704bef650b4491bd7962b2'\
-         'f7a2339347100d33da157ce65bf0bb10')
 
 build() {
-  cd $startdir/src/$pkgname-4.13
-  /usr/bin/patch -Np1 -i ../../$pkgname-$pkgver.patch
-  [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../$pkgname-$pkgver-autoconf-fixes.patch || return 1
-  [ "$CARCH" == "x86_64" ] && (libtoolize --copy --force && cp /usr/share/aclocal/libtool.m4 m4/ && aclocal -I m4)
-  ./configure --prefix=/usr --sysconfdir=/etc/$pkgname
+  cd ${startdir}/src/${pkgname}-4.13
+  patch -Np0 -i ${startdir}/src/a2ps-4.13-select-freebsd.patch || return 1
+  patch -Np1 -i ${startdir}/src/a2ps-4.13c-stdarg.patch || return 1
+  patch -Np1 -i ${startdir}/src/4.13c-gcc34.patch || return 1
+  patch -Np1 -i ${startdir}/src/a2ps-4.13c-ja_nls.patch || return 1
+  patch -Np0 -i ${startdir}/src/a2ps-4.13c-fixps.patch || return 1
+  patch -Np0 -i ${startdir}/src/a2ps-4.13c-psmandup.diff || return 1
+  patch -Np1 -i ${startdir}/src/a2ps-4.13c-psset.patch || return 1
+  patch -Np1 -i ${startdir}/src/a2ps-4.13-fixcachecheck.patch || return 1
+  patch -Np1 -i ${startdir}/src/a2ps-4.13-manpage-chmod.patch || return 1
+  libtoolize --force --copy || return 1
+  autoreconf -I m4 || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
+              --includedir=/usr/include --enable-nls
+  export LANG=C
   make || return 1
-  make prefix=$startdir/pkg/usr \
-    sysconfdir=$startdir/pkg/etc/$pkgname install
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  make DESTDIR=${startdir}/pkg install
+  sed -i "s:^countdictstack: \0:" ${startdir}/pkg/usr/bin/psset || return 1
 }
-# vim: ts=2 sw=2 et ft=sh
Index: extra/office/a2ps/a2ps-4.13-fixcachecheck.patch
diff -u /dev/null extra/office/a2ps/a2ps-4.13-fixcachecheck.patch:1.1
--- /dev/null	Fri Apr 27 16:18:27 2007
+++ extra/office/a2ps/a2ps-4.13-fixcachecheck.patch	Fri Apr 27 16:18:26 2007
@@ -0,0 +1,16 @@
+Index: a2ps-4.13/configure.in
+===================================================================
+--- a2ps-4.13.orig/configure.in
++++ a2ps-4.13/configure.in
+@@ -158,8 +158,9 @@ if test $ac_cv_func_fnmatch_works = no; 
+ fi
+ 
+ # Check for C99 va_copy
+-AC_CACHE_CHECK([
+-  AC_TRY_LINK([#include <stdarg.h>],
++AC_CACHE_CHECK([if compiler supports C99 va_copy],
++  [ac_cv_va_copy],
++  [AC_TRY_LINK([#include <stdarg.h>],
+    [
+ 	va_list va1, va2;
+ 
Index: extra/office/a2ps/a2ps-4.13-manpage-chmod.patch
diff -u /dev/null extra/office/a2ps/a2ps-4.13-manpage-chmod.patch:1.1
--- /dev/null	Fri Apr 27 16:18:27 2007
+++ extra/office/a2ps/a2ps-4.13-manpage-chmod.patch	Fri Apr 27 16:18:26 2007
@@ -0,0 +1,12 @@
+diff -ur a2ps-4.13.orig/man/Makefile.maint a2ps-4.13/man/Makefile.maint
+--- a2ps-4.13.orig/man/Makefile.maint	2002-03-04 20:46:26.000000000 +0200
++++ a2ps-4.13/man/Makefile.maint	2007-02-19 21:50:29.000000000 +0200
+@@ -20,7 +20,7 @@
+ 	    --include=$(basename $@).x \
+ 	    --include=common.x \
+ 	    $(executable) > $@-t || exit 1; \
+-	  chmod -w $@-t || exit 1; \
++	  chmod a-w $@-t || exit 1; \
+ 	  rm -f $@ || exit 1; \
+ 	  mv $@-t $@ || exit 1; \
+ 	else \
Index: extra/office/a2ps/a2ps-4.13-select-freebsd.patch
diff -u /dev/null extra/office/a2ps/a2ps-4.13-select-freebsd.patch:1.1
--- /dev/null	Fri Apr 27 16:18:27 2007
+++ extra/office/a2ps/a2ps-4.13-select-freebsd.patch	Fri Apr 27 16:18:26 2007
@@ -0,0 +1,57 @@
+--- src/select.c.orig	Thu Dec 16 02:04:56 1999
++++ src/select.c	Sat Aug 21 12:05:31 2004
+@@ -131,6 +131,36 @@
+   return 1;
+ }
+ 
++/* escapes the name of a file so that the shell groks it in 'single' q.marks. 
++   The resulting pointer has to be free()ed when not longer used. */
++char *
++shell_escape(const char *fn)
++{
++  size_t len = 0;
++  const char *inp;
++  char *retval, *outp;
++
++  for(inp = fn; *inp; ++inp)
++    switch(*inp)
++    {
++      case '\'': len += 4; break;
++      default:   len += 1; break;
++    }
++
++  outp = retval = malloc(len + 1);
++  if(!outp)
++    return NULL; /* perhaps one should do better error handling here */
++  for(inp = fn; *inp; ++inp)
++    switch(*inp)
++    {
++      case '\'': *outp++ = '\''; *outp++ = '\\'; *outp++ = '\'', *outp++ = '\''; break;
++      default:   *outp++ = *inp; break;
++    }
++  *outp = 0;
++
++  return retval;
++}
++
+ /* What says file about the type of a file (result is malloc'd).  NULL
+   if could not be run.  */
+ 
+@@ -144,11 +174,15 @@
+   if (IS_EMPTY (job->file_command))
+     return NULL;
+ 
++  filename = shell_escape(filename);
++  if(filename == NULL)
++    return NULL;
+   /* Call file(1) with the correct option */
+-  command = ALLOCA (char, (2
++  command = ALLOCA (char, (4
+ 			   + strlen (job->file_command)
+ 			   + ustrlen (filename)));
+-  sprintf (command, "%s %s", job->file_command, (const char *) filename);
++  sprintf (command, "%s '%s'", job->file_command, (const char *) filename);
++  free(filename);
+   message (msg_tool, (stderr, "Reading pipe: `%s'\n", command));
+   file_out = popen (command, "r");
+ 
Index: extra/office/a2ps/a2ps-4.13b-autoconf-fixes.patch
diff -u extra/office/a2ps/a2ps-4.13b-autoconf-fixes.patch:1.1 extra/office/a2ps/a2ps-4.13b-autoconf-fixes.patch:removed
--- extra/office/a2ps/a2ps-4.13b-autoconf-fixes.patch:1.1	Tue Jul 11 14:51:37 2006
+++ extra/office/a2ps/a2ps-4.13b-autoconf-fixes.patch	Fri Apr 27 16:18:27 2007
@@ -1,563 +0,0 @@
-diff -Naur a2ps-4.13.orig/Makefile.in a2ps-4.13/Makefile.in
---- a2ps-4.13.orig/Makefile.in	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/Makefile.in	2005-06-08 15:52:29.000000000 +0000
-@@ -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@
-diff -Naur a2ps-4.13.orig/config.h.in a2ps-4.13/config.h.in
---- a2ps-4.13.orig/config.h.in	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/config.h.in	2005-06-08 15:52:35.000000000 +0000
-@@ -380,7 +380,7 @@
- #undef SYNTAX_TABLE
- 
- /* Define if `sys_siglist' is declared by <signal.h> or <unistd.h>. */
--#undef SYS_SIGLIST_DECLARED
-+#undef HAVE_DECL_SYS_SIGLIST
- 
- /* Define if you can safely include both <sys/time.h> and <time.h>. */
- #undef TIME_WITH_SYS_TIME
-diff -Naur a2ps-4.13.orig/configure.in a2ps-4.13/configure.in
---- a2ps-4.13.orig/configure.in	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/configure.in	2005-06-08 15:52:35.000000000 +0000
-@@ -24,6 +24,8 @@
- ## Checks for programs.  ##
- ## --------------------- ##
- 
-+m4_pattern_allow([.*M4])
-+m4_pattern_allow([AC_MSG_WARN])
- AC_PROG_AWK
- AC_PROG_GNU_M4
- AC_PROG_INSTALL
-@@ -82,7 +84,7 @@
- AC_TYPE_PID_T
- AC_TYPE_SIGNAL
- AC_STRUCT_TM
--AC_CHECK_MEMBERS((struct passwd.pw_gecos),,,
-+AC_CHECK_MEMBERS([struct passwd.pw_gecos],,,
- [#if HAVE_PWD_H
- # include <pwd.h>
- #endif])
-@@ -141,7 +143,7 @@
- # Check and replace broken or missing "fnmatch"
- AC_FUNC_FNMATCH
- if test $ac_cv_func_fnmatch_works = no; then
--  LIBOBJS="$LIBOBJS fnmatch.o"
-+  AC_LIBOBJ([fnmatch])
-   AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch,
- 	  [Define to rpl_fnmatch if the replacement function should be used.])
- fi
-@@ -149,7 +151,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
-@@ -273,7 +275,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
-@@ -286,7 +288,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)
-@@ -295,7 +297,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.?
-@@ -313,7 +315,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)
- 
-@@ -326,7 +328,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)
-@@ -336,12 +338,6 @@
- ## Epilogue.  ##
- ## ---------- ##
- 
--# This is necessary so that .o files in LIBOBJS are also built via
--# the ANSI2KNR-filtering rules.
--LIBOBJS=`echo "$LIBOBJS" | sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
--# Autoconf 2.14a is not ready for libtool
--LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/\.lo/g'`
--AC_SUBST(LTLIBOBJS)
- LTALLOCA=`echo "$ALLOCA" | sed 's/\.o/\.lo/g'`
- AC_SUBST(LTALLOCA)
- 
-diff -Naur a2ps-4.13.orig/etc/Makefile.in a2ps-4.13/etc/Makefile.in
---- a2ps-4.13.orig/etc/Makefile.in	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/etc/Makefile.in	2005-06-08 15:52:23.000000000 +0000
-@@ -297,7 +297,9 @@
- 
- # Building the correct a2ps.cfg
- a2ps.cfg: a2ps_cfg Makefile
--	sed "s!@libpath@!$(libpath)!" a2ps_cfg > a2ps.cfg
-+	sed -e "s!@libpath@!$(libpath)!" \
-+	    -e "s!@apppath@!$(PSFONT_PATH)!" \
-+	    a2ps_cfg > a2ps.cfg
- 
- # Building a time stamp to know the version.
- README: README.in Makefile
-diff -Naur a2ps-4.13.orig/etc/a2ps_cfg.in a2ps-4.13/etc/a2ps_cfg.in
---- a2ps-4.13.orig/etc/a2ps_cfg.in	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/etc/a2ps_cfg.in	2005-06-08 15:52:23.000000000 +0000
-@@ -73,6 +73,7 @@
- # It may be useful to extend it so that a2ps can see some
- # TeX or X11 resources: it likes AFM files and PF[AB] files.
- #AppendLibraryPath: foo
-+AppendLibraryPath: @apppath@
- 
- 
- #################################################################
-diff -Naur a2ps-4.13.orig/lib/Makefile.in a2ps-4.13/lib/Makefile.in
---- a2ps-4.13.orig/lib/Makefile.in	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/lib/Makefile.in	2005-06-08 15:52:29.000000000 +0000
-@@ -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@
-diff -Naur a2ps-4.13.orig/lib/fonts.l a2ps-4.13/lib/fonts.l
---- a2ps-4.13.orig/lib/fonts.l	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/lib/fonts.l	2005-06-08 15:52:29.000000000 +0000
-@@ -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);
-diff -Naur a2ps-4.13.orig/lib/signame.c a2ps-4.13/lib/signame.c
---- a2ps-4.13.orig/lib/signame.c	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/lib/signame.c	2005-06-08 15:52:35.000000000 +0000
-@@ -62,7 +62,7 @@
- 
- #else	/* HAVE_SYS_SIGLIST.  */
- 
--#ifndef SYS_SIGLIST_DECLARED
-+#if HAVE_DECL_SYS_SIGLIST == 0
- extern char *sys_siglist[];
- #endif	/* Not SYS_SIGLIST_DECLARED.  */
- 
-diff -Naur a2ps-4.13.orig/m4/atexit.m4 a2ps-4.13/m4/atexit.m4
---- a2ps-4.13.orig/m4/atexit.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/atexit.m4	2005-06-08 15:52:35.000000000 +0000
-@@ -14,7 +14,7 @@
-   [AC_CHECK_FUNCS(atexit)
-    if test $ac_cv_func_atexit = no; then
-      AC_CHECK_FUNCS(on_exit)
--     LIBOBJS="$LIBOBJS atexit.o"
-+     AC_LIBOBJ([atexit])
-      if test $ac_cv_func_on_exit = no; then
-        AC_DEFINE_UNQUOTED(exit, rpl_exit,
- 			  [Define to rpl_exit if the replacement function should be used])
-diff -Naur a2ps-4.13.orig/m4/c-bs-a.m4 a2ps-4.13/m4/c-bs-a.m4
---- a2ps-4.13.orig/m4/c-bs-a.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/c-bs-a.m4	2005-06-08 15:52:47.000000000 +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)
-diff -Naur a2ps-4.13.orig/m4/error.m4 a2ps-4.13/m4/error.m4
---- a2ps-4.13.orig/m4/error.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/error.m4	2005-06-08 15:52:47.000000000 +0000
-@@ -1,13 +1,12 @@
- 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,
- 	      am_cv_lib_error_at_line=no)])
-  if test $am_cv_lib_error_at_line = no; then
--   LIBOBJS="$LIBOBJS error.$ac_objext"
-+   AC_LIBOBJ([error])
-  fi
-- AC_SUBST(LIBOBJS)dnl
- ])
-diff -Naur a2ps-4.13.orig/m4/fullpath.m4 a2ps-4.13/m4/fullpath.m4
---- a2ps-4.13.orig/m4/fullpath.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/fullpath.m4	2005-06-08 15:52:35.000000000 +0000
-@@ -37,12 +37,6 @@
-     COM_$1=""
-   fi
- fi
--ifval([$2],
--[if test "[$]COM_$1" = "#"; then
--  AC_MSG_WARN([============================================================
--$2])
--  AC_MSG_WARN([============================================================])
--fi])
- AC_SUBST($1)
- AC_SUBST(COM_$1)])
- 
-diff -Naur a2ps-4.13.orig/m4/lex.m4 a2ps-4.13/m4/lex.m4
---- a2ps-4.13.orig/m4/lex.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/lex.m4	2005-06-08 15:52:47.000000000 +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
-diff -Naur a2ps-4.13.orig/m4/libtool.m4 a2ps-4.13/m4/libtool.m4
---- a2ps-4.13.orig/m4/libtool.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/libtool.m4	2005-06-08 15:52:47.000000000 +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
-diff -Naur a2ps-4.13.orig/m4/malloc.m4 a2ps-4.13/m4/malloc.m4
---- a2ps-4.13.orig/m4/malloc.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/malloc.m4	2005-06-08 15:52:35.000000000 +0000
-@@ -27,8 +27,7 @@
- 	 jm_cv_func_working_malloc=no)
-   ])
-   if test $jm_cv_func_working_malloc = no; then
--    AC_SUBST(LIBOBJS)
--    LIBOBJS="$LIBOBJS malloc.$ac_objext"
-+    AC_LIBOBJ([malloc])
-     AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
-       [Define to rpl_malloc if the replacement function should be used.])
-   fi
-diff -Naur a2ps-4.13.orig/m4/obstack.m4 a2ps-4.13/m4/obstack.m4
---- a2ps-4.13.orig/m4/obstack.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/obstack.m4	2005-06-08 15:52:47.000000000 +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)],
-@@ -10,6 +10,6 @@
-  if test $am_cv_func_obstack = yes; then
-    AC_DEFINE(HAVE_OBSTACK,1,[Define if libc includes obstacks])
-  else
--   LIBOBJS="$LIBOBJS obstack.$ac_objext"
-+   AC_LIBOBJ([obstack])
-  fi
- ])
-diff -Naur a2ps-4.13.orig/m4/realloc.m4 a2ps-4.13/m4/realloc.m4
---- a2ps-4.13.orig/m4/realloc.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/realloc.m4	2005-06-08 15:52:35.000000000 +0000
-@@ -27,8 +27,7 @@
- 	 jm_cv_func_working_realloc=no)
-   ])
-   if test $jm_cv_func_working_realloc = no; then
--    AC_SUBST(LIBOBJS)
--    LIBOBJS="$LIBOBJS realloc.$ac_objext"
-+    AC_LIBOBJ([realloc])
-     AC_DEFINE_UNQUOTED(realloc, rpl_realloc,
-       [Define to rpl_realloc if the replacement function should be used.])
-   fi
-diff -Naur a2ps-4.13.orig/m4/rename.m4 a2ps-4.13/m4/rename.m4
---- a2ps-4.13.orig/m4/rename.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/rename.m4	2005-06-08 15:52:35.000000000 +0000
-@@ -27,7 +27,7 @@
-    test "$ac_cv_func_rename_works" = no; then
-   AC_CHECK_FUNCS(link)
-   dnl FIXME: Define MVDIR
--  LIBOBJS="$LIBOBJS rename.o"
-+  AC_LIBOBJ([rename.o])
-   AC_DEFINE_UNQUOTED(rename, rpl_rename,
-    [Define to the replacement function if should be used.])
- fi])
-diff -Naur a2ps-4.13.orig/m4/strcasecmp.m4 a2ps-4.13/m4/strcasecmp.m4
---- a2ps-4.13.orig/m4/strcasecmp.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/strcasecmp.m4	2005-06-08 15:52:35.000000000 +0000
-@@ -13,7 +13,7 @@
-  if test $ac_cv_func_strcasecmp = no; then
-    AC_CHECK_FUNCS(stricmp)
-    if test $ac_cv_func_stricmp = no; then
--     LIBOBJS="$LIBOBJS strcasecmp.o"
-+     AC_LIBOBJ([strcasecmp])
-    else
-      AC_DEFINE_UNQUOTED(strcasecmp, stricmp,
- 	  [Define to the replacement function if should be used.])
-@@ -25,7 +25,7 @@
-  if test $ac_cv_func_strncasecmp = no; then
-    AC_CHECK_FUNCS(strnicmp)
-    if test $ac_cv_func_strnicmp = no; then
--     LIBOBJS="$LIBOBJS strncasecmp.o"
-+     AC_LIBOBJ([strncasecmp])
-    else
-      AC_DEFINE_UNQUOTED(strncasecmp, strnicmp,
- 	  [Define to the replacement function if should be used.])
-diff -Naur a2ps-4.13.orig/m4/strftim.m4 a2ps-4.13/m4/strftim.m4
---- a2ps-4.13.orig/m4/strftim.m4	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/m4/strftim.m4	2005-06-08 15:52:35.000000000 +0000
-@@ -12,7 +12,7 @@
-   AC_CHECK_HEADERS(limits.h)
-   AC_FUNC_MKTIME
-   if test $ac_cv_func_strftime = no; then
--    LIBOBJS="$LIBOBJS strftime.o"
-+    AC_LIBOBJ([strftime])
-     if test $ac_cv_func_working_mktime = no; then
-        AC_DEFINE_UNQUOTED(mktime, rpl_mktime,
- 	[Define to rpl_mktime if the replacement function should be used.])
-diff -Naur a2ps-4.13.orig/ogonkify/configure.in a2ps-4.13/ogonkify/configure.in
---- a2ps-4.13.orig/ogonkify/configure.in	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/ogonkify/configure.in	2005-06-08 15:52:35.000000000 +0000
-@@ -45,7 +45,7 @@
-  x/*) # User specified a version of Perl to use by absolute path.
-      AC_SUBST(PERL);;
-  x)   # She didn't specify at all.
--      AC_PATH_PROG(PERL, 'perl perl5', no) ;;
-+      AC_PATH_PROG(PERL, [perl perl5], no) ;;
-  x*)  # She specified the name, but we want the path.
-      AC_PATH_PROG(PERL, $PERL, no) ;;
- esac
-diff -Naur a2ps-4.13.orig/src/Makefile.in a2ps-4.13/src/Makefile.in
---- a2ps-4.13.orig/src/Makefile.in	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/src/Makefile.in	2005-06-08 15:52:29.000000000 +0000
-@@ -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)...
-diff -Naur a2ps-4.13.orig/src/lexps.l a2ps-4.13/src/lexps.l
---- a2ps-4.13.orig/src/lexps.l	2005-06-08 15:52:16.000000000 +0000
-+++ a2ps-4.13/src/lexps.l	2005-06-08 15:52:29.000000000 +0000
-@@ -35,7 +35,7 @@
- void pslex_initialize PARAMS ((void));
- %}
- 
--%option yylineno
-+/* %option yylineno */
- %option prefix="ps"
- %option outfile="lex.yy.c"
- 
Index: extra/office/a2ps/a2ps-4.13b.patch
diff -u extra/office/a2ps/a2ps-4.13b.patch:1.1 extra/office/a2ps/a2ps-4.13b.patch:removed
--- extra/office/a2ps/a2ps-4.13b.patch:1.1	Mon May  3 13:19:46 2004
+++ extra/office/a2ps/a2ps-4.13b.patch	Fri Apr 27 16:18:27 2007
@@ -1,12 +0,0 @@
-diff -ru a2ps-4.13/lib/path-concat.c a2ps-4.13.arch/lib/path-concat.c
---- a2ps-4.13/lib/path-concat.c	1999-10-10 14:34:46.000000000 -0400
-+++ a2ps-4.13.arch/lib/path-concat.c	2004-05-03 13:05:38.000000000 -0400
-@@ -31,7 +31,7 @@
- #endif
- #include <sys/types.h>
- 
--char *malloc ();
-+/*char *malloc ();*/
- 
- #ifndef DIRECTORY_SEPARATOR
- # define DIRECTORY_SEPARATOR '/'
Index: extra/office/a2ps/a2ps-4.13c-fixps.patch
diff -u /dev/null extra/office/a2ps/a2ps-4.13c-fixps.patch:1.1
--- /dev/null	Fri Apr 27 16:18:27 2007
+++ extra/office/a2ps/a2ps-4.13c-fixps.patch	Fri Apr 27 16:18:26 2007
@@ -0,0 +1,19 @@
+--- contrib/fixps.in.orig	2004-12-20 00:11:40.000000000 +0100
++++ contrib/fixps.in	2004-12-20 00:14:12.000000000 +0100
+@@ -38,7 +38,7 @@
+ run_gs=0
+ # What action to perform: fixps, cat, check, and gs
+ task=fixps
+-tmpdir=/tmp/$program.$$
++tmpdir=`mktemp -d -t fixps.XXXXXX` || { echo "$program: Cannot create temporary dir!" >&2 ; exit 1; }
+ verbose=echo
+ 
+ # The version/usage strings
+@@ -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
Index: extra/office/a2ps/a2ps-4.13c-psmandup.diff
diff -u /dev/null extra/office/a2ps/a2ps-4.13c-psmandup.diff:1.1
--- /dev/null	Fri Apr 27 16:18:27 2007
+++ extra/office/a2ps/a2ps-4.13c-psmandup.diff	Fri Apr 27 16:18:26 2007
@@ -0,0 +1,19 @@
+--- contrib/psmandup.in.orig	2004-12-20 00:16:07.000000000 +0100
++++ contrib/psmandup.in	2004-12-20 00:16:39.000000000 +0100
+@@ -36,7 +36,7 @@
+ message=
+ psselect=${PSSELECT:-psselect}
+ psset=${PSSET:-psset}
+-tmpdir=/tmp/$program.$$
++tmpdir=`mktemp -d -t fixps.XXXXXX` || { echo "$program: Cannot create temporary dir!" >&2 ; exit 1; }
+ 
+ # These two must be kept in synch.  They are opposed.
+ verbose=echo
+@@ -185,7 +185,6 @@
+   trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
+ fi
+ 
+-mkdir $tmpdir
+ 
+ # If printing from stdin, save into a tmp file
+ if test $file = '-'; then
Index: extra/office/a2ps/a2ps-4.13c-psset.patch
diff -u /dev/null extra/office/a2ps/a2ps-4.13c-psset.patch:1.1
--- /dev/null	Fri Apr 27 16:18:27 2007
+++ extra/office/a2ps/a2ps-4.13c-psset.patch	Fri Apr 27 16:18:27 2007
@@ -0,0 +1,11 @@
+--- a2ps-4.13/contrib/psset.in.orig	2006-03-16 12:30:48.000000000 +0100
++++ a2ps-4.13/contrib/psset.in		2006-03-16 12:28:14.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.
Index: extra/office/a2ps/a2ps-4.13c-stdarg.patch
diff -u /dev/null extra/office/a2ps/a2ps-4.13c-stdarg.patch:1.1
--- /dev/null	Fri Apr 27 16:18:27 2007
+++ extra/office/a2ps/a2ps-4.13c-stdarg.patch	Fri Apr 27 16:18:27 2007
@@ -0,0 +1,74 @@
+--- a2ps-4.13-orig/configure.in	2005-08-14 14:13:42.000000000 +0200
++++ a2ps-4.13/configure.in	2005-08-14 14:18:20.000000000 +0200
+@@ -157,6 +157,22 @@
+ 	  [Define to rpl_fnmatch if the replacement function should be used.])
+ fi
+ 
++# Check for C99 va_copy
++AC_CACHE_CHECK([
++  AC_TRY_LINK([#include <stdarg.h>],
++   [
++	va_list va1, va2;
++
++	va_copy(va2, va1);
++	va_end(va2);
++   ],
++   [ac_cv_va_copy="yes"],[ac_cv_va_copy="no"]
++  )
++])
++if test "x$ac_cv_va_copy"="xyes"; then
++	AC_DEFINE(HAVE_VA_COPY,1,[Define to 1 if C99 va_copy function should be used])
++fi
++
+ # Needed checks for tinyterm.[ch]
+ ad_TINYTERM_CHECKS
+ 
+--- a2ps-4.13-orig/lib/printlen.c	2002-03-04 19:46:25.000000000 +0100
++++ a2ps-4.13/lib/printlen.c	2005-08-14 14:29:08.000000000 +0200
+@@ -27,15 +27,24 @@
+ 
+ unsigned long strtoul ();
+ 
++#if !defined(HAVE_VA_COPY)
+ static int
+ int_printflen (const char *format, va_list *args)
++#else
++static int
++int_printflen (const char *format, va_list args)
++#endif
+ {
+   const char *cp;
+   int total_width = 0;
+   int width = 0;
+   va_list ap;
+ 
++#ifndef HAVE_VA_COPY
+   memcpy (&ap, args, sizeof (va_list));
++#else
++  va_copy(ap, args);
++#endif
+ 
+   for (cp = format ; *cp ; cp++)
+     {
+@@ -93,13 +102,21 @@
+ 	    }
+ 	}
+     }
++
++#ifdef HAVE_VA_COPY
++  va_end(ap);
++#endif
+   return total_width;
+ }
+ 
+ int
+ vprintflen (const char *format,  va_list args)
+ {
++#if !defined(HAVE_VA_COPY)
+   return int_printflen (format, &args);
++#else
++  return int_printflen (format, args);
++#endif
+ }
+ 
+ int




More information about the arch-commits mailing list