diff options
author | joerg <joerg@pkgsrc.org> | 2006-01-25 14:41:31 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-01-25 14:41:31 +0000 |
commit | 4b68cabb693c4cae467aa2671fb1afa5f0fb4a56 (patch) | |
tree | f3580df8ff100d19cf2134fb543f693dda8cad07 | |
parent | c5204480d46f8fc34d1d4b17964f7105b3a58d82 (diff) | |
download | pkgsrc-4b68cabb693c4cae467aa2671fb1afa5f0fb4a56.tar.gz |
Remove some compat hacks from NetBSD's libc which are not necessary
and in fact harmful in a standalone binary.
-rw-r--r-- | textproc/vis/distinfo | 3 | ||||
-rw-r--r-- | textproc/vis/patches/patch-aa | 56 |
2 files changed, 58 insertions, 1 deletions
diff --git a/textproc/vis/distinfo b/textproc/vis/distinfo index b26e40c3dd2..f06295259ca 100644 --- a/textproc/vis/distinfo +++ b/textproc/vis/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/07/05 19:53:40 christos Exp $ +$NetBSD: distinfo,v 1.3 2006/01/25 14:41:31 joerg Exp $ SHA1 (vis-0.1.tar.gz) = 981dad2960374a83e368c8497e6405781ba65bff RMD160 (vis-0.1.tar.gz) = 23e8da2e899be6f78414beaa38a649407499c7ad Size (vis-0.1.tar.gz) = 8893 bytes +SHA1 (patch-aa) = 885c462e6b136b5b87bd32f276fcbc2482c1f04f diff --git a/textproc/vis/patches/patch-aa b/textproc/vis/patches/patch-aa new file mode 100644 index 00000000000..9907b29618a --- /dev/null +++ b/textproc/vis/patches/patch-aa @@ -0,0 +1,56 @@ +$NetBSD: patch-aa,v 1.1 2006/01/25 14:41:31 joerg Exp $ + +--- unvis/libunvis.c.orig 2006-01-25 14:33:51.000000000 +0000 ++++ unvis/libunvis.c +@@ -40,11 +40,6 @@ __RCSID("$NetBSD: unvis.c,v 1.24 2003/08 + #endif + #endif /* LIBC_SCCS and not lint */ + +-#ifdef notdef +-#define __LIBC12_SOURCE__ +- +-#include "namespace.h" +-#endif + #include <sys/types.h> + + #include <assert.h> +@@ -52,20 +47,11 @@ __RCSID("$NetBSD: unvis.c,v 1.24 2003/08 + #include <stdio.h> + #include <vis.h> + +-#ifdef __weak_alias +-__weak_alias(strunvis,_strunvis) +-__weak_alias(unvis,_unvis) +-#endif + #ifndef _DIAGASSERT + #define _DIAGASSERT(a) + #endif + +-#ifdef __warn_references +-__warn_references(unvis, +- "warning: reference to compatibility unvis(); include <vis.h> for correct reference") +-#endif +- +-#if !HAVE_VIS ++#ifndef HAVE_VIS + /* + * decode driven by state machine + */ +@@ -82,6 +68,8 @@ __warn_references(unvis, + #define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') + #define xtod(c) (isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10)) + ++static int __unvis13(char *cp, int c, int *astate, int flag); ++ + int + unvis(cp, c, astate, flag) + char *cp; +@@ -94,7 +82,7 @@ unvis(cp, c, astate, flag) + /* + * unvis - decode characters previously encoded by vis + */ +-int ++static int + __unvis13(cp, c, astate, flag) + char *cp; + int c; |