Skip to content
Permalink
Browse files

Update to 1.64.

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

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@18685 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
pguyot committed Jul 22, 2006
1 parent 6f60a0a commit 23ce46ef0e68e7a6b985d252cd9f8240a434d4f0
@@ -1,8 +1,8 @@
# $Id: Portfile,v 1.2 2004/09/29 11:37:14 pguyot Exp $
# $Id: Portfile,v 1.3 2006/07/22 08:54:03 pguyot Exp $

PortSystem 1.0
name yaws
version 1.49
version 1.64
categories www
maintainers pguyot@kallisys.net
platforms darwin
@@ -12,26 +12,21 @@ long_description Yaws is a high performance HTTP server for dynamic content \
code. Yaws also features a built-in Wiki.
homepage http://yaws.hyber.org/
master_sites http://yaws.hyber.org/download/
checksums md5 2056958a87de28163e8d2c437cfebb1e
checksums md5 e5a122aede7c120b301d6c10eaf76c9d \
sha1 42e4b1ce76d91d9823317014910679cbba05c017 \
rmd160 378ecf8bf2309e3ec2d574e1f44554ca31c6848c

depends_build bin:erlc:erlang
depends_run path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup

extract.post_args | tar -xf - --exclude \
"${name}-${version}/www/testdir/xx*xx.jpg"
post-extract {
# Copy BSD rc.d stuff.
file mkdir ${worksrcpath}/scripts/bsd/
file copy ${filespath}/yaws.sh ${worksrcpath}/scripts/bsd/
}

patchfiles patch-man-yaws.1 \
patch-man-yaws_api.5 \
patch-man-yaws.conf.5 \
patch-scripts-Install \
patch-scripts-Makefile \
patch-scripts-yaws.conf.template \
patch-src-yaws_config.erl
patch-scripts-yaws.conf.template

post-patch {
reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/man/yaws.1
@@ -48,8 +43,14 @@ configure.args --prefix=${prefix} \
post-destroot {
xinstall -d "${destroot}${prefix}/var/log/yaws/"
system "touch ${destroot}${prefix}/var/log/yaws/.turd"
file rename "${destroot}${prefix}/etc/yaws.conf" "${destroot}${prefix}/etc/yaws.conf.template"
}

post-install {
ui_msg "Copy and customize ${prefix}/etc/yaws.conf.template to ${prefix}/etc/yaws.conf"
}
}

startupitem.create yes
startupitem.name yaws
startupitem.start "${prefix}/bin/yaws --daemon --heart --conf ${prefix}/etc/yaws.conf"
startupitem.stop "${prefix}/bin/yaws --stop"
@@ -1,8 +1,8 @@
--- man/yaws.1.orig Wed May 26 13:16:03 2004
+++ man/yaws.1 Wed Sep 29 11:43:07 2004
@@ -37,9 +37,10 @@
--- man/yaws.1.orig 2006-04-28 04:25:10.000000000 +0900
+++ man/yaws.1 2006-07-22 17:37:47.000000000 +0900
@@ -39,9 +39,10 @@
.TP
\fB\-c file\fR
\fB\--conf file\fR
Use a different configuration file than the default. The default configuration file
-when running as root is /etc/yaws.conf. When running as a non priviliged user, yaws
-will search for its configuration file in the following order. First in
@@ -12,5 +12,5 @@
+First in $HOME/yaws.conf, then in ./yaws.conf and
+finally in __PREFIX/etc/yaws.conf
.TP
\fB\-r module\fR
\fB\--runmod module\fR
Tells yaws to call \fImodule:start/0\fR at startup. This makes it possible
@@ -8,7 +8,7 @@
.SH DESCRIPTION
.\" Add any additional description here
.PP
@@ -362,11 +362,11 @@
@@ -467,11 +467,11 @@
The following example defines a single server on port 80.
.nf

@@ -22,7 +22,7 @@
</server>
.fi

@@ -375,17 +375,17 @@
@@ -480,17 +480,17 @@

.nf

@@ -43,7 +43,7 @@
</server>


@@ -399,7 +399,7 @@
@@ -504,7 +504,7 @@
<server www.mydomain.org>
port = 80
listen = 192.168.128.31
@@ -52,7 +52,7 @@
access_log = false
<auth>
dir = secret/dir1
@@ -424,7 +424,7 @@
@@ -529,7 +529,7 @@
<server www.funky.org>
port = 80
listen = 192.168.128.31
@@ -61,7 +61,7 @@
start_mod = btt
<opaque>
mydbdir = /tmp
@@ -448,14 +448,14 @@
@@ -553,14 +553,14 @@

.nf

@@ -78,7 +78,7 @@
</server>


