Sun May 26 09:22:14 2013 UTC ()
Changes 2.9.1:
Features:
Support for Python3,
Add xmlXPathSetContextNode and xmlXPathNodeEval

Documentation:
Add documentation for xmllint --xpath
Fix the URL of the SAX documentation from James
Fix spelling of "length"

Portability:
Fix python bindings with versions older than 2.7
rebuild docs:Makefile.am
elfgcchack.h after rebuild in doc
elfgcchack for buf module
Fix a uneeded and wrong extra link parameter
Few cleanup patches for Windows
Fix rpmbuild --nocheck
Fix for win32/configure.js and WITH_THREAD_ALLOC
Fix Broken multi-arch support in xml2-config
Fix a portability issue for GCC < 3.4.0
Windows build fixes
Fix a thread portability problem
Downgrade autoconf requirement to 2.63

Bug Fixes:
Fix a linking error for python bindings
Fix a couple of return without value
Improve the hashing functions
Improve handling of xmlStopParser()
Remove risk of lockup in dictionary initialization
Activate detection of encoding in external subset
Fix an output buffer flushing conversion bug
Fix an old bug in xmlSchemaValidateOneElement
Fix configure cannot remove messages
fix schema validation in combination with xsi:nil
xmlCtxtReadFile doesn't work with literal IPv6 URLs
Fix a few problems with setEntityLoader
Detect excessive entities expansion upon replacement
Fix the flushing out of raw buffers on encoding conversions
Fix some buffer conversion issues
When calling xmlNodeDump make sure we grow the buffer quickly
Fix an error in the progressive DTD parsing code
xmllint should not load DTD by default when using the reader
Try IBM-037 when looking for EBCDIC handlers
Fix potential out of bound access
Fix large parse of file from memory
Fix a bug in the nsclean option of the parser
Fix a regression in 2.9.0 breaking validation while streaming
Remove potential calls to exit()

Improvements:
Regenerated API, and testapi, rebuild documentation
Fix tree iterators broken by 2to3 script
update all tests for Python3 and Python2
A few more fixes for python 3 affecting libxml2.py
Fix compilation on Python3
Converting apibuild.py to python3
First pass at starting porting to python3
updated configure.in for python3
Add support for xpathRegisterVariable in Python
Added a regression tests from bug 694228 data
Cache presence of '<' in entities content
Avoid extra processing on entities
Python binding for xmlRegisterInputCallback
Python bindings: DOM casts everything to xmlNode
Define LIBXML_THREAD_ALLOC_ENABLED via xmlversion.h
Adding streaming validation to runtest checks
Add a --pushsmall option to xmllint

Cleanups:
Switched comment in file to UTF-8 encoding
Extend gitignore
Silent the new python test on input
Cleanup of a duplicate test
Cleanup on duplicate test expressions
Fix compiler warning after 153cf15905cf4ec080612ada6703757d10caba1e
Spec cleanups and a fix for multiarch support
Silence a clang warning
Cleanup the Copyright to be pure MIT Licence wording
rand_seed should be static in dict.c
Fix typos in parser comments


