Update qDecoder to 9.0. Patch submitted by Jun-Yong Park.

This version is based on a new branch and may not be fully compatible
with older versions.

Changes since 7.0.1:
    NEW) qDecoderSetUploadBase() - Initialize qDecoder() for progressive
    uploading.
    FIX) qDecoder() - Now qDecoder() supports progressive uploading and direct
    file saving into disk.
    NEW) qSedArgAddDirect() - For huge size(over 1024 - 1) value.
    FIX) qSedArgAdd() - Adjust miss typed variable length. (1024*64 => 1024)
    NEW) qGetTimeStr() - Generate date string formatted as 'YYYYMMDDhhmmss'.
    NEW) qJavaScript() - Print out some JavaScript code.
    NEW) qAwkStr() - Scanning pattern from string.
    FIX) qAwkOpen() - Compatibility increment
    FIX) qAwkNext() - Expand array size to 1024(before 256)
    FIX) qCountRead() - Compatibility increment
    FIX) qCountSave() - Compatibility increment
    FIX) qCountUpdate() - Compatibility increment
    FIX) qDecoder() - Now qdecoder uses more smaller memory
    FIX) qCheckFile() - Utility increment
    New socket functions(unix only). Please refer the reference for more
    details.
    NEW) qSocketOpen()
    NEW) qSocketClose()
    NEW) qSocketWaitReadable()
    NEW) qSocketRead()
    NEW) qSocketGets()
    NEW) qSocketWrite()
    NEW) qSocketPuts()
    NEW) qSocketPrintf()
    NEW) qSocketSendFile()
    NEW) qSocketSaveIntoFile()
    NEW) qSocketSetNonblock()
    NEW) qSocketConv2file()

7 files changed, 175 insertions, 53 deletions

diff --git a/www/qDecoder/DESCR b/www/qDecoder/DESCR
index 59509aafa63..4147ca10efb 100644
--- a/www/qDecoder/DESCR
+++ b/www/qDecoder/DESCR
@@ -1,9 +1,7 @@
-What's qDecoder?
-
-Being a Web Application Interface for C/C++ use, qDecoder is a solution
-product for developers. The Query Fetch algorithm of qDecoder based on the
-linked-list provides transparency with low layers by the simple library
-interface regardless of COOKIE/GET/POST(including File Upload). Thus, it
-enables the web based software to be more intuitively designed and
-implemented. qDecoder is developed according to the free software model and
-is publicly distributed.
+qDecoder is a CGI library for C/C++ and a solution product for
+developers.  The Query Fetch algorithm of qDecoder which is based on
+linked-list gives developers simpler library interface without regard
+to a method of GET or POST.  Also because it gives transparency with a
+subordinate layer, web-based softwares - CGI - is designed and
+embodied in reliability further. The source code for qDecoder is
+freely available to everyone.
diff --git a/www/qDecoder/Makefile b/www/qDecoder/Makefile
index 3ec157e0ac0..fd0a6951401 100644
--- a/www/qDecoder/Makefile
+++ b/www/qDecoder/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2007/03/28 13:30:11 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/11/26 01:23:40 minskim Exp $
+#
 
-DISTNAME=	qDecoder-7.0.1
+DISTNAME=	qDecoder-9.0
 CATEGORIES=	www
-PKGREVISION=	1
 MASTER_SITES=	ftp://ftp.qDecoder.org/pub/qDecoder/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.qDecoder.org/
@@ -12,13 +11,16 @@ COMMENT=	Web Application Interface for C/C++ (CGI Library)
 
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
-INSTALLATION_DIRS=	include lib share/doc/qDecoder  share/examples/qDecoder
+INSTALLATION_DIRS=	include lib share/doc/qDecoder share/doc/qDecoder/html \
+			share/examples/qDecoder share/examples/qDecoder/qDecoder-upload
 
 post-install:
-	cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS CHANGES COPYING	\
-		DISCLAIMER README REFERENCE qDecoder.jpg 	\
-		${PREFIX}/share/doc/qDecoder
-	cd ${WRKSRC}/examples; ${INSTALL_DATA} *.c *.conf s*.in	\
+	cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS CHANGES COPYING \
+		qDecoder.jpg ${PREFIX}/share/doc/qDecoder
+	cd ${WRKSRC}/doc/html; ${INSTALL_DATA} * ${PREFIX}/share/doc/qDecoder/html
+	cd ${WRKSRC}/examples; ${INSTALL_DATA} *.c *.conf s*.in \
 		*.html ${PREFIX}/share/examples/qDecoder
