[pkgsrc/trunk]: pkgsrc/devel/popt patch-aa: fix devel/popt build on NetBSD-cu...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6715f5229c1a
branches:  trunk
changeset: 391943:6715f5229c1a
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Apr 22 15:25:05 2009 +0000

description:
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:

 devel/popt/distinfo         |   3 ++-
 devel/popt/patches/patch-aa |  16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 72f124a398e5 -r 6715f5229c1a devel/popt/distinfo
--- a/devel/popt/distinfo       Wed Apr 22 14:50:18 2009 +0000
+++ b/devel/popt/distinfo       Wed Apr 22 15:25:05 2009 +0000
@@ -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 -r 72f124a398e5 -r 6715f5229c1a devel/popt/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/popt/patches/patch-aa       Wed Apr 22 15:25:05 2009 +0000
@@ -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