@@ -463,16 +463,16 @@
@@ -568,16 +568,16 @@
<server www.funky.org>
port = 80
listen = 192.168.128.31
@@ -1,6 +1,6 @@
--- man/yaws_api.5.orig Fri May 28 15:56:13 2004
+++ man/yaws_api.5 Wed Sep 29 11:43:07 2004
@@ -298,8 +298,8 @@
--- man/yaws_api.5.orig 2006-04-28 04:25:10.000000000 +0900
+++ man/yaws_api.5 2006-07-22 17:37:47.000000000 +0900
@@ -308,8 +308,8 @@
.TP
\fBsetconf(Gconf, Groups)\fR
This function is intended for embedded mode in yaws. It makes it possible
@@ -1,41 +1,103 @@
--- scripts/Install.orig Fri Jun 4 15:15:55 2004
+++ scripts/Install Wed Sep 29 12:03:40 2004
@@ -24,35 +24,6 @@
install -d ${installprefix}/lib/yaws/examples/ebin
install -d ${installprefix}/lib/yaws/examples/include
--- scripts/Install.orig 2006-07-03 18:17:32.000000000 +0900
+++ scripts/Install 2006-07-22 17:22:26.000000000 +0900
@@ -33,53 +33,53 @@
install -d ${destdir}/${prefix}/lib/yaws/examples/ebin
install -d ${destdir}/${prefix}/lib/yaws/examples/include

