[112385] trunk/dports/www/yaws
ciserlohn at macports.org
ciserlohn at macports.org
Mon Oct 21 13:08:45 PDT 2013
Revision: 112385
https://trac.macports.org/changeset/112385
Author: ciserlohn at macports.org
Date: 2013-10-21 13:08:45 -0700 (Mon, 21 Oct 2013)
Log Message:
-----------
yaws: update to version 1.97; adapt patches to upstream changes
Modified Paths:
--------------
trunk/dports/www/yaws/Portfile
trunk/dports/www/yaws/files/patch-man-yaws.conf.5
trunk/dports/www/yaws/files/patch-man-yaws_api.5
trunk/dports/www/yaws/files/patch-scripts-Install
trunk/dports/www/yaws/files/patch-scripts-yaws.conf.template
Modified: trunk/dports/www/yaws/Portfile
===================================================================
--- trunk/dports/www/yaws/Portfile 2013-10-21 19:57:30 UTC (rev 112384)
+++ trunk/dports/www/yaws/Portfile 2013-10-21 20:08:45 UTC (rev 112385)
@@ -4,7 +4,7 @@
PortSystem 1.0
name yaws
-version 1.96
+version 1.97
categories www
maintainers ciserlohn
platforms darwin
@@ -16,8 +16,8 @@
homepage http://yaws.hyber.org/
master_sites http://yaws.hyber.org/download/
-checksums rmd160 00c3c687bcea0f2ce1a63f746c03a8ac2862e88e \
- sha256 8d4f16d18937335ac021ca4c65c8ee81dc4d71f133718c7148856cc6bf1f55e2
+checksums rmd160 21c6138cf982b67f608ef8fd7228d17c754fe959 \
+ sha256 a792478564866393f3e901bf4ec33272c22d7c01a8c5493b33856729d25b026e
depends_build port:erlang
Modified: trunk/dports/www/yaws/files/patch-man-yaws.conf.5
===================================================================
--- trunk/dports/www/yaws/files/patch-man-yaws.conf.5 2013-10-21 19:57:30 UTC (rev 112384)
+++ trunk/dports/www/yaws/files/patch-man-yaws.conf.5 2013-10-21 20:08:45 UTC (rev 112385)
@@ -1,23 +1,23 @@
--- man/yaws.conf.5.orig 2011-05-30 23:07:43.000000000 +0200
+++ man/yaws.conf.5 2011-05-30 23:13:30.000000000 +0200
@@ -1,6 +1,6 @@
- .TH YAWS.CONF "5" "" "" "User Commands"
+ .TH YAWS.CONF "5" "" "" "User Commands" -*- nroff -*-
.SH NAME
-/etc/yaws/yaws.conf \- Configuration file for the Yaws web server
+__PREFIX/etc/yaws/yaws.conf \- Configuration file for the Yaws web server
.SH DESCRIPTION
.\" Add any additional description here
.PP
-@@ -1057,7 +1057,7 @@
+@@ -1380,7 +1380,7 @@
dir = secret/dir1
</auth>
<opaque>
- keytab = /etc/yaws/http.keytab
+ keytab = __PREFIX/etc/yaws/http.keytab
</opaque>
- </server>
-
-@@ -1099,8 +1099,8 @@
+ </server>
+ .fi
+@@ -1416,8 +1416,8 @@
listen = 192.168.128.32
docroot = /var/yaws/www_funky_org
<ssl>
@@ -27,4 +27,5 @@
+ certfile = __PREFIX/etc/funky.cert
password = gazonk
</ssl>
- </server>
+ </server>
+ .fi
Modified: trunk/dports/www/yaws/files/patch-man-yaws_api.5
===================================================================
--- trunk/dports/www/yaws/files/patch-man-yaws_api.5 2013-10-21 19:57:30 UTC (rev 112384)
+++ trunk/dports/www/yaws/files/patch-man-yaws_api.5 2013-10-21 20:08:45 UTC (rev 112385)
@@ -1,6 +1,6 @@
--- man/yaws_api.5.orig 2011-05-30 23:08:14.000000000 +0200
+++ man/yaws_api.5 2011-05-30 23:11:32.000000000 +0200
-@@ -388,7 +388,7 @@
+@@ -494,7 +494,7 @@
.TP
\fBsetconf(Gconf, Groups)\fR
This function is intended for embedded mode in yaws. It makes it possible
Modified: trunk/dports/www/yaws/files/patch-scripts-Install
===================================================================
--- trunk/dports/www/yaws/files/patch-scripts-Install 2013-10-21 19:57:30 UTC (rev 112384)
+++ trunk/dports/www/yaws/files/patch-scripts-Install 2013-10-21 20:08:45 UTC (rev 112385)
@@ -1,9 +1,10 @@
---- scripts/Install.orig 2011-05-30 23:15:13.000000000 +0200
-+++ scripts/Install 2011-05-30 23:20:40.000000000 +0200
-@@ -35,61 +35,6 @@
- install -d ${destdir}${prefix}/lib/yaws/examples/ebin
- install -d ${destdir}${prefix}/lib/yaws/examples/include
+--- scripts/Install.orig 2013-10-21 21:33:23.000000000 +0200
++++ scripts/Install 2013-10-21 21:35:02.000000000 +0200
+@@ -33,68 +33,3 @@
+ install -d ${destdir}${libdir}/yaws/examples/ebin
+ install -d ${destdir}${libdir}/yaws/examples/include
+-
-## seems gentoo don't like to be installed in /usr/local/etc
-## since /sbin/runscript still reads /etc/conf.d
-if [ -f /etc/gentoo-release ]; then
@@ -17,7 +18,8 @@
-elif [ -f /etc/redhat-release ]; then
- install -d ${destdir}${etcdir}/init.d
- sed -e "s;%prefix%;$p;g" \
-- -e "s;%etcdir%;$e;g" redhat/yaws.init.d > ${destdir}${etcdir}/init.d/yaws
+- -e "s;%etcdir%;$e;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
@@ -31,7 +33,8 @@
-elif [ -f /etc/debian_version ]; then
- install -d ${destdir}${etcdir}/init.d
- sed -e "s;%prefix%;$p;g" \
-- -e "s;%etcdir%;$e;g" debian/yaws.init.d > ${destdir}${etcdir}/init.d/yaws
+- -e "s;%etcdir%;$e;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
@@ -50,15 +53,19 @@
- # 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
+- sed -e "s;%prefix%;$p;g" -e "s;%etcdir%;$e;g" \
+- freebsd/yaws > ${destdir}${etcdir}/rc.d/yaws
-elif [ "`uname -s`" = "NetBSD" ]; then
-- sed -e "s;%prefix%;$p;g" -e "s;%etcdir%;$e;g" netbsd/yaws.sh > /etc/rc.d/yaws
+- sed -e "s;%prefix%;$p;g" -e "s;%etcdir%;$e;g" \
+- netbsd/yaws.sh > /etc/rc.d/yaws
-else
- install -d ${destdir}${etcdir}
- echo "Don't know how to make /etc/init scripts for this system"
- echo "possibly add ${prefix}/bin/yaws --daemon --heart to your /etc/rc.local manually"
-fi
-
-
-
-
+-
+-
+-
+-
+-
Modified: trunk/dports/www/yaws/files/patch-scripts-yaws.conf.template
===================================================================
--- trunk/dports/www/yaws/files/patch-scripts-yaws.conf.template 2013-10-21 19:57:30 UTC (rev 112384)
+++ trunk/dports/www/yaws/files/patch-scripts-yaws.conf.template 2013-10-21 20:08:45 UTC (rev 112385)
@@ -16,7 +16,7 @@
# Set this to an integer value to control
# max number of connections from clients into the server.
-@@ -113,32 +113,32 @@
+@@ -119,32 +119,32 @@
appmods = <cgi-bin, yaws_appmod_cgi>
</server>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131021/2a1f9c3b/attachment.html>
More information about the macports-changes
mailing list