Ticket #18455: patch-wikkawiki.2.diff

File patch-wikkawiki.2.diff, 4.2 KB (added by nerdling (Jeremy Lavergne), 16 years ago)

further changes (whitespace, post-activate, lone {)

  • www/wikkawiki/Portfile

    old new  
    1 # c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
     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
    22# $Id: Portfile 46696 2009-02-10 20:21:26Z snc@macports.org $
    33
    44PortSystem 1.0
    … …  
    2525    port:php4 \
    2626    port:mysql4
    2727
     28set wikkapath ${destroot}${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 ${prefix}/www/wikkawiki ${destroot}${osxdocpath}/wikka
     50    }
    4451
    45 use_configure   no
    46 build            {}
     52    post-activate {
     53        ui_msg "**********************************************************"
     54        ui_msg "* Point your browser to http://localhost/wikka to continue"
     55        ui_msg "* installation. Be sure to lock down permissions on"
     56        ui_msg "* ${osxdocpath}/wikka/wikka.config.php and"
     57        ui_msg "* ${osxdocpath}/wikka/.htaccess for public sites!"
     58        ui_msg "* Visit http://docs.wikkawiki.org/MacportInstall for help."
     59        ui_msg "**********************************************************"
     60    }
     61}
    4762
    48 set wikkapath ${destroot}${prefix}/www/wikka
    49 set osxdocpath /Library/WebServer/Documents
     63use_configure   no
     64build           {}
    5065
    5166destroot {
    5267    xinstall -d -m 0755 ${wikkapath}
    5368    eval file copy [glob ${worksrcpath}/*] ${wikkapath}
    5469    xinstall -m 0666 ${worksrcpath}/.htaccess ${wikkapath}
    5570    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     }
     71    xinstall -m 0666 ${wikkapath}/wikka.config.php
    6272}
    6373
    6474post-activate {
    65     if {[variant_isset use_osx_docroot]} {
    66         ui_msg "**********************************************************"
    67         ui_msg "* Point your browser to http://localhost/wikka to continue"
    68         ui_msg "* installation. Be sure to lock down permissions on"
    69         ui_msg "* ${osxdocpath}/wikka/wikka.config.php and"
    70         ui_msg "* ${osxdocpath}/wikka/.htaccess for public sites!"
    71         ui_msg "* Visit http://docs.wikkawiki.org/MacportInstall for help."
    72         ui_msg "**********************************************************"
    73     } else {
    74         ui_msg "**********************************************************"
    75         ui_msg "* Point your browser to http://localhost/wikka to continue"
    76         ui_msg "* installation. Be sure to lock down permissions on"
    77         ui_msg "* ${prefix}/www/wikka/wikka.config.php and"
    78         ui_msg "* ${prefix}/www/wikka/.htaccess for public sites!"
    79         ui_msg "* Visit http://docs.wikkawiki.org/MacportInstall for help."
    80         ui_msg "**********************************************************"
    81     }
     75    ui_msg "**********************************************************"
     76    ui_msg "* Point your browser to http://localhost/wikka to continue"
     77    ui_msg "* installation. Be sure to lock down permissions on"
     78    ui_msg "* ${prefix}/www/wikka/wikka.config.php and"
     79    ui_msg "* ${prefix}/www/wikka/.htaccess for public sites!"
     80    ui_msg "* Visit http://docs.wikkawiki.org/MacportInstall for help."
     81    ui_msg "**********************************************************"
    8282}