[80814] trunk/dports/python

jmr at macports.org jmr at macports.org
Mon Jul 18 09:54:27 PDT 2011


Revision: 80814
          http://trac.macports.org/changeset/80814
Author:   jmr at macports.org
Date:     2011-07-18 09:54:27 -0700 (Mon, 18 Jul 2011)
Log Message:
-----------
py*-libxml2: update to 2.7.8 (#23139)

Modified Paths:
--------------
    trunk/dports/python/py-libxml2/Portfile
    trunk/dports/python/py-libxml2/files/patch-setup.py.diff
    trunk/dports/python/py25-libxml2/Portfile
    trunk/dports/python/py26-libxml2/Portfile
    trunk/dports/python/py27-libxml2/Portfile

Modified: trunk/dports/python/py-libxml2/Portfile
===================================================================
--- trunk/dports/python/py-libxml2/Portfile	2011-07-18 16:04:29 UTC (rev 80813)
+++ trunk/dports/python/py-libxml2/Portfile	2011-07-18 16:54:27 UTC (rev 80814)
@@ -5,7 +5,7 @@
 PortGroup python24 1.0
 
 name                    py-libxml2
-version                 2.6.21
+version                 2.7.8
 categories              python textproc
 license                 MIT
 platforms               darwin
@@ -14,34 +14,32 @@
 long_description        ${description}
 
 homepage                http://xmlsoft.org/
-master_sites            ftp://xmlsoft.org/libxml2/python/
-distname                libxml2-python-${version}
-checksums               md5 229dd2b3d110a77defeeaa73af83f7f3
-patchfiles              patch-setup.py.diff
+master_sites            ftp://fr.rpmfind.net/pub/libxml/ \
+                        ftp://gd.tuwien.ac.at/pub/libxml/ \
+                        ${homepage}sources/ \
+                        ftp://xmlsoft.org/libxml2/
+distname                libxml2-${version}
+dist_subdir             libxml2
+checksums               md5 8127a65e8c3b08856093099b52599c86 \
+                        sha1 859dd535edbb851cc15b64740ee06551a7a17d40 \
+                        rmd160 30709622cfe3e2175e73d6701b7e19a25ab5ac47
 
-depends_lib-append      port:libxml2 \
-                        port:zlib
+depends_lib-append      port:libxml2
 
-build.env               LDFLAGS=-L${prefix}/lib
+worksrcdir              ${worksrcdir}/python
 
+patchfiles              patch-setup.py.diff
 post-patch {
   reinplace "s|@PREFIX@|$prefix|" ${worksrcpath}/setup.py
 }
 
 post-destroot {
-  # strip out anything related to libxslt, so py-libxml2 doesn't conflict with
-  # py-libxslt
-  fs-traverse file ${destroot} {
-    if {[file isfile ${file}]} {
-      if {[string match "*xslt*" ${file}]} {
-          file delete ${file}
-      }
-    }
-  }
+  set docdir ${prefix}/share/doc/${name}
+  xinstall -d ${destroot}${docdir}
   xinstall -m 644 -W ${worksrcpath} README TODO \
     ${destroot}${prefix}/share/doc/${name}
 }
 
-livecheck.type          md5
-livecheck.url           ftp://xmlsoft.org/libxml2/python/
-livecheck.md5           a2cc31311f1b3fb52a08cf1056efda11
+livecheck.type  regex
+livecheck.url   ${homepage}news.html
+livecheck.regex {<h3>(\d+(?:\.\d+)*): .*</h3>}

Modified: trunk/dports/python/py-libxml2/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-libxml2/files/patch-setup.py.diff	2011-07-18 16:04:29 UTC (rev 80813)
+++ trunk/dports/python/py-libxml2/files/patch-setup.py.diff	2011-07-18 16:54:27 UTC (rev 80814)
@@ -1,5 +1,5 @@
---- setup.py	2005-09-04 19:12:47.000000000 -0400
-+++ setup.py.new	2007-05-16 07:46:02.000000000 -0400
+--- setup.py.orig	2007-10-11 15:24:20.000000000 +0200
++++ setup.py	2007-10-11 15:24:54.000000000 +0200
 @@ -56,11 +56,7 @@
  # - iconv.h 
  # - libxslt/xsltconfig.h
@@ -22,3 +22,36 @@
  ]
  
  xml_files = ["libxml2-api.xml", "libxml2-python-api.xml",
+@@ -122,32 +118,6 @@
+     result.close()
+ 
+ with_xslt=0
+-if missing("libxslt-py.c") or missing("libxslt.py"):
+-    if missing("xsltgenerator.py") or missing("libxslt-api.xml"):
+-        print "libxslt stub generator not found, libxslt not built"
+-    else:
+-	try:
+-	    import xsltgenerator
+-	except:
+-	    print "failed to generate stubs for libxslt, aborting ..."
+-	    print sys.exc_type, sys.exc_value
+-	else:
+-	    head = open("libxsl.py", "r")
+-	    generated = open("libxsltclass.py", "r")
+-	    result = open("libxslt.py", "w")
+-	    for line in head.readlines():
+-                if WITHDLLS:
+-                    result.write(altImport(line))
+-                else:
+-                    result.write(line)
+-	    for line in generated.readlines():
+-		result.write(line)
+-	    head.close()
+-	    generated.close()
+-	    result.close()
+-	    with_xslt=1
+-else:
+-    with_xslt=1
+ 
+ if with_xslt == 1:
+     xslt_includes=""

Modified: trunk/dports/python/py25-libxml2/Portfile
===================================================================
--- trunk/dports/python/py25-libxml2/Portfile	2011-07-18 16:04:29 UTC (rev 80813)
+++ trunk/dports/python/py25-libxml2/Portfile	2011-07-18 16:54:27 UTC (rev 80814)
@@ -5,8 +5,7 @@
 PortGroup python25 1.0
 
 name                    py25-libxml2
-version                 2.6.21
-revision                1
+version                 2.7.8
 categories              python textproc
 license                 MIT
 platforms               darwin
@@ -14,32 +13,33 @@
 description             Python bindings for libxml2
 long_description        ${description}
 
-homepage                http://xmlsoft.org/python.html
-master_sites            ftp://xmlsoft.org/libxml2/python/
-distname                libxml2-python-${version}
+homepage                http://xmlsoft.org/
+master_sites            ftp://fr.rpmfind.net/pub/libxml/ \
+                        ftp://gd.tuwien.ac.at/pub/libxml/ \
+                        ${homepage}sources/ \
+                        ftp://xmlsoft.org/libxml2/
+distname                libxml2-${version}
+dist_subdir             libxml2
+checksums               md5 8127a65e8c3b08856093099b52599c86 \
+                        sha1 859dd535edbb851cc15b64740ee06551a7a17d40 \
+                        rmd160 30709622cfe3e2175e73d6701b7e19a25ab5ac47
 
-checksums               md5 229dd2b3d110a77defeeaa73af83f7f3 \
-                        sha1 2d395e8a5e9accd68f4e78ac2391431ef884e9d5 \
-                        rmd160 d4973576c33e0e65c4fc41b31ee3df5f803abfad
+depends_lib-append      port:libxml2
 
+worksrcdir              ${worksrcdir}/python
+
 patchfiles              patch-setup.py.diff
-
-depends_lib-append      port:libxml2 \
-                        port:zlib
-
-build.env               LDFLAGS=-L${prefix}/lib
-
 post-patch {
   reinplace "s|@PREFIX@|$prefix|" ${worksrcpath}/setup.py
 }
 
 post-destroot {
-  set docdir ${prefix}/share/doc/${name}-${version}
+  set docdir ${prefix}/share/doc/${name}
   xinstall -d ${destroot}${docdir}
   xinstall -m 0644 -W ${worksrcpath} README TODO \
     ${destroot}${docdir}
 }
 
-livecheck.type          regex
-livecheck.url           http://xmlsoft.org/sources/python/
-livecheck.regex         {libxml2-python-(\d+(?:\.\d+)*)}
+livecheck.type  regex
+livecheck.url   ${homepage}news.html
+livecheck.regex {<h3>(\d+(?:\.\d+)*): .*</h3>}

Modified: trunk/dports/python/py26-libxml2/Portfile
===================================================================
--- trunk/dports/python/py26-libxml2/Portfile	2011-07-18 16:04:29 UTC (rev 80813)
+++ trunk/dports/python/py26-libxml2/Portfile	2011-07-18 16:54:27 UTC (rev 80814)
@@ -5,7 +5,7 @@
 PortGroup  python26 1.0
 
 name                    py26-libxml2
-version                 2.6.21
+version                 2.7.8
 categories              python textproc
 license                 MIT
 platforms               darwin
@@ -13,32 +13,33 @@
 description             Python bindings for libxml2
 long_description        ${description}
 
-homepage                http://xmlsoft.org/python.html
-master_sites            ftp://xmlsoft.org/libxml2/python/
-distname                libxml2-python-${version}
+homepage                http://xmlsoft.org/
+master_sites            ftp://fr.rpmfind.net/pub/libxml/ \
+                        ftp://gd.tuwien.ac.at/pub/libxml/ \
+                        ${homepage}sources/ \
+                        ftp://xmlsoft.org/libxml2/
+distname                libxml2-${version}
+dist_subdir             libxml2
+checksums               md5 8127a65e8c3b08856093099b52599c86 \
+                        sha1 859dd535edbb851cc15b64740ee06551a7a17d40 \
+                        rmd160 30709622cfe3e2175e73d6701b7e19a25ab5ac47
 
-checksums               md5 229dd2b3d110a77defeeaa73af83f7f3 \
-                        sha1 2d395e8a5e9accd68f4e78ac2391431ef884e9d5 \
-                        rmd160 d4973576c33e0e65c4fc41b31ee3df5f803abfad
+depends_lib-append      port:libxml2
 
+worksrcdir              ${worksrcdir}/python
+
 patchfiles              patch-setup.py.diff
-
-depends_lib-append      port:libxml2 \
-                        port:zlib
-
-build.env               LDFLAGS=-L${prefix}/lib
-
 post-patch {
   reinplace "s|@PREFIX@|$prefix|" ${worksrcpath}/setup.py
 }
 
 post-destroot {
-  set docdir ${prefix}/share/doc/${name}-${version}
+  set docdir ${prefix}/share/doc/${name}
   xinstall -d ${destroot}${docdir}
   xinstall -m 0644 -W ${worksrcpath} README TODO \
     ${destroot}${docdir}
 }
 
-livecheck.type          regex
-livecheck.url           ftp://xmlsoft.org/libxml2/python/
-livecheck.regex         {python-(\d+(?:\.\d+)*)}
+livecheck.type  regex
+livecheck.url   ${homepage}news.html
+livecheck.regex {<h3>(\d+(?:\.\d+)*): .*</h3>}

Modified: trunk/dports/python/py27-libxml2/Portfile
===================================================================
--- trunk/dports/python/py27-libxml2/Portfile	2011-07-18 16:04:29 UTC (rev 80813)
+++ trunk/dports/python/py27-libxml2/Portfile	2011-07-18 16:54:27 UTC (rev 80814)
@@ -5,7 +5,7 @@
 PortGroup  python27 1.0
 
 name                    py27-libxml2
-version                 2.6.21
+version                 2.7.8
 categories              python textproc
 license                 MIT
 platforms               darwin
@@ -14,31 +14,32 @@
 long_description        ${description}
 
 homepage                http://xmlsoft.org/python.html
-master_sites            ftp://xmlsoft.org/libxml2/python/
-distname                libxml2-python-${version}
+master_sites            ftp://fr.rpmfind.net/pub/libxml/ \
+                        ftp://gd.tuwien.ac.at/pub/libxml/ \
+                        ${homepage}sources/ \
+                        ftp://xmlsoft.org/libxml2/
+distname                libxml2-${version}
+dist_subdir             libxml2
+checksums               md5 8127a65e8c3b08856093099b52599c86 \
+                        sha1 859dd535edbb851cc15b64740ee06551a7a17d40 \
+                        rmd160 30709622cfe3e2175e73d6701b7e19a25ab5ac47
 
-checksums               md5 229dd2b3d110a77defeeaa73af83f7f3 \
-                        sha1 2d395e8a5e9accd68f4e78ac2391431ef884e9d5 \
-                        rmd160 d4973576c33e0e65c4fc41b31ee3df5f803abfad
+depends_lib-append      port:libxml2
 
+worksrcdir              ${worksrcdir}/python
+
 patchfiles              patch-setup.py.diff
-
-depends_lib-append      port:libxml2 \
-                        port:zlib
-
-build.env               LDFLAGS=-L${prefix}/lib
-
 post-patch {
   reinplace "s|@PREFIX@|$prefix|" ${worksrcpath}/setup.py
 }
 
 post-destroot {
-  set docdir ${prefix}/share/doc/${name}-${version}
+  set docdir ${prefix}/share/doc/${name}
   xinstall -d ${destroot}${docdir}
   xinstall -m 0644 -W ${worksrcpath} README TODO \
     ${destroot}${docdir}
 }
 
-livecheck.type          regex
-livecheck.url           ftp://xmlsoft.org/libxml2/python/
-livecheck.regex         {python-(\d+(?:\.\d+)*)}
+livecheck.type  regex
+livecheck.url   ${homepage}news.html
+livecheck.regex {<h3>(\d+(?:\.\d+)*): .*</h3>}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110718/26f8ac0b/attachment.html>


More information about the macports-changes mailing list