-if [ -f /etc/gentoo-release ]; then
- install -d ${etcdir}/init.d/
- install -d ${etcdir}/conf.d/
- cp gentoo/init.d.yaws ${etcdir}/init.d/yaws
- chmod +x ${etcdir}/init.d/yaws
- sed -e "s;%prefix%;$p;g" gentoo/conf.d.yaws > ${etcdir}/conf.d/yaws
- install -d ${destdir}/${etcdir}/init.d/
- install -d ${destdir}/${etcdir}/conf.d/
- install -d ${destdir}/${vardir}/run/yaws
- chmod a+rwx ${destdir}/${vardir}/run/yaws
- cp gentoo/init.d.yaws ${destdir}/${etcdir}/init.d/yaws
- chmod +x ${destdir}/${etcdir}/init.d/yaws
- sed -e "s;%prefix%;$p;g" gentoo/conf.d.yaws > ${destdir}/${etcdir}/conf.d/yaws
-elif [ -f /etc/redhat-release ]; then
- install -d ${etcdir}/init.d
- sed -e "s;%prefix%;$p;g" redhat/yaws.init.d > ${etcdir}/init.d/yaws
- chmod +x ${etcdir}/init.d/yaws
- install -d ${destdir}/${etcdir}/init.d
- sed -e "s;%prefix%;$p;g" redhat/yaws.init.d > ${destdir}/${etcdir}/init.d/yaws
- chmod +x ${destdir}/${etcdir}/init.d/yaws
- install -d ${destdir}/${vardir}/run/yaws
- chmod a+rwx ${destdir}/${vardir}/run/yaws
-elif [ -f /etc/suseservers ]; then
- install -d ${etcdir}/init.d
- sed -e "s;%prefix%;$p;g" suse/yaws.init.d > ${etcdir}/init.d/yaws
- chmod +x ${etcdir}/init.d/yaws
-elif [ "`uname -s`" = "Darwin" ]; then
- install -d ${destdir}/${etcdir}/init.d
- sed -e "s;%prefix%;$p;g" suse/yaws.init.d > ${destdir}/${etcdir}/init.d/yaws
- chmod +x ${destdir}/${etcdir}/init.d/yaws
- install -d ${destdir}/${vardir}/run/yaws
- chmod a+rwx ${destdir}/${vardir}/run/yaws
-elif [ -f /etc/debian_version ]; then
- install -d ${destdir}/${etcdir}/init.d
- sed -e "s;%prefix%;$p;g" debian/yaws.init.d > ${destdir}/${etcdir}/init.d/yaws
- chmod +x ${destdir}/${etcdir}/init.d/yaws
- install -d ${destdir}/${vardir}/run/yaws
- chmod a+rwx ${destdir}/${vardir}/run/yaws
-
-elif [ "`uname -s`" = "Darwin" -a `id -u` = 0 ]; then
- startupdir="/Library/StartupItems/Yaws"
- if [ ! -d ${startupdir} ]; then
- if [ ! -e ${startupdir} && ]; then
- mkdir ${startupdir};
- elif [ ! -d ${startupdir} ]; then
- echo "${startupdir} exists but is not a directory, bailing out ..."
- exit 1
- fi
- sed -e "s;%prefix%;$p;g" darwin/Yaws.StartupItem > ${startupdir}/Yaws
- chmod +x ${startupdir}/Yaws
- cp darwin/Yaws.plist ${startupdir}/StartupParameters.plist
- # MacOS is particular about the ownership of startup items.
- chown -R root:wheel ${startupdir}
-elif [ "`uname -s`" = "FreeBSD" ]; then
- sed -e "s;%prefix%;$p;g" -e "s;%etcdir%;$e;g" freebsd/yaws.sh > ${destdir}/${etcdir}/rc.d/yaws.sh
-else
- install -d ${destdir}/${etcdir}
- echo "Don't know how to make /etc/init scrips for this system"
- echo "possibly add $1/bin/yaws -D -heart to your /etc/rc.local manually"
- echo "possibly add ${prefix}/bin/yaws --daemon --heart to your /etc/rc.local manually"
-fi
-
-
-
-
-
-
+install -d ${etcdir}/rc.d/
+sed -e "s;%prefix%;$p;g" bsd/yaws.sh > ${etcdir}/rc.d/yaws.sh
+chmod +x ${etcdir}/rc.d/yaws.sh
+# if [ -f /etc/gentoo-release ]; then
+# install -d ${destdir}/${etcdir}/init.d/
+# install -d ${destdir}/${etcdir}/conf.d/
+# install -d ${destdir}/${vardir}/run/yaws
+# chmod a+rwx ${destdir}/${vardir}/run/yaws
+# cp gentoo/init.d.yaws ${destdir}/${etcdir}/init.d/yaws
+# chmod +x ${destdir}/${etcdir}/init.d/yaws
+# sed -e "s;%prefix%;$p;g" gentoo/conf.d.yaws > ${destdir}/${etcdir}/conf.d/yaws
+# elif [ -f /etc/redhat-release ]; then
+# install -d ${destdir}/${etcdir}/init.d
+# sed -e "s;%prefix%;$p;g" redhat/yaws.init.d > ${destdir}/${etcdir}/init.d/yaws
+# chmod +x ${destdir}/${etcdir}/init.d/yaws
+# install -d ${destdir}/${vardir}/run/yaws
+# chmod a+rwx ${destdir}/${vardir}/run/yaws
+# elif [ -f /etc/suseservers ]; then
+# install -d ${destdir}/${etcdir}/init.d
+# sed -e "s;%prefix%;$p;g" suse/yaws.init.d > ${destdir}/${etcdir}/init.d/yaws
+# chmod +x ${destdir}/${etcdir}/init.d/yaws
+# install -d ${destdir}/${vardir}/run/yaws
+# chmod a+rwx ${destdir}/${vardir}/run/yaws
+# elif [ -f /etc/debian_version ]; then
+# install -d ${destdir}/${etcdir}/init.d
+# sed -e "s;%prefix%;$p;g" debian/yaws.init.d > ${destdir}/${etcdir}/init.d/yaws
+# chmod +x ${destdir}/${etcdir}/init.d/yaws
+# install -d ${destdir}/${vardir}/run/yaws
+# chmod a+rwx ${destdir}/${vardir}/run/yaws
+#
+# elif [ "`uname -s`" = "Darwin" -a `id -u` = 0 ]; then
+# startupdir="/Library/StartupItems/Yaws"
+# if [ ! -e ${startupdir} && ]; then
+# mkdir ${startupdir};
+# elif [ ! -d ${startupdir} ]; then
+# echo "${startupdir} exists but is not a directory, bailing out ..."
+# exit 1
+# fi
+# sed -e "s;%prefix%;$p;g" darwin/Yaws.StartupItem > ${startupdir}/Yaws
+# chmod +x ${startupdir}/Yaws
+# cp darwin/Yaws.plist ${startupdir}/StartupParameters.plist
+# # MacOS is particular about the ownership of startup items.
+# chown -R root:wheel ${startupdir}
+# elif [ "`uname -s`" = "FreeBSD" ]; then
+# sed -e "s;%prefix%;$p;g" -e "s;%etcdir%;$e;g" freebsd/yaws.sh > ${destdir}/${etcdir}/rc.d/yaws.sh
+# else
+# install -d ${destdir}/${etcdir}
+# echo "Don't know how to make /etc/init scrips for this system"
+# echo "possibly add ${prefix}/bin/yaws --daemon --heart to your /etc/rc.local manually"
+# fi



@@ -1,5 +1,5 @@
--- scripts/yaws.conf.template.orig Tue May 25 16:10:08 2004
+++ scripts/yaws.conf.template Wed Sep 29 12:06:45 2004
--- scripts/yaws.conf.template.orig 2005-12-01 05:10:20.000000000 +0900
+++ scripts/yaws.conf.template 2006-07-22 17:23:51.000000000 +0900
@@ -15,14 +15,14 @@
# beam code can be placed. The daemon will add this
# directory to its search path
@@ -17,16 +17,16 @@



@@ -91,7 +91,7 @@
@@ -129,7 +129,7 @@
<server localhost>
port = %port%
listen = 0.0.0.0
- docroot = /tmp
+ docroot = __PREFIX/tmp
dir_listings = true
dav = true
<auth>
realm = foobar
@@ -107,7 +107,7 @@
@@ -146,7 +146,7 @@

<server %host%>
port = %sslport%

This file was deleted.

This file was deleted.

0 comments on commit 23ce46e

Please sign in to comment.
You can’t perform that action at this time.