[101411] trunk/dports/python

[jmr at macports.org]

Revision: 101411
          https://trac.macports.org/changeset/101411
Author:   jmr at macports.org
Date:     2013-01-10 10:38:49 -0800 (Thu, 10 Jan 2013)
Log Message:
-----------
py*-pyobjc-cocoa: unify

Modified Paths:
--------------
    trunk/dports/python/py-pyobjc-cocoa/Portfile
    trunk/dports/python/py-pyobjc2-cocoa/Portfile

Added Paths:
-----------
    trunk/dports/python/py-pyobjc-cocoa/

Removed Paths:
-------------
    trunk/dports/python/py25-pyobjc-cocoa/
    trunk/dports/python/py26-pyobjc-cocoa/
    trunk/dports/python/py27-pyobjc-cocoa/
    trunk/dports/python/py32-pyobjc-cocoa/

Modified: trunk/dports/python/py-pyobjc-cocoa/Portfile
===================================================================
--- trunk/dports/python/py-pyobjc2-cocoa/Portfile	2013-01-10 15:17:36 UTC (rev 101402)
+++ trunk/dports/python/py-pyobjc-cocoa/Portfile	2013-01-10 18:38:49 UTC (rev 101411)
@@ -2,39 +2,64 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup python24 1.0
+PortGroup python 1.0
 
-name            py-pyobjc2-cocoa
-version         2.0
-revision        1
+name            py-pyobjc-cocoa
+version         2.4
 categories      python devel
 license         MIT
 maintainers     nomaintainer
 platforms       darwin
-description     cocoa wrappers for py-pyobjc2
+description     cocoa wrappers for PyObjC
 long_description    This port provides the CoreFoundation, Foundation and AppKit wrappers \
-                    for use with py-pyobjc2.
+                    for use with PyObjC.
 
 homepage        http://pyobjc.sourceforge.net/
+master_sites    http://pypi.python.org/packages/source/p/pyobjc-framework-Cocoa/
+distname        pyobjc-framework-Cocoa-${version}
+checksums       sha1   89c9662cd2df6f115c2e6fa48ef44bd123b7ab3e \
+                rmd160 e23f68b0e84c5bd3ec653d95ccd8915065aef8a4
 
-depends_lib-append     port:py-pyobjc2
+python.versions 24 25 26 27 32
 
-fetch.type      svn
-svn.url         http://svn.red-bean.com/pyobjc/tags/r200-leopard/pyobjc-framework-Cocoa/
-worksrcdir      pyobjc-framework-Cocoa
+if {$subport != $name} {
+    depends_lib     port:py${python.version}-pyobjc
 
-if {${os.major} < 9} {
-    pre-fetch {
-        return -code error "PyObjC 2.0 requires Mac OS X 10.5"
+    if {${python.version} == 24} {
+        version         2.0
+        fetch.type      svn
+        svn.url         http://svn.red-bean.com/pyobjc/tags/r200-leopard/pyobjc-framework-Cocoa/
+        worksrcdir      pyobjc-framework-Cocoa
+    } elseif {${python.version} == 25} {
+        version         2.2
+        distname        pyobjc-framework-Cocoa-${version}
+        checksums       md5 324185e6699b59d1ce85b5020e8f83e5 \
+                        sha1 b6c224065096cb2389660e19f0a757d0289031a8 \
+                        rmd160 c8ebb071a0d04188106c9698f117d655325367f9
     }
-}
 
-post-destroot {
-    xinstall -m 644 -W ${worksrcpath} \
-        LICENSE.txt README.txt \
-        ${destroot}${prefix}/share/doc/${name}
-    copy ${worksrcpath}/Examples \
-        ${destroot}${prefix}/share/doc/${name}/examples
+    platform darwin 8 {
+        depends_fetch
+        depends_lib
+        pre-fetch {
+            return -code error "PyObjC 2 requires Mac OS X 10.5 or later"
+        }
+    }
+
+    post-destroot {
+        xinstall -m 644 -W ${worksrcpath} \
+            LICENSE.txt README.txt \
+            ${destroot}${prefix}/share/doc/${subport}
+        copy ${worksrcpath}/Examples \
+            ${destroot}${prefix}/share/doc/${subport}/examples
+        if {${python.version} >= 25} {
+            copy ${worksrcpath}/Doc ${destroot}${prefix}/share/doc/${subport}
+        }
+    }
+
+    livecheck.type  none
+} else {
+    livecheck.type  regex
+    livecheck.url   http://pypi.python.org/pypi/pyobjc-framework-Cocoa/
+    livecheck.regex {pyobjc-framework-Cocoa ([0-9.]+)}
 }
-
-livecheck.type  none

Modified: trunk/dports/python/py-pyobjc2-cocoa/Portfile
===================================================================
--- trunk/dports/python/py-pyobjc2-cocoa/Portfile	2013-01-10 18:14:44 UTC (rev 101410)
+++ trunk/dports/python/py-pyobjc2-cocoa/Portfile	2013-01-10 18:38:49 UTC (rev 101411)
@@ -2,39 +2,13 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup python24 1.0
 
+replaced_by     py24-pyobjc-cocoa
+PortGroup       obsolete 1.0
+
 name            py-pyobjc2-cocoa
 version         2.0
-revision        1
+revision        2
 categories      python devel
-license         MIT
-maintainers     nomaintainer
-platforms       darwin
-description     cocoa wrappers for py-pyobjc2
-long_description    This port provides the CoreFoundation, Foundation and AppKit wrappers \
-                    for use with py-pyobjc2.
 
 homepage        http://pyobjc.sourceforge.net/
-
-depends_lib-append     port:py-pyobjc2
-
-fetch.type      svn
-svn.url         http://svn.red-bean.com/pyobjc/tags/r200-leopard/pyobjc-framework-Cocoa/
-worksrcdir      pyobjc-framework-Cocoa
-
-if {${os.major} < 9} {
-    pre-fetch {
-        return -code error "PyObjC 2.0 requires Mac OS X 10.5"
-    }
-}
-
-post-destroot {
-    xinstall -m 644 -W ${worksrcpath} \
-        LICENSE.txt README.txt \
-        ${destroot}${prefix}/share/doc/${name}
-    copy ${worksrcpath}/Examples \
-        ${destroot}${prefix}/share/doc/${name}/examples
-}
-
-livecheck.type  none
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130110/f03bf670/attachment.html>