Wed Feb 16 03:00:25 2011 UTC ()
Pullup ticket #3355 - requested by taca

Revisions pulled up:
- pkgsrc/net/bind96/Makefile		1.18
- pkgsrc/net/bind96/PLIST		1.7
- pkgsrc/net/bind96/distinfo		1.11
- pkgsrc/net/bind96/patches/patch-ad	1.5
- pkgsrc/net/bind96/patches/patch-am	1.3

-------------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Feb  9 16:24:14 UTC 2011

   Modified Files:
   	pkgsrc/net/bind96: Makefile PLIST distinfo
   	pkgsrc/net/bind96/patches: patch-ad patch-am

   Log Message:
   Update bind96 package to 9.6.3.

   9.6.3

        * BIND now builds with threads disabled in versions of NetBSD earlier
          than 5.0 and with pthreads enabled by default in NetBSD versions
          5.0 and higher. Also removes support for unproven-pthreads,
          mit-pthreads and ptl2. [RT #19203]
        * HPUX now correctly defaults to using /dev/poll, which should
          increase performance. [RT #21919]
        * If named is running as a threaded application, after an "rndc stop"
          command has been issued, other inbound TCP requests can cause named
          to hang and never complete shutdown. [RT #22108]
        * When performing a GSS-TSIG signed dynamic zone update, memory could
          be leaked. This causes an unclean shutdown and may affect
          long-running servers. [RT #22573]
        * A bug in NetBSD and FreeBSD kernels with SO_ACCEPTFILTER enabled
          allows for a TCP DoS attack. Until there is a kernel fix, ISC is
          disabling SO_ACCEPTFILTER support in BIND. [RT #22589]
        * Corrected a defect where a combination of dynamic updates and zone
          transfers incorrectly locked the in-memory zone database, causing
          named to freeze. [RT #22614]
        * Don't run MX checks (check-mx) when the MX record points to ".".
          [RT #22645]
        * DST key reference counts can now be incremented via dst_key_attach.
          [RT #22672]
        * isc_mutex_init_errcheck() in phtreads/mutex.c failed to destroy
          attr. [RT #22766]
        * The Kerberos realm was being truncated when being pulled from the
          the host prinicipal, make krb5-self updates fail. [RT #22770]
        * named failed to preserve the case of domain names in RDATA which is
          not compressible when writing master files. [RT #22863]
        * There was a bug in how the clients-per-query code worked with some
          query patterns. This could result, in rare circumstances, in having
          all the client query slots filled with queries for the same DNS
          label, essentially ignoring the max-clients-per-query setting. [RT
          #22972]


(sbd)
diff -r1.17 -r1.17.2.1 pkgsrc/net/bind96/Makefile
diff -r1.6 -r1.6.6.1 pkgsrc/net/bind96/PLIST
diff -r1.10 -r1.10.2.1 pkgsrc/net/bind96/distinfo
diff -r1.4 -r1.4.6.1 pkgsrc/net/bind96/patches/patch-ad
diff -r1.2 -r1.2.6.1 pkgsrc/net/bind96/patches/patch-am

cvs diff -r1.17 -r1.17.2.1 pkgsrc/net/bind96/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/bind96/Attic/Makefile 2010/12/02 00:32:34 1.17
+++ pkgsrc/net/bind96/Attic/Makefile 2011/02/16 03:00:25 1.17.2.1
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.17 2010/12/02 00:32:34 taca Exp $ 1# $NetBSD: Makefile,v 1.17.2.1 2011/02/16 03:00:25 sbd Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-P/pl/}
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \ 6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
7 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/ 7 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.isc.org/software/bind 10HOMEPAGE= http://www.isc.org/software/bind
11COMMENT= Version 9 of the Berkeley Internet Name Daemon, implementation of DNS 11COMMENT= Version 9 of the Berkeley Internet Name Daemon, implementation of DNS
12 12
13CONFLICTS+= bind<9.6.0 13CONFLICTS+= bind<9.6.0
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
18 18
19BIND_VERSION= 9.6.2-P3 19BIND_VERSION= 9.6.3
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23BUILD_DEFS+= BIND_DIR VARBASE 23BUILD_DEFS+= BIND_DIR VARBASE
24 24
25.include "options.mk" 25.include "options.mk"
26 26
27USE_TOOLS+= pax perl 27USE_TOOLS+= pax perl
28USE_LIBTOOL= yes 28USE_LIBTOOL= yes
29GNU_CONFIGURE= yes 29GNU_CONFIGURE= yes
30#CONFIG_SHELL= sh -x 30#CONFIG_SHELL= sh -x
31 31
32CONFIGURE_ARGS+= --with-libtool 32CONFIGURE_ARGS+= --with-libtool

cvs diff -r1.6 -r1.6.6.1 pkgsrc/net/bind96/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/net/bind96/Attic/PLIST 2010/05/26 15:57:37 1.6
+++ pkgsrc/net/bind96/Attic/PLIST 2011/02/16 03:00:25 1.6.6.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2010/05/26 15:57:37 taca Exp $ 1@comment $NetBSD: PLIST,v 1.6.6.1 2011/02/16 03:00:25 sbd Exp $
2bin/dig 2bin/dig
3bin/host 3bin/host
4bin/isc-config.sh 4bin/isc-config.sh
5bin/nslookup 5bin/nslookup
6bin/nsupdate 6bin/nsupdate
7${PLIST.inet6}include/isc/ipv6.h 7${PLIST.inet6}include/isc/ipv6.h
8include/bind9/check.h 8include/bind9/check.h
9include/bind9/getaddresses.h 9include/bind9/getaddresses.h
10include/bind9/version.h 10include/bind9/version.h
11include/dns/acl.h 11include/dns/acl.h
12include/dns/adb.h 12include/dns/adb.h
13include/dns/byaddr.h 13include/dns/byaddr.h
14include/dns/cache.h 14include/dns/cache.h
@@ -326,44 +326,50 @@ share/doc/bind9/arm/Bv9ARM.html @@ -326,44 +326,50 @@ share/doc/bind9/arm/Bv9ARM.html
326share/doc/bind9/arm/man.dig.html 326share/doc/bind9/arm/man.dig.html
327share/doc/bind9/arm/man.dnssec-dsfromkey.html 327share/doc/bind9/arm/man.dnssec-dsfromkey.html
328share/doc/bind9/arm/man.dnssec-keyfromlabel.html 328share/doc/bind9/arm/man.dnssec-keyfromlabel.html
329share/doc/bind9/arm/man.dnssec-keygen.html 329share/doc/bind9/arm/man.dnssec-keygen.html
330share/doc/bind9/arm/man.dnssec-signzone.html 330share/doc/bind9/arm/man.dnssec-signzone.html
331share/doc/bind9/arm/man.host.html 331share/doc/bind9/arm/man.host.html
332share/doc/bind9/arm/man.named-checkconf.html 332share/doc/bind9/arm/man.named-checkconf.html
333share/doc/bind9/arm/man.named-checkzone.html 333share/doc/bind9/arm/man.named-checkzone.html
334share/doc/bind9/arm/man.named.html 334share/doc/bind9/arm/man.named.html
335share/doc/bind9/arm/man.nsupdate.html 335share/doc/bind9/arm/man.nsupdate.html
336share/doc/bind9/arm/man.rndc-confgen.html 336share/doc/bind9/arm/man.rndc-confgen.html
337share/doc/bind9/arm/man.rndc.conf.html 337share/doc/bind9/arm/man.rndc.conf.html
338share/doc/bind9/arm/man.rndc.html 338share/doc/bind9/arm/man.rndc.html
339share/doc/bind9/draft/draft-ietf-6man-text-addr-representation-01.txt 339share/doc/bind9/draft/draft-ietf-6man-text-addr-representation-07.txt
340share/doc/bind9/draft/draft-ietf-behave-dns64-06.txt 340share/doc/bind9/draft/draft-ietf-behave-address-format-07.txt
341share/doc/bind9/draft/draft-ietf-dnsext-axfr-clarify-13.txt 341share/doc/bind9/draft/draft-ietf-behave-dns64-11.txt
342share/doc/bind9/draft/draft-ietf-dnsext-dns-tcp-requirements-02.txt 342share/doc/bind9/draft/draft-ietf-dnsext-axfr-clarify-14.txt
343share/doc/bind9/draft/draft-ietf-dnsext-dnssec-bis-updates-09.txt 343share/doc/bind9/draft/draft-ietf-dnsext-dns-tcp-requirements-03.txt
344share/doc/bind9/draft/draft-ietf-dnsext-dnssec-gost-06.txt 344share/doc/bind9/draft/draft-ietf-dnsext-dnssec-bis-updates-12.txt
 345share/doc/bind9/draft/draft-ietf-dnsext-dnssec-registry-fixes-06.txt
345share/doc/bind9/draft/draft-ietf-dnsext-ecc-key-07.txt 346share/doc/bind9/draft/draft-ietf-dnsext-ecc-key-07.txt
346share/doc/bind9/draft/draft-ietf-dnsext-interop3597-02.txt 347share/doc/bind9/draft/draft-ietf-dnsext-interop3597-02.txt
347share/doc/bind9/draft/draft-ietf-dnsext-rfc2671bis-edns0-02.txt 348share/doc/bind9/draft/draft-ietf-dnsext-rfc2671bis-edns0-02.txt
348share/doc/bind9/draft/draft-ietf-dnsext-rfc2672bis-dname-18.txt 349share/doc/bind9/draft/draft-ietf-dnsext-rfc2672bis-dname-19.txt
349share/doc/bind9/draft/draft-ietf-dnsext-rfc3597-bis-00.txt 350share/doc/bind9/draft/draft-ietf-dnsext-rfc3597-bis-02.txt
350share/doc/bind9/draft/draft-ietf-dnsext-tsig-md5-deprecated-03.txt 351share/doc/bind9/draft/draft-ietf-dnsext-tsig-md5-deprecated-03.txt
351share/doc/bind9/draft/draft-ietf-dnsop-bad-dns-res-05.txt 352share/doc/bind9/draft/draft-ietf-dnsop-bad-dns-res-05.txt
352share/doc/bind9/draft/draft-ietf-dnsop-default-local-zones-09.txt 353share/doc/bind9/draft/draft-ietf-dnsop-default-local-zones-10.txt
 354share/doc/bind9/draft/draft-ietf-dnsop-dnssec-key-timing-00.txt
 355share/doc/bind9/draft/draft-ietf-dnsop-dnssec-trust-history-01.txt
353share/doc/bind9/draft/draft-ietf-dnsop-inaddr-required-07.txt 356share/doc/bind9/draft/draft-ietf-dnsop-inaddr-required-07.txt
354share/doc/bind9/draft/draft-ietf-dnsop-name-server-management-reqs-02.txt 357share/doc/bind9/draft/draft-ietf-dnsop-name-server-management-reqs-02.txt
355share/doc/bind9/draft/draft-ietf-dnsop-respsize-06.txt 358share/doc/bind9/draft/draft-ietf-dnsop-respsize-06.txt
356share/doc/bind9/draft/draft-kato-dnsop-local-zones-00.txt 359share/doc/bind9/draft/draft-kato-dnsop-local-zones-00.txt
 360share/doc/bind9/draft/draft-kerr-ixfr-only-01.txt
 361share/doc/bind9/draft/draft-mekking-dnsop-auto-cpsync-00.txt
 362share/doc/bind9/draft/draft-yao-dnsext-bname-04.txt
357share/doc/bind9/rfc/rfc1032.txt 363share/doc/bind9/rfc/rfc1032.txt
358share/doc/bind9/rfc/rfc1033.txt 364share/doc/bind9/rfc/rfc1033.txt
359share/doc/bind9/rfc/rfc1034.txt 365share/doc/bind9/rfc/rfc1034.txt
360share/doc/bind9/rfc/rfc1035.txt 366share/doc/bind9/rfc/rfc1035.txt
361share/doc/bind9/rfc/rfc1101.txt 367share/doc/bind9/rfc/rfc1101.txt
362share/doc/bind9/rfc/rfc1122.txt 368share/doc/bind9/rfc/rfc1122.txt
363share/doc/bind9/rfc/rfc1123.txt 369share/doc/bind9/rfc/rfc1123.txt
364share/doc/bind9/rfc/rfc1183.txt 370share/doc/bind9/rfc/rfc1183.txt
365share/doc/bind9/rfc/rfc1348.txt 371share/doc/bind9/rfc/rfc1348.txt
366share/doc/bind9/rfc/rfc1535.txt 372share/doc/bind9/rfc/rfc1535.txt
367share/doc/bind9/rfc/rfc1536.txt 373share/doc/bind9/rfc/rfc1536.txt
368share/doc/bind9/rfc/rfc1537.txt 374share/doc/bind9/rfc/rfc1537.txt
369share/doc/bind9/rfc/rfc1591.txt 375share/doc/bind9/rfc/rfc1591.txt
@@ -471,16 +477,17 @@ share/doc/bind9/rfc/rfc4648.txt @@ -471,16 +477,17 @@ share/doc/bind9/rfc/rfc4648.txt
471share/doc/bind9/rfc/rfc4697.txt 477share/doc/bind9/rfc/rfc4697.txt
472share/doc/bind9/rfc/rfc4701.txt 478share/doc/bind9/rfc/rfc4701.txt
473share/doc/bind9/rfc/rfc4892.txt 479share/doc/bind9/rfc/rfc4892.txt
474share/doc/bind9/rfc/rfc4955.txt 480share/doc/bind9/rfc/rfc4955.txt
475share/doc/bind9/rfc/rfc4956.txt 481share/doc/bind9/rfc/rfc4956.txt
476share/doc/bind9/rfc/rfc5001.txt 482share/doc/bind9/rfc/rfc5001.txt
477share/doc/bind9/rfc/rfc5011.txt 483share/doc/bind9/rfc/rfc5011.txt
478share/doc/bind9/rfc/rfc5155.txt 484share/doc/bind9/rfc/rfc5155.txt
479share/doc/bind9/rfc/rfc5205.txt 485share/doc/bind9/rfc/rfc5205.txt
480share/doc/bind9/rfc/rfc5452.txt 486share/doc/bind9/rfc/rfc5452.txt
481share/doc/bind9/rfc/rfc5507.txt 487share/doc/bind9/rfc/rfc5507.txt
482share/doc/bind9/rfc/rfc5625.txt 488share/doc/bind9/rfc/rfc5625.txt
483share/doc/bind9/rfc/rfc5702.txt 489share/doc/bind9/rfc/rfc5702.txt
 490share/doc/bind9/rfc/rfc5933.txt
484share/doc/bind9/rfc/rfc952.txt 491share/doc/bind9/rfc/rfc952.txt
485share/examples/rc.d/lwresd 492share/examples/rc.d/lwresd
486share/examples/rc.d/named9 493share/examples/rc.d/named9

cvs diff -r1.10 -r1.10.2.1 pkgsrc/net/bind96/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/bind96/Attic/distinfo 2010/12/02 00:32:34 1.10
+++ pkgsrc/net/bind96/Attic/distinfo 2011/02/16 03:00:25 1.10.2.1
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.10 2010/12/02 00:32:34 taca Exp $ 1$NetBSD: distinfo,v 1.10.2.1 2011/02/16 03:00:25 sbd Exp $
2 2
3SHA1 (bind-9.6.2-P3.tar.gz) = b6f0ac1612229529636e4b2ae1c4cb21447d2e8f 3SHA1 (bind-9.6.3.tar.gz) = 7d6dc79dc7bf32e8d6785c7bb1d913aa676f6424
4RMD160 (bind-9.6.2-P3.tar.gz) = d95b78c04400b13c04251f1b4a3da4ad446ec364 4RMD160 (bind-9.6.3.tar.gz) = df00af80d58c79190149a0068f4cc2fe84557db2
5Size (bind-9.6.2-P3.tar.gz) = 6725172 bytes 5Size (bind-9.6.3.tar.gz) = 7203094 bytes
6SHA1 (patch-ab) = 6cec876c8caa7082f97365863f3f88c4f168da48 6SHA1 (patch-ab) = 6cec876c8caa7082f97365863f3f88c4f168da48
7SHA1 (patch-ac) = 074649e1514870a3154c623a5f6d1507b72b5b05 7SHA1 (patch-ac) = 074649e1514870a3154c623a5f6d1507b72b5b05
8SHA1 (patch-ad) = 65b571e506d41054951315729859d3b189689913 8SHA1 (patch-ad) = 7e17cfd77d3eeef203f215bb1d19ad88ad4f082a
9SHA1 (patch-ag) = ffc547b444f01f51a12a01cfa884916a9a411a88 9SHA1 (patch-ag) = ffc547b444f01f51a12a01cfa884916a9a411a88
10SHA1 (patch-am) = 790408852e6b0f3a1b6dfb2725e2a43ad7240935 10SHA1 (patch-am) = 4c6346b048232ede4611fcd0584487aab8fd1998

cvs diff -r1.4 -r1.4.6.1 pkgsrc/net/bind96/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/bind96/patches/Attic/patch-ad 2010/05/26 15:57:37 1.4
+++ pkgsrc/net/bind96/patches/Attic/patch-ad 2011/02/16 03:00:25 1.4.6.1
@@ -1,74 +1,34 @@ @@ -1,74 +1,34 @@
1$NetBSD: patch-ad,v 1.4 2010/05/26 15:57:37 taca Exp $ 1$NetBSD: patch-ad,v 1.4.6.1 2011/02/16 03:00:25 sbd Exp $
2 2
3--- configure.orig 2009-10-16 04:30:13.000000000 +0000 3--- configure.orig 2010-12-21 04:33:58.000000000 +0000
4+++ configure 4+++ configure
5@@ -23124,6 +23124,8 @@ case $host in 5@@ -21168,6 +21168,8 @@ case $host in
6 use_threads=false ;; 6 use_threads=false ;;
7 *-freebsd*) 7 *-freebsd*)
8 use_threads=false ;; 8 use_threads=false ;;
9+*-dragonfly*) 9+*-dragonfly*)
10+ use_threads=false ;; 10+ use_threads=false ;;
11 *-bsdi234*) 11 *-bsdi234*)
12 # Thread signals do not work reliably on some versions of BSD/OS. 12 # Thread signals do not work reliably on some versions of BSD/OS.
13 use_threads=false ;; 13 use_threads=false ;;
14@@ -23212,7 +23214,7 @@ echo "$as_me: WARNING: linking with PTL2 14@@ -22484,9 +22486,9 @@ case $use_libtool in
15 echo "${ECHO_T}native" >&6; } 
16 LIBS="-lpthread $LIBS" 
17 else 
18- if test ! -d $LOCALBASE/pthreads 
19+ if test ! -d $LOCALBASE/pthreads -a ! -f /usr/include/pthread.h 
20 then 
21 { echo "$as_me:$LINENO: result: none" >&5 
22 echo "${ECHO_T}none" >&6; } 
23@@ -23223,14 +23225,23 @@ echo "$as_me: error: \"could not find th 
24  
25 if $use_threads 
26 then 
27- { echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5 
28+ if test -f /usr/include/pthread.h 
29+ then 
30+ { echo "$as_me:$LINENO: result: native pthreads" >&5 
31+$as_echo "native pthreads" >&6; } 
32+ LIBS="-lpthread $LIBS" 
33+ CPPFLAGS="$CPPFLAGS -I/usr/include" 
34+ STD_CINDLUES="$STD_CINDLUES -I/usr/include" 
35+ else 
36+ { echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5 
37 echo "${ECHO_T}mit-pthreads/unproven-pthreads" >&6; } 
38- pkg="$LOCALBASE/pthreads" 
39- lib1="-L$pkg/lib -Wl,-R$pkg/lib" 
40- lib2="-lpthread -lm -lgcc -lpthread" 
41- LIBS="$lib1 $lib2 $LIBS" 
42- CPPFLAGS="$CPPFLAGS -I$pkg/include" 
43- STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include" 
44+ pkg="$LOCALBASE/pthreads" 
45+ lib1="-L$pkg/lib -Wl,-R$pkg/lib" 
46+ lib2="-lpthread -lm -lgcc -lpthread" 
47+ LIBS="$lib1 $lib2 $LIBS" 
48+ CPPFLAGS="$CPPFLAGS -I$pkg/include" 
49+ STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include" 
50+ fi 
51 fi 
52 fi 
53 fi 
54@@ -25648,9 +25659,9 @@ case $use_libtool in 
55 O=lo 15 O=lo
56 A=la 16 A=la
57 LIBTOOL_MKDEP_SED='s;\.o;\.lo;' 17 LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
58- LIBTOOL_MODE_COMPILE='--mode=compile' 18- LIBTOOL_MODE_COMPILE='--mode=compile'
59+ LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC' 19+ LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
60 LIBTOOL_MODE_INSTALL='--mode=install' 20 LIBTOOL_MODE_INSTALL='--mode=install'
61- LIBTOOL_MODE_LINK='--mode=link' 21- LIBTOOL_MODE_LINK='--mode=link'
62+ LIBTOOL_MODE_LINK='--mode=link --tag=CC' 22+ LIBTOOL_MODE_LINK='--mode=link --tag=CC'
63 case "$host" in 23 case "$host" in
64 *) LIBTOOL_ALLOW_UNDEFINED= ;; 24 *) LIBTOOL_ALLOW_UNDEFINED= ;;
65 esac 25 esac
66@@ -32072,7 +32083,7 @@ echo "${ECHO_T}no" >&6; } 26@@ -25587,7 +25589,7 @@ $as_echo "no" >&6; }
67 fi 27 fi
68 if test -n "-L$use_dlz_postgres_lib -lpq" 28 if test -n "-L$use_dlz_postgres_lib -lpq"
69 then 29 then
70- DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq" 30- DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq"
71+ DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${PREFIX}/lib -lpq" 31+ DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${PREFIX}/lib -lpq"
72 fi 32 fi
73  33
74  34

cvs diff -r1.2 -r1.2.6.1 pkgsrc/net/bind96/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/net/bind96/patches/Attic/patch-am 2010/05/26 15:57:37 1.2
+++ pkgsrc/net/bind96/patches/Attic/patch-am 2011/02/16 03:00:25 1.2.6.1
@@ -1,51 +1,13 @@ @@ -1,51 +1,13 @@
1$NetBSD: patch-am,v 1.2 2010/05/26 15:57:37 taca Exp $ 1$NetBSD: patch-am,v 1.2.6.1 2011/02/16 03:00:25 sbd Exp $
2 2
3--- config.threads.in.orig 2006-07-20 05:39:07.000000000 +0000 3--- config.threads.in.orig 2010-12-21 04:33:18.000000000 +0000
4+++ config.threads.in 4+++ config.threads.in
5@@ -48,6 +48,8 @@ case $host in 5@@ -44,6 +44,8 @@ case $host in
6 use_threads=false ;; 6 use_threads=false ;;
7 *-freebsd*) 7 *-freebsd*)
8 use_threads=false ;; 8 use_threads=false ;;
9+*-dragonfly*) 9+*-dragonfly*)
10+ use_threads=false ;; 10+ use_threads=false ;;
11 *-bsdi[234]*) 11 *-bsdi[234]*)
12 # Thread signals do not work reliably on some versions of BSD/OS. 12 # Thread signals do not work reliably on some versions of BSD/OS.
13 use_threads=false ;; 13 use_threads=false ;;
14@@ -121,7 +123,7 @@ then 
15 AC_MSG_RESULT(native) 
16 LIBS="-lpthread $LIBS" 
17 else 
18- if test ! -d $LOCALBASE/pthreads 
19+ if test ! -d $LOCALBASE/pthreads -a ! -f /usr/include/pthread.h 
20 then 
21 AC_MSG_RESULT(none) 
22 AC_MSG_ERROR("could not find thread libraries") 
23@@ -129,13 +131,21 @@ then 
24  
25 if $use_threads 
26 then 
27- AC_MSG_RESULT(mit-pthreads/unproven-pthreads) 
28- pkg="$LOCALBASE/pthreads" 
29- lib1="-L$pkg/lib -Wl,-R$pkg/lib" 
30- lib2="-lpthread -lm -lgcc -lpthread" 
31- LIBS="$lib1 $lib2 $LIBS" 
32- CPPFLAGS="$CPPFLAGS -I$pkg/include" 
33- STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include" 
34+ if test -f /usr/include/pthread.h 
35+ then 
36+ AC_MSG_RESULT(native pthreads) 
37+ LIBS="-lpthread $LIBS" 
38+ CPPFLAGS="$CPPFLAGS -I/usr/inclue" 
39+ STD_CINDLUES="$STD_CINDLUES -I/usr/include" 
40+ else 
41+ AC_MSG_RESULT(mit-pthreads/unproven-pthreads) 
42+ pkg="$LOCALBASE/pthreads" 
43+ lib1="-L$pkg/lib -Wl,-R$pkg/lib" 
44+ lib2="-lpthread -lm -lgcc -lpthread" 
45+ LIBS="$lib1 $lib2 $LIBS" 
46+ CPPFLAGS="$CPPFLAGS -I$pkg/include" 
47+ STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include" 
48+ fi 
49 fi 
50 fi 
51 fi