Changes 3.2.9:

* Correction of bugs

Changes 3.2.8:
* Correction of bugs on compilation

Changes 3.2.7:
* Correction of bugs on compilation

Changes 3.2.6:
* Correction of bugs, see changelog file

Changes 3.2.5:
* Add the XHTML support from David Roberts work

5 files changed, 26 insertions, 180 deletions

diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 8bc5f83eaba..8efcce5e12e 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2008/06/12 02:14:55 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2011/03/17 14:48:50 adam Exp $
 
-DISTNAME=	cgicc-3.2.3
+DISTNAME=	cgicc-3.2.9
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GNU:=cgicc/}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/cgicc/cgicc.html
 COMMENT=	C++ compliant CGI applications libraries
+LICENSE=	gnu-lgpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,6 +17,8 @@ USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-demos
 
+BUILD_DIRS=		cgicc support
+
 .include "../../mk/compiler.mk"
 
 .if empty(CC_VERSION:Mgcc*)
diff --git a/www/cgicc/PLIST b/www/cgicc/PLIST
index f02432718eb..ed27cb1d236 100644
--- a/www/cgicc/PLIST
+++ b/www/cgicc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 22:00:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/03/17 14:48:50 adam Exp $
 bin/cgicc-config
 include/cgicc/CgiDefs.h
 include/cgicc/CgiEnvironment.h
@@ -23,163 +23,9 @@ include/cgicc/HTTPPlainHeader.h
 include/cgicc/HTTPRedirectHeader.h
 include/cgicc/HTTPResponseHeader.h
 include/cgicc/HTTPStatusHeader.h
+include/cgicc/HTTPXHTMLHeader.h
 include/cgicc/MStreamable.h
+include/cgicc/XHTMLDoctype.h
+include/cgicc/XMLDeclaration.h
+include/cgicc/XMLPI.h
 lib/libcgicc.la
