Wed Jul 21 11:48:06 2010 UTC ()
Fix undefined reference to re_comp/re_exec on dragonfly.
Reported by Francois Tigeot.
(tnn)
diff -r1.70 -r1.71 pkgsrc/mail/thunderbird/distinfo
diff -r1.1 -r1.2 pkgsrc/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h
diff -r1.52 -r1.53 pkgsrc/www/seamonkey/distinfo
diff -r1.2 -r1.3 pkgsrc/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h
--- pkgsrc/mail/thunderbird/distinfo 2010/07/12 16:49:21 1.70
+++ pkgsrc/mail/thunderbird/distinfo 2010/07/21 11:48:05 1.71
@@ -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-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
--- pkgsrc/mail/thunderbird/patches/Attic/patch-directory_c-sdk_ldap_include_portable.h 2010/07/12 16:49:22 1.1
+++ pkgsrc/mail/thunderbird/patches/Attic/patch-directory_c-sdk_ldap_include_portable.h 2010/07/21 11:48:05 1.2
@@ -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 @@
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) \
--- pkgsrc/www/seamonkey/distinfo 2010/07/12 13:57:29 1.52
+++ pkgsrc/www/seamonkey/distinfo 2010/07/21 11:48:05 1.53
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2010/07/12 13:57:29 tnn Exp $
+$NetBSD: distinfo,v 1.53 2010/07/21 11:48:05 tnn Exp $
SHA1 (seamonkey-2.0.5.source.tar.bz2) = a2be375b89a7d1f641da285f1c8edb81c2831e7b
RMD160 (seamonkey-2.0.5.source.tar.bz2) = ac8f03efa79ebd1c7f47434e0f8bfb79ff209f25
@@ -33,7 +33,7 @@
SHA1 (patch-ba) = fd28f3b24848e7221078ef692eef7ccae8625987
SHA1 (patch-bb) = 70d1d1fed2f611fa0185ca5736dae26c8cbc2f12
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
--- pkgsrc/www/seamonkey/patches/Attic/patch-directory_c-sdk_ldap_include_portable.h 2010/07/12 13:57:29 1.2
+++ pkgsrc/www/seamonkey/patches/Attic/patch-directory_c-sdk_ldap_include_portable.h 2010/07/21 11:48:05 1.3
@@ -1,11 +1,24 @@
-$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.2 2010/07/12 13:57:29 tnn Exp $
+$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.3 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 @@
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) \