(adam)
diff -r1.124 -r1.125 pkgsrc/textproc/libxml2/Makefile
diff -r1.43 -r1.44 pkgsrc/textproc/libxml2/PLIST
diff -r1.100 -r1.101 pkgsrc/textproc/libxml2/distinfo
diff -r1.1 -r0 pkgsrc/textproc/libxml2/patches/patch-CVE-2012-5134
diff -r1.1 -r0 pkgsrc/textproc/libxml2/patches/patch-CVE-2013-0338-CVE-2013-0339
diff -r1.1 -r0 pkgsrc/textproc/libxml2/patches/patch-SA53061_2
diff -r1.2 -r0 pkgsrc/textproc/libxml2/patches/patch-SA53061_1
diff -r1.26 -r1.27 pkgsrc/textproc/libxml2/patches/patch-aa
diff -r1.26 -r1.27 pkgsrc/textproc/libxml2/patches/patch-ab
diff -r1.12 -r1.13 pkgsrc/textproc/libxml2/patches/patch-ae
diff -r1.3 -r1.4 pkgsrc/textproc/libxml2/patches/patch-threads.c
cvs diff -r1.124 -r1.125 pkgsrc/textproc/libxml2/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/Makefile 2013/04/18 10:17:42 1.124
+++ pkgsrc/textproc/libxml2/Makefile 2013/05/26 09:22:14 1.125
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.124 2013/04/18 10:17:42 drochner Exp $ 1# $NetBSD: Makefile,v 1.125 2013/05/26 09:22:14 adam Exp $
2 2
3DISTNAME= libxml2-2.9.0 3DISTNAME= libxml2-2.9.1
4PKGREVISION= 3 
5CATEGORIES= textproc 4CATEGORIES= textproc
6MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ 5MASTER_SITES= ftp://xmlsoft.org/libxml2/ \
7 http://xmlsoft.org/sources/ 6 http://xmlsoft.org/sources/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://xmlsoft.org/ 9HOMEPAGE= http://xmlsoft.org/
11COMMENT= XML parser library from the GNOME project 10COMMENT= XML parser library from the GNOME project
12LICENSE= modified-bsd 11LICENSE= modified-bsd
13 12
14PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
15 14
16USE_FEATURES= glob 15USE_FEATURES= glob
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
cvs diff -r1.43 -r1.44 pkgsrc/textproc/libxml2/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/PLIST 2012/09/15 10:23:38 1.43
+++ pkgsrc/textproc/libxml2/PLIST 2013/05/26 09:22:14 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.43 2012/09/15 10:23:38 adam Exp $ 1@comment $NetBSD: PLIST,v 1.44 2013/05/26 09:22:14 adam Exp $
2bin/xml2-config 2bin/xml2-config
3bin/xmlcatalog 3bin/xmlcatalog
4bin/xmllint 4bin/xmllint
5include/libxml2/libxml/DOCBparser.h 5include/libxml2/libxml/DOCBparser.h
6include/libxml2/libxml/HTMLparser.h 6include/libxml2/libxml/HTMLparser.h
7include/libxml2/libxml/HTMLtree.h 7include/libxml2/libxml/HTMLtree.h
8include/libxml2/libxml/SAX.h 8include/libxml2/libxml/SAX.h
9include/libxml2/libxml/SAX2.h 9include/libxml2/libxml/SAX2.h
10include/libxml2/libxml/c14n.h 10include/libxml2/libxml/c14n.h
11include/libxml2/libxml/catalog.h 11include/libxml2/libxml/catalog.h
12include/libxml2/libxml/chvalid.h 12include/libxml2/libxml/chvalid.h
13include/libxml2/libxml/debugXML.h 13include/libxml2/libxml/debugXML.h
14include/libxml2/libxml/dict.h 14include/libxml2/libxml/dict.h
@@ -107,26 +107,27 @@ share/doc/libxml2/html/libxml-xmlmemory. @@ -107,26 +107,27 @@ share/doc/libxml2/html/libxml-xmlmemory.
107share/doc/libxml2/html/libxml-xmlmodule.html 107share/doc/libxml2/html/libxml-xmlmodule.html
108share/doc/libxml2/html/libxml-xmlreader.html 108share/doc/libxml2/html/libxml-xmlreader.html
109share/doc/libxml2/html/libxml-xmlregexp.html 109share/doc/libxml2/html/libxml-xmlregexp.html
110share/doc/libxml2/html/libxml-xmlsave.html 110share/doc/libxml2/html/libxml-xmlsave.html
111share/doc/libxml2/html/libxml-xmlschemas.html 111share/doc/libxml2/html/libxml-xmlschemas.html
112share/doc/libxml2/html/libxml-xmlschemastypes.html 112share/doc/libxml2/html/libxml-xmlschemastypes.html
113share/doc/libxml2/html/libxml-xmlstring.html 113share/doc/libxml2/html/libxml-xmlstring.html
114share/doc/libxml2/html/libxml-xmlunicode.html 114share/doc/libxml2/html/libxml-xmlunicode.html
115share/doc/libxml2/html/libxml-xmlversion.html 115share/doc/libxml2/html/libxml-xmlversion.html
116share/doc/libxml2/html/libxml-xmlwriter.html 116share/doc/libxml2/html/libxml-xmlwriter.html
117share/doc/libxml2/html/libxml-xpath.html 117share/doc/libxml2/html/libxml-xpath.html
118share/doc/libxml2/html/libxml-xpathInternals.html 118share/doc/libxml2/html/libxml-xpathInternals.html
119share/doc/libxml2/html/libxml-xpointer.html 119share/doc/libxml2/html/libxml-xpointer.html
 120share/doc/libxml2/html/libxml-xzlib.html
