ports/81513: Update port: www/cherokee to 0.4.23

[KATO Tsuguru]

>Number:         81513
>Category:       ports
>Synopsis:       Update port: www/cherokee to 0.4.23
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 26 15:10:05 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 0.4.23

New file:
files/patch-cherokee-buffer.c
files/patch-cherokee-config_protocol_scanner.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/www/cherokee/Makefile www/cherokee/Makefile
--- /usr/ports/www/cherokee/Makefile	Sun Apr 24 03:47:15 2005
+++ www/cherokee/Makefile	Tue May 24 16:26:27 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	0.4.19
+PORTVERSION=	0.4.23
 CATEGORIES=	www
 MASTER_SITES=	http://www.0x50.org/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
@@ -25,7 +25,7 @@
 CONFIGURE_ARGS=	--with-wwwroot=${PREFIX}/www
 INSTALLS_SHLIB=	yes
 
-MAN1=		cherokee-config.1 cherokee.1
+MAN1=		cget.1 cherokee-config.1 cherokee.1
 
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff -urN /usr/ports/www/cherokee/distinfo www/cherokee/distinfo
--- /usr/ports/www/cherokee/distinfo	Sun Apr 24 03:47:15 2005
+++ www/cherokee/distinfo	Tue May 24 15:55:26 2005
@@ -1,2 +1,2 @@
-MD5 (cherokee-0.4.19.tar.gz) = ecd2b9e52450bdd70f0eed8f0c803871
-SIZE (cherokee-0.4.19.tar.gz) = 1024984
+MD5 (cherokee-0.4.23.tar.gz) = 915416b891a7ac60d4d7a0868c305bd2
+SIZE (cherokee-0.4.23.tar.gz) = 1340107
diff -urN /usr/ports/www/cherokee/files/patch-cherokee-buffer.c www/cherokee/files/patch-cherokee-buffer.c
--- /usr/ports/www/cherokee/files/patch-cherokee-buffer.c	Thu Jan  1 09:00:00 1970
+++ www/cherokee/files/patch-cherokee-buffer.c	Tue May 24 16:18:14 2005
@@ -0,0 +1,13 @@
+--- cherokee/buffer.c.orig	Tue May 24 00:46:59 2005
++++ cherokee/buffer.c	Tue May 24 16:18:01 2005
+@@ -39,6 +39,10 @@
+ #include "util.h"
+ #include "crc32.h"
+ 
++#ifndef va_copy
++#define va_copy(to,fr) ((to)=(fr))
++#endif
++
+ #define BUFFER_VA_LEN 200
+ 
+ #define TO_HEX(c) (c>9? c+'a'-10 : c+'0')
diff -urN /usr/ports/www/cherokee/files/patch-cherokee-config_protocol_scanner.c www/cherokee/files/patch-cherokee-config_protocol_scanner.c
--- /usr/ports/www/cherokee/files/patch-cherokee-config_protocol_scanner.c	Thu Jan  1 09:00:00 1970
+++ www/cherokee/files/patch-cherokee-config_protocol_scanner.c	Tue May 24 16:15:57 2005
@@ -0,0 +1,11 @@
+--- cherokee/config_protocol_scanner.c.orig	Sat May 21 02:14:14 2005
++++ cherokee/config_protocol_scanner.c	Tue May 24 16:15:26 2005
+@@ -782,7 +782,7 @@
+ case 6:
+ YY_RULE_SETUP
+ #line 47 "config_protocol_scanner.l"
+-{ yy_config_protocol_lval.number = atoll(yy_config_protocol_text); return T_NUM; }
++{ yy_config_protocol_lval.number = strtoll(yy_config_protocol_text, (char **)NULL, 10); return T_NUM; }
+ 	YY_BREAK
+ case 7:
+ /* rule 7 can match eol */
diff -urN /usr/ports/www/cherokee/pkg-plist www/cherokee/pkg-plist
--- /usr/ports/www/cherokee/pkg-plist	Sun Apr 24 03:47:15 2005
+++ www/cherokee/pkg-plist	Tue May 24 16:36:17 2005
@@ -10,10 +10,12 @@
 etc/cherokee/sites-available/example.com
 etc/cherokee/sites-enabled/default
 %%PAM5%%etc/pam.d/cherokee
+include/cherokee/admin_client.h
 include/cherokee/buffer.h
 include/cherokee/cherokee-config.h
 include/cherokee/cherokee.h
 include/cherokee/common.h
+include/cherokee/config_value.h
 include/cherokee/connection.h
 include/cherokee/downloader.h
 include/cherokee/encoder.h
@@ -32,18 +34,22 @@
 include/cherokee/table.h
 include/cherokee/url.h
 include/cherokee/util.h
+lib/cherokee/libplugin_admin.so
 lib/cherokee/libplugin_cgi.so
 lib/cherokee/libplugin_combined.so
 lib/cherokee/libplugin_common.so
 lib/cherokee/libplugin_dirlist.so
 lib/cherokee/libplugin_error_redir.so
+lib/cherokee/libplugin_fastcgi.so
 lib/cherokee/libplugin_file.so
 lib/cherokee/libplugin_gzip.so
+lib/cherokee/libplugin_htdigest.so
 lib/cherokee/libplugin_ncsa.so
 lib/cherokee/libplugin_nn.so
 %%PAM%%lib/cherokee/libplugin_pam.so
 lib/cherokee/libplugin_phpcgi.so
 lib/cherokee/libplugin_plain.so
+lib/cherokee/libplugin_read_config.so
 lib/cherokee/libplugin_redir.so
 lib/cherokee/libplugin_remote_control.so
 lib/cherokee/libplugin_server_info.so
@@ -54,6 +60,9 @@
 lib/libcherokee-client.a
 lib/libcherokee-client.so
 lib/libcherokee-client.so.0
+lib/libcherokee-config.a
+lib/libcherokee-config.so
+lib/libcherokee-config.so.0
 lib/libcherokee-server.a
 lib/libcherokee-server.so
 lib/libcherokee-server.so.0
@@ -85,6 +94,10 @@
 %%DATADIR%%/icons/text.png
 %%DATADIR%%/icons/unknown.png
 %%DATADIR%%/mime_types.txt
+www/images/cherokee-logo.png
+www/images/powered_by_cherokee.png
+www/images/top-layer.png
+www/index.html
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/deps
 @dirrm %%DATADIR%%
@@ -96,4 +109,5 @@
 @dirrm etc/cherokee/mods-enabled
 @dirrm etc/cherokee/mods-available
 @dirrm etc/cherokee
- at unexec rmdir %%LOCALBASE%%/www/data 2>/dev/null || true
+ at unexec rmdir %D/www/images 2>/dev/null || true
+ at unexec rmdir %D/www/data 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted: