Update to 0.5.1

PR:		95819
Submitted by:	KATO Tsuguru

8 files changed, 68 insertions, 24 deletions

diff --git a/www/cherokee-devel/Makefile b/www/cherokee-devel/Makefile
index 4ae23113f620..9ebc46a32a90 100644
--- a/www/cherokee-devel/Makefile
+++ b/www/cherokee-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	0.4.30
-PORTREVISION=	2
+PORTVERSION=	0.5.1
 CATEGORIES=	www
 MASTER_SITES=	http://www.0x50.org/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
@@ -52,7 +51,6 @@ PLIST_SUB+=	PAM="@comment "
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|@mkdir_p@|${MKDIR} --|g'
-	@${REINPLACE_CMD} -e '/^if/s|==|=|g' ${WRKSRC}/configure
 
 pre-build:
 .for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example
diff --git a/www/cherokee-devel/distinfo b/www/cherokee-devel/distinfo
index 6a443c77f48b..3cd85903f5c2 100644
--- a/www/cherokee-devel/distinfo
+++ b/www/cherokee-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (cherokee-0.4.30.tar.gz) = bedcf9997928faeb550f54bc6621c13b
-SHA256 (cherokee-0.4.30.tar.gz) = 336cc7008fc2ee65d0f5f45892e3404e8d5b36a8b903358c45aa2ddc090bc71d
-SIZE (cherokee-0.4.30.tar.gz) = 1367424
+MD5 (cherokee-0.5.1.tar.gz) = 9835a293044ab1592d61550c1f26f1b2
+SHA256 (cherokee-0.5.1.tar.gz) = 6a89ee7476f511307d7480e9de9345cb3ff3bd983aa3c53b6823f9222d3cd72a
+SIZE (cherokee-0.5.1.tar.gz) = 1546966
diff --git a/www/cherokee-devel/files/patch-Makefile.in b/www/cherokee-devel/files/patch-Makefile.in
index f1ef24f4b3e6..4400c7c64dcf 100644
--- a/www/cherokee-devel/files/patch-Makefile.in
+++ b/www/cherokee-devel/files/patch-Makefile.in
@@ -1,15 +1,15 @@
---- Makefile.in.orig	Thu Jan 19 03:58:11 2006
-+++ Makefile.in	Thu Jan 19 14:01:55 2006
+--- Makefile.in.orig	Tue Apr  4 17:23:41 2006
++++ Makefile.in	Tue Apr 11 02:25:14 2006
 @@ -314,7 +314,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--SUBDIRS = m4 contrib www doc icons qa cherokee cget 
-+SUBDIRS = m4 contrib www icons qa cherokee cget 
+-SUBDIRS = m4 contrib www doc icons qa cherokee cget windows
++SUBDIRS = m4 contrib www icons qa cherokee cget windows
  bin_SCRIPTS = cherokee-config
  SUFFIXES = .sample.pre .sample
  
-@@ -978,7 +978,7 @@
+@@ -979,7 +979,7 @@
  
  
  .sample.pre.sample:
@@ -18,7 +18,7 @@
  
  install-data-local-config:
  	@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);
-@@ -1021,9 +1021,6 @@
+@@ -1022,9 +1022,6 @@
  		echo "$@ will not overwrite existing $(cherokeeconfdir)/mime.compression.types"; \
  	else \
  		$(INSTALL_DATA) $(top_srcdir)/mime.compression.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \
diff --git a/www/cherokee-devel/pkg-plist b/www/cherokee-devel/pkg-plist
index 921fb701e299..ed101d58aa96 100644
--- a/www/cherokee-devel/pkg-plist
+++ b/www/cherokee-devel/pkg-plist
@@ -61,6 +61,9 @@ lib/cherokee/libplugin_error_redir.so
 lib/cherokee/libplugin_fastcgi.a
 lib/cherokee/libplugin_fastcgi.la
 lib/cherokee/libplugin_fastcgi.so
+lib/cherokee/libplugin_fcgi.a
+lib/cherokee/libplugin_fcgi.la
+lib/cherokee/libplugin_fcgi.so
 lib/cherokee/libplugin_file.a
 lib/cherokee/libplugin_file.la
 lib/cherokee/libplugin_file.so
@@ -91,6 +94,9 @@ lib/cherokee/libplugin_read_config.so
 lib/cherokee/libplugin_redir.a
 lib/cherokee/libplugin_redir.la
 lib/cherokee/libplugin_redir.so
+lib/cherokee/libplugin_scgi.a
+lib/cherokee/libplugin_scgi.la
+lib/cherokee/libplugin_scgi.so
 lib/cherokee/libplugin_server_info.a
 lib/cherokee/libplugin_server_info.la
 lib/cherokee/libplugin_server_info.so
@@ -141,34 +147,52 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/icons/text.png
 %%DATADIR%%/icons/unknown.png
 %%DATADIR%%/mime_types.txt
+%%PORTDOCS%%%%DOCSDIR%%/Authentication.html
+%%PORTDOCS%%%%DOCSDIR%%/Authors.html
 %%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html
 %%PORTDOCS%%%%DOCSDIR%%/Cget.html
+%%PORTDOCS%%%%DOCSDIR%%/Cherokee-icono.png
 %%PORTDOCS%%%%DOCSDIR%%/Combined_logger.html
+%%PORTDOCS%%%%DOCSDIR%%/Combined_logs.html
 %%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html
+%%PORTDOCS%%%%DOCSDIR%%/Comparison_servers.html
 %%PORTDOCS%%%%DOCSDIR%%/Compiling_and_Installing.html
 %%PORTDOCS%%%%DOCSDIR%%/Configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/Copying_and_license.html
 %%PORTDOCS%%%%DOCSDIR%%/Current_events.html
 %%PORTDOCS%%%%DOCSDIR%%/Directory_configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/Directory_listing.html
+%%PORTDOCS%%%%DOCSDIR%%/Encoders.html
+%%PORTDOCS%%%%DOCSDIR%%/Exquisite-khelpcenter.png
 %%PORTDOCS%%%%DOCSDIR%%/Extension_configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/FastCGI.html
 %%PORTDOCS%%%%DOCSDIR%%/File_sending.html
 %%PORTDOCS%%%%DOCSDIR%%/Frequently_asked_questions.html
+%%PORTDOCS%%%%DOCSDIR%%/Gzip_encoder.html
 %%PORTDOCS%%%%DOCSDIR%%/How_to_generate_SSL_keys.html
 %%PORTDOCS%%%%DOCSDIR%%/How_to_manage_Virtual_Host.html
+%%PORTDOCS%%%%DOCSDIR%%/Htdigest_validator.html
+%%PORTDOCS%%%%DOCSDIR%%/Htpasswd_validator.html
 %%PORTDOCS%%%%DOCSDIR%%/Icons_configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/Jaws_and_Cherokee_with_FastCGI.html
 %%PORTDOCS%%%%DOCSDIR%%/Logging_system.html
 %%PORTDOCS%%%%DOCSDIR%%/Mime_types_configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/NCSA_logger.html
+%%PORTDOCS%%%%DOCSDIR%%/NCSA_logs.html
+%%PORTDOCS%%%%DOCSDIR%%/PAM_validator.html
 %%PORTDOCS%%%%DOCSDIR%%/PHP_execution.html
+%%PORTDOCS%%%%DOCSDIR%%/Plain_validator.html
 %%PORTDOCS%%%%DOCSDIR%%/Redirections.html
 %%PORTDOCS%%%%DOCSDIR%%/Request_configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/Ruby_on_Rails_with_SCGI.html
+%%PORTDOCS%%%%DOCSDIR%%/SCGI.html
 %%PORTDOCS%%%%DOCSDIR%%/Server-conf-small.png
 %%PORTDOCS%%%%DOCSDIR%%/Server_configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/U-Cherokee.html
 %%PORTDOCS%%%%DOCSDIR%%/Validators.html
 %%PORTDOCS%%%%DOCSDIR%%/W3C_logger.html
+%%PORTDOCS%%%%DOCSDIR%%/W3C_logs.html
 %%PORTDOCS%%%%DOCSDIR%%/WebApplications.html
 %%PORTDOCS%%%%DOCSDIR%%/cherokee.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 4ae23113f620..9ebc46a32a90 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	0.4.30
-PORTREVISION=	2
+PORTVERSION=	0.5.1
 CATEGORIES=	www
 MASTER_SITES=	http://www.0x50.org/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
@@ -52,7 +51,6 @@ PLIST_SUB+=	PAM="@comment "
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|@mkdir_p@|${MKDIR} --|g'
-	@${REINPLACE_CMD} -e '/^if/s|==|=|g' ${WRKSRC}/configure
 
 pre-build:
 .for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example
diff --git a/www/cherokee/distinfo b/www/cherokee/distinfo
index 6a443c77f48b..3cd85903f5c2 100644
--- a/www/cherokee/distinfo
+++ b/www/cherokee/distinfo
@@ -1,3 +1,3 @@
-MD5 (cherokee-0.4.30.tar.gz) = bedcf9997928faeb550f54bc6621c13b
-SHA256 (cherokee-0.4.30.tar.gz) = 336cc7008fc2ee65d0f5f45892e3404e8d5b36a8b903358c45aa2ddc090bc71d
-SIZE (cherokee-0.4.30.tar.gz) = 1367424
+MD5 (cherokee-0.5.1.tar.gz) = 9835a293044ab1592d61550c1f26f1b2
+SHA256 (cherokee-0.5.1.tar.gz) = 6a89ee7476f511307d7480e9de9345cb3ff3bd983aa3c53b6823f9222d3cd72a
+SIZE (cherokee-0.5.1.tar.gz) = 1546966
diff --git a/www/cherokee/files/patch-Makefile.in b/www/cherokee/files/patch-Makefile.in
index f1ef24f4b3e6..4400c7c64dcf 100644
--- a/www/cherokee/files/patch-Makefile.in
+++ b/www/cherokee/files/patch-Makefile.in
@@ -1,15 +1,15 @@
---- Makefile.in.orig	Thu Jan 19 03:58:11 2006
-+++ Makefile.in	Thu Jan 19 14:01:55 2006
+--- Makefile.in.orig	Tue Apr  4 17:23:41 2006
++++ Makefile.in	Tue Apr 11 02:25:14 2006
 @@ -314,7 +314,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--SUBDIRS = m4 contrib www doc icons qa cherokee cget 
-+SUBDIRS = m4 contrib www icons qa cherokee cget 
+-SUBDIRS = m4 contrib www doc icons qa cherokee cget windows
++SUBDIRS = m4 contrib www icons qa cherokee cget windows
  bin_SCRIPTS = cherokee-config
  SUFFIXES = .sample.pre .sample
  
-@@ -978,7 +978,7 @@
+@@ -979,7 +979,7 @@
  
  
  .sample.pre.sample:
@@ -18,7 +18,7 @@
  
  install-data-local-config:
  	@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);
-@@ -1021,9 +1021,6 @@
+@@ -1022,9 +1022,6 @@
  		echo "$@ will not overwrite existing $(cherokeeconfdir)/mime.compression.types"; \
  	else \
  		$(INSTALL_DATA) $(top_srcdir)/mime.compression.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \
diff --git a/www/cherokee/pkg-plist b/www/cherokee/pkg-plist
index 921fb701e299..ed101d58aa96 100644
--- a/www/cherokee/pkg-plist
+++ b/www/cherokee/pkg-plist
@@ -61,6 +61,9 @@ lib/cherokee/libplugin_error_redir.so
 lib/cherokee/libplugin_fastcgi.a
 lib/cherokee/libplugin_fastcgi.la
 lib/cherokee/libplugin_fastcgi.so
+lib/cherokee/libplugin_fcgi.a
+lib/cherokee/libplugin_fcgi.la
+lib/cherokee/libplugin_fcgi.so
 lib/cherokee/libplugin_file.a
 lib/cherokee/libplugin_file.la
 lib/cherokee/libplugin_file.so
@@ -91,6 +94,9 @@ lib/cherokee/libplugin_read_config.so
 lib/cherokee/libplugin_redir.a
 lib/cherokee/libplugin_redir.la
 lib/cherokee/libplugin_redir.so
+lib/cherokee/libplugin_scgi.a
+lib/cherokee/libplugin_scgi.la
+lib/cherokee/libplugin_scgi.so
 lib/cherokee/libplugin_server_info.a
 lib/cherokee/libplugin_server_info.la
 lib/cherokee/libplugin_server_info.so
@@ -141,34 +147,52 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/icons/text.png
 %%DATADIR%%/icons/unknown.png
 %%DATADIR%%/mime_types.txt
+%%PORTDOCS%%%%DOCSDIR%%/Authentication.html
+%%PORTDOCS%%%%DOCSDIR%%/Authors.html
 %%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html
 %%PORTDOCS%%%%DOCSDIR%%/Cget.html
+%%PORTDOCS%%%%DOCSDIR%%/Cherokee-icono.png
 %%PORTDOCS%%%%DOCSDIR%%/Combined_logger.html
+%%PORTDOCS%%%%DOCSDIR%%/Combined_logs.html
 %%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html
+%%PORTDOCS%%%%DOCSDIR%%/Comparison_servers.html
 %%PORTDOCS%%%%DOCSDIR%%/Compiling_and_Installing.html
 %%PORTDOCS%%%%DOCSDIR%%/Configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/Copying_and_license.html
 %%PORTDOCS%%%%DOCSDIR%%/Current_events.html
 %%PORTDOCS%%%%DOCSDIR%%/Directory_configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/Directory_listing.html
+%%PORTDOCS%%%%DOCSDIR%%/Encoders.html
+%%PORTDOCS%%%%DOCSDIR%%/Exquisite-khelpcenter.png
 %%PORTDOCS%%%%DOCSDIR%%/Extension_configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/FastCGI.html
 %%PORTDOCS%%%%DOCSDIR%%/File_sending.html
 %%PORTDOCS%%%%DOCSDIR%%/Frequently_asked_questions.html
+%%PORTDOCS%%%%DOCSDIR%%/Gzip_encoder.html
 %%PORTDOCS%%%%DOCSDIR%%/How_to_generate_SSL_keys.html
 %%PORTDOCS%%%%DOCSDIR%%/How_to_manage_Virtual_Host.html
+%%PORTDOCS%%%%DOCSDIR%%/Htdigest_validator.html
+%%PORTDOCS%%%%DOCSDIR%%/Htpasswd_validator.html
 %%PORTDOCS%%%%DOCSDIR%%/Icons_configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/Jaws_and_Cherokee_with_FastCGI.html
 %%PORTDOCS%%%%DOCSDIR%%/Logging_system.html
 %%PORTDOCS%%%%DOCSDIR%%/Mime_types_configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/NCSA_logger.html
+%%PORTDOCS%%%%DOCSDIR%%/NCSA_logs.html
+%%PORTDOCS%%%%DOCSDIR%%/PAM_validator.html
 %%PORTDOCS%%%%DOCSDIR%%/PHP_execution.html
+%%PORTDOCS%%%%DOCSDIR%%/Plain_validator.html
 %%PORTDOCS%%%%DOCSDIR%%/Redirections.html
 %%PORTDOCS%%%%DOCSDIR%%/Request_configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/Ruby_on_Rails_with_SCGI.html
+%%PORTDOCS%%%%DOCSDIR%%/SCGI.html
 %%PORTDOCS%%%%DOCSDIR%%/Server-conf-small.png
 %%PORTDOCS%%%%DOCSDIR%%/Server_configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/U-Cherokee.html
 %%PORTDOCS%%%%DOCSDIR%%/Validators.html
 %%PORTDOCS%%%%DOCSDIR%%/W3C_logger.html
+%%PORTDOCS%%%%DOCSDIR%%/W3C_logs.html
 %%PORTDOCS%%%%DOCSDIR%%/WebApplications.html
 %%PORTDOCS%%%%DOCSDIR%%/cherokee.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html