maj a2ps#4.14-1

6 files changed, 107 insertions, 16 deletions

diff --git a/extra/a2ps/.footprint b/extra/a2ps/.footprint
index b4e79d54a..f7f162b02 100755
--- a/extra/a2ps/.footprint
+++ b/extra/a2ps/.footprint
@@ -32,6 +32,10 @@ drwxr-xr-x	root/root	usr/share/a2ps/afm/
 -rw-r--r--	root/root	usr/share/a2ps/afm/crr56__i.afm
 -rw-r--r--	root/root	usr/share/a2ps/afm/fonts.map
 -rwxr-xr-x	root/root	usr/share/a2ps/afm/make_fonts_map.sh
+-rw-r--r--	root/root	usr/share/a2ps/afm/pagb.afm
+-rw-r--r--	root/root	usr/share/a2ps/afm/pagbo.afm
+-rw-r--r--	root/root	usr/share/a2ps/afm/pagd.afm
+-rw-r--r--	root/root	usr/share/a2ps/afm/pagdo.afm
 -rw-r--r--	root/root	usr/share/a2ps/afm/pbkd.afm
 -rw-r--r--	root/root	usr/share/a2ps/afm/pbkdi.afm
 -rw-r--r--	root/root	usr/share/a2ps/afm/pbkl.afm
@@ -86,6 +90,7 @@ drwxr-xr-x	root/root	usr/share/a2ps/encoding/
 -rw-r--r--	root/root	usr/share/a2ps/encoding/koi8.edf
 -rw-r--r--	root/root	usr/share/a2ps/encoding/mac.edf
 -rw-r--r--	root/root	usr/share/a2ps/encoding/ms-cp1250.edf
+-rw-r--r--	root/root	usr/share/a2ps/encoding/ms-cp1251.edf
 drwxr-xr-x	root/root	usr/share/a2ps/fonts/
 -rw-r--r--	root/root	usr/share/a2ps/fonts/colle10.pfb
 -rw-r--r--	root/root	usr/share/a2ps/fonts/colle8.pfb
@@ -110,6 +115,7 @@ drwxr-xr-x	root/root	usr/share/a2ps/ps/
 -rw-r--r--	root/root	usr/share/a2ps/ps/color.hdr
 -rw-r--r--	root/root	usr/share/a2ps/ps/color.pro
 -rw-r--r--	root/root	usr/share/a2ps/ps/diff.pro
+-rw-r--r--	root/root	usr/share/a2ps/ps/diffcolor.pro
 -rw-r--r--	root/root	usr/share/a2ps/ps/ehandler.ps
 -rw-r--r--	root/root	usr/share/a2ps/ps/fixed.pro
 -rw-r--r--	root/root	usr/share/a2ps/ps/gray.pro
@@ -135,6 +141,7 @@ drwxr-xr-x	root/root	usr/share/a2ps/sheets/
 -rw-r--r--	root/root	usr/share/a2ps/sheets/coqv.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/cpp.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/csh.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/csharp.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/cxx.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/dc_shell.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/eiffel.ssh
@@ -164,11 +171,13 @@ drwxr-xr-x	root/root	usr/share/a2ps/sheets/
 -rw-r--r--	root/root	usr/share/a2ps/sheets/mail.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/make.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/maple.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/matlab.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/matlab4.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/mib.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/mly.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/modula2.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/modula3.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/nasm.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/o2c.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/oberon.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/objc.ssh
@@ -177,6 +186,8 @@ drwxr-xr-x	root/root	usr/share/a2ps/sheets/
 -rw-r--r--	root/root	usr/share/a2ps/sheets/oracle.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/pascal.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/perl.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/php.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/pic16f84.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/plsql.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/pov.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/ppd.ssh
@@ -186,7 +197,10 @@ drwxr-xr-x	root/root	usr/share/a2ps/sheets/
 -rw-r--r--	root/root	usr/share/a2ps/sheets/promela.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/ps.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/python.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/rd.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/rexx.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/ruby.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/s.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/sather.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/scheme.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/sdl88.ssh
