diff options
| author | tnn <tnn@pkgsrc.org> | 2010-07-21 11:48:05 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2010-07-21 11:48:05 +0000 |
| commit | 6d67c7b4222948788f418ce01fd404d6151286a7 (patch) | |
| tree | 4958629b9a4cf8502e25050427f3d3af084f97f5 /mail | |
| parent | 5ad0feb24a3863fa8e9d5f2a1d6f7ff94244b085 (diff) | |
| download | pkgsrc-6d67c7b4222948788f418ce01fd404d6151286a7.tar.gz | |
Fix undefined reference to re_comp/re_exec on dragonfly.
Reported by Francois Tigeot.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/thunderbird/distinfo | 4 | ||||
| -rw-r--r-- | mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h | 19 |
2 files changed, 18 insertions, 5 deletions
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 507b2f30504..672b08f1fde 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.70 2010/07/12 16:49:21 tnn Exp $ +$NetBSD: distinfo,v 1.71 2010/07/21 11:48:05 tnn Exp $ SHA1 (enigmail-1.1.2.tar.gz) = d29fce2b20a36d210b12c28fcbbee965007c95aa RMD160 (enigmail-1.1.2.tar.gz) = 2c1fa3494c1c2458635a3d68929ce7ff8fdb48e7 @@ -40,7 +40,7 @@ SHA1 (patch-be) = 654ca74f4ec23bfef147c6f0f852ae6de046bc9e SHA1 (patch-bf) = 63d4ba67d29ab64ba97fe6f148a52760e940a8b3 SHA1 (patch-bg) = 5e44de4d5904dc962c40d146d212ad084011c79c SHA1 (patch-directory_c-sdk_configure.in) = 4d8d8c1425ca26036d8f5179f954dbea2203de36 -SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 2727868e9fd905badb5b2f6195903ba214ce8138 +SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 0e1c188af241289ce0a9fc252a063a69f3d504a4 SHA1 (patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in) = 6e9788e5e9575fc0813f5f0e178cc2f5659ea781 SHA1 (patch-ma) = 9b9bc5e5ced5831aa14e1549ed2ddf0b9c2ce986 SHA1 (patch-ma-toplevel) = 460326a0551fecd13ca188cff907c89cce359c31 diff --git a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h index 69c1ac7515d..dd30de8542a 100644 --- a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h +++ b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h @@ -1,11 +1,24 @@ -$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.1 2010/07/12 16:49:22 tnn Exp $ +$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.2 2010/07/21 11:48:05 tnn Exp $ Add DragonFly support. https://bugzilla.mozilla.org/show_bug.cgi?id=577298 --- directory/c-sdk/ldap/include/portable.h.orig 2006-10-03 20:43:40.000000000 +0000 +++ directory/c-sdk/ldap/include/portable.h -@@ -295,7 +295,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP +@@ -122,8 +122,11 @@ + * some systems don't have the BSD re_comp and re_exec routines + */ + #ifndef NEED_BSDREGEX +-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) ++#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined(DRAGONFLY) || defined( linux ) || defined( DARWIN )) && !defined(sgi) + #define NEED_BSDREGEX ++/* there are conflicting prototypes in unistd.h on DragonFly */ ++#define re_comp ldap_compat_re_comp ++#define re_exec ldap_compat_re_exec + #endif + #endif + +@@ -295,7 +298,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP #elif defined(HPUX10) #define GETHOSTBYNAME_BUF_T struct hostent_data #define GETHOSTBYNAME( n, r, b, l, e ) nsldapi_compat_gethostbyname_r( n, r, (char *)&b, l, e ) @@ -14,7 +27,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=577298 typedef char GETHOSTBYNAME_buf_t [NSLDAPI_NETDB_BUF_SIZE]; #define GETHOSTBYNAME_BUF_T GETHOSTBYNAME_buf_t #define GETHOSTBYNAME( n, r, b, l, rp, e ) gethostbyname_r( n, r, b, l, rp, e ) -@@ -317,7 +317,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP +@@ -317,7 +320,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP || defined(OSF1V4) || defined(AIX) || defined(UnixWare) \ || defined(hpux) || defined(HPUX11) || defined(NETBSD) \ || defined(IRIX6) || defined(FREEBSD) || defined(VMS) \ |