-share/doc/cgicc/COPYING-source.html
-share/doc/cgicc/COPYING_8DOC-source.html
-share/doc/cgicc/COPYING_8LIB-source.html
-share/doc/cgicc/CgiDefs_8h-source.html
-share/doc/cgicc/CgiDefs_8h.html
-share/doc/cgicc/CgiEnvironment_8h-source.html
-share/doc/cgicc/CgiEnvironment_8h.html
-share/doc/cgicc/CgiInput_8h-source.html
-share/doc/cgicc/CgiInput_8h.html
-share/doc/cgicc/CgiUtils_8h-source.html
-share/doc/cgicc/CgiUtils_8h.html
-share/doc/cgicc/Cgicc_8h-source.html
-share/doc/cgicc/Cgicc_8h.html
-share/doc/cgicc/FormEntry_8h-source.html
-share/doc/cgicc/FormEntry_8h.html
-share/doc/cgicc/FormFile_8h-source.html
-share/doc/cgicc/FormFile_8h.html
-share/doc/cgicc/HTMLAtomicElement_8h-source.html
-share/doc/cgicc/HTMLAtomicElement_8h.html
-share/doc/cgicc/HTMLAttributeList_8h-source.html
-share/doc/cgicc/HTMLAttributeList_8h.html
-share/doc/cgicc/HTMLAttribute_8h-source.html
-share/doc/cgicc/HTMLAttribute_8h.html
-share/doc/cgicc/HTMLBooleanElement_8h-source.html
-share/doc/cgicc/HTMLBooleanElement_8h.html
-share/doc/cgicc/HTMLClasses_8h-source.html
-share/doc/cgicc/HTMLClasses_8h.html
-share/doc/cgicc/HTMLDoctype_8h-source.html
-share/doc/cgicc/HTMLDoctype_8h.html
-share/doc/cgicc/HTMLElementList_8h-source.html
-share/doc/cgicc/HTMLElementList_8h.html
-share/doc/cgicc/HTMLElement_8h-source.html
-share/doc/cgicc/HTMLElement_8h.html
-share/doc/cgicc/HTTPContentHeader_8h-source.html
-share/doc/cgicc/HTTPContentHeader_8h.html
-share/doc/cgicc/HTTPCookie_8h-source.html
-share/doc/cgicc/HTTPCookie_8h.html
-share/doc/cgicc/HTTPHTMLHeader_8h-source.html
-share/doc/cgicc/HTTPHTMLHeader_8h.html
-share/doc/cgicc/HTTPHeader_8h-source.html
-share/doc/cgicc/HTTPHeader_8h.html
-share/doc/cgicc/HTTPPlainHeader_8h-source.html
-share/doc/cgicc/HTTPPlainHeader_8h.html
-share/doc/cgicc/HTTPRedirectHeader_8h-source.html
-share/doc/cgicc/HTTPRedirectHeader_8h.html
-share/doc/cgicc/HTTPResponseHeader_8h-source.html
-share/doc/cgicc/HTTPResponseHeader_8h.html
-share/doc/cgicc/HTTPStatusHeader_8h-source.html
-share/doc/cgicc/HTTPStatusHeader_8h.html
-share/doc/cgicc/MStreamable_8h-source.html
-share/doc/cgicc/MStreamable_8h.html
-share/doc/cgicc/annotated.html
-share/doc/cgicc/bugs_8tmpl-source.html
-share/doc/cgicc/cgi-overview_8tmpl-source.html
-share/doc/cgicc/cgi_overview.html
-share/doc/cgicc/cgicc-doc.css
-share/doc/cgicc/cgicc.png
-share/doc/cgicc/cgicc_bugs.html
-share/doc/cgicc/cgicc_demos.html
-share/doc/cgicc/cgicc_license.html
-share/doc/cgicc/cgicc_lists.html
-share/doc/cgicc/cgicc_tutorial.html
-share/doc/cgicc/classcgicc_1_1CgiEnvironment-members.html
-share/doc/cgicc/classcgicc_1_1CgiEnvironment.html
-share/doc/cgicc/classcgicc_1_1CgiInput-members.html
-share/doc/cgicc/classcgicc_1_1CgiInput.html
-share/doc/cgicc/classcgicc_1_1Cgicc-members.html
-share/doc/cgicc/classcgicc_1_1Cgicc.html
-share/doc/cgicc/classcgicc_1_1FormEntry-members.html
-share/doc/cgicc/classcgicc_1_1FormEntry.html
-share/doc/cgicc/classcgicc_1_1FormFile-members.html
-share/doc/cgicc/classcgicc_1_1FormFile.html
-share/doc/cgicc/classcgicc_1_1HTMLAtomicElement-members.html
-share/doc/cgicc/classcgicc_1_1HTMLAtomicElement.html
-share/doc/cgicc/classcgicc_1_1HTMLAtomicElement.png
-share/doc/cgicc/classcgicc_1_1HTMLAttribute-members.html
-share/doc/cgicc/classcgicc_1_1HTMLAttribute.html
-share/doc/cgicc/classcgicc_1_1HTMLAttribute.png
-share/doc/cgicc/classcgicc_1_1HTMLAttributeList-members.html
-share/doc/cgicc/classcgicc_1_1HTMLAttributeList.html
-share/doc/cgicc/classcgicc_1_1HTMLBooleanElement-members.html
-share/doc/cgicc/classcgicc_1_1HTMLBooleanElement.html
-share/doc/cgicc/classcgicc_1_1HTMLBooleanElement.png
-share/doc/cgicc/classcgicc_1_1HTMLDoctype-members.html
-share/doc/cgicc/classcgicc_1_1HTMLDoctype.html
-share/doc/cgicc/classcgicc_1_1HTMLDoctype.png
-share/doc/cgicc/classcgicc_1_1HTMLElement-members.html
-share/doc/cgicc/classcgicc_1_1HTMLElement.html
-share/doc/cgicc/classcgicc_1_1HTMLElement.png
-share/doc/cgicc/classcgicc_1_1HTMLElementList-members.html
-share/doc/cgicc/classcgicc_1_1HTMLElementList.html
-share/doc/cgicc/classcgicc_1_1HTTPContentHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPContentHeader.html
-share/doc/cgicc/classcgicc_1_1HTTPContentHeader.png
-share/doc/cgicc/classcgicc_1_1HTTPCookie-members.html
-share/doc/cgicc/classcgicc_1_1HTTPCookie.html
-share/doc/cgicc/classcgicc_1_1HTTPCookie.png
-share/doc/cgicc/classcgicc_1_1HTTPHTMLHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPHTMLHeader.html
-share/doc/cgicc/classcgicc_1_1HTTPHTMLHeader.png
-share/doc/cgicc/classcgicc_1_1HTTPHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPHeader.html
-share/doc/cgicc/classcgicc_1_1HTTPHeader.png
-share/doc/cgicc/classcgicc_1_1HTTPPlainHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPPlainHeader.html
-share/doc/cgicc/classcgicc_1_1HTTPPlainHeader.png
-share/doc/cgicc/classcgicc_1_1HTTPRedirectHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPRedirectHeader.html
-share/doc/cgicc/classcgicc_1_1HTTPRedirectHeader.png
-share/doc/cgicc/classcgicc_1_1HTTPResponseHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPResponseHeader.html
-share/doc/cgicc/classcgicc_1_1HTTPResponseHeader.png
-share/doc/cgicc/classcgicc_1_1HTTPStatusHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPStatusHeader.html
-share/doc/cgicc/classcgicc_1_1HTTPStatusHeader.png
-share/doc/cgicc/classcgicc_1_1MStreamable-members.html
-share/doc/cgicc/classcgicc_1_1MStreamable.html
-share/doc/cgicc/classcgicc_1_1MStreamable.png
-share/doc/cgicc/classcgicc_1_1comment-members.html
-share/doc/cgicc/classcgicc_1_1comment.html
-share/doc/cgicc/classcgicc_1_1comment.png
-share/doc/cgicc/config_8h-source.html
-share/doc/cgicc/cookie_8cpp-source.html
-share/doc/cgicc/cookie_8cpp.html
-share/doc/cgicc/demos_8tmpl-source.html
-share/doc/cgicc/dns_8cpp-source.html
-share/doc/cgicc/dns_8cpp.html
-share/doc/cgicc/doxygen.css
-share/doc/cgicc/doxygen.png
-share/doc/cgicc/files.html
-share/doc/cgicc/functions.html
-share/doc/cgicc/functions_enum.html
-share/doc/cgicc/functions_eval.html
-share/doc/cgicc/functions_func.html
-share/doc/cgicc/functions_rela.html
-share/doc/cgicc/globals.html
-share/doc/cgicc/globals_defs.html
-share/doc/cgicc/hierarchy.html
-share/doc/cgicc/index.html
-share/doc/cgicc/index_8tmpl-source.html
-share/doc/cgicc/lib-overview_8tmpl-source.html
-share/doc/cgicc/lib_overview.html
-share/doc/cgicc/license_8tmpl-source.html
-share/doc/cgicc/license_fdl.html
-share/doc/cgicc/license_gpl.html
-share/doc/cgicc/license_lgpl.html
-share/doc/cgicc/lists_8tmpl-source.html
-share/doc/cgicc/namespacecgicc.html
-share/doc/cgicc/namespacemembers.html
-share/doc/cgicc/namespacemembers_func.html
-share/doc/cgicc/namespacemembers_type.html
-share/doc/cgicc/namespaces.html
-share/doc/cgicc/pages.html
-share/doc/cgicc/test_8cpp-source.html
-share/doc/cgicc/test_8cpp.html
-share/doc/cgicc/tutorial_8tmpl-source.html
-share/doc/cgicc/upload_8cpp-source.html
-share/doc/cgicc/upload_8cpp.html
diff --git a/www/cgicc/buildlink3.mk b/www/cgicc/buildlink3.mk
new file mode 100644
index 00000000000..7c8473411d2
--- /dev/null
+++ b/www/cgicc/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2011/03/17 14:48:50 adam Exp $
+
+BUILDLINK_TREE+=	cgicc
+
+.if !defined(CGICC_BUILDLINK3_MK)
+CGICC_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.cgicc+=	cgicc>=3.2.9
+BUILDLINK_PKGSRCDIR.cgicc?=	../../www/cgicc
+.endif	# CGICC_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-cgicc
diff --git a/www/cgicc/distinfo b/www/cgicc/distinfo
index dae2abe5c69..8952097ce3e 100644
--- a/www/cgicc/distinfo
+++ b/www/cgicc/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2006/03/05 22:34:33 adam Exp $
+$NetBSD: distinfo,v 1.4 2011/03/17 14:48:50 adam Exp $
 