+	cd ${WRKSRC}/examples/qDecoder-upload; ${INSTALL_DATA} *.html *.js \
+		${PREFIX}/share/examples/qDecoder/qDecoder-upload
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/qDecoder/PLIST b/www/qDecoder/PLIST
index 169bbacf839..41425b8e8a3 100644
--- a/www/qDecoder/PLIST
+++ b/www/qDecoder/PLIST
@@ -1,27 +1,78 @@
-@comment $NetBSD: PLIST,v 1.2 2006/06/10 19:43:24 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/11/26 01:23:40 minskim Exp $
 include/qDecoder.h
 lib/libqDecoder.la
 share/doc/qDecoder/AUTHORS
 share/doc/qDecoder/CHANGES
 share/doc/qDecoder/COPYING
-share/doc/qDecoder/DISCLAIMER
-share/doc/qDecoder/README
-share/doc/qDecoder/REFERENCE
+share/doc/qDecoder/html/annotated.html
+share/doc/qDecoder/html/doxygen.css
+share/doc/qDecoder/html/doxygen.png
+share/doc/qDecoder/html/files.html
+share/doc/qDecoder/html/functions.html
+share/doc/qDecoder/html/functions_vars.html
+share/doc/qDecoder/html/globals.html
+share/doc/qDecoder/html/globals_func.html
+share/doc/qDecoder/html/index.html
+share/doc/qDecoder/html/qCgiRequest_8c.html
+share/doc/qDecoder/html/qCgiResponse_8c.html
+share/doc/qDecoder/html/qConfig_8c.html
+share/doc/qDecoder/html/qCount_8c.html
+share/doc/qDecoder/html/qDatabase_8c.html
+share/doc/qDecoder/html/qDecoder_8h.html
+share/doc/qDecoder/html/qEncode_8c.html
+share/doc/qDecoder/html/qEntry_8c.html
+share/doc/qDecoder/html/qFile_8c.html
+share/doc/qDecoder/html/qHash_8c.html
+share/doc/qDecoder/html/qHasharr_8c.html
+share/doc/qDecoder/html/qHashtbl_8c.html
+share/doc/qDecoder/html/qHtml_8c.html
+share/doc/qDecoder/html/qLog_8c.html
+share/doc/qDecoder/html/qObstack_8c.html
+share/doc/qDecoder/html/qQueue_8c.html
+share/doc/qDecoder/html/qSed_8c.html
+share/doc/qDecoder/html/qSem_8c.html
+share/doc/qDecoder/html/qSession_8c.html
+share/doc/qDecoder/html/qShm_8c.html
+share/doc/qDecoder/html/qSocket_8c.html
+share/doc/qDecoder/html/qString_8c.html
+share/doc/qDecoder/html/qSystem_8c.html
+share/doc/qDecoder/html/qTime_8c.html
+share/doc/qDecoder/html/structQ__DB.html
+share/doc/qDecoder/html/structQ__DBRESULT.html
+share/doc/qDecoder/html/structQ__ENTRY.html
+share/doc/qDecoder/html/structQ__HASHARR.html
+share/doc/qDecoder/html/structQ__HASHTBL.html
+share/doc/qDecoder/html/structQ__LOG.html
+share/doc/qDecoder/html/structQ__NLOBJ.html
+share/doc/qDecoder/html/structQ__OBJ.html
+share/doc/qDecoder/html/structQ__OBSTACK.html
+share/doc/qDecoder/html/structQ__QUEUE.html
+share/doc/qDecoder/html/tab_b.gif
+share/doc/qDecoder/html/tab_l.gif
+share/doc/qDecoder/html/tab_r.gif
+share/doc/qDecoder/html/tabs.css
 share/doc/qDecoder/qDecoder.jpg
 share/examples/qDecoder/arglist.c
-share/examples/qDecoder/confparser.c
-share/examples/qDecoder/confparser.conf
+share/examples/qDecoder/config.c
+share/examples/qDecoder/config.conf
+share/examples/qDecoder/config_default.conf
 share/examples/qDecoder/cookie.c
 share/examples/qDecoder/download.c
 share/examples/qDecoder/examples.html
-share/examples/qDecoder/fetch.c
 share/examples/qDecoder/multivalue.c
+share/examples/qDecoder/obstack.c
+share/examples/qDecoder/qDecoder-upload/qDecoder-upload.html
+share/examples/qDecoder/qDecoder-upload/qDecoder-upload.js
+share/examples/qDecoder/query.c
 share/examples/qDecoder/session.c
+share/examples/qDecoder/socket.c
 share/examples/qDecoder/streamedit-header.html.in
 share/examples/qDecoder/streamedit-tailer.html.in
 share/examples/qDecoder/streamedit.c
