5 files changed, 207 insertions, 189 deletions

diff --git a/www/yaws/Makefile b/www/yaws/Makefile
index c911c78149f6..684f3f8030dc 100644
--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yaws
-PORTVERSION=	1.96
-PORTREVISION=	1
+PORTVERSION=	1.97
 CATEGORIES=	www devel
 MASTER_SITES=	http://yaws.hyber.org/download/
 
@@ -25,9 +24,8 @@ APPDIR=		${PREFIX}/lib/erlang/lib/yaws-${PORTVERSION}
 
 SUB_FILES=	pkg-message
 
-CONFIGURE_ARGS+=--prefix=${PREFIX} --localstatedir=/var
+CONFIGURE_ARGS+=--prefix=${STAGEDIR}${PREFIX} --localstatedir=/var
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-extract:
@@ -35,41 +33,40 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|!!PREFIX!!|${PREFIX}|g' \
-		${WRKSRC}/man/yaws_api.5 ${WRKSRC}/man/yaws.conf.5 \
-		${WRKSRC}/README ${WRKSRC}/scripts/gen-yaws
+		${WRKSRC}/man/yaws_api.5 \
+		${WRKSRC}/man/yaws.conf.5 \
+		${WRKSRC}/README \
+		${WRKSRC}/scripts/gen-yaws \
+		${WRKSRC}/scripts/gen-yaws-generated
 	@${REINPLACE_CMD} -e 's|!!VERSION!!|${PORTVERSION}|g' \
 		${WRKSRC}/scripts/gen-yaws
 	@${FIND} ${WRKSRC} \( -name \*.orig -or -name \*.bak \) -delete
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/bin/yaws ${PREFIX}/bin
-	@${MKDIR} ${ETCDIR}
-	@${INSTALL_DATA} ${FILESDIR}/yaws.conf.sample ${ETCDIR}
-	@${MKDIR} ${APPDIR}/ebin
-	@${MKDIR} ${APPDIR}/examples
-	@${MKDIR} ${APPDIR}/examples/ebin
-	@${MKDIR} ${APPDIR}/examples/src
-	@${MKDIR} ${APPDIR}/include
-	@${MKDIR} ${APPDIR}/priv
-	@${MKDIR} ${APPDIR}/priv/lib
-	@${MKDIR} ${APPDIR}/src
-	@${MKDIR} ${PREFIX}/www/yaws
-	@${INSTALL_DATA} ${WRKSRC}/ebin/* ${APPDIR}/ebin
-	@${INSTALL_DATA} ${WRKSRC}/examples/ebin/* ${APPDIR}/examples/ebin
-	@${INSTALL_DATA} ${WRKSRC}/examples/src/* ${APPDIR}/examples/src
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/yaws ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	@${INSTALL_DATA} ${FILESDIR}/yaws.conf.sample ${STAGEDIR}${ETCDIR}/yaws.conf.dist
+	@${MKDIR} ${STAGEDIR}${APPDIR}/ebin
+	@${MKDIR} ${STAGEDIR}${APPDIR}/examples
+	@${MKDIR} ${STAGEDIR}${APPDIR}/examples/ebin
+	@${MKDIR} ${STAGEDIR}${APPDIR}/examples/src
+	@${MKDIR} ${STAGEDIR}${APPDIR}/include
+	@${MKDIR} ${STAGEDIR}${APPDIR}/priv
+	@${MKDIR} ${STAGEDIR}${APPDIR}/priv/lib
+	@${MKDIR} ${STAGEDIR}${APPDIR}/src
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/yaws
+	@${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${APPDIR}/ebin
+	@${INSTALL_DATA} ${WRKSRC}/examples/ebin/* ${STAGEDIR}${APPDIR}/examples/ebin
+	@${INSTALL_DATA} ${WRKSRC}/examples/src/* ${STAGEDIR}${APPDIR}/examples/src
 .for FILE in envelope.xsd mime.types soap.xsd wsdl.xsd soap-envelope.xsd wsdl11soap12.xsd xml.xsd
-	@${INSTALL_DATA} ${WRKSRC}/priv/${FILE} ${APPDIR}/priv
+	@${INSTALL_DATA} ${WRKSRC}/priv/${FILE} ${STAGEDIR}${APPDIR}/priv
 .endfor
-	@${INSTALL_PROGRAM} ${WRKSRC}/priv/epam ${APPDIR}/priv
-	@${INSTALL_LIB} ${WRKSRC}/priv/lib/* ${APPDIR}/priv/lib
-	@${INSTALL_DATA} ${WRKSRC}/include/* ${APPDIR}/include
-	@${INSTALL_DATA} ${WRKSRC}/src/*.?rl ${APPDIR}/src
-	@cd ${WRKSRC}/www && (${FIND} * | ${CPIO} -pu ${WWWDIR})
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WWWDIR}
-	@${INSTALL_MAN} ${WRKSRC}/man/*.1 ${MANPREFIX}/man/man1
-	@${INSTALL_MAN} ${WRKSRC}/man/*.5 ${MANPREFIX}/man/man5
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${INSTALL_PROGRAM} ${WRKSRC}/priv/epam ${STAGEDIR}${APPDIR}/priv
+	@${INSTALL_LIB} ${WRKSRC}/priv/lib/* ${STAGEDIR}${APPDIR}/priv/lib
+	@${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${APPDIR}/include
+	@${INSTALL_DATA} ${WRKSRC}/src/*.?rl ${STAGEDIR}${APPDIR}/src
+	@cd ${WRKSRC}/www && (${FIND} * | ${CPIO} -pu ${STAGEDIR}${WWWDIR})
+	@${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/man/*.5 ${STAGEDIR}${MANPREFIX}/man/man5
 
 .include <bsd.port.post.mk>
diff --git a/www/yaws/distinfo b/www/yaws/distinfo
index 054f4efa2a8e..4686e2bf5d65 100644
--- a/www/yaws/distinfo
+++ b/www/yaws/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yaws-1.96.tar.gz) = 8d4f16d18937335ac021ca4c65c8ee81dc4d71f133718c7148856cc6bf1f55e2
-SIZE (yaws-1.96.tar.gz) = 1226822
+SHA256 (yaws-1.97.tar.gz) = a792478564866393f3e901bf4ec33272c22d7c01a8c5493b33856729d25b026e
+SIZE (yaws-1.97.tar.gz) = 1242089
diff --git a/www/yaws/files/patch-scripts_gen-yaws-generated b/www/yaws/files/patch-scripts_gen-yaws-generated
new file mode 100644
index 000000000000..b6ddd8fda3fb
--- /dev/null
+++ b/www/yaws/files/patch-scripts_gen-yaws-generated
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- scripts/gen-yaws-generated.orig
++++ scripts/gen-yaws-generated
+@@ -9,6 +9,6 @@
+     ../scripts/Subst %VSN% "${YAWS_VSN}" | \
+     ../scripts/Subst %VARDIR% "${VARDIR}" | \
+     ../scripts/Subst %localinstall% $1 | \
+-    ../scripts/Subst %ETCDIR% "${ETCDIR}"
++    ../scripts/Subst %ETCDIR% "!!PREFIX!!/etc"
+ 
+ exit 0
diff --git a/www/yaws/files/yaws.conf.sample b/www/yaws/files/yaws.conf.sample
index 8d325967fe2a..fe834b38323c 100644
--- a/www/yaws/files/yaws.conf.sample
+++ b/www/yaws/files/yaws.conf.sample
@@ -3,7 +3,7 @@
 # first we have a set of globals
 
 logdir = /var/log/yaws
-ebin_dir = /usr/local/www/yaws/shopingcart
+ebin_dir = /usr/local/www/yaws/shoppingcart
 include_dir = /usr/local/www/yaws
 
 #end then a set of servers
diff --git a/www/yaws/pkg-plist b/www/yaws/pkg-plist
index 801471ebf72d..f519f1d1dd7d 100644
--- a/www/yaws/pkg-plist
+++ b/www/yaws/pkg-plist
@@ -1,138 +1,146 @@
 bin/yaws
-%%ETCDIR%%/yaws.conf.sample
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/haxe.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/json.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/json2.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/jsonrpc.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/mime_type_c.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/mime_types.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws.app
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws.appup
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_api.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_app.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_appmod_cgi.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_appmod_fcgi.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_cgi.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_compile.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_config.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ctl.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_dav.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_davlock.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_debug.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_dime.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_exhtml.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_generated.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_html.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_jsonrpc.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_log.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_log_file_h.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_logger.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ls.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_multipart.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_outmod.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_pam.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_revproxy.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_rpc.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_rss.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sendfile.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_server.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_session_server.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_shaper.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_soap12_lib.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_soap_lib.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_soap_srv.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sse.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_stats.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sup.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sup_restarts.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ticker.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_trace.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_vdir.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_websockets.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_xmlrpc.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_zlib.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/ebin/advanced_echo_callback.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/ebin/authmod_gssapi.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/ebin/basic_echo_callback.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/ebin/basic_echo_callback_extended.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/ebin/myappmod.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/ebin/server_sent_events.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/ebin/shopcart.beam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/src/Makefile
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/src/advanced_echo_callback.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/src/authmod_gssapi.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/src/basic_echo_callback.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/src/basic_echo_callback_extended.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/src/server_sent_events.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/include/soap-envelope.hrl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/include/soap.hrl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/include/wsdl11soap12.hrl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/include/yaws.hrl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/include/yaws_api.hrl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/include/yaws_dav.hrl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/include/yaws_soap.hrl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/envelope.xsd
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/epam
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/lib/setuid_drv.so
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/mime.types
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/soap-envelope.xsd
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/soap.xsd
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/wsdl.xsd
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/wsdl11soap12.xsd
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/xml.xsd
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/haxe.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/json.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/json2.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/jsonrpc.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/mime_type_c.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/mime_types.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_api.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_app.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_appmod_cgi.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_appmod_fcgi.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_cgi.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_compile.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_config.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_configure.hrl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_ctl.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_dav.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_davlock.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_debug.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_debug.hrl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_dime.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_exhtml.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_generated.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_html.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_jsonrpc.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_log.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_log_file_h.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_logger.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_ls.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_multipart.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_outmod.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_pam.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_revproxy.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_rpc.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_rss.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_sendfile.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_server.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_session_server.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_shaper.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_soap12_lib.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_soap_lib.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_soap_srv.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_sse.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_stats.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_sup.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_sup_restarts.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_ticker.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_trace.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_vdir.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_websockets.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_xmlrpc.erl
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_zlib.erl
+@unexec if cmp -s %D/%%ETCDIR%%/yaws.conf %D/%%ETCDIR%%/yaws.conf.dist; then rm -f %D/%%ETCDIR%%/yaws.conf; fi
+%%ETCDIR%%/yaws.conf.dist
+@exec test -f %B/yaws.conf || cp %B/%f %B/yaws.conf
+man/man1/yaws.1.gz
+man/man5/yaws.conf.5.gz
+man/man5/yaws_api.5.gz
+man/man5/yaws_soap_lib.5.gz
+lib/erlang/lib/yaws-%%VERSION%%/ebin/haxe.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/json.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/json2.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/jsonrpc.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/mime_type_c.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/mime_types.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws.app
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws.appup
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_api.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_app.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_appmod_cgi.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_appmod_dav.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_appmod_fcgi.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_cgi.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_compile.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_config.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ctl.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_debug.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_dime.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_exhtml.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_generated.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_html.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_jsonrpc.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_log.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_log_file_h.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_logger.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ls.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_multipart.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_outmod.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_pam.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_revproxy.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_rpc.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_rss.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_runmod_lock.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sendfile.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_server.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_session_server.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_shaper.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_soap12_lib.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_soap_lib.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_soap_srv.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sse.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_stats.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sup.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sup_restarts.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ticker.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_trace.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_vdir.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_websockets.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_xmlrpc.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_zlib.beam
+lib/erlang/lib/yaws-%%VERSION%%/examples/ebin/advanced_echo_callback.beam
+lib/erlang/lib/yaws-%%VERSION%%/examples/ebin/authmod_gssapi.beam
+lib/erlang/lib/yaws-%%VERSION%%/examples/ebin/basic_echo_callback.beam
+lib/erlang/lib/yaws-%%VERSION%%/examples/ebin/basic_echo_callback_extended.beam
+lib/erlang/lib/yaws-%%VERSION%%/examples/ebin/myappmod.beam
+lib/erlang/lib/yaws-%%VERSION%%/examples/ebin/server_sent_events.beam
+lib/erlang/lib/yaws-%%VERSION%%/examples/ebin/shopcart.beam
+lib/erlang/lib/yaws-%%VERSION%%/examples/src/Makefile
+lib/erlang/lib/yaws-%%VERSION%%/examples/src/advanced_echo_callback.erl
+lib/erlang/lib/yaws-%%VERSION%%/examples/src/authmod_gssapi.erl
+lib/erlang/lib/yaws-%%VERSION%%/examples/src/basic_echo_callback.erl
+lib/erlang/lib/yaws-%%VERSION%%/examples/src/basic_echo_callback_extended.erl
+lib/erlang/lib/yaws-%%VERSION%%/examples/src/server_sent_events.erl
+lib/erlang/lib/yaws-%%VERSION%%/include/soap-envelope.hrl
+lib/erlang/lib/yaws-%%VERSION%%/include/soap.hrl
+lib/erlang/lib/yaws-%%VERSION%%/include/wsdl11soap12.hrl
+lib/erlang/lib/yaws-%%VERSION%%/include/yaws.hrl
+lib/erlang/lib/yaws-%%VERSION%%/include/yaws_api.hrl
+lib/erlang/lib/yaws-%%VERSION%%/include/yaws_dav.hrl
+lib/erlang/lib/yaws-%%VERSION%%/include/yaws_lock.hrl
+lib/erlang/lib/yaws-%%VERSION%%/include/yaws_soap.hrl
+lib/erlang/lib/yaws-%%VERSION%%/priv/envelope.xsd
+lib/erlang/lib/yaws-%%VERSION%%/priv/epam
+lib/erlang/lib/yaws-%%VERSION%%/priv/lib/setuid_drv.so
+lib/erlang/lib/yaws-%%VERSION%%/priv/lib/yaws_sendfile_drv.so
+lib/erlang/lib/yaws-%%VERSION%%/priv/mime.types
+lib/erlang/lib/yaws-%%VERSION%%/priv/soap-envelope.xsd
+lib/erlang/lib/yaws-%%VERSION%%/priv/soap.xsd
+lib/erlang/lib/yaws-%%VERSION%%/priv/wsdl.xsd
+lib/erlang/lib/yaws-%%VERSION%%/priv/wsdl11soap12.xsd
+lib/erlang/lib/yaws-%%VERSION%%/priv/xml.xsd
+lib/erlang/lib/yaws-%%VERSION%%/src/haxe.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/json.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/json2.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/jsonrpc.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/mime_type_c.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/mime_types.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_api.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_app.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_appmod_cgi.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_appmod_dav.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_appmod_fcgi.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_cgi.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_compile.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_config.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_configure.hrl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_ctl.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_debug.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_debug.hrl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_dime.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_exhtml.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_generated.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_html.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_jsonrpc.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_log.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_log_file_h.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_logger.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_ls.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_multipart.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_outmod.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_pam.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_revproxy.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_rpc.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_rss.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_runmod_lock.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_sendfile.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_server.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_session_server.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_shaper.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_soap12_lib.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_soap_lib.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_soap_srv.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_sse.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_stats.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_sup.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_sup_restarts.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_ticker.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_trace.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_vdir.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_websockets.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_xmlrpc.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_zlib.erl
 %%WWWDIR%%/END
 %%WWWDIR%%/END2
 %%WWWDIR%%/HEAD
@@ -358,23 +366,23 @@ bin/yaws
 %%WWWDIR%%/ybed.erl
 %%WWWDIR%%/ybed_sup.erl
 %%WWWDIR%%/yman.yaws
-@dirrm %%WWWDIR%%/testdir
-@dirrm %%WWWDIR%%/ssi
-@dirrm %%WWWDIR%%/shoppingcart
-@dirrm %%WWWDIR%%/jsolait/lib
-@dirrm %%WWWDIR%%/jsolait
-@dirrm %%WWWDIR%%/icons/small
-@dirrm %%WWWDIR%%/icons
-@dirrm %%WWWDIR%%/code
-@dirrm %%WWWDIR%%/cgi-bin
-@dirrm %%WWWDIR%%
-@dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src
-@dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/lib
-@dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv
-@dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/include
-@dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/src
-@dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples/ebin
-@dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/examples
-@dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin
-@dirrm %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%
+@dirrmtry %%WWWDIR%%/testdir
+@dirrmtry %%WWWDIR%%/ssi
+@dirrmtry %%WWWDIR%%/shoppingcart
+@dirrmtry %%WWWDIR%%/jsolait/lib
+@dirrmtry %%WWWDIR%%/jsolait
+@dirrmtry %%WWWDIR%%/icons/small
+@dirrmtry %%WWWDIR%%/icons
+@dirrmtry %%WWWDIR%%/code
+@dirrmtry %%WWWDIR%%/cgi-bin
+@dirrmtry %%WWWDIR%%
+@dirrmtry lib/erlang/lib/yaws-%%VERSION%%/src
+@dirrmtry lib/erlang/lib/yaws-%%VERSION%%/priv/lib
+@dirrmtry lib/erlang/lib/yaws-%%VERSION%%/priv
+@dirrmtry lib/erlang/lib/yaws-%%VERSION%%/include
+@dirrmtry lib/erlang/lib/yaws-%%VERSION%%/examples/src
+@dirrmtry lib/erlang/lib/yaws-%%VERSION%%/examples/ebin
+@dirrmtry lib/erlang/lib/yaws-%%VERSION%%/examples
+@dirrmtry lib/erlang/lib/yaws-%%VERSION%%/ebin
+@dirrmtry lib/erlang/lib/yaws-%%VERSION%%
 @dirrm %%ETCDIR%%