@@ -194,10 +208,14 @@ drwxr-xr-x	root/root	usr/share/a2ps/sheets/
 -rw-r--r--	root/root	usr/share/a2ps/sheets/sh.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/sheets.map
 -rw-r--r--	root/root	usr/share/a2ps/sheets/shell.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/small.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/sml.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/specc.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/sql.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/sql92.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/ssh.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/st.ssh
+-rw-r--r--	root/root	usr/share/a2ps/sheets/stratego.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/symbols.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/tcl.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/tclx.ssh
@@ -219,17 +237,8 @@ drwxr-xr-x	root/root	usr/share/a2ps/sheets/
 -rw-r--r--	root/root	usr/share/a2ps/sheets/yacc.ssh
 -rw-r--r--	root/root	usr/share/a2ps/sheets/zsh.ssh
 drwxr-xr-x	root/root	usr/share/info/
--rw-r--r--	root/root	usr/share/info/a2ps.info-1.gz
--rw-r--r--	root/root	usr/share/info/a2ps.info-2.gz
--rw-r--r--	root/root	usr/share/info/a2ps.info-3.gz
--rw-r--r--	root/root	usr/share/info/a2ps.info-4.gz
--rw-r--r--	root/root	usr/share/info/a2ps.info-5.gz
--rw-r--r--	root/root	usr/share/info/a2ps.info-6.gz
 -rw-r--r--	root/root	usr/share/info/a2ps.info.gz
 -rw-r--r--	root/root	usr/share/info/ogonkify.info.gz
--rw-r--r--	root/root	usr/share/info/regex.info-1.gz
--rw-r--r--	root/root	usr/share/info/regex.info-2.gz
--rw-r--r--	root/root	usr/share/info/regex.info-3.gz
 -rw-r--r--	root/root	usr/share/info/regex.info.gz
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
diff --git a/extra/a2ps/.md5sum b/extra/a2ps/.md5sum
index 32542875e..a4238b308 100755
--- a/extra/a2ps/.md5sum
+++ b/extra/a2ps/.md5sum
@@ -1,2 +1,5 @@
-0c8e0c31b08c14f7a7198ce967eb3281  a2ps-4.13b.tar.gz
+93011b58e9f20a7fafa31287a51884a4  a2ps-4.13c-fnmatch-replacement.patch
+42aa39b74f6da8cf6e94185c4fc3e601  a2ps-4.14-check-mempcpy.patch
+066f9327fee6b6eca3a57d657d1097d1  a2ps-4.14-fix-stpcpy-proto.patch
+781ac3d9b213fa3e1ed0d79f986dc8c7  a2ps-4.14.tar.gz
 fee1456d0e6e94af4fc5b5a1bb9687b7  i18n-fonts-0.1.tar.gz
diff --git a/extra/a2ps/Pkgfile b/extra/a2ps/Pkgfile
index 312a75d2e..7d5f7bffb 100755
--- a/extra/a2ps/Pkgfile
+++ b/extra/a2ps/Pkgfile
@@ -2,20 +2,27 @@
 # URL: http://www.inf.enst.fr/~demaille/a2ps/
 # Maintainer: NuTyX core team
 # Packager: fred.galusik at gmail dot com
-# Depends on: perl, psutils
+# Depends on: perl, psutils, ghostscript, imagemagick
 
 name=a2ps
