[150285] trunk/dports/www/yaws
ciserlohn at macports.org
ciserlohn at macports.org
Thu Jul 14 04:26:42 PDT 2016
Revision: 150285
https://trac.macports.org/changeset/150285
Author: ciserlohn at macports.org
Date: 2016-07-14 04:26:42 -0700 (Thu, 14 Jul 2016)
Log Message:
-----------
yaws: update to version 2.0.3
Modified Paths:
--------------
trunk/dports/www/yaws/Portfile
trunk/dports/www/yaws/files/patch-scripts-yaws.conf.template
Added Paths:
-----------
trunk/dports/www/yaws/files/patch-scripts-regular-install
Removed Paths:
-------------
trunk/dports/www/yaws/files/patch-configure.in
trunk/dports/www/yaws/files/patch-scripts-Install
trunk/dports/www/yaws/files/patch-scripts-Makefile
Modified: trunk/dports/www/yaws/Portfile
===================================================================
--- trunk/dports/www/yaws/Portfile 2016-07-14 06:10:58 UTC (rev 150284)
+++ trunk/dports/www/yaws/Portfile 2016-07-14 11:26:42 UTC (rev 150285)
@@ -4,7 +4,7 @@
PortSystem 1.0
name yaws
-version 1.98
+version 2.0.3
categories www
maintainers ciserlohn
platforms darwin
@@ -16,8 +16,8 @@
homepage http://yaws.hyber.org/
master_sites http://yaws.hyber.org/download/
-checksums rmd160 98a3977c5f0f29cb3aeeedf6fe9adaa1ebc7bc40 \
- sha256 d47d14cce5173d18e5cf0e7f63b06447021ff250450ac4865547c1fe8e6a0831
+checksums rmd160 e7d8a9ec8600cad0302ff16adfc93bd36575f101 \
+ sha256 450a4b2b2750a6feb34238c0b38bc9801de80b228188a22d85dccbb4b4e049f6
depends_build port:erlang
@@ -26,13 +26,11 @@
extract.post_args | tar -xf - --exclude \
"${name}-${version}/www/testdir/xx*xx.jpg"
-patchfiles patch-configure.in \
- patch-man-yaws.1 \
+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-scripts-yaws.conf.template \
+ patch-scripts-regular-install
post-patch {
reinplace "s|__PREFIX|${prefix}|g" \
@@ -62,7 +60,7 @@
post-destroot {
xinstall -d "${destroot}${prefix}/var/log/yaws/"
system "touch ${destroot}${prefix}/var/log/yaws/.turd"
- file rename "${destroot}${prefix}/etc/yaws/yaws.conf" "${destroot}${prefix}/etc/yaws/yaws.conf.template"
+ file delete "${destroot}${prefix}/etc/yaws/yaws.conf"
}
notes "\
Deleted: trunk/dports/www/yaws/files/patch-configure.in
===================================================================
--- trunk/dports/www/yaws/files/patch-configure.in 2016-07-14 06:10:58 UTC (rev 150284)
+++ trunk/dports/www/yaws/files/patch-configure.in 2016-07-14 11:26:42 UTC (rev 150285)
@@ -1,24 +0,0 @@
---- configure.in.orig 2011-12-23 23:57:55.000000000 +0100
-+++ configure.in 2011-12-23 23:57:04.000000000 +0100
-@@ -274,21 +274,6 @@
- AC_LANG(C)
- AC_CHECK_LIB([c],[sendfile],[HAVE_SENDFILE=true])
- case "$host_os" in
-- darwin1?*)
-- AC_LANG(Erlang)
-- AC_RUN_IFELSE(
-- [AC_LANG_PROGRAM([],[dnl
-- halt(try erlang:system_info({wordsize,external}) of
-- 8 -> 0; 4 -> 1
-- catch _:badarg ->
-- case erlang:system_info(wordsize) of
-- 8 -> 0; 4 -> 1
-- end end)])],
-- [AC_MSG_NOTICE(found 64-bit Erlang)
-- CBIT=-m64],
-- [AC_MSG_NOTICE(found 32-bit Erlang)
-- CBIT=-m32])
-- ;;
- *)
- CBIT=""
- ;;
Deleted: trunk/dports/www/yaws/files/patch-scripts-Install
===================================================================
--- trunk/dports/www/yaws/files/patch-scripts-Install 2016-07-14 06:10:58 UTC (rev 150284)
+++ trunk/dports/www/yaws/files/patch-scripts-Install 2016-07-14 11:26:42 UTC (rev 150285)
@@ -1,71 +0,0 @@
---- 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
-- 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
-- sed -e "s;%prefix%;$p;g" \
-- -e "s;%etcdir%;$e;g" gentoo/init.d.yaws > ${destdir}${etcdir}/init.d/yaws
-- chmod +x ${destdir}${etcdir}/init.d/yaws
--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
-- 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" \
-- -e "s;%etcdir%;$e;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" \
-- -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
--
--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 > ${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
--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
--
--
--
--
--
--
Deleted: trunk/dports/www/yaws/files/patch-scripts-Makefile
===================================================================
--- trunk/dports/www/yaws/files/patch-scripts-Makefile 2016-07-14 06:10:58 UTC (rev 150284)
+++ trunk/dports/www/yaws/files/patch-scripts-Makefile 2016-07-14 11:26:42 UTC (rev 150285)
@@ -1,8 +0,0 @@
---- scripts/Makefile.orig 2009-11-09 10:08:37.000000000 +0200
-+++ scripts/Makefile 2009-11-09 10:10:14.000000000 +0200
-@@ -1,3 +1,5 @@
-+.PHONY : install
-+
- include ../include.mk
-
-
Added: trunk/dports/www/yaws/files/patch-scripts-regular-install
===================================================================
--- trunk/dports/www/yaws/files/patch-scripts-regular-install (rev 0)
+++ trunk/dports/www/yaws/files/patch-scripts-regular-install 2016-07-14 11:26:42 UTC (rev 150285)
@@ -0,0 +1,133 @@
+--- scripts/regular-install.orig 2016-07-14 10:07:24.000000000 +0200
++++ scripts/regular-install 2016-07-14 10:11:27.000000000 +0200
+@@ -3,130 +3,4 @@
+ install -d ${DESTDIR}${ETCDIR}
+ install -d ${DESTDIR}${LOGDIR}
+
+-# Start by detecting if systemd is used
+-(which systemctl && systemctl list-units) >/dev/null 2>&1
+-if [ $? = 0 ]; then
+- install -d ${DESTDIR}${ETCDIR}/systemd/system/
+- sed -e "s;%prefix%;${PREFIX};g" \
+- -e "s;%etcdir%;${ETCDIR};g" \
+- -e "s;%bindir%;${BINDIR};g" \
+- systemd/yaws.service > ${DESTDIR}${ETCDIR}/systemd/system/yaws.service
+- exit 0
+-fi
+-
+-# Else, looking at distro-specific files
+-os=$( uname -s )
+-which lsb_release >/dev/null 2>&1
+-if [ $? = 0 ]; then
+- os=$( lsb_release -si )
+-elif [ -f /etc/os-release ]; then
+- . /etc/os-release
+- os=${ID}
+-elif [ -f /etc/arch-release ]; then
+- os="arch"
+-elif [ -f /etc/gentoo-release ]; then
+- os="gentoo"
+-elif [ -f /etc/fedora-release ]; then
+- os="fedora"
+-elif [ -f /etc/centos-release ]; then
+- os="centos"
+-elif [ -f /etc/redhat-release ]; then
+- os="redhat"
+-elif [ -f /etc/debian_version ]; then
+- os="debian"
+-elif [ -f /etc/SuSE-release ]; then
+- os="suse"
+-elif [ $os = "Darwin" -a $(id -u) = 0 ]; then
+- os="darwin"
+-elif [ $os = "FreeBSD" ]; then
+- os="freebsd"
+-elif [ $os = "NetBSD" ]; then
+- os="netbsd"
+-else
+- os="Unknown"
+-fi
+-
+-case $(printf $os | tr '[:upper:]' '[:lower:]') in
+- debian | ubuntu)
+- install -d ${DESTDIR}${ETCDIR}/init.d
+- sed -e "s;%prefix%;${PREFIX};g" \
+- -e "s;%etcdir%;${ETCDIR};g" \
+- -e "s;%bindir%;${BINDIR};g" \
+- debian/yaws.init > ${DESTDIR}${ETCDIR}/init.d/yaws
+- chmod +x ${DESTDIR}${ETCDIR}/init.d/yaws
+- ;;
+-
+- gentoo)
+- # seems gentoo don't like to be installed in /usr/local/etc since #
+- # /sbin/runscript still reads /etc/conf.d
+- install -d ${DESTDIR}${ETCDIR}/init.d
+- install -d ${DESTDIR}${ETCDIR}/conf.d
+- sed -e "s;%prefix%;${PREFIX};g" \
+- -e "s;%etcdir%;${ETCDIR};g" \
+- -e "s;%bindir%;${BINDIR};g" \
+- gentoo/yaws.init > ${DESTDIR}${ETCDIR}/init.d/yaws
+- chmod +x ${DESTDIR}${ETCDIR}/init.d/yaws
+- ;;
+-
+- redhat | fedora | centos)
+- install -d ${DESTDIR}${ETCDIR}/init.d
+- sed -e "s;%prefix%;${PREFIX};g" \
+- -e "s;%etcdir%;${ETCDIR};g" \
+- -e "s;%bindir%;${BINDIR};g" \
+- redhat/yaws.init > ${DESTDIR}${ETCDIR}/init.d/yaws
+- chmod +x ${DESTDIR}${ETCDIR}/init.d/yaws
+- ;;
+-
+- *suse*)
+- install -d ${DESTDIR}${ETCDIR}/init.d
+- sed -e "s;%prefix%;${PREFIX};g" \
+- -e "s;%etcdir%;${ETCDIR};g" \
+- -e "s;%bindir%;${BINDIR};g" \
+- suse/yaws.init > ${DESTDIR}${ETCDIR}/init.d/yaws
+- chmod +x ${DESTDIR}${ETCDIR}/init.d/yaws
+- ;;
+-
+-
+- darwin)
+- 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%;${PREFIX};g" \
+- -e "s;%etcdir%;${ETCDIR};g" \
+- -e "s;%bindir%;${BINDIR};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}
+- ;;
+-
+- freebsd)
+- install -d ${DESTDIR}${ETCDIR}/rc.d
+- sed -e "s;%prefix%;${PREFIX};g" \
+- -e "s;%etcdir%;${ETCDIR};g" \
+- -e "s;%bindir%;${BINDIR};g" \
+- freebsd/yaws > ${DESTDIR}${ETCDIR}/rc.d/yaws
+- chmod +x ${DESTDIR}${ETCDIR}/rc.d/yaws
+- ;;
+-
+- netbsd)
+- sed -e "s;%prefix%;${PREFIX};g" \
+- -e "s;%etcdir%;${ETCDIR};g" \
+- -e "s;%bindir%;${BINDIR};g" \
+- netbsd/yaws.sh > ${DESTDIR}${ETCDIR}/rc.d/yaws
+- chmod +x /etc/rc.d/yaws
+- ;;
+- *)
+- 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"
+- ;;
+-esac
+-
+-
+ exit 0
Modified: trunk/dports/www/yaws/files/patch-scripts-yaws.conf.template
===================================================================
--- trunk/dports/www/yaws/files/patch-scripts-yaws.conf.template 2016-07-14 06:10:58 UTC (rev 150284)
+++ trunk/dports/www/yaws/files/patch-scripts-yaws.conf.template 2016-07-14 11:26:42 UTC (rev 150285)
@@ -1,29 +1,28 @@
---- scripts/yaws.conf.template.orig 2011-05-30 23:16:15.000000000 +0200
-+++ scripts/yaws.conf.template 2011-05-30 23:31:41.000000000 +0200
-@@ -10,13 +10,13 @@
- # These are the paths to directories where additional
- # beam code can be placed. The daemon will add these
- # directories to its search path.
--ebin_dir = %yawsdir%/examples/ebin
-+ebin_dir = %yawsdir%/ebin
- ebin_dir = %vardir%/yaws/ebin
+--- scripts/yaws.conf.template.orig 2016-07-14 09:51:58.000000000 +0200
++++ scripts/yaws.conf.template 2016-07-14 09:53:35.000000000 +0200
+@@ -106,41 +106,41 @@
+ # The examples below first show two virthosted servers on the same IP (0.0.0.0)
+ # in this case, but an explicit IP can be given as well.
- # This is a directory where application specific .hrl
- # files can be placed. Application-specific .yaws code can
- # then include these .hrl files.
--include_dir = %yawsdir%/examples/include
-+include_dir = %yawsdir%/include
+-<server *>
+- port = %port%
+- listen = 0.0.0.0
+- docroot = %docroot%
+- auth_log = true
+- appmods = <cgi-bin, yaws_appmod_cgi>
+-</server>
++#<server *>
++# port = %port%
++# listen = 0.0.0.0
++# docroot = %docroot%
++# auth_log = true
++# appmods = <cgi-bin, yaws_appmod_cgi>
++#</server>
- # Set this to an integer value to control
- # max number of connections from clients into the server.
-@@ -119,32 +119,32 @@
- appmods = <cgi-bin, yaws_appmod_cgi>
- </server>
-
-<server localhost>
- port = %port%
- listen = 0.0.0.0
-- docroot = /tmp
+- docroot = %tmpdir%
- dir_listings = true
- auth_log = true
- statistics = true
@@ -37,7 +36,7 @@
+#<server localhost>
+# port = %port%
+# listen = 0.0.0.0
-+# docroot = /tmp
++# docroot = %docroot%
+# dir_listings = true
+# auth_log = true
+# statistics = true
@@ -51,27 +50,29 @@
# Now an SSL server
--<server %host%>
+-<server *>
- port = %sslport%
-- docroot = /tmp
+- docroot = %tmpdir%
- listen = 0.0.0.0
- dir_listings = true
- auth_log = true
- <ssl>
- keyfile = %certdir%/yaws-key.pem
- certfile = %certdir%/yaws-cert.pem
+- dhfile = %certdir%/dhparams.pem
- depth = 0
- </ssl>
-</server>
-+#<server %host%>
++#<server *>
+# port = %sslport%
-+# docroot = /tmp
++# docroot = %docroot%
+# listen = 0.0.0.0
+# dir_listings = true
+# auth_log = true
+# <ssl>
+# keyfile = %certdir%/yaws-key.pem
+# certfile = %certdir%/yaws-cert.pem
++# dhfile = %certdir%/dhparams.pem
+# depth = 0
+# </ssl>
+#</server>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160714/6659c31b/attachment-0001.html>
More information about the macports-changes
mailing list