Changeset 18685


Ignore:
Timestamp:
Jul 22, 2006, 8:54:03 AM (14 years ago)
Author:
pguyot (Paul Guyot)
Message:

Update to 1.64.

Bug:
Submitted by: jon.olsson@…
Reviewed by:
Approved by:
Obtained from:

Location:
trunk/dports/www/yaws
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/www/yaws/Portfile

    r8498 r18685  
    1 # $Id: Portfile,v 1.2 2004/09/29 11:37:14 pguyot Exp $
     1# $Id: Portfile,v 1.3 2006/07/22 08:54:03 pguyot Exp $
    22
    33PortSystem                      1.0
    44name                            yaws
    5 version                         1.49
     5version                         1.64
    66categories                      www
    77maintainers                     pguyot@kallisys.net
     
    1313homepage                        http://yaws.hyber.org/
    1414master_sites            http://yaws.hyber.org/download/
    15 checksums                       md5 2056958a87de28163e8d2c437cfebb1e
     15checksums                       md5 e5a122aede7c120b301d6c10eaf76c9d \
     16                                        sha1 42e4b1ce76d91d9823317014910679cbba05c017 \
     17                                        rmd160 378ecf8bf2309e3ec2d574e1f44554ca31c6848c
    1618
    1719depends_build           bin:erlc:erlang
    18 depends_run                     path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
    1920
    2021extract.post_args       | tar -xf - --exclude \
    2122                                        "${name}-${version}/www/testdir/xx*xx.jpg"
    22 post-extract {
    23         # Copy BSD rc.d stuff.
    24         file mkdir ${worksrcpath}/scripts/bsd/
    25         file copy ${filespath}/yaws.sh ${worksrcpath}/scripts/bsd/
    26 }
    2723
    2824patchfiles                      patch-man-yaws.1 \
     
    3127                                        patch-scripts-Install \
    3228                                        patch-scripts-Makefile \
    33                                         patch-scripts-yaws.conf.template \
    34                                         patch-src-yaws_config.erl
     29                                        patch-scripts-yaws.conf.template
    3530
    3631post-patch {
     
    4944        xinstall -d "${destroot}${prefix}/var/log/yaws/"
    5045        system "touch ${destroot}${prefix}/var/log/yaws/.turd"
     46        file rename "${destroot}${prefix}/etc/yaws.conf" "${destroot}${prefix}/etc/yaws.conf.template"
    5147}
    5248
     
    5450        ui_msg "Copy and customize ${prefix}/etc/yaws.conf.template to ${prefix}/etc/yaws.conf"
    5551}
     52
     53startupitem.create      yes
     54startupitem.name        yaws
     55startupitem.start       "${prefix}/bin/yaws --daemon --heart --conf ${prefix}/etc/yaws.conf"
     56startupitem.stop        "${prefix}/bin/yaws --stop"
  • trunk/dports/www/yaws/files/patch-man-yaws.1

    r8498 r18685  
    1 --- man/yaws.1.orig     Wed May 26 13:16:03 2004
    2 +++ man/yaws.1  Wed Sep 29 11:43:07 2004
    3 @@ -37,9 +37,10 @@
     1--- man/yaws.1.orig     2006-04-28 04:25:10.000000000 +0900
     2+++ man/yaws.1  2006-07-22 17:37:47.000000000 +0900
     3@@ -39,9 +39,10 @@
    44 .TP
    5  \fB\-c file\fR
     5 \fB\--conf file\fR
    66 Use a different configuration file than the default. The default configuration file
    77-when running as root is /etc/yaws.conf. When running as a non priviliged user, yaws
     
    1313+finally in __PREFIX/etc/yaws.conf
    1414 .TP
    15  \fB\-r module\fR
     15 \fB\--runmod module\fR
    1616 Tells yaws to call \fImodule:start/0\fR at startup. This makes it possible
  • trunk/dports/www/yaws/files/patch-man-yaws.conf.5

    r8498 r18685  
    99 .\" Add any additional description here
    1010 .PP
    11 @@ -362,11 +362,11 @@
     11@@ -467,11 +467,11 @@
    1212 The following example defines a single server on port 80.
    1313 .nf
     
    2323 .fi
    2424 
    25 @@ -375,17 +375,17 @@
     25@@ -480,17 +480,17 @@
    2626 
    2727 .nf
     
    4444 
    4545 
    46 @@ -399,7 +399,7 @@
     46@@ -504,7 +504,7 @@
    4747 <server www.mydomain.org>
    4848         port = 80
     
    5353         <auth>
    5454             dir = secret/dir1
    55 @@ -424,7 +424,7 @@
     55@@ -529,7 +529,7 @@
    5656 <server www.funky.org>
    5757         port = 80
     
    6262        <opaque>
    6363                mydbdir = /tmp
    64 @@ -448,14 +448,14 @@
     64@@ -553,14 +553,14 @@
    6565 
    6666 .nf
     
    7979 
    8080 
    81 @@ -463,16 +463,16 @@
     81@@ -568,16 +568,16 @@
    8282 <server www.funky.org>
    8383         port = 80
  • trunk/dports/www/yaws/files/patch-man-yaws_api.5

    r8498 r18685  
    1 --- man/yaws_api.5.orig Fri May 28 15:56:13 2004
    2 +++ man/yaws_api.5      Wed Sep 29 11:43:07 2004
    3 @@ -298,8 +298,8 @@
     1--- man/yaws_api.5.orig 2006-04-28 04:25:10.000000000 +0900
     2+++ man/yaws_api.5      2006-07-22 17:37:47.000000000 +0900
     3@@ -308,8 +308,8 @@
    44 .TP
    55 \fBsetconf(Gconf, Groups)\fR
  • trunk/dports/www/yaws/files/patch-scripts-Install

    r8498 r18685  
    1 --- scripts/Install.orig        Fri Jun  4 15:15:55 2004
    2 +++ scripts/Install     Wed Sep 29 12:03:40 2004
    3 @@ -24,35 +24,6 @@
    4  install -d ${installprefix}/lib/yaws/examples/ebin
    5  install -d ${installprefix}/lib/yaws/examples/include
     1--- scripts/Install.orig        2006-07-03 18:17:32.000000000 +0900
     2+++ scripts/Install     2006-07-22 17:22:26.000000000 +0900
     3@@ -33,53 +33,53 @@
     4 install -d ${destdir}/${prefix}/lib/yaws/examples/ebin
     5 install -d ${destdir}/${prefix}/lib/yaws/examples/include
    66 
    77-if [ -f /etc/gentoo-release ]; then
    8 -    install -d  ${etcdir}/init.d/
    9 -    install -d ${etcdir}/conf.d/
    10 -    cp gentoo/init.d.yaws  ${etcdir}/init.d/yaws
    11 -    chmod +x ${etcdir}/init.d/yaws
    12 -    sed -e "s;%prefix%;$p;g" gentoo/conf.d.yaws > ${etcdir}/conf.d/yaws
     8-    install -d ${destdir}/${etcdir}/init.d/
     9-    install -d ${destdir}/${etcdir}/conf.d/
     10-    install -d ${destdir}/${vardir}/run/yaws
     11-    chmod a+rwx ${destdir}/${vardir}/run/yaws
     12-    cp gentoo/init.d.yaws  ${destdir}/${etcdir}/init.d/yaws
     13-    chmod +x ${destdir}/${etcdir}/init.d/yaws
     14-    sed -e "s;%prefix%;$p;g" gentoo/conf.d.yaws > ${destdir}/${etcdir}/conf.d/yaws
    1315-elif [ -f /etc/redhat-release ]; then
    14 -    install -d ${etcdir}/init.d
    15 -    sed -e "s;%prefix%;$p;g" redhat/yaws.init.d  > ${etcdir}/init.d/yaws
    16 -    chmod +x ${etcdir}/init.d/yaws
     16-    install -d ${destdir}/${etcdir}/init.d
     17-    sed -e "s;%prefix%;$p;g" redhat/yaws.init.d  > ${destdir}/${etcdir}/init.d/yaws
     18-    chmod +x ${destdir}/${etcdir}/init.d/yaws
     19-    install -d ${destdir}/${vardir}/run/yaws
     20-    chmod a+rwx ${destdir}/${vardir}/run/yaws
    1721-elif [ -f /etc/suseservers ]; then
    18 -    install -d ${etcdir}/init.d
    19 -    sed -e "s;%prefix%;$p;g" suse/yaws.init.d  > ${etcdir}/init.d/yaws
    20 -    chmod +x ${etcdir}/init.d/yaws
    21 -elif [ "`uname -s`" = "Darwin" ]; then
     22-    install -d ${destdir}/${etcdir}/init.d
     23-    sed -e "s;%prefix%;$p;g" suse/yaws.init.d  > ${destdir}/${etcdir}/init.d/yaws
     24-    chmod +x ${destdir}/${etcdir}/init.d/yaws
     25-    install -d ${destdir}/${vardir}/run/yaws
     26-    chmod a+rwx ${destdir}/${vardir}/run/yaws
     27-elif [ -f /etc/debian_version ]; then
     28-    install -d ${destdir}/${etcdir}/init.d
     29-    sed -e "s;%prefix%;$p;g" debian/yaws.init.d  > ${destdir}/${etcdir}/init.d/yaws
     30-    chmod +x ${destdir}/${etcdir}/init.d/yaws
     31-    install -d ${destdir}/${vardir}/run/yaws
     32-    chmod a+rwx ${destdir}/${vardir}/run/yaws
     33-
     34-elif [ "`uname -s`" = "Darwin" -a `id -u` = 0 ]; then
    2235-     startupdir="/Library/StartupItems/Yaws"
    23 -     if [ ! -d ${startupdir} ]; then
     36-     if [ ! -e ${startupdir} && ]; then
    2437-       mkdir ${startupdir};
     38-     elif [ ! -d ${startupdir} ]; then
     39-        echo "${startupdir} exists but is not a directory, bailing out ..."
     40-        exit 1
    2541-     fi
    2642-     sed -e "s;%prefix%;$p;g" darwin/Yaws.StartupItem > ${startupdir}/Yaws
    2743-     chmod +x ${startupdir}/Yaws
    2844-     cp darwin/Yaws.plist ${startupdir}/StartupParameters.plist
     45-      # MacOS is particular about the ownership of startup items.
     46-     chown -R root:wheel ${startupdir}
     47-elif [ "`uname -s`" = "FreeBSD" ]; then
     48-    sed -e "s;%prefix%;$p;g" -e "s;%etcdir%;$e;g" freebsd/yaws.sh > ${destdir}/${etcdir}/rc.d/yaws.sh
    2949-else
     50-    install -d ${destdir}/${etcdir}
    3051-    echo "Don't know how to make /etc/init scrips for this system"
    31 -    echo "possibly add $1/bin/yaws -D -heart to your /etc/rc.local manually"
     52-    echo "possibly add ${prefix}/bin/yaws --daemon --heart to your /etc/rc.local manually"
    3253-fi
    33 -
    34 -
    35 -
    36 -
    37 -
    38 -
    39 +install -d ${etcdir}/rc.d/
    40 +sed -e "s;%prefix%;$p;g" bsd/yaws.sh  > ${etcdir}/rc.d/yaws.sh
    41 +chmod +x ${etcdir}/rc.d/yaws.sh
     54+# if [ -f /etc/gentoo-release ]; then
     55+#     install -d ${destdir}/${etcdir}/init.d/
     56+#     install -d ${destdir}/${etcdir}/conf.d/
     57+#     install -d ${destdir}/${vardir}/run/yaws
     58+#     chmod a+rwx ${destdir}/${vardir}/run/yaws
     59+#     cp gentoo/init.d.yaws  ${destdir}/${etcdir}/init.d/yaws
     60+#     chmod +x ${destdir}/${etcdir}/init.d/yaws
     61+#     sed -e "s;%prefix%;$p;g" gentoo/conf.d.yaws > ${destdir}/${etcdir}/conf.d/yaws
     62+# elif [ -f /etc/redhat-release ]; then
     63+#     install -d ${destdir}/${etcdir}/init.d
     64+#     sed -e "s;%prefix%;$p;g" redhat/yaws.init.d  > ${destdir}/${etcdir}/init.d/yaws
     65+#     chmod +x ${destdir}/${etcdir}/init.d/yaws
     66+#     install -d ${destdir}/${vardir}/run/yaws
     67+#     chmod a+rwx ${destdir}/${vardir}/run/yaws
     68+# elif [ -f /etc/suseservers ]; then
     69+#     install -d ${destdir}/${etcdir}/init.d
     70+#     sed -e "s;%prefix%;$p;g" suse/yaws.init.d  > ${destdir}/${etcdir}/init.d/yaws
     71+#     chmod +x ${destdir}/${etcdir}/init.d/yaws
     72+#     install -d ${destdir}/${vardir}/run/yaws
     73+#     chmod a+rwx ${destdir}/${vardir}/run/yaws
     74+# elif [ -f /etc/debian_version ]; then
     75+#     install -d ${destdir}/${etcdir}/init.d
     76+#     sed -e "s;%prefix%;$p;g" debian/yaws.init.d  > ${destdir}/${etcdir}/init.d/yaws
     77+#     chmod +x ${destdir}/${etcdir}/init.d/yaws
     78+#     install -d ${destdir}/${vardir}/run/yaws
     79+#     chmod a+rwx ${destdir}/${vardir}/run/yaws
     80+#
     81+# elif [ "`uname -s`" = "Darwin" -a `id -u` = 0 ]; then
     82+#      startupdir="/Library/StartupItems/Yaws"
     83+#      if [ ! -e ${startupdir} && ]; then
     84+#        mkdir ${startupdir};
     85+#      elif [ ! -d ${startupdir} ]; then
     86+#       echo "${startupdir} exists but is not a directory, bailing out ..."
     87+#       exit 1
     88+#      fi
     89+#      sed -e "s;%prefix%;$p;g" darwin/Yaws.StartupItem > ${startupdir}/Yaws
     90+#      chmod +x ${startupdir}/Yaws
     91+#      cp darwin/Yaws.plist ${startupdir}/StartupParameters.plist
     92+#       # MacOS is particular about the ownership of startup items.
     93+#      chown -R root:wheel ${startupdir}
     94+# elif [ "`uname -s`" = "FreeBSD" ]; then
     95+#     sed -e "s;%prefix%;$p;g" -e "s;%etcdir%;$e;g" freebsd/yaws.sh > ${destdir}/${etcdir}/rc.d/yaws.sh
     96+# else
     97+#     install -d ${destdir}/${etcdir}
     98+#     echo "Don't know how to make /etc/init scrips for this system"
     99+#     echo "possibly add ${prefix}/bin/yaws --daemon --heart to your /etc/rc.local manually"
     100+# fi
     101 
     102 
     103 
  • trunk/dports/www/yaws/files/patch-scripts-yaws.conf.template

    r8498 r18685  
    1 --- scripts/yaws.conf.template.orig     Tue May 25 16:10:08 2004
    2 +++ scripts/yaws.conf.template  Wed Sep 29 12:06:45 2004
     1--- scripts/yaws.conf.template.orig     2005-12-01 05:10:20.000000000 +0900
     2+++ scripts/yaws.conf.template  2006-07-22 17:23:51.000000000 +0900
    33@@ -15,14 +15,14 @@
    44 # beam code can be placed. The daemon will add this
     
    1818 
    1919 
    20 @@ -91,7 +91,7 @@
     20@@ -129,7 +129,7 @@
    2121 <server localhost>
    2222        port = %port%
     
    2525+       docroot = __PREFIX/tmp
    2626        dir_listings = true
     27        dav = true
    2728        <auth>
    28                 realm = foobar
    29 @@ -107,7 +107,7 @@
     29@@ -146,7 +146,7 @@
    3030 
    3131 <server %host%>
Note: See TracChangeset for help on using the changeset viewer.