-SHA1 (cgicc-3.2.3.tar.bz2) = 0d49c933a77d5a917ebf761f416fe1f0140e7664
-RMD160 (cgicc-3.2.3.tar.bz2) = c1da8be93801344bc4c6338e2547788eb4de217d
-Size (cgicc-3.2.3.tar.bz2) = 445393 bytes
-SHA1 (patch-aa) = 614b1cb30bebe5db76bbff5adbd0bd7b248e91da
+SHA1 (cgicc-3.2.9.tar.gz) = 161fbf98a20f0df388148aba87f1e6da432de63c
+RMD160 (cgicc-3.2.9.tar.gz) = 133b85d148242d3cc9e7b2f3506839f1a1a3e61c
+Size (cgicc-3.2.9.tar.gz) = 2087796 bytes
diff --git a/www/cgicc/patches/patch-aa b/www/cgicc/patches/patch-aa
deleted file mode 100644
index 2c175faecfe..00000000000
--- a/www/cgicc/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/03/05 22:34:33 adam Exp $
-
---- doc/Makefile.in.orig	2006-03-05 23:20:52.000000000 +0100
-+++ doc/Makefile.in
-@@ -155,7 +155,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- CLEANFILES = *~
- DOXYFILE = Doxyfile
--docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/$(PACKAGE)
- TEMPLATES = index.tmpl license.tmpl lists.tmpl bugs.tmpl demos.tmpl	\
- cgi-overview.tmpl tutorial.tmpl lib-overview.tmpl COPYING COPYING.LIB	\
- COPYING.DOC header.html footer.html cgicc-doc.css