[46832] trunk/dports/www/wikkawiki/Portfile

[snc at macports.org]

Revision: 46832
          http://trac.macports.org/changeset/46832
Author:   snc at macports.org
Date:     2009-02-14 06:55:57 -0800 (Sat, 14 Feb 2009)
Log Message:
-----------
further cleanup of wikkawiki, ticket #18455

Modified Paths:
--------------
    trunk/dports/www/wikkawiki/Portfile

Modified: trunk/dports/www/wikkawiki/Portfile
===================================================================
--- trunk/dports/www/wikkawiki/Portfile	2009-02-14 13:52:12 UTC (rev 46831)
+++ trunk/dports/www/wikkawiki/Portfile	2009-02-14 14:55:57 UTC (rev 46832)
@@ -1,4 +1,4 @@
-# c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem 1.0
@@ -25,13 +25,16 @@
     port:php4 \
     port:mysql4
 
+set wikkapath ${prefix}/www/wikka
+set osxdocpath /Library/WebServer/Documents
+
 variant php5 description {Use php5 instead of php4 (not fully tested)} {
-    depends_lib-append  port:php5
+    depends_lib-append  path:bin/php:php5
     depends_lib-delete  port:php4
 }
 
 variant mysql5 description {Use mysql5 instead of mysql4 (not fully tested)} {
-    depends_lib-append  port:mysql5
+    depends_lib-append  path:bin/mysql_config5:mysql5
     depends_lib-delete  port:mysql4
 }
 
@@ -40,25 +43,25 @@
     depends_lib-delete port:mysql4
 }
 
-variant use_osx_docroot conflicts php5 mysql5 requires nodeps description {Create link to /Library/WebServer/Documents} {}
+variant use_osx_docroot conflicts php5 mysql5 requires nodeps description {Create link to /Library/WebServer/Documents} {
+    post-destroot {
+        xinstall -d ${destroot}${osxdocpath}
+        ln -s ${wikkapath} ${destroot}${osxdocpath}/wikka
+    }
 
+    post-activate {
+    }
+}
+
 use_configure   no
-build            {}
+build           {}
 
-set wikkapath ${destroot}${prefix}/www/wikka
-set osxdocpath /Library/WebServer/Documents
-
 destroot {
-    xinstall -d -m 0755 ${wikkapath}
-    eval file copy [glob ${worksrcpath}/*] ${wikkapath}
-    xinstall -m 0666 ${worksrcpath}/.htaccess ${wikkapath}
-    touch ${wikkapath}/wikka.config.php
-    file attributes ${wikkapath}/wikka.config.php -permissions 0666
-
-    if {[variant_isset use_osx_docroot]} {
-        file delete -force ${osxdocpath}/wikka
-        ln -s ${prefix}/www/wikka ${osxdocpath}/wikka
-    }
+    xinstall -d -m 0755 ${destroot}${wikkapath}
+    eval file copy [glob ${worksrcpath}/*] ${destroot}${wikkapath}
+    xinstall -m 0666 ${worksrcpath}/.htaccess ${destroot}${wikkapath}
+    touch ${destroot}${wikkapath}/wikka.config.php
+    file attributes ${destroot}${wikkapath}/wikka.config.php -permissions 0666
 }
 
 post-activate {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090214/54ac620b/attachment.html>