5 files changed, 27 insertions, 45 deletions

diff --git a/www/yaws/Makefile b/www/yaws/Makefile
index 6396d2c29f32..a06fb350dc0b 100644
--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yaws
-PORTVERSION=	1.61
+PORTVERSION=	1.64
 CATEGORIES=	www
 MASTER_SITES=	http://yaws.hyber.org/download/
 
diff --git a/www/yaws/distinfo b/www/yaws/distinfo
index 6e2ef2759d30..b293796e1d7e 100644
--- a/www/yaws/distinfo
+++ b/www/yaws/distinfo
@@ -1,3 +1,3 @@
-MD5 (yaws-1.61.tar.gz) = 8b008c81beb6fa7eabba954c36f16312
-SHA256 (yaws-1.61.tar.gz) = 35274fdf2241e48b9abb08b347c2e2b360fd5c37b9837f0f723bfa8064294f94
-SIZE (yaws-1.61.tar.gz) = 710741
+MD5 (yaws-1.64.tar.gz) = e5a122aede7c120b301d6c10eaf76c9d
+SHA256 (yaws-1.64.tar.gz) = 8c1cb67f4f228b5460371c9e97c8874eeb7ec1cace4dae60bc1e4d05688a0b4f
+SIZE (yaws-1.64.tar.gz) = 750324
diff --git a/www/yaws/files/patch-scripts_yaws.template b/www/yaws/files/patch-scripts_yaws.template
deleted file mode 100644
index 9644e8bfa0cd..000000000000
--- a/www/yaws/files/patch-scripts_yaws.template
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- scripts/yaws.template.orig	Thu May  6 14:43:33 2004
-+++ scripts/yaws.template	Thu May  6 14:44:26 2004
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
- 
--yawsdir="%yawsdir%"
-+yawsdir=""
- erl="%erl%"
- case `uname` in
-     CYGWIN*)
diff --git a/www/yaws/files/patch-src_yaws__config.erl b/www/yaws/files/patch-src_yaws__config.erl
deleted file mode 100644
index af5e127daf05..000000000000
--- a/www/yaws/files/patch-src_yaws__config.erl
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- src/yaws_config.erl.orig	Fri Apr 25 10:02:59 2003
-+++ src/yaws_config.erl	Fri May 30 12:31:50 2003
-@@ -9,6 +9,7 @@
- -author('klacke@bluetail.com').
- 
- 
-+-define(CONFIGURATION_FILE, "!!PREFIX!!/etc/yaws.conf").
- 
- 
- -include_lib("yaws/include/yaws.hrl").
-@@ -29,11 +30,11 @@
- paths() ->
-     case yaws:getuid() of
- 	{ok, "0"} ->    %% root 
--	    ["/etc/yaws.conf"];
-+	    [?CONFIGURATION_FILE];
- 	_ -> %% developer
- 	    [filename:join([os:getenv("HOME"), "yaws.conf"]),
- 	     "./yaws.conf", 
--	     "/etc/yaws.conf"]
-+	     ?CONFIGURATION_FILE]
-     end.
- 
- 
diff --git a/www/yaws/pkg-plist b/www/yaws/pkg-plist
index af4ebedad7ac..ad4f60f1863d 100644
--- a/www/yaws/pkg-plist
+++ b/www/yaws/pkg-plist
@@ -1,5 +1,8 @@
 bin/yaws
 etc/yaws.conf.sample
+lib/erlang/lib/yaws-%%VERSION%%/ebin/haxe.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/json.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
@@ -15,16 +18,19 @@ lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_dav.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_debug.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_ls.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_server.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_session_server.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sup.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ticker.beam
+lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_xmlrpc.beam
 lib/erlang/lib/yaws-%%VERSION%%/ebin/yaws_zlib.beam
 lib/erlang/lib/yaws-%%VERSION%%/include/yaws.hrl
 lib/erlang/lib/yaws-%%VERSION%%/include/yaws_api.hrl
@@ -32,6 +38,9 @@ lib/erlang/lib/yaws-%%VERSION%%/include/yaws_dav.hrl
 lib/erlang/lib/yaws-%%VERSION%%/priv/epam
 lib/erlang/lib/yaws-%%VERSION%%/priv/mime.types
 lib/erlang/lib/yaws-%%VERSION%%/priv/setuid_drv.so
+lib/erlang/lib/yaws-%%VERSION%%/src/haxe.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/json.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
@@ -48,16 +57,19 @@ 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_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_ls.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_server.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_session_server.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_sup.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_ticker.erl
+lib/erlang/lib/yaws-%%VERSION%%/src/yaws_xmlrpc.erl
 lib/erlang/lib/yaws-%%VERSION%%/src/yaws_zlib.erl
 %%PORTDOCS%%%%DOCSDIR%%/yaws.pdf
 www/yaws/END
@@ -84,6 +96,9 @@ www/yaws/embed.yaws
 www/yaws/examples.yaws
 www/yaws/favicon.ico
 www/yaws/form.yaws
+www/yaws/haxe_intro.yaws
+www/yaws/haxe_sample.html
+www/yaws/haxe_sample.yaws
 www/yaws/history.yaws
 www/yaws/icons/PythonPowered.png
 www/yaws/icons/README
@@ -208,6 +223,12 @@ www/yaws/icons/yaws_pb.gif
 www/yaws/icons/yaws_y.gif
 www/yaws/index.yaws
 www/yaws/internals.yaws
+www/yaws/jsolait/jsolait.js
+www/yaws/jsolait/lib/jsonrpc.js
+www/yaws/jsolait/lib/urllib.js
+www/yaws/json_intro.yaws
+www/yaws/json_sample.html
+www/yaws/json_sample.yaws
 www/yaws/man.yaws
 www/yaws/motivation.yaws
 www/yaws/news
@@ -263,6 +284,8 @@ www/yaws/ybed.erl
 www/yaws/yman.yaws
 @dirrm www/yaws/ssi
 @dirrm www/yaws/shopingcart
+@dirrm www/yaws/jsolait/lib
+@dirrm www/yaws/jsolait
 @dirrm www/yaws/icons/small
 @dirrm www/yaws/icons
 @dirrm www/yaws/code