diff options
| author | marino <marino@pkgsrc.org> | 2012-03-23 18:44:23 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-03-23 18:44:23 +0000 |
| commit | cd53f5c14576c622d7051e2e0d2e81000ca5b966 (patch) | |
| tree | 34c57a529db0f6d53a160e94fd4bb714f49115b8 /print | |
| parent | dd65525e1123c743da6d10b1d1c0d18140042911 (diff) | |
| download | pkgsrc-cd53f5c14576c622d7051e2e0d2e81000ca5b966.tar.gz | |
print/a2ps: Fix mempcpy for DragonFly
a2ps is inconsistent with it's use of mempcpy. For lib/path-concat.c and
lib/strftime.c, it's looking for "mempcpy", but for src/regex.c it is
looking for __mempcpy.
DragonFly has mempcpy in string.h, so just patch the problematic
lib/path-concat.c to stop it from being redefined. HAVE_MEMPCPY isn't
defined correctly and if it were it would break at regex.c. The string.h
header and mempcpy definition are mutually exclusive in strftime.c file
so this one didn't need a patch.
Diffstat (limited to 'print')
| -rw-r--r-- | print/a2ps/distinfo | 3 | ||||
| -rw-r--r-- | print/a2ps/patches/patch-lib_path-concat.c | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/print/a2ps/distinfo b/print/a2ps/distinfo index 194deb1f73f..28f830f4dec 100644 --- a/print/a2ps/distinfo +++ b/print/a2ps/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2010/10/28 23:21:52 tron Exp $ +$NetBSD: distinfo,v 1.13 2012/03/23 18:44:23 marino Exp $ SHA1 (a2ps-4.14.tar.gz) = 365abbbe4b7128bf70dad16d06e23c5701874852 RMD160 (a2ps-4.14.tar.gz) = a5105d6256a809483e099519325979aaaff7219e @@ -6,3 +6,4 @@ Size (a2ps-4.14.tar.gz) = 2552507 bytes SHA1 (patch-aa) = 6317b6abca697388538fc705037da55379a4e1e1 SHA1 (patch-ab) = 7b1f1e3ed2af47e7d9864ec2dbcd7d105f93632a SHA1 (patch-ac) = 8e09c4c3b320b58bf12c4266d4d22977b5f9b826 +SHA1 (patch-lib_path-concat.c) = b345a7b16559315223dcbb182e92feccca7e6e2f diff --git a/print/a2ps/patches/patch-lib_path-concat.c b/print/a2ps/patches/patch-lib_path-concat.c new file mode 100644 index 00000000000..a8b4eec8bf7 --- /dev/null +++ b/print/a2ps/patches/patch-lib_path-concat.c @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_path-concat.c,v 1.1 2012/03/23 18:44:23 marino Exp $ + +--- lib/path-concat.c.orig 2012-03-23 17:50:24.184967000 +0000 ++++ lib/path-concat.c +@@ -21,7 +21,7 @@ + # include <config.h> + #endif + +-#ifndef HAVE_MEMPCPY ++#if !defined(HAVE_MEMPCPY) && !defined(__DragonFly__) + # define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N))) + #endif + |