diff -urN /usr/ports/www/cgicc/Makefile www/cgicc/Makefile
--- /usr/ports/www/cgicc/Makefile	2013-11-06 21:57:10.000000000 +0900
+++ www/cgicc/Makefile	2014-01-06 00:00:00.000000000 +0900
@@ -2,44 +2,39 @@
 # $FreeBSD: head/www/cgicc/Makefile 327776 2013-09-20 23:36:50Z bapt $
 
 PORTNAME=	cgicc
-PORTVERSION=	3.2.10
-PORTREVISION=	1
+PORTVERSION=	3.2.12
 CATEGORIES=	www devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ class library for writing CGI applications
 
-USE_GMAKE=	yes
+LICENSE=	LGPL3 # (or later)
+
+OPTIONS_DEFINE=	DOCS
+
+USES=		gmake pathfix
 USE_AUTOTOOLS=	libtool
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
 USE_LDCONFIG=	yes
-USES=		pathfix
 
-PORTDOCS=	*
 CXXFLAGS+=	-Wno-unknown-pragmas
 
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.endif
+PORTDOCS=	*
 
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e '/CXXFLAGS/s|-pedantic||g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.in
+.include <bsd.port.options.mk>
 
-post-build:
-.if !defined(NOPORTDOCS)
-	@(cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		${MAKEFILE} ${ALL_TARGET})
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+.else
+CONFIGURE_ENV+=	ac_cv_prog_DOXYGEN="${ECHO_CMD}"
 .endif
 
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${DOCSDIR})
-.endif
-	${RM} -f ${PREFIX}/lib/libcgicc.la
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|-lstdc++||' ${WRKSRC}/cgicc/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^docdir/s|=.*|= @docdir@|' ${WRKSRC}/doc/Makefile.in
 
 .include <bsd.port.mk>
diff -urN /usr/ports/www/cgicc/distinfo www/cgicc/distinfo
--- /usr/ports/www/cgicc/distinfo	2013-11-06 21:57:10.000000000 +0900
+++ www/cgicc/distinfo	2014-01-06 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (cgicc-3.2.10.tar.gz) = 87680cb303e65bee2816b9f0e3d0a3c3258efc4f908ec3cad620d01f0b597ce0
-SIZE (cgicc-3.2.10.tar.gz) = 2385130
+SHA256 (cgicc-3.2.12.tar.gz) = 4b3789e94e77b0616d42ac3e6c80b8dab22009dcf997f69df9cd26c5b8bca9f4
+SIZE (cgicc-3.2.12.tar.gz) = 2385390
diff -urN /usr/ports/www/cgicc/files/patch-Cgicc www/cgicc/files/patch-Cgicc
--- /usr/ports/www/cgicc/files/patch-Cgicc	2013-11-06 21:57:10.000000000 +0900
+++ www/cgicc/files/patch-Cgicc	1970-01-01 09:00:00.000000000 +0900
@@ -1,9 +0,0 @@
---- cgicc/Cgicc.cpp	2013-01-12 06:48:13.000000000 -0500
-+++ cgicc/Cgicc.cpp	2013-01-14 12:33:56.000000000 -0500
-@@ -388,5 +388,5 @@
-       
-       // Find the '&' or ';' separating subsequent name/value pairs
--      pos = data.find_first_of(';&', oldPos);
-+      pos = data.find_first_of(";&", oldPos);
-       
-       // Even if an '&' wasn't found the rest of the string is a value
diff -urN /usr/ports/www/cgicc/pkg-plist www/cgicc/pkg-plist
--- /usr/ports/www/cgicc/pkg-plist	2013-11-06 21:57:10.000000000 +0900
+++ www/cgicc/pkg-plist	2014-01-06 00:00:00.000000000 +0900
@@ -28,6 +28,7 @@
 include/cgicc/XMLDeclaration.h
 include/cgicc/XMLPI.h
 lib/libcgicc.a
+lib/libcgicc.la
 lib/libcgicc.so
 lib/libcgicc.so.5
 libdata/pkgconfig/cgicc.pc