a2ps, port nettoyé

4 files changed, 3 insertions, 74 deletions

diff --git a/extra/a2ps/Pkgfile b/extra/a2ps/Pkgfile
index ecc0e72d5..f7b790016 100755
--- a/extra/a2ps/Pkgfile
+++ b/extra/a2ps/Pkgfile
@@ -9,8 +9,9 @@ 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 \
-a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch \
-a2ps-4.13c-fnmatch-replacement.patch)
+http://nutyx.meticul.eu/files/patchs/$name/a2ps-4.14-check-mempcpy.patch\
+http://nutyx.meticul.eu/files/patchs/$name/a2ps-4.14-fix-stpcpy-proto.patch \
+http://nutyx.meticul.eu/files/patchs/$name/a2ps-4.13c-fnmatch-replacement.patch)
 
 build() {
 	cd $name-$version
diff --git a/extra/a2ps/a2ps-4.13c-fnmatch-replacement.patch b/extra/a2ps/a2ps-4.13c-fnmatch-replacement.patch
deleted file mode 100644
index c49ab78c9..000000000
--- a/extra/a2ps/a2ps-4.13c-fnmatch-replacement.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index 7b820cead..000000000
--- a/extra/a2ps/a2ps-4.14-check-mempcpy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 7c3c69076..000000000
--- a/extra/a2ps/a2ps-4.14-fix-stpcpy-proto.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== 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 *
-