-share/examples/qDecoder/streamedit.html
 share/examples/qDecoder/streamedit.html.in
 share/examples/qDecoder/upload.c
+share/examples/qDecoder/uploadfile.c
+@dirrm share/examples/qDecoder/qDecoder-upload
 @dirrm share/examples/qDecoder
+@dirrm share/doc/qDecoder/html
 @dirrm share/doc/qDecoder
diff --git a/www/qDecoder/distinfo b/www/qDecoder/distinfo
index 77d266598fb..6e09a58fefc 100644
--- a/www/qDecoder/distinfo
+++ b/www/qDecoder/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/06/10 19:43:24 minskim Exp $
+$NetBSD: distinfo,v 1.5 2008/11/26 01:23:40 minskim Exp $
 
-SHA1 (qDecoder-7.0.1.tar.Z) = a5c8f76e6a62405628f0b75a9e536b8ba4539f96
-RMD160 (qDecoder-7.0.1.tar.Z) = f8e4dfc7d531c749ee51eebbbfe864a66b05e3a2
-Size (qDecoder-7.0.1.tar.Z) = 993825 bytes
-SHA1 (patch-aa) = 4824679d8d4d6b0efc5e2138d703fb56dcc8dcb3
-SHA1 (patch-ab) = 47b2c521b57ab6ae94119cca4337818e44f46c6f
+SHA1 (qDecoder-9.0.tar.gz) = 7b167d2cb6eb7a39fb638fda6fca1776a7a14ef8
+RMD160 (qDecoder-9.0.tar.gz) = 4545f2a020136be7f26df1e6164c9b4c720e03a9
+Size (qDecoder-9.0.tar.gz) = 300204 bytes
+SHA1 (patch-aa) = 4a9f5591f4ceeddca2e3d2b97f3104c9911f1643
+SHA1 (patch-ab) = 1dc9544e227a911df635538ae881afe40e5e81f2
+SHA1 (patch-ac) = 70716b2b0a35f63eba3b11e3ce16b94a135496f5
diff --git a/www/qDecoder/patches/patch-aa b/www/qDecoder/patches/patch-aa
index 2e8cac10e36..a5ad462a9cb 100644
--- a/www/qDecoder/patches/patch-aa
+++ b/www/qDecoder/patches/patch-aa
@@ -1,34 +1,34 @@
-$NetBSD: patch-aa,v 1.2 2006/06/10 19:43:24 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2008/11/26 01:23:40 minskim Exp $
 
---- src/Makefile.in.orig	2001-09-06 08:33:39.000000000 -0700
+--- src/Makefile.in.orig	2008-11-23 17:42:37.000000000 +0900
 +++ src/Makefile.in
-@@ -92,24 +92,17 @@ OBJ		= qDecoder.o \
+@@ -95,19 +95,12 @@ OBJ		= qCgiRequest.o		\
+ all: qdecoder
  
- ## Make Library
- all: ${OBJ}
+ qdecoder: ${OBJ}
 -	${AR} ${ARFLAGS} ${LIBNAME} ${OBJ}
 -	${RANLIB} ${LIBNAME}
--	${LD} ${LDFLAGS} -o ${SLIBREALNAME} ${OBJ}
+-	${LD} ${LDFLAGS} ${OBJ} -o ${SLIBREALNAME}
 -	${CHMOD} 0644 ${SLIBREALNAME}
 -	${RM} -f ${SLIBNAME}
 -	${LN_S} ${SLIBREALNAME} ${SLIBNAME}
 +	${LIBTOOL} --mode=link ${CC} -o ${LIBNAME:.a=.la} ${OBJ:.o=.lo} \
 +		-rpath ${PREFIX}/lib -version-info ${SLIBVERSION}:0:0
  
- ## Compile Module
- .c.o:
--	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -c -o $@ $<
-+	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -c -o $@ $<
- 
- ## Install Module
 -install: all
 +install:
- 	${INSTALL} qDecoder.h ${HEADERDIR}/qDecoder.h
--	${INSTALL} ${LIBNAME} ${LIBDIR}/${LIBNAME}
--	${INSTALL} ${SLIBREALNAME} ${LIBDIR}/${SLIBREALNAME}
+ 	${INSTALL_DATA} qDecoder.h ${HEADERDIR}/qDecoder.h
+-	${INSTALL_DATA} ${LIBNAME} ${LIBDIR}/${LIBNAME}
+-	${INSTALL_DATA} ${SLIBREALNAME} ${LIBDIR}/${SLIBREALNAME}
 -	${RM} -f ${LIBDIR}/${SLIBNAME}
 -	${LN_S} ${LIBDIR}/${SLIBREALNAME} ${LIBDIR}/${SLIBNAME}
 +	${LIBTOOL} --mode=install ${INSTALL} ${LIBNAME:.a=.la} ${LIBDIR}
  
