[104598] trunk/dports

[cal at macports.org]

Revision: 104598
          https://trac.macports.org/changeset/104598
Author:   cal at macports.org
Date:     2013-03-29 08:36:30 -0700 (Fri, 29 Mar 2013)
Log Message:
-----------
libxml2, py-libxml2: update to 2.9.0, closes #38388, maintainer timeout

Modified Paths:
--------------
    trunk/dports/python/py-libxml2/Portfile
    trunk/dports/textproc/libxml2/Portfile

Added Paths:
-----------
    trunk/dports/textproc/libxml2/files/
    trunk/dports/textproc/libxml2/files/patch-thread.cc-fix-portability.diff

Modified: trunk/dports/python/py-libxml2/Portfile
===================================================================
--- trunk/dports/python/py-libxml2/Portfile	2013-03-29 15:23:59 UTC (rev 104597)
+++ trunk/dports/python/py-libxml2/Portfile	2013-03-29 15:36:30 UTC (rev 104598)
@@ -5,7 +5,7 @@
 PortGroup python 1.0
 
 name                    py-libxml2
-version                 2.8.0
+version                 2.9.0
 categories-append       textproc
 license                 MIT
 platforms               darwin
@@ -20,8 +20,8 @@
                         ftp://xmlsoft.org/libxml2/
 distname                libxml2-${version}
 dist_subdir             libxml2
-checksums               rmd160 45820c9f4939f642a87be9259c55fd081ea6759a \
-                        sha256 f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a
+checksums               rmd160  d025639320bb34adbc45a43f46354190f6bbb7b5 \
+                        sha256  ad25d91958b7212abdc12b9611cfb4dc4e5cddb6d1e9891532f48aacee422b82
 
 python.versions         24 25 26 27
 

Modified: trunk/dports/textproc/libxml2/Portfile
===================================================================
--- trunk/dports/textproc/libxml2/Portfile	2013-03-29 15:23:59 UTC (rev 104597)
+++ trunk/dports/textproc/libxml2/Portfile	2013-03-29 15:36:30 UTC (rev 104598)
@@ -3,7 +3,7 @@
 PortSystem            1.0
 
 name                  libxml2
-version               2.8.0
+version               2.9.0
 categories            textproc
 description           gnome xml library
 platforms             darwin
@@ -16,8 +16,8 @@
                       ${homepage}sources/ \
                       ftp://xmlsoft.org/${name}/
 
-checksums             rmd160 45820c9f4939f642a87be9259c55fd081ea6759a \
-                      sha256 f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a
+checksums             rmd160  d025639320bb34adbc45a43f46354190f6bbb7b5 \
+                      sha256  ad25d91958b7212abdc12b9611cfb4dc4e5cddb6d1e9891532f48aacee422b82
 
 depends_lib           port:libiconv port:zlib port:xz
 
@@ -29,9 +29,11 @@
         ${worksrcpath}/xmllint.c \
         ${worksrcpath}/doc/xmlcatalog.1 \
         ${worksrcpath}/doc/xmllint.1
-
 }
 
+patch.args              -p1
+patchfiles              patch-thread.cc-fix-portability.diff
+
 configure.args          --enable-static \
                         --without-python
 

Added: trunk/dports/textproc/libxml2/files/patch-thread.cc-fix-portability.diff
===================================================================
--- trunk/dports/textproc/libxml2/files/patch-thread.cc-fix-portability.diff	                        (rev 0)
+++ trunk/dports/textproc/libxml2/files/patch-thread.cc-fix-portability.diff	2013-03-29 15:36:30 UTC (rev 104598)
@@ -0,0 +1,33 @@
+From 3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e Mon Sep 17 00:00:00 2001
+From: Friedrich Haubensak <hsk at fli-leibniz.de>
+Date: Wed, 12 Sep 2012 15:34:53 +0000
+Subject: Fix a thread portability problem
+
+cannot compile libxml2-2.9.0 using studio 12.1 compiler on solaris 10
+
+I.M.O. structure initializer (as PTHREAD_ONCE_INIT) cannot be used in
+a structure assignment anyway
+---
+diff --git a/threads.c b/threads.c
+index f206149..7e85a26 100644
+--- a/threads.c
++++ b/threads.c
+@@ -146,6 +146,7 @@ struct _xmlRMutex {
+ static pthread_key_t globalkey;
+ static pthread_t mainthread;
+ static pthread_once_t once_control = PTHREAD_ONCE_INIT;
++static pthread_once_t once_control_init = PTHREAD_ONCE_INIT;
+ static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER;
+ #elif defined HAVE_WIN32_THREADS
+ #if defined(HAVE_COMPILER_TLS)
+@@ -915,7 +916,7 @@ xmlCleanupThreads(void)
+ #ifdef HAVE_PTHREAD_H
+     if ((libxml_is_threaded)  && (pthread_key_delete != NULL))
+         pthread_key_delete(globalkey);
+-    once_control = PTHREAD_ONCE_INIT;
++    once_control = once_control_init;
+ #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
+     if (globalkey != TLS_OUT_OF_INDEXES) {
+         xmlGlobalStateCleanupHelperParams *p;
+--
+cgit v0.9.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130329/9ca77eb4/attachment.html>