[pkgsrc/trunk]: pkgsrc/www/cherokee Rename T_USER to not conflict with system...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/37e9dd2b73f2
branches:  trunk
changeset: 518935:37e9dd2b73f2
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Sep 24 15:40:24 2006 +0000

description:
Rename T_USER to not conflict with system enum on DragonFly and FreeBSD.

diffstat:

 www/cherokee/distinfo         |   4 +++-
 www/cherokee/patches/patch-ac |  40 ++++++++++++++++++++++++++++++++++++++++
 www/cherokee/patches/patch-ad |  13 +++++++++++++
 3 files changed, 56 insertions(+), 1 deletions(-)

diffs (75 lines):

diff -r 4b35ef761a3d -r 37e9dd2b73f2 www/cherokee/distinfo
--- a/www/cherokee/distinfo     Sun Sep 24 15:33:54 2006 +0000
+++ b/www/cherokee/distinfo     Sun Sep 24 15:40:24 2006 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2006/06/08 19:48:35 joerg Exp $
+$NetBSD: distinfo,v 1.3 2006/09/24 15:40:24 joerg Exp $
 
 SHA1 (cherokee-0.5.3.tar.gz) = 97f436a8e5109eb1420b9ead70f281adac535278
 RMD160 (cherokee-0.5.3.tar.gz) = adad3e9c0f3b181dda135c931337b1946770bfce
 Size (cherokee-0.5.3.tar.gz) = 1547870 bytes
 SHA1 (patch-aa) = 541c40b0ffeedab919f345b4439305a3c7c63dc4
 SHA1 (patch-ab) = 35008bfd0a665120a91cf891d0aa3520587b5e75
+SHA1 (patch-ac) = 5523771b9be6fed879634d61c796cad2be15dd9a
+SHA1 (patch-ad) = 2246b5097b90e6db3464d0ab38579467d1980043
diff -r 4b35ef761a3d -r 37e9dd2b73f2 www/cherokee/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/cherokee/patches/patch-ac     Sun Sep 24 15:40:24 2006 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.1 2006/09/24 15:40:24 joerg Exp $
+
+--- cherokee/read_config_grammar.y.orig        2006-09-24 17:26:21.000000000 +0000
++++ cherokee/read_config_grammar.y
+@@ -440,7 +440,7 @@ yyerror (char* msg)
+ 
+ 
+ %token T_QUOTE T_DENY T_THREAD_NUM T_SSL_CERT_KEY_FILE T_SSL_CERT_FILE T_KEEPALIVE_MAX_REQUESTS T_ERROR_HANDLER
+-%token T_TIMEOUT T_KEEPALIVE T_DOCUMENT_ROOT T_LOG T_MIME_FILE T_DIRECTORY T_HANDLER T_USER T_GROUP T_POLICY
++%token T_TIMEOUT T_KEEPALIVE T_DOCUMENT_ROOT T_LOG T_MIME_FILE T_DIRECTORY T_HANDLER T_USER_ T_GROUP T_POLICY
+ %token T_SERVER T_USERDIR T_PIDFILE T_LISTEN T_SERVER_TOKENS T_ENCODER T_ALLOW T_DIRECTORYINDEX 
+ %token T_ICONS T_AUTH T_NAME T_METHOD T_PASSWDFILE T_SSL_CA_LIST_FILE T_FROM T_SOCKET T_LOG_FLUSH_INTERVAL
+ %token T_HEADERFILE T_PANIC_ACTION T_JUST_ABOUT T_LISTEN_QUEUE_SIZE T_SENDFILE T_MINSIZE T_MAXSIZE T_MAX_FDS
+@@ -1059,7 +1059,7 @@ ipv6 : T_IPV6 T_NUMBER
+          SRV(server)->ipv6 = $2;
+ };
+ 
+-user1 : T_USER T_ID
++user1 : T_USER_ T_ID
+ {
+          struct passwd *pwd;
+          
+@@ -1074,7 +1074,7 @@ user1 : T_USER T_ID
+          free ($2);
+ };
+ 
+-user2 : T_USER T_NUMBER
++user2 : T_USER_ T_NUMBER
+ {
+          SRV(server)->user = $2;
+ };
+@@ -1702,7 +1702,7 @@ auth_option : T_NAME T_QSTRING 
+          free ($2);
+ };
+ 
+-auth_option : T_USER id_list
++auth_option : T_USER_ id_list
+ {
+          linked_list_t *i;
+ 
diff -r 4b35ef761a3d -r 37e9dd2b73f2 www/cherokee/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/cherokee/patches/patch-ad     Sun Sep 24 15:40:24 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/09/24 15:40:24 joerg Exp $
+
+--- cherokee/read_config_scanner.l.orig        2006-04-01 14:50:24.000000000 +0000
++++ cherokee/read_config_scanner.l
+@@ -77,7 +77,7 @@ nl              [\n\r]
+ "KeepAlive"             { return T_KEEPALIVE; }
+ "MaxKeepAliveRequests"  { return T_KEEPALIVE_MAX_REQUESTS; }
+ "ErrorHandler"          { return T_ERROR_HANDLER; }
+-"User"                  { return T_USER; }
++"User"                  { return T_USER_; }
+ "Group"                 { return T_GROUP; }
+ "Server"                { return T_SERVER; }
+ "Userdir"               { return T_USERDIR; }