If strverscmp() is not present, libidn shouldn't export a symbol of the

same name, breaking the builds of libraries trying to both link against
libidn and use strverscmp(). Bump PKGREVISION.

Related to PR 39640.

5 files changed, 57 insertions, 2 deletions

diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index 17b46cf6184..da633b23bdb 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2008/09/06 15:13:55 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2008/09/28 00:43:39 tonnerre Exp $
 
 DISTNAME=	libidn-1.10
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://alpha.gnu.org/pub/gnu/libidn/ \
 		http://josefsson.org/libidn/releases/
diff --git a/devel/libidn/distinfo b/devel/libidn/distinfo
index 916cf4aabc8..14c0bd055e3 100644
--- a/devel/libidn/distinfo
+++ b/devel/libidn/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.37 2008/09/06 15:13:55 wiz Exp $
+$NetBSD: distinfo,v 1.38 2008/09/28 00:43:39 tonnerre Exp $
 
 SHA1 (libidn-1.10.tar.gz) = a19aa399f5dc636ab5c693ca15f06bce2a833e34
 RMD160 (libidn-1.10.tar.gz) = e112eeb5340c8ded1e0aef8096432451a03351bb
 Size (libidn-1.10.tar.gz) = 2534199 bytes
 SHA1 (patch-aa) = 412f1b609b81ade44c694f1a24f5b37d57c383c0
+SHA1 (patch-ab) = 850e8f30891c58dc9781c7e891e61136c6ed6d3b
+SHA1 (patch-ac) = 0b2eab310a21ca7ea695d0ee01449b7311338d6f
+SHA1 (patch-ad) = b0e3d6f4739f007d4df6de0ace056011dfb21c7d
diff --git a/devel/libidn/patches/patch-ab b/devel/libidn/patches/patch-ab
new file mode 100644
index 00000000000..10a8b513804
--- /dev/null
+++ b/devel/libidn/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2008/09/28 00:43:39 tonnerre Exp $
+
+--- lib/gl/strverscmp.c.orig	2008-08-25 17:33:33.000000000 +0200
++++ lib/gl/strverscmp.c
+@@ -58,7 +58,7 @@
+ */
+ 
+ int
+-__strverscmp (const char *s1, const char *s2)
++libidn_strverscmp (const char *s1, const char *s2)
+ {
+   const unsigned char *p1 = (const unsigned char *) s1;
+   const unsigned char *p2 = (const unsigned char *) s2;
diff --git a/devel/libidn/patches/patch-ac b/devel/libidn/patches/patch-ac
new file mode 100644
index 00000000000..feed2c011a7
--- /dev/null
+++ b/devel/libidn/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2008/09/28 00:43:39 tonnerre Exp $
+
+--- lib/gl/string.in.h.orig	2008-08-25 17:33:33.000000000 +0200
++++ lib/gl/string.in.h
+@@ -578,14 +578,15 @@ extern char *strsignal (int __sig);
+ 
+ #if @GNULIB_STRVERSCMP@
+ # if !@HAVE_STRVERSCMP@
+-extern int strverscmp (const char *, const char *);
++#define strverscmp libidn_strverscmp
++extern int libidn_strverscmp (const char *, const char *);
+ # endif
+ #elif defined GNULIB_POSIXCHECK
+ # undef strverscmp
+ # define strverscmp(a, b) \
+     (GL_LINK_WARNING ("strverscmp is unportable - " \
+                       "use gnulib module strverscmp for portability"), \
+-     strverscmp (a, b))
++     libidn_strverscmp (a, b))
+ #endif
+ 
+ 
diff --git a/devel/libidn/patches/patch-ad b/devel/libidn/patches/patch-ad
new file mode 100644
index 00000000000..2049099ed0f
--- /dev/null
+++ b/devel/libidn/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2008/09/28 00:43:39 tonnerre Exp $
+
+--- win32/include/gen-win32-headers.pl.orig	2008-08-27 10:12:12.000000000 +0200
++++ win32/include/gen-win32-headers.pl
+@@ -69,7 +69,10 @@ if(@ARGV == 0) {
+ #define strcasecmp stricmp
+ #define strncasecmp strnicmp
+ 
+-extern int strverscmp (const char *, const char *);
++#ifndef HAVE_STRVERSCMP
++#define strverscmp libidn_strverscmp
++extern int libidn_strverscmp (const char *, const char *);
++#endif
+ 
+ #define LOCALEDIR "."
+