120share/doc/libxml2/html/right.png 121share/doc/libxml2/html/right.png
121share/doc/libxml2/html/up.png 122share/doc/libxml2/html/up.png
122share/doc/libxml2/io1.c 123share/doc/libxml2/io1.c
123share/doc/libxml2/io1.res 124share/doc/libxml2/io1.res
124share/doc/libxml2/io2.c 125share/doc/libxml2/io2.c
125share/doc/libxml2/io2.res 126share/doc/libxml2/io2.res
126share/doc/libxml2/libxml.gif 127share/doc/libxml2/libxml.gif
127share/doc/libxml2/parse1.c 128share/doc/libxml2/parse1.c
128share/doc/libxml2/parse2.c 129share/doc/libxml2/parse2.c
129share/doc/libxml2/parse3.c 130share/doc/libxml2/parse3.c
130share/doc/libxml2/parse4.c 131share/doc/libxml2/parse4.c
131share/doc/libxml2/reader1.c 132share/doc/libxml2/reader1.c
132share/doc/libxml2/reader1.res 133share/doc/libxml2/reader1.res
cvs diff -r1.100 -r1.101 pkgsrc/textproc/libxml2/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/distinfo 2013/04/19 09:47:43 1.100
+++ pkgsrc/textproc/libxml2/distinfo 2013/05/26 09:22:14 1.101
@@ -1,17 +1,13 @@ @@ -1,17 +1,13 @@
1$NetBSD: distinfo,v 1.100 2013/04/19 09:47:43 drochner Exp $ 1$NetBSD: distinfo,v 1.101 2013/05/26 09:22:14 adam Exp $
2 2
3SHA1 (libxml2-2.9.0.tar.gz) = a43d7c0a8e463ac5a7846254f2a732a9af146fab 3SHA1 (libxml2-2.9.1.tar.gz) = eb3e2146c6d68aea5c2a4422ed76fe196f933c21
4RMD160 (libxml2-2.9.0.tar.gz) = d025639320bb34adbc45a43f46354190f6bbb7b5 4RMD160 (libxml2-2.9.1.tar.gz) = 257285d9ac070ed9f58666b7bd7c4653651c871b
5Size (libxml2-2.9.0.tar.gz) = 5161069 bytes 5Size (libxml2-2.9.1.tar.gz) = 5172503 bytes
6SHA1 (patch-CVE-2012-5134) = 22caaed2b03334d42253b2b1c5a43473e6c8b4dc 6SHA1 (patch-aa) = 589a279df1a5fac8b1b2dbd0018a1bbf0c5ab169
7SHA1 (patch-CVE-2013-0338-CVE-2013-0339) = d9eb3fe147dff5afd6920d818e5f982505e0663f 7SHA1 (patch-ab) = 11567fe9a3fde42f3901fd4ab4620bf845fe634b
8SHA1 (patch-SA53061_1) = ee1e4494c137aa7a294ad97a147f28f6bde11f30 
9SHA1 (patch-SA53061_2) = c6a61235f0fcb6a00677a3582450700281eaa3ed 
10SHA1 (patch-aa) = 6fcfb2e1ac374a7a047ee188a61ef218106ee54a 
11SHA1 (patch-ab) = 8a7a5ae0c9d129826485c74f29cf4de3199212e7 
12SHA1 (patch-ac) = 101cd554fd22e8e9817e21591240eb784b1219b5 8SHA1 (patch-ac) = 101cd554fd22e8e9817e21591240eb784b1219b5
13SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177 9SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
14SHA1 (patch-ae) = 035e015abf401b15af9bf052a108a1c7b8db6c79 10SHA1 (patch-ae) = 2823276343f65c7d244d22e548faa6a517445819
15SHA1 (patch-ag) = 19afd69713298ecbd247ba733a7c0c13464ae572 11SHA1 (patch-ag) = 19afd69713298ecbd247ba733a7c0c13464ae572
16SHA1 (patch-aj) = 988c30b4b09a1cbaf9e7db02bb8981da0f1beaa7 12SHA1 (patch-aj) = 988c30b4b09a1cbaf9e7db02bb8981da0f1beaa7
17SHA1 (patch-threads.c) = ed7339037e857707cf20217fa4c191d071e492f3 13SHA1 (patch-threads.c) = 70bb0a779dff6611f755128d609f82360a492f9a
File Deleted: pkgsrc/textproc/libxml2/patches/Attic/patch-CVE-2012-5134
File Deleted: pkgsrc/textproc/libxml2/patches/Attic/patch-CVE-2013-0338-CVE-2013-0339
File Deleted: pkgsrc/textproc/libxml2/patches/Attic/patch-SA53061_2
File Deleted: pkgsrc/textproc/libxml2/patches/Attic/patch-SA53061_1
cvs diff -r1.26 -r1.27 pkgsrc/textproc/libxml2/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/patches/Attic/patch-aa 2012/09/15 10:23:38 1.26
+++ pkgsrc/textproc/libxml2/patches/Attic/patch-aa 2013/05/26 09:22:14 1.27
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aa,v 1.26 2012/09/15 10:23:38 adam Exp $ 1$NetBSD: patch-aa,v 1.27 2013/05/26 09:22:14 adam Exp $
2 2
3--- Makefile.in.orig 2010-11-04 17:28:16.000000000 +0000 3--- Makefile.in.orig 2010-11-04 17:28:16.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -743,7 +743,7 @@ pkgconfig_DATA = libxml-2.0.pc 5@@ -765,7 +765,7 @@ pkgconfig_DATA = libxml-2.0.pc
6 # 6 #
7 BASE_DIR = $(datadir)/doc 7 BASE_DIR = $(datadir)/doc
8 DOC_MODULE = libxml2-$(VERSION) 8 DOC_MODULE = libxml2-$(VERSION)
9-EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples 9-EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
10+EXAMPLES_DIR = $(datadir)/examples/libxml2 10+EXAMPLES_DIR = $(datadir)/examples/libxml2
11  11
12 # 12 #
13 # Coverage support, largely borrowed from libvirt 13 # Coverage support, largely borrowed from libvirt
cvs diff -r1.26 -r1.27 pkgsrc/textproc/libxml2/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/patches/Attic/patch-ab 2013/01/15 15:31:57 1.26
+++ pkgsrc/textproc/libxml2/patches/Attic/patch-ab 2013/05/26 09:22:14 1.27
@@ -1,85 +1,85 @@ @@ -1,85 +1,85 @@
1$NetBSD: patch-ab,v 1.26 2013/01/15 15:31:57 joerg Exp $ 1$NetBSD: patch-ab,v 1.27 2013/05/26 09:22:14 adam Exp $
2 2
3--- configure.orig 2012-09-11 06:55:35.000000000 +0000 3--- configure.orig 2013-04-19 07:36:11.000000000 +0000
4+++ configure 4+++ configure
5@@ -13971,7 +13971,7 @@ fi 5@@ -13948,7 +13948,7 @@ fi
6 fi 6 fi
7  7
8  8
9-XML_LIBDIR='-L${libdir}' 9-XML_LIBDIR='-L${libdir}'
10+XML_LIBDIR='-Wl,-R${libdir} -L${libdir}' 10+XML_LIBDIR='-Wl,-R${libdir} -L${libdir}'
11 XML_INCLUDEDIR='-I${includedir}/libxml2' 11 XML_INCLUDEDIR='-I${includedir}/libxml2'
12  12
13 XML_CFLAGS="" 13 XML_CFLAGS=""
14@@ -14436,13 +14436,13 @@ else 14@@ -14417,13 +14417,13 @@ else
15 if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then 15 if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
16 ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" 16 ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
17 if test "x$ac_cv_header_pthread_h" = xyes; then : 17 if test "x$ac_cv_header_pthread_h" = xyes; then :
18- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5 18- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
19-$as_echo_n "checking for pthread_join in -lpthread... " >&6; } 19-$as_echo_n "checking for pthread_join in -lpthread... " >&6; }
20+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 20+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
21+$as_echo_n "checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; } 21+$as_echo_n "checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
22 if ${ac_cv_lib_pthread_pthread_join+:} false; then : 22 if ${ac_cv_lib_pthread_pthread_join+:} false; then :
23 $as_echo_n "(cached) " >&6 23 $as_echo_n "(cached) " >&6
24 else 24 else
25 ac_check_lib_save_LIBS=$LIBS 25 ac_check_lib_save_LIBS=$LIBS
26-LIBS="-lpthread $LIBS" 26-LIBS="-lpthread $LIBS"
27+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" 27+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
28 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 28 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
29 /* end confdefs.h. */ 29 /* end confdefs.h. */
30  30
31@@ -14474,7 +14474,7 @@ fi 31@@ -14455,7 +14455,7 @@ fi
32 $as_echo "$ac_cv_lib_pthread_pthread_join" >&6; } 32 $as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
33 if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then : 33 if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
34  34
35- THREAD_LIBS="-lpthread" 35- THREAD_LIBS="-lpthread"
36+ THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" 36+ THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
37  37
38 $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h 38 $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h
39  39
40@@ -14496,12 +14496,12 @@ fi 40@@ -14477,12 +14477,12 @@ fi
41 *beos*) WITH_THREADS="1" 41 *beos*) WITH_THREADS="1"
42 THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS" 42 THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
43 ;; 43 ;;
44- *linux*) 44- *linux*)
45+ *linux* | *openbsd* | *mirbsd*) 45+ *linux* | *openbsd* | *mirbsd*)
46 if test "${GCC}" = "yes" ; then 46 if test "${GCC}" = "yes" ; then
47 GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'` 47 GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
48 GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'` 48 GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'`
49 GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[0-9]*\.++' | sed 's+\..*++'` 49 GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[0-9]*\.++' | sed 's+\..*++'`
50- if test "${THREAD_LIBS}" = "-lpthread" ; then 50- if test "${THREAD_LIBS}" = "-lpthread" ; then
51+ if test "${THREAD_LIBS}" = "${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ; then 51+ if test "${THREAD_LIBS}" = "${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ; then
52 if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null 52 if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
53 then 53 then
54 THREAD_LIBS="" 54 THREAD_LIBS=""
55@@ -14518,6 +14518,10 @@ fi 55@@ -14499,6 +14499,10 @@ fi
56 fi 56 fi
57 fi 57 fi
58 ;; 58 ;;
59+ *freebsd* | *netbsd* | *dragonfly*) 59+ *freebsd* | *netbsd* | *dragonfly*)
60+ THREAD_LIBS="" 60+ THREAD_LIBS=""
61+ BASE_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" 61+ BASE_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
62+ ;; 62+ ;;
63 esac 63 esac
64 if test "$WITH_THREADS" = "1" ; then 64 if test "$WITH_THREADS" = "1" ; then
65 THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT" 65 THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
66@@ -14787,7 +14791,7 @@ else 66@@ -14769,7 +14773,7 @@ else
67 TEST_SAX=SAXtests 67 TEST_SAX=SAXtests
68 fi 68 fi
69  69
70- if test "${WITH_TRIO}" = "1"; then 70- if test "${WITH_TRIO}" = "1"; then
71+ if test "${WITH_SAX1}" = "1"; then 71+ if test "${WITH_SAX1}" = "1"; then
72 WITH_SAX1_SOURCES_TRUE= 72 WITH_SAX1_SOURCES_TRUE=
73 WITH_SAX1_SOURCES_FALSE='#' 73 WITH_SAX1_SOURCES_FALSE='#'
74 else 74 else
75@@ -15209,10 +15213,6 @@ case "$host" in 75@@ -15191,10 +15195,6 @@ case "$host" in
76  76
77 $as_echo "#define _WINSOCKAPI_ 1" >>confdefs.h 77 $as_echo "#define _WINSOCKAPI_ 1" >>confdefs.h
78  78
79- if test "${PYTHON}" != "" 79- if test "${PYTHON}" != ""
80- then 80- then
81- WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython$(echo ${PYTHON_VERSION} | tr -d .)" 81- WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython$(echo ${PYTHON_VERSION} | tr -d .)"
82- fi 82- fi
83 ;; 83 ;;
84 *-*-cygwin*) 84 *-*-cygwin*)
85 CYGWIN_EXTRA_LDFLAGS="-no-undefined" 85 CYGWIN_EXTRA_LDFLAGS="-no-undefined"
cvs diff -r1.12 -r1.13 pkgsrc/textproc/libxml2/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/patches/Attic/patch-ae 2012/09/15 10:23:38 1.12
+++ pkgsrc/textproc/libxml2/patches/Attic/patch-ae 2013/05/26 09:22:14 1.13
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ae,v 1.12 2012/09/15 10:23:38 adam Exp $ 1$NetBSD: patch-ae,v 1.13 2013/05/26 09:22:14 adam Exp $
2 2
3--- doc/examples/Makefile.in.orig 2012-09-11 06:55:36.000000000 +0000 3--- doc/examples/Makefile.in.orig 2012-09-11 06:55:36.000000000 +0000
4+++ doc/examples/Makefile.in 4+++ doc/examples/Makefile.in
5@@ -822,7 +822,7 @@ uninstall-am: 5@@ -844,7 +844,7 @@ uninstall-am:
6  6
7 install-data-local:  7 install-data-local:
8 $(MKDIR_P) $(DESTDIR)$(HTML_DIR) 8 $(MKDIR_P) $(DESTDIR)$(HTML_DIR)
9- -$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) 9- -$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
10+ -$(INSTALL) -m 0644 $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) 10+ -$(INSTALL) -m 0644 $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
11  11
12 clean-local: 12 clean-local:
13 test -f Makefile.am || rm -f test?.xml 13 test -f Makefile.am || rm -f test?.xml
cvs diff -r1.3 -r1.4 pkgsrc/textproc/libxml2/patches/Attic/patch-threads.c (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/patches/Attic/patch-threads.c 2012/09/15 10:23:39 1.3
+++ pkgsrc/textproc/libxml2/patches/Attic/patch-threads.c 2013/05/26 09:22:14 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-threads.c,v 1.3 2012/09/15 10:23:39 adam Exp $ 1$NetBSD: patch-threads.c,v 1.4 2013/05/26 09:22:14 adam Exp $
2 2
3* Treat OpenBSD and MirBSD same as Linux to avoid linking with libpthread 3* Treat OpenBSD and MirBSD same as Linux to avoid linking with libpthread
4* NetBSD<4.99.36 and FreeBSD<7.0 lack pthread_equal() stub function in libc 4* NetBSD<4.99.36 and FreeBSD<7.0 lack pthread_equal() stub function in libc
5* pthread_once_t cast needed to avoid compilation error 5* pthread_once_t cast needed to avoid compilation error
6 6
7--- threads.c.orig 2010-10-15 17:28:30.000000000 +0000 7--- threads.c.orig 2010-10-15 17:28:30.000000000 +0000
8+++ threads.c 8+++ threads.c
9@@ -42,13 +42,17 @@ 9@@ -42,13 +42,17 @@
10 #include <note.h> 10 #include <note.h>
11 #endif 11 #endif
12  12
13+#if defined(__NetBSD__) 13+#if defined(__NetBSD__)
14+#include <sys/param.h> 14+#include <sys/param.h>
@@ -26,22 +26,13 @@ $NetBSD: patch-threads.c,v 1.3 2012/09/1 @@ -26,22 +26,13 @@ $NetBSD: patch-threads.c,v 1.3 2012/09/1
26 extern int pthread_once (pthread_once_t *__once_control, 26 extern int pthread_once (pthread_once_t *__once_control,
27 void (*__init_routine) (void)) 27 void (*__init_routine) (void))
28@@ -90,6 +94,10 @@ extern int pthread_cond_signal () 28@@ -90,6 +94,10 @@ extern int pthread_cond_signal ()
29 #endif 29 #endif
30 #endif /* linux */ 30 #endif /* linux */
31 #endif /* __GNUC__ */ 31 #endif /* __GNUC__ */
32+#if (defined(__NetBSD__) && __NetBSD_Version__ < 499003600) || (defined(__FreeBSD__) && __FreeBSD_version < 700000) 32+#if (defined(__NetBSD__) && __NetBSD_Version__ < 499003600) || (defined(__FreeBSD__) && __FreeBSD_version < 700000)
33+extern int pthread_equal () 33+extern int pthread_equal ()
34+ __attribute((weak)); 34+ __attribute((weak));
35+#endif /* NetBSD-4, FreeBSD-6 */ 35+#endif /* NetBSD-4, FreeBSD-6 */
36 #endif /* HAVE_PTHREAD_H */ 36 #endif /* HAVE_PTHREAD_H */
37  37
38 /* 38 /*
39@@ -915,7 +923,7 @@ xmlCleanupThreads(void) 
40 #ifdef HAVE_PTHREAD_H 
41 if ((libxml_is_threaded) && (pthread_key_delete != NULL)) 
42 pthread_key_delete(globalkey); 
43- once_control = PTHREAD_ONCE_INIT; 
44+ once_control = (pthread_once_t)PTHREAD_ONCE_INIT; 
45 #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) 
46 if (globalkey != TLS_OUT_OF_INDEXES) { 
47 xmlGlobalStateCleanupHelperParams *p;