5 files changed, 11 insertions, 21 deletions

diff --git a/www/yaws/Makefile b/www/yaws/Makefile
index cf24fe255195..85cbd66735c2 100644
--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yaws
-PORTVERSION=	1.84
+PORTVERSION=	1.85
 CATEGORIES=	www
 MASTER_SITES=	http://yaws.hyber.org/download/
 
diff --git a/www/yaws/distinfo b/www/yaws/distinfo
index e128ab823736..55ec49d0e610 100644
--- a/www/yaws/distinfo
+++ b/www/yaws/distinfo
@@ -1,3 +1,3 @@
-MD5 (yaws-1.84.tar.gz) = f98108809fb127e8be0fb80b552a58dd
-SHA256 (yaws-1.84.tar.gz) = 49b8040b706005327dc3920f32b1a6cd2a5f31075b5f2e67bbbc3d67795458c0
-SIZE (yaws-1.84.tar.gz) = 787844
+MD5 (yaws-1.85.tar.gz) = 6941ea52638805246973bf94fd6e9a52
+SHA256 (yaws-1.85.tar.gz) = 4d7760eaa8e07933b03c104555cdc7c8d9635bb675fbd2f021dd8dc8e6f8ed50
+SIZE (yaws-1.85.tar.gz) = 810048
diff --git a/www/yaws/files/patch-README b/www/yaws/files/patch-README
deleted file mode 100644
index ba9ae64745c3..000000000000
--- a/www/yaws/files/patch-README
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- README.orig
-+++ README
-@@ -70,7 +70,7 @@
- 
- 7. This will create a webserver at http://${host} and one at https://${host}
- 
--8. as root Edit /etc/yaws.conf 
-+8. as root Edit !!PREFIX!!/etc/yaws/yaws.conf
- 
- 9. Create content in /var/yaws
- 
diff --git a/www/yaws/files/patch-man_yaws__api.5 b/www/yaws/files/patch-man_yaws__api.5
index bb07fb036d87..b633cff895b3 100644
--- a/www/yaws/files/patch-man_yaws__api.5
+++ b/www/yaws/files/patch-man_yaws__api.5
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- man/yaws_api.5.orig
 +++ man/yaws_api.5
-@@ -343,7 +343,7 @@
+@@ -379,7 +379,7 @@
  .TP
  \fBsetconf(Gconf, Groups)\fR
  This function is intended for embedded mode in yaws. It makes it possible
 -to load a yaws configuration from another data source than /etc/yaws.conf, such
 +to load a yaws configuration from another data source than !!PREFIX!!/etc/yaws/yaws.conf, such
- as a database. 
+ as a database.
  If yaws is started with the environment \fI{embedded, true}\fR, yaws will
  start with an empty default configuration, and wait for some other
diff --git a/www/yaws/pkg-plist b/www/yaws/pkg-plist
index bfcf6e661594..d87da80d05fd 100644
--- a/www/yaws/pkg-plist
+++ b/www/yaws/pkg-plist
@@ -11,6 +11,7 @@ bin/yaws
 %%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
@@ -23,6 +24,7 @@ bin/yaws
 %%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_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
@@ -62,6 +64,7 @@ bin/yaws
 %%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
@@ -78,6 +81,7 @@ bin/yaws
 %%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_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
@@ -94,7 +98,6 @@ bin/yaws
 %%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_vdir.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
@@ -309,6 +312,7 @@ bin/yaws
 %%WWWDIR%%/upload.yaws
 %%WWWDIR%%/upload0.yaws
 %%WWWDIR%%/urandom.yaws
+%%WWWDIR%%/urandom_from_pid.yaws
 %%WWWDIR%%/yapp_intro.yaws
 %%WWWDIR%%/yaws-1.55_to_1.56.patch
 %%WWWDIR%%/ybed.erl