Bump PKGREVISION. Fix another _res multi-thread error. Patch is provided by Dave Tyson on pkgsrc-users@.diff -r1.104 -r1.105 pkgsrc/mail/thunderbird/Makefile
(ryoon)
@@ -1,20 +1,21 @@ | @@ -1,20 +1,21 @@ | |||
1 | # $NetBSD: Makefile,v 1.104 2012/11/23 07:17:53 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.105 2012/12/12 08:35:58 ryoon Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= # empty | 4 | DISTNAME= # empty | |
5 | PKGNAME= thunderbird-${TB_VER} | 5 | PKGNAME= thunderbird-${TB_VER} | |
6 | TB_VER= 17.0 | 6 | TB_VER= 17.0 | |
7 | LIGHTNINGVER= 1.9 | 7 | LIGHTNINGVER= 1.9 | |
8 | PKGREVISION= 1 | |||
8 | CATEGORIES= mail | 9 | CATEGORIES= mail | |
9 | MASTER_SITES= ${MASTER_SITE_MOZILLA_ESR:=thunderbird/releases/${TB_VER}esr/source/} \ | 10 | MASTER_SITES= ${MASTER_SITE_MOZILLA_ESR:=thunderbird/releases/${TB_VER}esr/source/} \ | |
10 | ${MASTER_SITE_MOZILLA_ALL:=thunderbird/releases/${TB_VER}esr/source/} | 11 | ${MASTER_SITE_MOZILLA_ALL:=thunderbird/releases/${TB_VER}esr/source/} | |
11 | DISTFILES= thunderbird-${TB_VER}esr.source.tar.bz2 \ | 12 | DISTFILES= thunderbird-${TB_VER}esr.source.tar.bz2 \ | |
12 | lightning-${LIGHTNINGVER}.source.tar.bz2 | 13 | lightning-${LIGHTNINGVER}.source.tar.bz2 | |
13 | SITES.lightning-${LIGHTNINGVER}.source.tar.bz2= ${MASTER_SITE_MOZILLA:=calendar/lightning/releases/${LIGHTNINGVER}/source/} | 14 | SITES.lightning-${LIGHTNINGVER}.source.tar.bz2= ${MASTER_SITE_MOZILLA:=calendar/lightning/releases/${LIGHTNINGVER}/source/} | |
14 | EXTRACT_DIR.lightning-${LIGHTNINGVER}.source.tar.bz2= ${WRKSRC}/lightning | 15 | EXTRACT_DIR.lightning-${LIGHTNINGVER}.source.tar.bz2= ${WRKSRC}/lightning | |
15 | 16 | |||
16 | MAINTAINER= tnn@NetBSD.org | 17 | MAINTAINER= tnn@NetBSD.org | |
17 | HOMEPAGE= http://www.mozillamessaging.com/en-US/thunderbird/ | 18 | HOMEPAGE= http://www.mozillamessaging.com/en-US/thunderbird/ | |
18 | COMMENT= Organize, secure and customize your mail | 19 | COMMENT= Organize, secure and customize your mail | |
19 | 20 | |||
20 | USE_TOOLS+= unzip pax | 21 | USE_TOOLS+= unzip pax |
@@ -1,26 +1,26 @@ | @@ -1,26 +1,26 @@ | |||
1 | $NetBSD: distinfo,v 1.108 2012/11/23 11:08:05 ryoon Exp $ | 1 | $NetBSD: distinfo,v 1.109 2012/12/12 08:35:58 ryoon Exp $ | |
2 | 2 | |||
3 | SHA1 (enigmail-1.4.5.tar.gz) = 16d0450a9f5fb4de0e9cc5b9f8091dce4b070aaf | 3 | SHA1 (enigmail-1.4.5.tar.gz) = 16d0450a9f5fb4de0e9cc5b9f8091dce4b070aaf | |
4 | RMD160 (enigmail-1.4.5.tar.gz) = 860a1ca813fd2ccae69ac0afe07affd39611e56a | 4 | RMD160 (enigmail-1.4.5.tar.gz) = 860a1ca813fd2ccae69ac0afe07affd39611e56a | |
5 | Size (enigmail-1.4.5.tar.gz) = 1269207 bytes | 5 | Size (enigmail-1.4.5.tar.gz) = 1269207 bytes | |
6 | SHA1 (lightning-1.9.source.tar.bz2) = 3cc625649debed6f7403c862f166b771b80b92ce | 6 | SHA1 (lightning-1.9.source.tar.bz2) = 3cc625649debed6f7403c862f166b771b80b92ce | |
7 | RMD160 (lightning-1.9.source.tar.bz2) = 3396533847c05ed37537b9a78d771e55f767bea6 | 7 | RMD160 (lightning-1.9.source.tar.bz2) = 3396533847c05ed37537b9a78d771e55f767bea6 | |
8 | Size (lightning-1.9.source.tar.bz2) = 113944316 bytes | 8 | Size (lightning-1.9.source.tar.bz2) = 113944316 bytes | |
9 | SHA1 (thunderbird-17.0esr.source.tar.bz2) = d1bb6a5a7d6ad55029f5104561c1394a452e54b2 | 9 | SHA1 (thunderbird-17.0esr.source.tar.bz2) = d1bb6a5a7d6ad55029f5104561c1394a452e54b2 | |
10 | RMD160 (thunderbird-17.0esr.source.tar.bz2) = 6b61aa7acdbfeee1455c8d1540443f5f447e7923 | 10 | RMD160 (thunderbird-17.0esr.source.tar.bz2) = 6b61aa7acdbfeee1455c8d1540443f5f447e7923 | |
11 | Size (thunderbird-17.0esr.source.tar.bz2) = 113291870 bytes | 11 | Size (thunderbird-17.0esr.source.tar.bz2) = 113291870 bytes | |
12 | SHA1 (patch-aa) = 5217684e8e6d587b1cfa65066bd9440b9a313cf3 | 12 | SHA1 (patch-aa) = 5217684e8e6d587b1cfa65066bd9440b9a313cf3 | |
13 | SHA1 (patch-aa-toplevel) = 3e46b3ef5e15883c882995f4de41704890605d1d | 13 | SHA1 (patch-aa-toplevel) = b18a348a10efbf0caad1e3e58de2ecb1120ddaf3 | |
14 | SHA1 (patch-ab) = 7432f73e9771260849d99e14008164bd3d564bf8 | 14 | SHA1 (patch-ab) = 7432f73e9771260849d99e14008164bd3d564bf8 | |
15 | SHA1 (patch-ac) = 3d54eef3657bf39b73e2851a33b8ee1aa9408131 | 15 | SHA1 (patch-ac) = 3d54eef3657bf39b73e2851a33b8ee1aa9408131 | |
16 | SHA1 (patch-ad) = 5f225b1db28a7217d9225ffc03fe3a40b453d7f7 | 16 | SHA1 (patch-ad) = 5f225b1db28a7217d9225ffc03fe3a40b453d7f7 | |
17 | SHA1 (patch-ae) = 23648401a4f5335a370ff60ae1e1fb37a28404e7 | 17 | SHA1 (patch-ae) = 23648401a4f5335a370ff60ae1e1fb37a28404e7 | |
18 | SHA1 (patch-af) = 371779510213ba63eff81f1258d3d8686b78a7e7 | 18 | SHA1 (patch-af) = 371779510213ba63eff81f1258d3d8686b78a7e7 | |
19 | SHA1 (patch-ag) = bf447af7731e1b508df5b03ec0055e463c1c6db9 | 19 | SHA1 (patch-ag) = bf447af7731e1b508df5b03ec0055e463c1c6db9 | |
20 | SHA1 (patch-ai) = 6a23c06b627e0d5dddefb926ed08f76e1676d959 | 20 | SHA1 (patch-ai) = 6a23c06b627e0d5dddefb926ed08f76e1676d959 | |
21 | SHA1 (patch-aj) = 2b94927755ffebbe54516b5d66d109cc2e54c400 | 21 | SHA1 (patch-aj) = 2b94927755ffebbe54516b5d66d109cc2e54c400 | |
22 | SHA1 (patch-ak) = b47277baa1137a7610445b7c4dd147b331d5c5e6 | 22 | SHA1 (patch-ak) = b47277baa1137a7610445b7c4dd147b331d5c5e6 | |
23 | SHA1 (patch-al) = 9970e89e92ff8b120119b560cb661eabd3a387de | 23 | SHA1 (patch-al) = 9970e89e92ff8b120119b560cb661eabd3a387de | |
24 | SHA1 (patch-am) = 2d38162da23828ebee56e56a00ea086992d554ce | 24 | SHA1 (patch-am) = 2d38162da23828ebee56e56a00ea086992d554ce | |
25 | SHA1 (patch-an) = 96139c682b84432e4e8a0be98db56abee89daf02 | 25 | SHA1 (patch-an) = 96139c682b84432e4e8a0be98db56abee89daf02 | |
26 | SHA1 (patch-ao) = dcdffd03001b8b23ded6a6534c03c3eb300ee459 | 26 | SHA1 (patch-ao) = dcdffd03001b8b23ded6a6534c03c3eb300ee459 |
@@ -1,33 +1,43 @@ | @@ -1,33 +1,43 @@ | |||
1 | $NetBSD: patch-aa-toplevel,v 1.8 2012/09/02 06:43:39 ryoon Exp $ | 1 | $NetBSD: patch-aa-toplevel,v 1.9 2012/12/12 08:35:59 ryoon Exp $ | |
2 | 2 | |||
3 | --- configure.in.orig 2012-08-25 00:24:32.000000000 +0000 | 3 | --- configure.in.orig 2012-11-19 22:35:28.000000000 +0000 | |
4 | +++ configure.in | 4 | +++ configure.in | |
5 | @@ -1865,7 +1865,7 @@ ld.]) | 5 | @@ -1797,7 +1797,7 @@ ld.]) | |
6 | MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' | 6 | MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' | |
7 | ;; | 7 | ;; | |
8 | 8 | |||
9 | -*-freebsd*) | 9 | -*-freebsd*) | |
10 | +*-freebsd* | *-dragonfly*) | 10 | +*-freebsd* | *-dragonfly*) | |
11 | if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then | 11 | if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then | |
12 | DLL_SUFFIX=".so.1.0" | 12 | DLL_SUFFIX=".so.1.0" | |
13 | DSO_LDOPTS="-shared" | 13 | DSO_LDOPTS="-shared" | |
14 | @@ -1873,6 +1873,9 @@ ld.]) | 14 | @@ -1805,6 +1805,9 @@ ld.]) | |
15 | if test ! "$GNU_CC"; then | 15 | if test ! "$GNU_CC"; then | |
16 | DSO_LDOPTS="-Bshareable $DSO_LDOPTS" | 16 | DSO_LDOPTS="-Bshareable $DSO_LDOPTS" | |
17 | fi | 17 | fi | |
18 | + if test "$LIBRUNPATH"; then | 18 | + if test "$LIBRUNPATH"; then | |
19 | + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" | 19 | + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" | |
20 | + fi | 20 | + fi | |
21 | ;; | 21 | ;; | |
22 | 22 | |||
23 | ia64*-hpux*) | 23 | ia64*-hpux*) | |
24 | @@ -3106,6 +3109,9 @@ dnl ==================================== | 24 | @@ -3019,6 +3022,9 @@ dnl ==================================== | |
25 | case $target in | 25 | case $target in | |
26 | *-hpux11.*) | 26 | *-hpux11.*) | |
27 | ;; | 27 | ;; | |
28 | +*-dragonfly*) | 28 | +*-dragonfly*) | |
29 | + AC_CHECK_LIB(c, gethostbyname_r) | 29 | + AC_CHECK_LIB(c, gethostbyname_r) | |
30 | + ;; | 30 | + ;; | |
31 | *) | 31 | *) | |
32 | AC_CHECK_LIB(c_r, gethostbyname_r) | 32 | AC_CHECK_LIB(c_r, gethostbyname_r) | |
33 | ;; | 33 | ;; | |
34 | @@ -3339,6 +3345,9 @@ AC_CACHE_CHECK( | |||
35 | #ifdef linux | |||
36 | #define _BSD_SOURCE 1 | |||
37 | #endif | |||
38 | + #ifdef __NetBSD__ | |||
39 | + #error use of global _res variable in threaded programs is not portable | |||
40 | + #endif | |||
41 | #include <resolv.h> | |||
42 | ], | |||
43 | [int foo = res_ninit(&_res);], |