-version=4.13b
-release=3
+version=4.14
+release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz \
-ftp://ftp.enst.fr/pub/unix/a2ps/i18n-fonts-0.1.tar.gz)
+ftp://ftp.enst.fr/pub/unix/a2ps/i18n-fonts-0.1.tar.gz \
+a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch \
+a2ps-4.13c-fnmatch-replacement.patch)
 
 build() {
-cd $name-4.13
+	cd $name-$version
+	patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch
+	patch -p1 < ../a2ps-4.14-check-mempcpy.patch
+	patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch
 	sed -i "s|emacs||" contrib/Makefile.in
 	sed -i 's/+0 -1/-k 1,2/' afm/make_fonts_map.sh
 	sed -i "s|/usr/local/share|/usr/share|" configure
-	sed -i "s|char \*malloc ();|/* & */|" lib/path-concat.c
+#	sed -i "s|char \*malloc ();|/* & */|" lib/path-concat.c
+	libtoolize --force --copy
+	autoreconf -I m4
 	./configure --prefix=/usr \
 	--mandir=/usr/share/man \
 	--infodir=/usr/share/info \
diff --git a/extra/a2ps/a2ps-4.13c-fnmatch-replacement.patch b/extra/a2ps/a2ps-4.13c-fnmatch-replacement.patch
new file mode 100644
index 000000000..c49ab78c9
--- /dev/null
+++ b/extra/a2ps/a2ps-4.13c-fnmatch-replacement.patch
@@ -0,0 +1,43 @@
+diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c
+--- a2ps-4.13.orig/lib/fnmatch.c	2002-03-04 12:46:25 -0600
++++ a2ps-4.13/lib/fnmatch.c	2006-05-27 11:41:15 -0500
+@@ -27,18 +27,6 @@
+ #include <fnmatch.h>
+ #include <ctype.h>
+ 
+-
+-/* Comment out all this code if we are using the GNU C Library, and are not
+-   actually compiling the library itself.  This code is part of the GNU C
+-   Library, but also included in many other GNU distributions.  Compiling
+-   and linking in this code is a waste when using the GNU C library
+-   (especially if it is a shared library).  Rather than having every GNU
+-   program understand `configure --with-gnu-libc' and omit the object files,
+-   it is simpler to just do this in the source for each such file.  */
+-
+-#if defined _LIBC || !defined __GNU_LIBRARY__
+-
+-
+ # if defined STDC_HEADERS || !defined isascii
+ #  define ISASCII(c) 1
+ # else
+@@ -52,10 +40,13 @@
+ extern int errno;
+ # endif
+ 
++/* fnmatch replacement taken from the GNU C Library for systems that 
++   provide a broken implementation. */
++
+ /* Match STRING against the filename pattern PATTERN, returning zero if
+    it matches, nonzero if not.  */
+ int
+-fnmatch (const char *pattern, const char *string, int flags)
++rpl_fnmatch (const char *pattern, const char *string, int flags)
+ {
+   register const char *p = pattern, *n = string;
+   register char c;
+@@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char
+ 
+ # undef FOLD
+ }
+-
+-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
diff --git a/extra/a2ps/a2ps-4.14-check-mempcpy.patch b/extra/a2ps/a2ps-4.14-check-mempcpy.patch
new file mode 100644
index 000000000..7b820cead
--- /dev/null
+++ b/extra/a2ps/a2ps-4.14-check-mempcpy.patch
@@ -0,0 +1,12 @@
+--- a2ps-4.14-orig/configure.in	2008-04-16 08:36:03.000000000 +0200
++++ a2ps-4.14/configure.in	2008-04-16 08:36:29.000000000 +0200
+@@ -137,7 +137,8 @@
+ ad_REPLACE_FUNC_STRCASECMP
+ ad_REPLACE_FUNC_STRNCASECMP
+ ad_REPLACE_FUNC_RENAME
+-AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero tempnam strsignal psignal setlocale)
++AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero \
++  tempnam strsignal psignal setlocale mempcpy)
+ ad_FUNC_SYSTEMPAPERNAME
+ ad_FUNC_ATEXIT
+ ad_FUNC_STRFTIME
diff --git a/extra/a2ps/a2ps-4.14-fix-stpcpy-proto.patch b/extra/a2ps/a2ps-4.14-fix-stpcpy-proto.patch
new file mode 100644
index 000000000..7c3c69076
--- /dev/null
+++ b/extra/a2ps/a2ps-4.14-fix-stpcpy-proto.patch
@@ -0,0 +1,17 @@
+=== modified file 'lib/xstrrpl.c'
+--- lib/xstrrpl.c	2008-04-14 18:04:50 +0000
++++ lib/xstrrpl.c	2008-04-14 18:20:20 +0000
+@@ -20,12 +20,10 @@
+ 
+ #include "system.h"
+ #include <assert.h>
+ #include "xstrrpl.h"
+ 
+-extern char * stpcpy();
+-
+ /* Perform subsitutions in string.  Result is malloc'd
+    E.g., result = xstrrrpl ("1234", subst) gives result = "112333"
+    where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}}
+    */
+ char *
+