[48734] trunk/dports/python/py26-django/Portfile

[arthurk at macports.org]

Revision: 48734
          http://trac.macports.org/changeset/48734
Author:   arthurk at macports.org
Date:     2009-03-27 12:27:48 -0700 (Fri, 27 Mar 2009)
Log Message:
-----------
Fix conflict between py*-django ports (Ticket #18532 and #18903)

Modified Paths:
--------------
    trunk/dports/python/py26-django/Portfile

Modified: trunk/dports/python/py26-django/Portfile
===================================================================
--- trunk/dports/python/py26-django/Portfile	2009-03-27 19:26:57 UTC (rev 48733)
+++ trunk/dports/python/py26-django/Portfile	2009-03-27 19:27:48 UTC (rev 48734)
@@ -5,9 +5,10 @@
 
 name                py26-django
 version             1.0.2
-categories          python www
+revision            1
+categories-append   www
 platforms           darwin
-maintainers         arthurkoziel.com:arthur
+maintainers         arthurk
 homepage            http://www.djangoproject.com
 description         Django is a high-level Python Web framework
 long_description    Django is a high-level Python Web framework that \
@@ -22,26 +23,34 @@
 
 depends_lib-append  port:py26-setuptools
 
-variant bash_completion description {Bash completion support} {
+variant bash_completion {
     depends_run-append  port:bash-completion
-
+    
+    post-patch {
+        reinplace "s|django-admin.py|django-admin-2.6.py|g" \
+            ${worksrcpath}/extras/django_bash_completion
+    }
+    
     post-destroot {
         xinstall -d ${destroot}${prefix}/etc/bash_completion.d
         xinstall -m 644 ${worksrcpath}/extras/django_bash_completion \
-            ${destroot}${prefix}/etc/bash_completion.d/django-admin.py
+            ${destroot}${prefix}/etc/bash_completion.d/django-admin-2.6.py
     }
 }
 
 post-destroot   {
-        xinstall -m 644 -W ${worksrcpath} AUTHORS INSTALL LICENSE README \
-                ${destroot}${prefix}/share/doc/${name}
+    xinstall -m 644 -W ${worksrcpath} AUTHORS INSTALL LICENSE README \
+        ${destroot}${prefix}/share/doc/${name}
+            
+    file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name}/docs
+    file copy ${worksrcpath}/examples \
+        ${destroot}${prefix}/share/doc/${name}/examples
         
-        ln -s ${python.prefix}/bin/django-admin.py ${destroot}${prefix}/bin/django-admin.py
-        
-        file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name}/docs
-        file copy ${worksrcpath}/examples ${destroot}${prefix}/share/doc/${name}/examples
+    # To avoid conflict between py*-django
+    ln -s ${python.prefix}/bin/django-admin.py \
+        ${destroot}${prefix}/bin/django-admin-2.6.py
 }
 
 livecheck.check     regex
 livecheck.url       http://www.djangoproject.com/download/
-livecheck.regex     "The latest official version is (1\.\[0-9\]+\.\[0-9\]+)"
\ No newline at end of file
+livecheck.regex     "The latest official version is (1\.\[0-9\]+\.\[0-9\]+)"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090327/1c8eb01c/attachment-0001.html>