Upgrade to version 1.90.

7 files changed, 68 insertions, 11 deletions

diff --git a/www/yaws/Makefile b/www/yaws/Makefile
index b6c1e35aec87..6a3ceb51c465 100644
--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yaws
-PORTVERSION=	1.89
+PORTVERSION=	1.90
 CATEGORIES=	www
 MASTER_SITES=	http://yaws.hyber.org/download/
 
diff --git a/www/yaws/distinfo b/www/yaws/distinfo
index f6b4e83acfa8..c20c2b9f5573 100644
--- a/www/yaws/distinfo
+++ b/www/yaws/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yaws-1.89.tar.gz) = 577c8adde339b700373b83b57b7eca952a41624fcf5f963e43977399de54f170
-SIZE (yaws-1.89.tar.gz) = 878410
+SHA256 (yaws-1.90.tar.gz) = 264786747d952a26e01219afc24e97d96a9b60815120c1290ab3258b5932b7d5
+SIZE (yaws-1.90.tar.gz) = 867388
diff --git a/www/yaws/files/patch-applications_chat_include.mk b/www/yaws/files/patch-applications_chat_include.mk
new file mode 100644
index 000000000000..c327a51fde20
--- /dev/null
+++ b/www/yaws/files/patch-applications_chat_include.mk
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- applications/chat/include.mk.orig
++++ applications/chat/include.mk
+@@ -33,7 +33,7 @@
+ 
+ 
+ # Hmm, don't know if you are supposed to like this better... ;-)
+-APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\''$$1\'\''/; $$mods.=", " if $$mods; $$mods .= $$_; } while(<>) { s/\{vsn, git\}/\{vsn, $$vsn\}/; s/\{modules,\[\]\}/\{modules,\[$$mods\]\}/; print; }'
++APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\''$$1\'\''/; $$mods.=", " if $$mods; $$mods .= $$_; } while(<>) { s/\{vsn, git\}/\{vsn, "$$vsn"\}/; s/\{modules,\[\]\}/\{modules,\[$$mods\]\}/; print; }'
+ 
+ # Targets
+ 
diff --git a/www/yaws/files/patch-applications_mail_include.mk b/www/yaws/files/patch-applications_mail_include.mk
new file mode 100644
index 000000000000..78a784a919d1
--- /dev/null
+++ b/www/yaws/files/patch-applications_mail_include.mk
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- applications/mail/include.mk.orig
++++ applications/mail/include.mk
+@@ -33,7 +33,7 @@
+ 
+ 
+ # Hmm, don't know if you are supposed to like this better... ;-)
+-APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\''$$1\'\''/; $$mods.=", " if $$mods; $$mods .= $$_; } while(<>) { s/\{vsn, git\}/\{vsn, $$vsn\}/; s/\{modules,\[\]\}/\{modules,\[$$mods\]\}/; print; }'
++APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\''$$1\'\''/; $$mods.=", " if $$mods; $$mods .= $$_; } while(<>) { s/\{vsn, git\}/\{vsn, "$$vsn"\}/; s/\{modules,\[\]\}/\{modules,\[$$mods\]\}/; print; }'
+ 
+ # Targets
+ 
diff --git a/www/yaws/files/patch-applications_wiki_include.mk b/www/yaws/files/patch-applications_wiki_include.mk
new file mode 100644
index 000000000000..8d42bb9302c7
--- /dev/null
+++ b/www/yaws/files/patch-applications_wiki_include.mk
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- applications/wiki/include.mk.orig
++++ applications/wiki/include.mk
+@@ -33,7 +33,7 @@
+ 
+ 
+ # Hmm, don't know if you are supposed to like this better... ;-)
+-APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\''$$1\'\''/; $$mods.=", " if $$mods; $$mods .= $$_; } while(<>) { s/\{vsn, git\}/\{vsn, $$vsn\}/; s/\{modules,\[\]\}/\{modules,\[$$mods\]\}/; print; }'
++APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\''$$1\'\''/; $$mods.=", " if $$mods; $$mods .= $$_; } while(<>) { s/\{vsn, git\}/\{vsn, "$$vsn"\}/; s/\{modules,\[\]\}/\{modules,\[$$mods\]\}/; print; }'
+ 
+ # Targets
+ 
diff --git a/www/yaws/files/patch-include.mk.in b/www/yaws/files/patch-include.mk.in
new file mode 100644
index 000000000000..0d1ba1d8e34d
--- /dev/null
+++ b/www/yaws/files/patch-include.mk.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- include.mk.in.orig
++++ include.mk.in
+@@ -91,7 +91,7 @@
+ 
+ 
+ # Hmm, don't know if you are supposed to like this better... ;-)
+-APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\''$$1\'\''/; $$mods.=", " if $$mods; $$mods .= $$_; } while(<>) { s/\{vsn, git\}/\{vsn, $$vsn\}/; s/\{modules,\[\]\}/\{modules,\[$$mods\]\}/; print; }'
++APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\''$$1\'\''/; $$mods.=", " if $$mods; $$mods .= $$_; } while(<>) { s/\{vsn, git\}/\{vsn, "$$vsn"\}/; s/\{modules,\[\]\}/\{modules,\[$$mods\]\}/; print; }'
+ 
+ # Targets
+ 
diff --git a/www/yaws/pkg-plist b/www/yaws/pkg-plist
index f0ff49da18aa..5fb25c7e7d6f 100644
--- a/www/yaws/pkg-plist
+++ b/www/yaws/pkg-plist
@@ -3,10 +3,11 @@ bin/yaws
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/authmod_gssapi.beam
 %%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
@@ -23,6 +24,7 @@ bin/yaws
 %%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
@@ -31,15 +33,16 @@ bin/yaws
 %%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_sendfile_compat.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_soap_lib.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_soap_srv.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_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
@@ -56,6 +59,7 @@ bin/yaws
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/authmod_gssapi.erl
 %%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
@@ -68,17 +72,16 @@ bin/yaws
 %%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_content_negotiation.erl
 %%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_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_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
@@ -87,10 +90,9 @@ bin/yaws
 %%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_sendfile_compat.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_showarg.erl
+%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_shaper.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_stats.erl
@@ -101,7 +103,6 @@ bin/yaws
 %%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
-%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/ymnesia.erl
 %%WITH_SENDFILE%%%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/lib/yaws_sendfile_drv.so
 %%WWWDIR%%/END
 %%WWWDIR%%/END2
@@ -123,7 +124,7 @@ bin/yaws
 %%WWWDIR%%/compile_layout.png
 %%WWWDIR%%/configuration.yaws
 %%WWWDIR%%/contact.yaws
-%%WWWDIR%%/contribs.yaws
+%%WWWDIR%%/contributors.txt
 %%WWWDIR%%/cookies.yaws
 %%WWWDIR%%/doc.yaws
 %%WWWDIR%%/dynamic.yaws