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
cvs diff -r1.70 -r1.71 pkgsrc/mail/thunderbird/distinfo (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.70 2010/07/12 16:49:21 tnn Exp $ 1$NetBSD: distinfo,v 1.71 2010/07/21 11:48:05 tnn Exp $
2 2
3SHA1 (enigmail-1.1.2.tar.gz) = d29fce2b20a36d210b12c28fcbbee965007c95aa 3SHA1 (enigmail-1.1.2.tar.gz) = d29fce2b20a36d210b12c28fcbbee965007c95aa
4RMD160 (enigmail-1.1.2.tar.gz) = 2c1fa3494c1c2458635a3d68929ce7ff8fdb48e7 4RMD160 (enigmail-1.1.2.tar.gz) = 2c1fa3494c1c2458635a3d68929ce7ff8fdb48e7
5Size (enigmail-1.1.2.tar.gz) = 1280923 bytes 5Size (enigmail-1.1.2.tar.gz) = 1280923 bytes
6SHA1 (thunderbird-3.1.source.tar.bz2) = 89e9d8099a5437ce401577fc4d526eb0dd9e51da 6SHA1 (thunderbird-3.1.source.tar.bz2) = 89e9d8099a5437ce401577fc4d526eb0dd9e51da
7RMD160 (thunderbird-3.1.source.tar.bz2) = bc55cf89dfe1f2c946fff8f5ec21b0377229afe7 7RMD160 (thunderbird-3.1.source.tar.bz2) = bc55cf89dfe1f2c946fff8f5ec21b0377229afe7
8Size (thunderbird-3.1.source.tar.bz2) = 65633518 bytes 8Size (thunderbird-3.1.source.tar.bz2) = 65633518 bytes
9SHA1 (patch-aa) = 0d46562e73fce3fc1bf590ac93a28b2202a8e214 9SHA1 (patch-aa) = 0d46562e73fce3fc1bf590ac93a28b2202a8e214
10SHA1 (patch-aa-toplevel) = 0a872c898af5846a3493dadc2253ba3c72fa3094 10SHA1 (patch-aa-toplevel) = 0a872c898af5846a3493dadc2253ba3c72fa3094
11SHA1 (patch-ab) = abf862976c04594dc4f99d34a2b58725efafd5fd 11SHA1 (patch-ab) = abf862976c04594dc4f99d34a2b58725efafd5fd
12SHA1 (patch-ac) = e181323e153ee061b7f3644b599294a4c4a3e3e8 12SHA1 (patch-ac) = e181323e153ee061b7f3644b599294a4c4a3e3e8
13SHA1 (patch-ad) = f49147e2fa28400986b659ec50918e3835db0105 13SHA1 (patch-ad) = f49147e2fa28400986b659ec50918e3835db0105
14SHA1 (patch-ae) = cf4cb737fc29ef7ac6ffe1b3bc504743441e4828 14SHA1 (patch-ae) = cf4cb737fc29ef7ac6ffe1b3bc504743441e4828
@@ -30,27 +30,27 @@ SHA1 (patch-at) = 569a874251a1920fa916d4 @@ -30,27 +30,27 @@ SHA1 (patch-at) = 569a874251a1920fa916d4
30SHA1 (patch-au) = d381e6c0d6a791c2d72754f847df0e2210265fd8 30SHA1 (patch-au) = d381e6c0d6a791c2d72754f847df0e2210265fd8
31SHA1 (patch-av) = 2cb2e3d5b94f7b83117eb752d4410638daa6ae73 31SHA1 (patch-av) = 2cb2e3d5b94f7b83117eb752d4410638daa6ae73
32SHA1 (patch-aw) = 55d2769dfb6d0c65bd2072c1a7c82cfef0fd5404 32SHA1 (patch-aw) = 55d2769dfb6d0c65bd2072c1a7c82cfef0fd5404
33SHA1 (patch-ax) = 1dbdcd2e9a791a686fd42452ccf486d14cdf2a57 33SHA1 (patch-ax) = 1dbdcd2e9a791a686fd42452ccf486d14cdf2a57
34SHA1 (patch-ay) = 5aaeb992cab024fb2b6035ddee239a8534b23aee 34SHA1 (patch-ay) = 5aaeb992cab024fb2b6035ddee239a8534b23aee
35SHA1 (patch-az) = 0e04c1c740ad3f1462a6cda4a3832378acefb600 35SHA1 (patch-az) = 0e04c1c740ad3f1462a6cda4a3832378acefb600
36SHA1 (patch-ba) = fd28f3b24848e7221078ef692eef7ccae8625987 36SHA1 (patch-ba) = fd28f3b24848e7221078ef692eef7ccae8625987
37SHA1 (patch-bb) = 7cb648a5f20b3b61a24494e502bd49b535bb8055 37SHA1 (patch-bb) = 7cb648a5f20b3b61a24494e502bd49b535bb8055
38SHA1 (patch-bc) = ca4122954a38770449372bd67da5b64190d97d16 38SHA1 (patch-bc) = ca4122954a38770449372bd67da5b64190d97d16
39SHA1 (patch-be) = 654ca74f4ec23bfef147c6f0f852ae6de046bc9e 39SHA1 (patch-be) = 654ca74f4ec23bfef147c6f0f852ae6de046bc9e
40SHA1 (patch-bf) = 63d4ba67d29ab64ba97fe6f148a52760e940a8b3 40SHA1 (patch-bf) = 63d4ba67d29ab64ba97fe6f148a52760e940a8b3
41SHA1 (patch-bg) = 5e44de4d5904dc962c40d146d212ad084011c79c 41SHA1 (patch-bg) = 5e44de4d5904dc962c40d146d212ad084011c79c
42SHA1 (patch-directory_c-sdk_configure.in) = 4d8d8c1425ca26036d8f5179f954dbea2203de36 42SHA1 (patch-directory_c-sdk_configure.in) = 4d8d8c1425ca26036d8f5179f954dbea2203de36
43SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 2727868e9fd905badb5b2f6195903ba214ce8138 43SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 0e1c188af241289ce0a9fc252a063a69f3d504a4
44SHA1 (patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in) = 6e9788e5e9575fc0813f5f0e178cc2f5659ea781 44SHA1 (patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in) = 6e9788e5e9575fc0813f5f0e178cc2f5659ea781
45SHA1 (patch-ma) = 9b9bc5e5ced5831aa14e1549ed2ddf0b9c2ce986 45SHA1 (patch-ma) = 9b9bc5e5ced5831aa14e1549ed2ddf0b9c2ce986
46SHA1 (patch-ma-toplevel) = 460326a0551fecd13ca188cff907c89cce359c31 46SHA1 (patch-ma-toplevel) = 460326a0551fecd13ca188cff907c89cce359c31
47SHA1 (patch-mb) = c27a2a8891bd5215fef9b920baa87499424d278f 47SHA1 (patch-mb) = c27a2a8891bd5215fef9b920baa87499424d278f
48SHA1 (patch-mc) = 3050ce0f99c6a1cbb45dfa3a2b110ced8fb1edab 48SHA1 (patch-mc) = 3050ce0f99c6a1cbb45dfa3a2b110ced8fb1edab
49SHA1 (patch-md) = 932c2b0237c9690da06533f0abfeabddf32d8f3e 49SHA1 (patch-md) = 932c2b0237c9690da06533f0abfeabddf32d8f3e
50SHA1 (patch-me) = 775262c00ac16ea78a11ede5678e3d08f97c9640 50SHA1 (patch-me) = 775262c00ac16ea78a11ede5678e3d08f97c9640
51SHA1 (patch-mf) = 9aa245b2704df3b2009a8dee0e8217cbd20df9d0 51SHA1 (patch-mf) = 9aa245b2704df3b2009a8dee0e8217cbd20df9d0
52SHA1 (patch-mg) = f33a92539ebe171b7bbbd83a54ad9ac2fdca249a 52SHA1 (patch-mg) = f33a92539ebe171b7bbbd83a54ad9ac2fdca249a
53SHA1 (patch-mh) = 9f1b447ef0236ac10b88c8d6f6d62cde4acb4331 53SHA1 (patch-mh) = 9f1b447ef0236ac10b88c8d6f6d62cde4acb4331
54SHA1 (patch-mi) = c49e917409c0542e69f57fe5571a16b6c2e4aa9a 54SHA1 (patch-mi) = c49e917409c0542e69f57fe5571a16b6c2e4aa9a
55SHA1 (patch-mj) = 9b28802eb665a7a77e879ec44e9da52e2e79ec8b 55SHA1 (patch-mj) = 9b28802eb665a7a77e879ec44e9da52e2e79ec8b
56SHA1 (patch-mk) = 3c25934e0c7b9277d96a5635b961e1fb6682ab7b 56SHA1 (patch-mk) = 3c25934e0c7b9277d96a5635b961e1fb6682ab7b
cvs diff -r1.1 -r1.2 pkgsrc/mail/thunderbird/patches/Attic/patch-directory_c-sdk_ldap_include_portable.h (expand / switch to unified diff)

--- 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,25 +1,38 @@ @@ -1,25 +1,38 @@
1$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.1 2010/07/12 16:49:22 tnn Exp $ 1$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.2 2010/07/21 11:48:05 tnn Exp $
2 2
3Add DragonFly support. 3Add DragonFly support.
4https://bugzilla.mozilla.org/show_bug.cgi?id=577298 4https://bugzilla.mozilla.org/show_bug.cgi?id=577298
5 5
6--- directory/c-sdk/ldap/include/portable.h.orig 2006-10-03 20:43:40.000000000 +0000 6--- directory/c-sdk/ldap/include/portable.h.orig 2006-10-03 20:43:40.000000000 +0000
7+++ directory/c-sdk/ldap/include/portable.h 7+++ directory/c-sdk/ldap/include/portable.h
8@@ -295,7 +295,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP 8@@ -122,8 +122,11 @@
 9 * some systems don't have the BSD re_comp and re_exec routines
 10 */
 11 #ifndef NEED_BSDREGEX
 12-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
 13+#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined(DRAGONFLY) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
 14 #define NEED_BSDREGEX
 15+/* there are conflicting prototypes in unistd.h on DragonFly */
 16+#define re_comp ldap_compat_re_comp
 17+#define re_exec ldap_compat_re_exec
 18 #endif
 19 #endif
 20
 21@@ -295,7 +298,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP
9 #elif defined(HPUX10) 22 #elif defined(HPUX10)
10 #define GETHOSTBYNAME_BUF_T struct hostent_data 23 #define GETHOSTBYNAME_BUF_T struct hostent_data
11 #define GETHOSTBYNAME( n, r, b, l, e ) nsldapi_compat_gethostbyname_r( n, r, (char *)&b, l, e ) 24 #define GETHOSTBYNAME( n, r, b, l, e ) nsldapi_compat_gethostbyname_r( n, r, (char *)&b, l, e )
12-#elif defined(LINUX) 25-#elif defined(LINUX)
13+#elif defined(LINUX) || defined(DRAGONFLY) 26+#elif defined(LINUX) || defined(DRAGONFLY)
14 typedef char GETHOSTBYNAME_buf_t [NSLDAPI_NETDB_BUF_SIZE]; 27 typedef char GETHOSTBYNAME_buf_t [NSLDAPI_NETDB_BUF_SIZE];
15 #define GETHOSTBYNAME_BUF_T GETHOSTBYNAME_buf_t 28 #define GETHOSTBYNAME_BUF_T GETHOSTBYNAME_buf_t
16 #define GETHOSTBYNAME( n, r, b, l, rp, e ) gethostbyname_r( n, r, b, l, rp, e ) 29 #define GETHOSTBYNAME( n, r, b, l, rp, e ) gethostbyname_r( n, r, b, l, rp, e )
17@@ -317,7 +317,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP 30@@ -317,7 +320,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP
18 || defined(OSF1V4) || defined(AIX) || defined(UnixWare) \ 31 || defined(OSF1V4) || defined(AIX) || defined(UnixWare) \
19 || defined(hpux) || defined(HPUX11) || defined(NETBSD) \ 32 || defined(hpux) || defined(HPUX11) || defined(NETBSD) \
20 || defined(IRIX6) || defined(FREEBSD) || defined(VMS) \ 33 || defined(IRIX6) || defined(FREEBSD) || defined(VMS) \
21- || defined(NTO) || defined(OPENBSD) 34- || defined(NTO) || defined(OPENBSD)
22+ || defined(NTO) || defined(OPENBSD) || defined(DRAGONFLY) 35+ || defined(NTO) || defined(OPENBSD) || defined(DRAGONFLY)
23 #define NSLDAPI_CTIME( c, b, l ) ctime_r( c, b ) 36 #define NSLDAPI_CTIME( c, b, l ) ctime_r( c, b )
24 #elif defined( OSF1V3 ) 37 #elif defined( OSF1V3 )
25 #define NSLDAPI_CTIME( c, b, l ) (ctime_r( c, b, l ) ? NULL : b) 38 #define NSLDAPI_CTIME( c, b, l ) (ctime_r( c, b, l ) ? NULL : b)
cvs diff -r1.52 -r1.53 pkgsrc/www/seamonkey/distinfo (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.52 2010/07/12 13:57:29 tnn Exp $ 1$NetBSD: distinfo,v 1.53 2010/07/21 11:48:05 tnn Exp $
2 2
3SHA1 (seamonkey-2.0.5.source.tar.bz2) = a2be375b89a7d1f641da285f1c8edb81c2831e7b 3SHA1 (seamonkey-2.0.5.source.tar.bz2) = a2be375b89a7d1f641da285f1c8edb81c2831e7b
4RMD160 (seamonkey-2.0.5.source.tar.bz2) = ac8f03efa79ebd1c7f47434e0f8bfb79ff209f25 4RMD160 (seamonkey-2.0.5.source.tar.bz2) = ac8f03efa79ebd1c7f47434e0f8bfb79ff209f25
5Size (seamonkey-2.0.5.source.tar.bz2) = 61608877 bytes 5Size (seamonkey-2.0.5.source.tar.bz2) = 61608877 bytes
6SHA1 (patch-aa) = 0d46562e73fce3fc1bf590ac93a28b2202a8e214 6SHA1 (patch-aa) = 0d46562e73fce3fc1bf590ac93a28b2202a8e214
7SHA1 (patch-aa-toplevel) = 458051a1b3318b49124192c6e97cb9ed0d92dead 7SHA1 (patch-aa-toplevel) = 458051a1b3318b49124192c6e97cb9ed0d92dead
8SHA1 (patch-ab) = c7a6961362b131f0a39f65355562b115fae3be85 8SHA1 (patch-ab) = c7a6961362b131f0a39f65355562b115fae3be85
9SHA1 (patch-ac) = e181323e153ee061b7f3644b599294a4c4a3e3e8 9SHA1 (patch-ac) = e181323e153ee061b7f3644b599294a4c4a3e3e8
10SHA1 (patch-ad) = f49147e2fa28400986b659ec50918e3835db0105 10SHA1 (patch-ad) = f49147e2fa28400986b659ec50918e3835db0105
11SHA1 (patch-ae) = cf4cb737fc29ef7ac6ffe1b3bc504743441e4828 11SHA1 (patch-ae) = cf4cb737fc29ef7ac6ffe1b3bc504743441e4828
12SHA1 (patch-af) = 16cae98e043dedeb6331212fd15ce914196fe8c7 12SHA1 (patch-af) = 16cae98e043dedeb6331212fd15ce914196fe8c7
13SHA1 (patch-ag) = 7f8c3ac1bec475dd2b6fd6e10e5304ab9c112a67 13SHA1 (patch-ag) = 7f8c3ac1bec475dd2b6fd6e10e5304ab9c112a67
14SHA1 (patch-ah) = 10c80ec60801295b037b4a45fbad8937922da235 14SHA1 (patch-ah) = 10c80ec60801295b037b4a45fbad8937922da235
@@ -23,27 +23,27 @@ SHA1 (patch-ap) = 78d9944ba37b3d90d0ab9e @@ -23,27 +23,27 @@ SHA1 (patch-ap) = 78d9944ba37b3d90d0ab9e
23SHA1 (patch-aq) = ac5cd0e83f0c166fae6b033ad960d7820bb7add6 23SHA1 (patch-aq) = ac5cd0e83f0c166fae6b033ad960d7820bb7add6
24SHA1 (patch-ar) = dab688f86340bccb80db5531f4e36cb8f50254e4 24SHA1 (patch-ar) = dab688f86340bccb80db5531f4e36cb8f50254e4
25SHA1 (patch-as) = 7e283a79231909ab5fb60740b5e36c8c0744e025 25SHA1 (patch-as) = 7e283a79231909ab5fb60740b5e36c8c0744e025
26SHA1 (patch-at) = 569a874251a1920fa916d448c108910348cd75dc 26SHA1 (patch-at) = 569a874251a1920fa916d448c108910348cd75dc
27SHA1 (patch-au) = d381e6c0d6a791c2d72754f847df0e2210265fd8 27SHA1 (patch-au) = d381e6c0d6a791c2d72754f847df0e2210265fd8
28SHA1 (patch-av) = 2cb2e3d5b94f7b83117eb752d4410638daa6ae73 28SHA1 (patch-av) = 2cb2e3d5b94f7b83117eb752d4410638daa6ae73
29SHA1 (patch-aw) = 55d2769dfb6d0c65bd2072c1a7c82cfef0fd5404 29SHA1 (patch-aw) = 55d2769dfb6d0c65bd2072c1a7c82cfef0fd5404
30SHA1 (patch-ax) = 1dbdcd2e9a791a686fd42452ccf486d14cdf2a57 30SHA1 (patch-ax) = 1dbdcd2e9a791a686fd42452ccf486d14cdf2a57
31SHA1 (patch-ay) = 5aaeb992cab024fb2b6035ddee239a8534b23aee 31SHA1 (patch-ay) = 5aaeb992cab024fb2b6035ddee239a8534b23aee
32SHA1 (patch-az) = 0e04c1c740ad3f1462a6cda4a3832378acefb600 32SHA1 (patch-az) = 0e04c1c740ad3f1462a6cda4a3832378acefb600
33SHA1 (patch-ba) = fd28f3b24848e7221078ef692eef7ccae8625987 33SHA1 (patch-ba) = fd28f3b24848e7221078ef692eef7ccae8625987
34SHA1 (patch-bb) = 70d1d1fed2f611fa0185ca5736dae26c8cbc2f12 34SHA1 (patch-bb) = 70d1d1fed2f611fa0185ca5736dae26c8cbc2f12
35SHA1 (patch-directory_c-sdk_configure.in) = 4d8d8c1425ca26036d8f5179f954dbea2203de36 35SHA1 (patch-directory_c-sdk_configure.in) = 4d8d8c1425ca26036d8f5179f954dbea2203de36
36SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 2727868e9fd905badb5b2f6195903ba214ce8138 36SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 0e1c188af241289ce0a9fc252a063a69f3d504a4
37SHA1 (patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in) = 6e9788e5e9575fc0813f5f0e178cc2f5659ea781 37SHA1 (patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in) = 6e9788e5e9575fc0813f5f0e178cc2f5659ea781
38SHA1 (patch-ma) = 9b9bc5e5ced5831aa14e1549ed2ddf0b9c2ce986 38SHA1 (patch-ma) = 9b9bc5e5ced5831aa14e1549ed2ddf0b9c2ce986
39SHA1 (patch-ma-toplevel) = 460326a0551fecd13ca188cff907c89cce359c31 39SHA1 (patch-ma-toplevel) = 460326a0551fecd13ca188cff907c89cce359c31
40SHA1 (patch-mb) = 8bdd47c4e57ae63c971766286ce8626d3341c92e 40SHA1 (patch-mb) = 8bdd47c4e57ae63c971766286ce8626d3341c92e
41SHA1 (patch-md) = 932c2b0237c9690da06533f0abfeabddf32d8f3e 41SHA1 (patch-md) = 932c2b0237c9690da06533f0abfeabddf32d8f3e
42SHA1 (patch-me) = b7b853887b08fc55b45dbd19cd5a4a24f6c5224d 42SHA1 (patch-me) = b7b853887b08fc55b45dbd19cd5a4a24f6c5224d
43SHA1 (patch-mf) = bc693a247f306f414f54bf515eeb8f36841a46b8 43SHA1 (patch-mf) = bc693a247f306f414f54bf515eeb8f36841a46b8
44SHA1 (patch-mg) = f33a92539ebe171b7bbbd83a54ad9ac2fdca249a 44SHA1 (patch-mg) = f33a92539ebe171b7bbbd83a54ad9ac2fdca249a
45SHA1 (patch-mi) = c49e917409c0542e69f57fe5571a16b6c2e4aa9a 45SHA1 (patch-mi) = c49e917409c0542e69f57fe5571a16b6c2e4aa9a
46SHA1 (patch-mj) = 9b28802eb665a7a77e879ec44e9da52e2e79ec8b 46SHA1 (patch-mj) = 9b28802eb665a7a77e879ec44e9da52e2e79ec8b
47SHA1 (patch-mk) = 3c25934e0c7b9277d96a5635b961e1fb6682ab7b 47SHA1 (patch-mk) = 3c25934e0c7b9277d96a5635b961e1fb6682ab7b
48SHA1 (patch-ml) = ef7d87fff48f298f4c1ed037439eaf8c7c574f68 48SHA1 (patch-ml) = ef7d87fff48f298f4c1ed037439eaf8c7c574f68
49SHA1 (patch-mm) = 04d9105ab0fb520690b58230e90bf6217b439df7 49SHA1 (patch-mm) = 04d9105ab0fb520690b58230e90bf6217b439df7
cvs diff -r1.2 -r1.3 pkgsrc/www/seamonkey/patches/Attic/patch-directory_c-sdk_ldap_include_portable.h (expand / switch to unified diff)

--- 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,25 +1,38 @@ @@ -1,25 +1,38 @@
1$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.2 2010/07/12 13:57:29 tnn Exp $ 1$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.3 2010/07/21 11:48:05 tnn Exp $
2 2
3Add DragonFly support. 3Add DragonFly support.
4https://bugzilla.mozilla.org/show_bug.cgi?id=577298 4https://bugzilla.mozilla.org/show_bug.cgi?id=577298
5 5
6--- directory/c-sdk/ldap/include/portable.h.orig 2006-10-03 20:43:40.000000000 +0000 6--- directory/c-sdk/ldap/include/portable.h.orig 2006-10-03 20:43:40.000000000 +0000
7+++ directory/c-sdk/ldap/include/portable.h 7+++ directory/c-sdk/ldap/include/portable.h
8@@ -295,7 +295,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP 8@@ -122,8 +122,11 @@
 9 * some systems don't have the BSD re_comp and re_exec routines
 10 */
 11 #ifndef NEED_BSDREGEX
 12-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
 13+#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined(DRAGONFLY) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
 14 #define NEED_BSDREGEX
 15+/* there are conflicting prototypes in unistd.h on DragonFly */
 16+#define re_comp ldap_compat_re_comp
 17+#define re_exec ldap_compat_re_exec
 18 #endif
 19 #endif
 20
 21@@ -295,7 +298,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP
9 #elif defined(HPUX10) 22 #elif defined(HPUX10)
10 #define GETHOSTBYNAME_BUF_T struct hostent_data 23 #define GETHOSTBYNAME_BUF_T struct hostent_data
11 #define GETHOSTBYNAME( n, r, b, l, e ) nsldapi_compat_gethostbyname_r( n, r, (char *)&b, l, e ) 24 #define GETHOSTBYNAME( n, r, b, l, e ) nsldapi_compat_gethostbyname_r( n, r, (char *)&b, l, e )
12-#elif defined(LINUX) 25-#elif defined(LINUX)
13+#elif defined(LINUX) || defined(DRAGONFLY) 26+#elif defined(LINUX) || defined(DRAGONFLY)
14 typedef char GETHOSTBYNAME_buf_t [NSLDAPI_NETDB_BUF_SIZE]; 27 typedef char GETHOSTBYNAME_buf_t [NSLDAPI_NETDB_BUF_SIZE];
15 #define GETHOSTBYNAME_BUF_T GETHOSTBYNAME_buf_t 28 #define GETHOSTBYNAME_BUF_T GETHOSTBYNAME_buf_t
16 #define GETHOSTBYNAME( n, r, b, l, rp, e ) gethostbyname_r( n, r, b, l, rp, e ) 29 #define GETHOSTBYNAME( n, r, b, l, rp, e ) gethostbyname_r( n, r, b, l, rp, e )
17@@ -317,7 +317,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP 30@@ -317,7 +320,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP
18 || defined(OSF1V4) || defined(AIX) || defined(UnixWare) \ 31 || defined(OSF1V4) || defined(AIX) || defined(UnixWare) \
19 || defined(hpux) || defined(HPUX11) || defined(NETBSD) \ 32 || defined(hpux) || defined(HPUX11) || defined(NETBSD) \
20 || defined(IRIX6) || defined(FREEBSD) || defined(VMS) \ 33 || defined(IRIX6) || defined(FREEBSD) || defined(VMS) \
21- || defined(NTO) || defined(OPENBSD) 34- || defined(NTO) || defined(OPENBSD)
22+ || defined(NTO) || defined(OPENBSD) || defined(DRAGONFLY) 35+ || defined(NTO) || defined(OPENBSD) || defined(DRAGONFLY)
23 #define NSLDAPI_CTIME( c, b, l ) ctime_r( c, b ) 36 #define NSLDAPI_CTIME( c, b, l ) ctime_r( c, b )
24 #elif defined( OSF1V3 ) 37 #elif defined( OSF1V3 )
25 #define NSLDAPI_CTIME( c, b, l ) (ctime_r( c, b, l ) ? NULL : b) 38 #define NSLDAPI_CTIME( c, b, l ) (ctime_r( c, b, l ) ? NULL : b)