- uninstall: deinstall
- deinstall:
+ deinstall: uninstall
+ uninstall:
+@@ -127,4 +120,4 @@ clean:
+ 
+ ## Compile
+ .c.o:
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -c -o $@ $<
++	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -c -o $@ $<
diff --git a/www/qDecoder/patches/patch-ab b/www/qDecoder/patches/patch-ab
index 048b6a27a61..8659d702da3 100644
--- a/www/qDecoder/patches/patch-ab
+++ b/www/qDecoder/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2006/06/10 19:43:24 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2008/11/26 01:23:40 minskim Exp $
 
---- Makefile.in.orig	2001-09-06 08:33:40.000000000 -0700
+--- Makefile.in.orig	2008-11-23 17:48:44.000000000 +0900
 +++ Makefile.in
-@@ -61,3 +61,5 @@ distclean: clean
- 		echo "===> Removing $${DIR}/Makefile"; \
+@@ -53,3 +53,5 @@ distclean: clean
  		(cd $${DIR}; rm -f Makefile); \
  	done
+ 	${RM} -f config.h
 +
 +.PHONY: install
diff --git a/www/qDecoder/patches/patch-ac b/www/qDecoder/patches/patch-ac
new file mode 100644
index 00000000000..1eca7a6e885
--- /dev/null
+++ b/www/qDecoder/patches/patch-ac
@@ -0,0 +1,70 @@
+$NetBSD: patch-ac,v 1.1 2008/11/26 01:23:40 minskim Exp $
+
+--- examples/Makefile.in.orig	2008-11-17 16:55:45.000000000 +0900
++++ examples/Makefile.in
+@@ -30,47 +30,46 @@ DEFS	= @DEFS@
+ INCLUDE	= -I. -I../src
+ 
+ ## qDecoder Library Path
+-QLIB	= ../src/libqDecoder.a
+-#QLIB	= ../src/libqDecoder.so
++QLIB	= ../src/libqDecoder.la
+ 
+ ## Main
+ all:	query.cgi cookie.cgi multivalue.cgi upload.cgi uploadfile.cgi download.cgi streamedit.cgi session.cgi config.cgi socket.cgi obstack.cgi
+ 
+ query.cgi: ${QLIB} query.o
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o query.cgi query.o ${QLIB}
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o query.cgi query.o ${QLIB}
+ 
+ cookie.cgi: ${QLIB} cookie.o
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o cookie.cgi cookie.o ${QLIB}
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o cookie.cgi cookie.o ${QLIB}
+ 
+ multivalue.cgi:	${QLIB} multivalue.o
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o multivalue.cgi multivalue.o ${QLIB}
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o multivalue.cgi multivalue.o ${QLIB}
+ 
+ upload.cgi: ${QLIB} upload.o
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o upload.cgi upload.o ${QLIB}
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o upload.cgi upload.o ${QLIB}
+ 	chmod 6755 upload.cgi
+ 
+ uploadfile.cgi: ${QLIB} uploadfile.o
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o uploadfile.cgi uploadfile.o ${QLIB}
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o uploadfile.cgi uploadfile.o ${QLIB}
+ 	chmod 6755 uploadfile.cgi
+ 
+ download.cgi: ${QLIB} download.o
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o download.cgi download.o ${QLIB}
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o download.cgi download.o ${QLIB}
+ 
+ streamedit.cgi: ${QLIB} streamedit.o
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o streamedit.cgi streamedit.o ${QLIB}
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o streamedit.cgi streamedit.o ${QLIB}
+ 
+ session.cgi: ${QLIB} session.o
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o session.cgi session.o ${QLIB}
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o session.cgi session.o ${QLIB}
+ 	chmod 6755 session.cgi
+ 
+ config.cgi: ${QLIB} config.o
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o config.cgi config.o ${QLIB}
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o config.cgi config.o ${QLIB}
+ 
+ socket.cgi: ${QLIB} socket.o
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o socket.cgi socket.o ${QLIB}
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o socket.cgi socket.o ${QLIB}
+ 
+ obstack.cgi: ${QLIB} obstack.o
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o obstack.cgi obstack.o ${QLIB}
++	${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -o obstack.cgi obstack.o ${QLIB}
+ 
+ ${QLIB}:
+ 	(cd ../src/; make all)
+@@ -81,4 +80,4 @@ clean:
+ 
+ ## Compile Module
+ .c.o:
+-	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -c -o $@ $<
++	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -c -o $@ $<