[97041] trunk/dports

[jmr at macports.org]

Revision: 97041
          https://trac.macports.org/changeset/97041
Author:   jmr at macports.org
Date:     2012-08-25 01:26:01 -0700 (Sat, 25 Aug 2012)
Log Message:
-----------
py*-libxml2: unify

Modified Paths:
--------------
    trunk/dports/python/py-libxml2/Portfile
    trunk/dports/python/py-xmlsec/Portfile
    trunk/dports/sysutils/yum-arch/Portfile

Removed Paths:
-------------
    trunk/dports/python/py25-libxml2/
    trunk/dports/python/py26-libxml2/
    trunk/dports/python/py27-libxml2/

Modified: trunk/dports/python/py-libxml2/Portfile
===================================================================
--- trunk/dports/python/py-libxml2/Portfile	2012-08-25 08:15:43 UTC (rev 97040)
+++ trunk/dports/python/py-libxml2/Portfile	2012-08-25 08:26:01 UTC (rev 97041)
@@ -2,18 +2,18 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup python24 1.0
+PortGroup python 1.0
 
 name                    py-libxml2
 version                 2.7.8
 categories              python textproc
 license                 MIT
 platforms               darwin
-maintainers             sfiera openmaintainer
+maintainers             sfiera mcalhoun openmaintainer
 description             Python bindings for libxml2
 long_description        ${description}
 
-homepage                http://xmlsoft.org/
+homepage                http://xmlsoft.org/python.html
 master_sites            ftp://fr.rpmfind.net/pub/libxml/ \
                         ftp://gd.tuwien.ac.at/pub/libxml/ \
                         ${homepage}sources/ \
@@ -24,22 +24,27 @@
                         sha1 859dd535edbb851cc15b64740ee06551a7a17d40 \
                         rmd160 30709622cfe3e2175e73d6701b7e19a25ab5ac47
 
-depends_lib-append      port:libxml2
+python.versions         24 25 26 27
 
-worksrcdir              ${worksrcdir}/python
-
-patchfiles              patch-setup.py.diff
-post-patch {
-  reinplace "s|@PREFIX@|$prefix|" ${worksrcpath}/setup.py
+if {$subport != $name} {
+    depends_lib-append      port:libxml2
+    
+    worksrcdir              ${worksrcdir}/python
+    
+    patchfiles              patch-setup.py.diff
+    post-patch {
+      reinplace "s|@PREFIX@|$prefix|" ${worksrcpath}/setup.py
+    }
+    
+    post-destroot {
+      set docdir ${prefix}/share/doc/${subport}
+      xinstall -d ${destroot}${docdir}
+      xinstall -m 644 -W ${worksrcpath} README TODO \
+        ${destroot}${docdir}
+    }
+    livecheck.type  none
+} else {
+    livecheck.type  regex
+    livecheck.url   ${homepage}news.html
+    livecheck.regex {<h3>(\d+(?:\.\d+)*): .*</h3>}
 }
-
-post-destroot {
-  set docdir ${prefix}/share/doc/${name}
-  xinstall -d ${destroot}${docdir}
-  xinstall -m 644 -W ${worksrcpath} README TODO \
-    ${destroot}${prefix}/share/doc/${name}
-}
-
-livecheck.type  regex
-livecheck.url   ${homepage}news.html
-livecheck.regex {<h3>(\d+(?:\.\d+)*): .*</h3>}

Modified: trunk/dports/python/py-xmlsec/Portfile
===================================================================
--- trunk/dports/python/py-xmlsec/Portfile	2012-08-25 08:15:43 UTC (rev 97040)
+++ trunk/dports/python/py-xmlsec/Portfile	2012-08-25 08:26:01 UTC (rev 97041)
@@ -18,7 +18,7 @@
 checksums		md5 615aac32eaa2abb0c9091832336fa82b
 patchfiles		patch-setup.py
 
-depends_lib-append	port:py-libxml2 \
+depends_lib-append	port:py24-libxml2 \
 				port:openssl \
 				port:xmlsec
 

Modified: trunk/dports/sysutils/yum-arch/Portfile
===================================================================
--- trunk/dports/sysutils/yum-arch/Portfile	2012-08-25 08:15:43 UTC (rev 97040)
+++ trunk/dports/sysutils/yum-arch/Portfile	2012-08-25 08:26:01 UTC (rev 97041)
@@ -21,7 +21,7 @@
 
 patchfiles	 yum-arch-folder.patch patch-prefix.diff
 
-depends_lib	port:rpm port:python24 port:py-libxml2
+depends_lib	port:rpm port:python24 port:py24-libxml2
 
 patch {
 		foreach patch $patchfiles {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120825/409f5749/attachment.html>