Ticket #29649: yaws.diff

File yaws.diff, 12.5 KB (added by ci42, 13 years ago)

  • Portfile 

    diff -ur orig/Portfile new/Portfile
    old new  
    44PortSystem          1.0
    55
    66name                yaws
    7 version             1.89
     7version             1.90
    88categories          www
    99maintainers         googlemail.com:ciserlohn
    1010platforms           darwin
    … …  
    1515homepage            http://yaws.hyber.org/
    1616master_sites        http://yaws.hyber.org/download/
    1717
    18 checksums           sha1    3f6cc88eb7f154f017f78f1ad07eff5521e7319c \
    19                     rmd160  9fc274a9ddc82cc83bceeaed133758ee71c2951e
     18checksums           sha1    85ce8a738e9691dfc2b9280e313458eafe441bdc \
     19                    rmd160  92d7ed2fdec826cbca3084dd18816f6bb329ef37
    2020
    2121depends_build       port:erlang
    2222

  • files/patch-configure.in 

    diff -ur orig/files/patch-configure.in new/files/patch-configure.in
    old new  
    1 --- configure.in.orig   2010-03-18 16:02:47.000000000 -0500
    2 +++ configure.in        2010-08-29 04:04:04.000000000 -0500
    3 @@ -235,17 +235,6 @@
    4           *darwin*)
     1--- configure.in.orig   2011-05-31 23:06:43.000000000 +0200
     2+++ configure.in        2011-05-31 23:08:41.000000000 +0200
     3@@ -255,17 +255,6 @@
     4            AC_LANG(C)
    55            AC_CHECK_LIB([c],[sendfile],[HAVE_SENDFILE=true])
    6             case "$target_os" in
     6            case "$host_os" in
    77-               darwin10*)
    88-                   AC_LANG(Erlang)
    99-                   AC_RUN_IFELSE(

  • files/patch-man-yaws.1 

    Only in new/files: patch-configure.in.orig
diff -ur orig/files/patch-man-yaws.1 new/files/patch-man-yaws.1
    old new  
    1 --- man/yaws.1.orig     2009-11-09 10:01:46.000000000 +0200
    2 +++ man/yaws.1  2009-11-09 10:01:51.000000000 +0200
    3 @@ -54,9 +54,9 @@
    4  .TP
     1--- man/yaws.1.orig     2011-05-30 23:07:05.000000000 +0200
     2+++ man/yaws.1  2011-05-30 23:09:45.000000000 +0200
     3@@ -55,10 +55,10 @@
    54 \fB\--conf file\fR
    6  Use a different configuration file than the default. The default configuration file
    7 -when running as root is /etc/yaws/yaws.conf. When running as a non priviliged user, yaws
    8 +when running as root is __PREFIX/etc/yaws/yaws.conf. When running as a non priviliged user, yaws
    9  will search for its configuration file in the following order. First in
    10 -$HOME/yaws.conf, then in ./yaws.conf and finally in /etc/yaws/yaws.conf
    11 +$HOME/yaws.conf, then in ./yaws.conf and finally in __PREFIX/etc/yaws/yaws.conf
     5 Use a different configuration file than the default. If the configuration
     6 parameter \fIconfig\fR is set, yaws use it as default configuration file. Else,
     7-The default configuration file when running as root is /etc/yaws/yaws.conf. When
     8+The default configuration file when running as root is __PREFIX/etc/yaws/yaws.conf. When
     9 running as a non priviliged user, yaws will search for its configuration file in
     10 the following order. First in $HOME/yaws.conf, then in ./yaws.conf and finally
     11-in /etc/yaws/yaws.conf.
     12+in __PREFIX/etc/yaws/yaws.conf.
    1213 .TP
    1314 \fB\--runmod module\fR
    1415 Tells yaws to call \fImodule:start/0\fR at startup. This makes it possible

  • files/patch-man-yaws.conf.5 

    diff -ur orig/files/patch-man-yaws.conf.5 new/files/patch-man-yaws.conf.5
    old new  
    1 --- man/yaws.conf.5.orig        2010-03-18 16:02:47.000000000 -0500
    2 +++ man/yaws.conf.5     2010-08-29 03:54:35.000000000 -0500
     1--- man/yaws.conf.5.orig        2011-05-30 23:07:43.000000000 +0200
     2+++ man/yaws.conf.5     2011-05-30 23:13:30.000000000 +0200
    33@@ -1,6 +1,6 @@
    44 .TH YAWS.CONF "5" "" "" "User Commands"
    55 .SH NAME
    … …  
    88 .SH DESCRIPTION
    99 .\" Add any additional description here
    1010 .PP
    11 @@ -743,7 +743,7 @@
     11@@ -1057,7 +1057,7 @@
    1212                 dir = secret/dir1
    1313         </auth>
    1414         <opaque>
    … …  
    1717         </opaque>
    1818 </server>
    1919 
    20 @@ -785,8 +785,8 @@
     20@@ -1099,8 +1099,8 @@
    2121         listen = 192.168.128.32
    2222         docroot = /var/yaws/www_funky_org
    2323         <ssl>

  • files/patch-man-yaws_api.5 

    diff -ur orig/files/patch-man-yaws_api.5 new/files/patch-man-yaws_api.5
    old new  
    1 --- man/yaws_api.5.orig 2009-11-09 10:04:05.000000000 +0200
    2 +++ man/yaws_api.5      2009-11-09 10:04:21.000000000 +0200
    3 @@ -379,7 +379,7 @@
     1--- man/yaws_api.5.orig 2011-05-30 23:08:14.000000000 +0200
     2+++ man/yaws_api.5      2011-05-30 23:11:32.000000000 +0200
     3@@ -388,7 +388,7 @@
    44 .TP
    55 \fBsetconf(Gconf, Groups)\fR
    66 This function is intended for embedded mode in yaws. It makes it possible

  • files/patch-scripts-Install 

    diff -ur orig/files/patch-scripts-Install new/files/patch-scripts-Install
    old new  
    1 --- scripts/Install.orig        2009-11-09 10:04:44.000000000 +0200
    2 +++ scripts/Install     2009-11-09 10:08:54.000000000 +0200
    3 @@ -37,58 +37,58 @@
     1--- scripts/Install.orig        2011-05-30 23:15:13.000000000 +0200
     2+++ scripts/Install     2011-05-30 23:20:40.000000000 +0200
     3@@ -35,61 +35,6 @@
     4 install -d ${destdir}${prefix}/lib/yaws/examples/ebin
     5 install -d ${destdir}${prefix}/lib/yaws/examples/include
    46 
    5  ## seems gentoo don't like to be installed in /usr/local/etc
    6  ## since /sbin/runscript still reads /etc/conf.d
     7-## seems gentoo don't like to be installed in /usr/local/etc
     8-## since /sbin/runscript still reads /etc/conf.d
    79-if [ -f /etc/gentoo-release ]; then
    810-    install -d ${destdir}${etcdir}/init.d/
    911-    install -d ${destdir}${etcdir}/conf.d/
    … …  
    5153-    sed -e "s;%prefix%;$p;g" -e "s;%etcdir%;$e;g" freebsd/yaws.sh > ${destdir}${etcdir}/rc.d/yaws.sh
    5254-elif [ "`uname -s`" = "NetBSD" ]; then
    5355-    sed -e "s;%prefix%;$p;g" -e "s;%etcdir%;$e;g" netbsd/yaws.sh > /etc/rc.d/yaws
    54 -else   
    55 -    install -d ${destdir}${etcdir} 
    56 -    echo "Don't know how to make /etc/init scrips for this system"
     56-else
     57-    install -d ${destdir}${etcdir}
     58-    echo "Don't know how to make /etc/init scripts for this system"
    5759-    echo "possibly add ${prefix}/bin/yaws --daemon --heart to your /etc/rc.local manually"
    5860-fi
    59 +# if [ -f /etc/gentoo-release ]; then
    60 +#     install -d ${destdir}${etcdir}/init.d/
    61 +#     install -d ${destdir}${etcdir}/conf.d/
    62 +#     install -d ${destdir}${vardir}/run/yaws
    63 +#     chmod a+rwx ${destdir}${vardir}/run/yaws
    64 +#     sed -e  "s;%prefix%;$p;g"  \
    65 +#      -e "s;%etcdir%;$e;g" gentoo/init.d.yaws > ${destdir}${etcdir}/init.d/yaws
    66 +#     chmod +x ${destdir}${etcdir}/init.d/yaws
    67 +# elif [ -f /etc/redhat-release ]; then
    68 +#     install -d ${destdir}${etcdir}/init.d
    69 +#     sed -e "s;%prefix%;$p;g" \
    70 +#      -e "s;%etcdir%;$e;g" redhat/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/suseservers ]; then
    75 +#     install -d ${destdir}${etcdir}/init.d
    76 +#     sed -e "s;%prefix%;$p;g" \
    77 +#      -e "s;%etcdir%;$e;g" suse/yaws.init.d/ > ${destdir}${etcdir}/init.d/yaws
    78 +#     chmod +x ${destdir}${etcdir}/init.d/yaws
    79 +#     install -d ${destdir}${vardir}/run/yaws
    80 +#     chmod a+rwx ${destdir}${vardir}/run/yaws
    81 +# elif [ -f /etc/debian_version ]; then
    82 +#     install -d ${destdir}${etcdir}/init.d
    83 +#     sed -e "s;%prefix%;$p;g" \
    84 +#      -e "s;%etcdir%;$e;g" debian/yaws.init.d >  ${destdir}${etcdir}/init.d/yaws
    85 +#     chmod +x ${destdir}${etcdir}/init.d/yaws
    86 +#     install -d ${destdir}${vardir}/run/yaws
    87 +#     chmod a+rwx ${destdir}${vardir}/run/yaws
    88 +#
    89 +# elif [ "`uname -s`" = "Darwin" -a `id -u` = 0 ]; then
    90 +#      startupdir="/Library/StartupItems/Yaws"
    91 +#      if [ ! -e ${startupdir} ]; then
    92 +#        mkdir ${startupdir};
    93 +#      elif [ ! -d ${startupdir} ]; then
    94 +#       echo "${startupdir} exists but is not a directory, bailing out ..."
    95 +#       exit 1
    96 +#      fi
    97 +#      sed -e "s;%prefix%;$p;g" darwin/Yaws.StartupItem > ${startupdir}/Yaws
    98 +#      chmod +x ${startupdir}/Yaws
    99 +#      cp darwin/Yaws.plist ${startupdir}/StartupParameters.plist
    100 +#       # MacOS is particular about the ownership of startup items.
    101 +#      chown -R root:wheel ${startupdir}
    102 +# elif [ "`uname -s`" = "FreeBSD" ]; then
    103 +#     sed -e "s;%prefix%;$p;g" -e "s;%etcdir%;$e;g" freebsd/yaws.sh > ${destdir}${etcdir}/rc.d/yaws.sh
    104 +# elif [ "`uname -s`" = "NetBSD" ]; then
    105 +#     sed -e "s;%prefix%;$p;g" -e "s;%etcdir%;$e;g" netbsd/yaws.sh > /etc/rc.d/yaws
    106 +# else   
    107 +#     install -d ${destdir}${etcdir}
    108 +#     echo "Don't know how to make /etc/init scrips for this system"
    109 +#     echo "possibly add ${prefix}/bin/yaws --daemon --heart to your /etc/rc.local manually"
    110 +# fi
     61-
    11162 
    11263 
    11364 

  • files/patch-scripts-yaws.conf.template 

    diff -ur orig/files/patch-scripts-yaws.conf.template new/files/patch-scripts-yaws.conf.template
    old new  
    1 --- scripts/yaws.conf.template.orig     2010-03-18 16:02:47.000000000 -0500
    2 +++ scripts/yaws.conf.template  2010-08-29 03:57:15.000000000 -0500
    3 @@ -15,7 +15,7 @@
    4  # beam code can be placed. The daemon will add this
    5  # directory to its search path
    6  
     1--- scripts/yaws.conf.template.orig     2011-05-30 23:16:15.000000000 +0200
     2+++ scripts/yaws.conf.template  2011-05-30 23:31:41.000000000 +0200
     3@@ -10,13 +10,13 @@
     4 # These are the paths to directories where additional
     5 # beam code can be placed. The daemon will add these
     6 # directories to its search path.
    77-ebin_dir = %yawsdir%/examples/ebin
    88+ebin_dir = %yawsdir%/ebin
    99 ebin_dir = %vardir%/yaws/ebin
    1010 
    11  
    12 @@ -23,7 +23,7 @@
    13  # files can be placed. application specifig .yaws code can
    14  # then include these .hrl files
    15  
     11 # This is a directory where application specific .hrl
     12 # files can be placed. Application-specific .yaws code can
     13 # then include these .hrl files.
    1614-include_dir = %yawsdir%/examples/include
    1715+include_dir = %yawsdir%/include
    1816 
    1917 # Set this to an integer value to control
    20  # max number of connections from clients into the server
    21 @@ -130,35 +130,35 @@
    22          appmods = <cgi-bin, yaws_appmod_cgi>       
     18 # max number of connections from clients into the server.
     19@@ -113,32 +113,32 @@
     20         appmods = <cgi-bin, yaws_appmod_cgi>
    2321 </server>
    2422 
    2523-<server localhost>
    … …  
    2725-        listen = 0.0.0.0
    2826-        docroot = /tmp
    2927-        dir_listings = true
     28-        auth_log = true
    3029-        statistics = true
    3130-        <auth>
    3231-                realm = foobar
    … …  
    3534-                user = baz:bar
    3635-        </auth>
    3736-</server>
    38 +# <server localhost>
    39 +#         port = %port%
    40 +#         listen = 0.0.0.0
    41 +#         docroot = __PREFIX/tmp
    42 +#         dir_listings = true
    43 +#         statistics = true
    44 +#         <auth>
    45 +#                 realm = foobar
    46 +#                 dir = /
    47 +#                 user = foo:bar
    48 +#                 user = baz:bar
    49 +#         </auth>
    50 +# </server>
     37+#<server localhost>
     38+#        port = %port%
     39+#        listen = 0.0.0.0
     40+#        docroot = /tmp
     41+#        dir_listings = true
     42+#        auth_log = true
     43+#        statistics = true
     44+#        <auth>
     45+#                realm = foobar
     46+#                dir = /
     47+#                user = foo:bar
     48+#                user = baz:bar
     49+#        </auth>
     50+#</server>
    5151 
    52  
    53  
    54  # And then an ssl server
     52 # Now an SSL server
    5553 
    5654-<server %host%>
    5755-        port = %sslport%
    5856-        docroot = /tmp
    5957-        listen = 0.0.0.0
    6058-        dir_listings = true
    61 -        <ssl> 
     59-        auth_log = true
     60-        <ssl>
    6261-                keyfile = %certdir%/yaws-key.pem
    6362-                certfile = %certdir%/yaws-cert.pem
    6463-                depth = 0
    6564-        </ssl>
    6665-</server>
    67 +# <server %host%>
    68 +#         port = %sslport%
    69 +#         docroot = __PREFIX/tmp
    70 +#         listen = 0.0.0.0
    71 +#         dir_listings = true
    72 +#         <ssl> 
    73 +#                 keyfile = %certdir%/yaws-key.pem
    74 +#                 certfile = %certdir%/yaws-cert.pem
    75 +#                 depth = 0
    76 +#         </ssl>
    77 +# </server>
    78                                  
    79          
    80  
     66+#<server %host%>
     67+#        port = %sslport%
     68+#        docroot = /tmp
     69+#        listen = 0.0.0.0
     70+#        dir_listings = true
     71+#        auth_log = true
     72+#        <ssl>
     73+#                keyfile = %certdir%/yaws-key.pem
     74+#                certfile = %certdir%/yaws-cert.pem
     75+#                depth = 0
     76+#        </ssl>
     77+#</server>