Ticket #18455: patch-wikkawiki.5.diff

File patch-wikkawiki.5.diff, 3.5 KB (added by brian@…, 16 years ago)

Correct target dir in post-destroot symlink creation

  • Portfile

    old new  
    1 # c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    2 # $Id: Portfile.macports,v 1.1 2009/02/14 05:07:53 brian Exp brian $
     1# -*- 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
     2# $Id: Portfile,v 1.1 2008/12/21 02:55:40 brian Exp $
    33
    44PortSystem 1.0
    55
    6 name                wikkawiki
     6name                wikkawiki 
    77set major_version   1.1.6
    88version             ${major_version}.5
    99categories          www php
    … …  
    2525    port:php4 \
    2626    port:mysql4
    2727
     28set wikkapath ${prefix}/www/wikka
     29set osxdocpath /Library/WebServer/Documents
     30
    2831variant php5 description {Use php5 instead of php4 (not fully tested)} {
    29     depends_lib-append  port:php5
     32    depends_lib-append  path:bin/php:php5
    3033    depends_lib-delete  port:php4
    3134}
    3235
    3336variant mysql5 description {Use mysql5 instead of mysql4 (not fully tested)} {
    34     depends_lib-append  port:mysql5
     37    depends_lib-append  path:bin/mysql_config5:mysql5
    3538    depends_lib-delete  port:mysql4
    3639}
    3740
    … …  
    4043    depends_lib-delete port:mysql4
    4144}
    4245
    43 variant use_osx_docroot conflicts php5 mysql5 requires nodeps description {Create link to /Library/WebServer/Documents} {}
     46variant use_osx_docroot conflicts php5 mysql5 requires nodeps description {Create link to /Library/WebServer/Documents} {
     47    post-destroot {
     48        xinstall -d ${destroot}${osxdocpath}
     49        ln -s ${wikkapath} ${destroot}${osxdocpath}/wikka
     50    }
    4451
    45 use_configure   no
    46 build            {}
     52    post-activate {
     53    }
     54}
    4755
    48 set wikkapath ${destroot}${prefix}/www/wikka
    49 set osxdocpath /Library/WebServer/Documents
     56use_configure   no
     57build           {}
    5058
    5159destroot {
    52     xinstall -d -m 0755 ${wikkapath}
    53     eval file copy [glob ${worksrcpath}/*] ${wikkapath}
    54     xinstall -m 0666 ${worksrcpath}/.htaccess ${wikkapath}
    55     touch ${wikkapath}/wikka.config.php
    56     file attributes ${wikkapath}/wikka.config.php -permissions 0666
    57 
    58     if {[variant_isset use_osx_docroot]} {
    59         file delete -force ${osxdocpath}/wikka
    60         ln -s ${prefix}/www/wikka ${osxdocpath}/wikka
    61     }
     60    xinstall -d -m 0755 ${destroot}${wikkapath}
     61    eval file copy [glob ${worksrcpath}/*] ${destroot}${wikkapath}
     62    xinstall -m 0666 ${worksrcpath}/.htaccess ${destroot}${wikkapath}
     63    touch ${destroot}${wikkapath}/wikka.config.php
     64    file attributes ${destroot}${wikkapath}/wikka.config.php -permissions 0666
    6265}
    6366
    6467post-activate {
    6568    if {[variant_isset use_osx_docroot]} {
    6669        ui_msg "**********************************************************"
    67         ui_msg "* Point your browser to http://localhost/wikka to continue"
     70        ui_msg "* Point your browser to http://localhost/wikka to continue" 
    6871        ui_msg "* installation. Be sure to lock down permissions on"
    6972        ui_msg "* ${osxdocpath}/wikka/wikka.config.php and"
    7073        ui_msg "* ${osxdocpath}/wikka/.htaccess for public sites!"
    … …  
    7275        ui_msg "**********************************************************"
    7376    } else {
    7477        ui_msg "**********************************************************"
    75         ui_msg "* Point your browser to http://localhost/wikka to continue"
     78        ui_msg "* Point your browser to http://localhost/wikka to continue" 
    7679        ui_msg "* installation. Be sure to lock down permissions on"
    7780        ui_msg "* ${prefix}/www/wikka/wikka.config.php and"
    7881        ui_msg "* ${prefix}/www/wikka/.htaccess for public sites!"