diff options
| author | tnn <tnn@pkgsrc.org> | 2009-04-22 15:25:05 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2009-04-22 15:25:05 +0000 |
| commit | 3601c23d04af967b2ef9bfeb3e5fbdd5c5bcf2c4 (patch) | |
| tree | 504c1f82857c67edbe3bd4088ee549a02436042d /devel/popt | |
| parent | e7974f67d0594d573f1ce15b02c849a2583bfe46 (diff) | |
| download | pkgsrc-3601c23d04af967b2ef9bfeb3e5fbdd5c5bcf2c4.tar.gz | |
patch-aa: fix devel/popt build on NetBSD-current (>=5.99.11) which
has glob_pattern_p(3) in libc.
Reported in PR pkg/41265.
Diffstat (limited to 'devel/popt')
| -rw-r--r-- | devel/popt/distinfo | 3 | ||||
| -rw-r--r-- | devel/popt/patches/patch-aa | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/devel/popt/distinfo b/devel/popt/distinfo index 38787ef46cd..43a9483638f 100644 --- a/devel/popt/distinfo +++ b/devel/popt/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.20 2009/04/20 11:23:57 wiz Exp $ +$NetBSD: distinfo,v 1.21 2009/04/22 15:25:05 tnn Exp $ SHA1 (popt-1.15.tar.gz) = d9bc3067a4e7e62ac0bd9818e8cd649ee0dd12dc RMD160 (popt-1.15.tar.gz) = f169eadb9c72160176d4c941e24f86e03104b839 Size (popt-1.15.tar.gz) = 666242 bytes +SHA1 (patch-aa) = 7edb4bbd7fe044da9f388159fdc22327377e267e diff --git a/devel/popt/patches/patch-aa b/devel/popt/patches/patch-aa new file mode 100644 index 00000000000..8ff0ca3eb11 --- /dev/null +++ b/devel/popt/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.8 2009/04/22 15:25:05 tnn Exp $ + +--- poptconfig.c.orig 2009-04-12 20:14:38.000000000 +0200 ++++ poptconfig.c +@@ -42,7 +42,10 @@ extern int glob_pattern_p (const char *_ + /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/ + #endif /* __LCLINT__ */ + +-#if !defined(__GLIBC__) ++#if defined(__NetBSD__) ++#include <sys/param.h> ++#endif ++#if !defined(__GLIBC__) && (!defined(__NetBSD__) || __NetBSD_Version__ < 599001100) + /* Return nonzero if PATTERN contains any metacharacters. + Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ + static int |