upgrade to 3.2.1

4 files changed, 13 insertions, 52 deletions

diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index d4116491765b..a0ecb086f1e3 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	cgicc
-PORTVERSION=	3.2
+PORTVERSION=	3.2.1
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +20,7 @@ CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e 's| install-data-local||g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's| install-data-local||g' ${WRKSRC}/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/www/cgicc/distinfo b/www/cgicc/distinfo
index c94fd05f2080..2a9419fd0b51 100644
--- a/www/cgicc/distinfo
+++ b/www/cgicc/distinfo
@@ -1 +1 @@
-MD5 (cgicc-3.2.tar.gz) = 9b94938475aebb335075ba3f12b5d721
+MD5 (cgicc-3.2.1.tar.gz) = 2ddd359775976aa6ae4a65873e184df9
diff --git a/www/cgicc/files/patch-ltmain.sh b/www/cgicc/files/patch-ltmain.sh
deleted file mode 100644
index d1888f44abc0..000000000000
--- a/www/cgicc/files/patch-ltmain.sh
+++ /dev/null
@@ -1,41 +0,0 @@
---- ltmain.sh.orig	Mon Nov  5 08:29:48 2001
-+++ ltmain.sh	Sun Mar 10 03:05:06 2002
-@@ -1043,14 +1043,14 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -2441,7 +2441,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *)
-@@ -4210,10 +4210,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/cgicc/pkg-plist b/www/cgicc/pkg-plist
index 5b1f65726f0e..ea14f871b27b 100644
--- a/www/cgicc/pkg-plist
+++ b/www/cgicc/pkg-plist
@@ -1,6 +1,7 @@
 bin/cgicc-config
 include/cgicc/CgiDefs.h
 include/cgicc/CgiEnvironment.h
+include/cgicc/CgiInput.h
 include/cgicc/CgiUtils.h
 include/cgicc/Cgicc.h
 include/cgicc/FormEntry.h
@@ -16,16 +17,17 @@ include/cgicc/HTMLElementList.h
 include/cgicc/HTTPContentHeader.h
 include/cgicc/HTTPCookie.h
 include/cgicc/HTTPHTMLHeader.h
-include/cgicc/HTTPHeaders.h
 include/cgicc/HTTPHeader.h
 include/cgicc/HTTPPlainHeader.h
 include/cgicc/HTTPRedirectHeader.h
 include/cgicc/HTTPResponseHeader.h
 include/cgicc/HTTPStatusHeader.h
 include/cgicc/MStreamable.h
+@dirrm include/cgicc
 lib/libcgicc.a
+lib/libcgicc.la
 lib/libcgicc.so
-lib/libcgicc.so.3
+lib/libcgicc.so.4
 %%PORTDOCS%%share/doc/cgicc/COPYING-source.html
 %%PORTDOCS%%share/doc/cgicc/COPYING_8DOC-source.html
 %%PORTDOCS%%share/doc/cgicc/COPYING_8LIB-source.html
@@ -33,6 +35,8 @@ lib/libcgicc.so.3
 %%PORTDOCS%%share/doc/cgicc/CgiDefs_8h.html
 %%PORTDOCS%%share/doc/cgicc/CgiEnvironment_8h-source.html
 %%PORTDOCS%%share/doc/cgicc/CgiEnvironment_8h.html
+%%PORTDOCS%%share/doc/cgicc/CgiInput_8h-source.html
+%%PORTDOCS%%share/doc/cgicc/CgiInput_8h.html
 %%PORTDOCS%%share/doc/cgicc/CgiUtils_8h-source.html
 %%PORTDOCS%%share/doc/cgicc/CgiUtils_8h.html
 %%PORTDOCS%%share/doc/cgicc/Cgicc_8h-source.html
@@ -65,7 +69,6 @@ lib/libcgicc.so.3
 %%PORTDOCS%%share/doc/cgicc/HTTPHTMLHeader_8h.html
 %%PORTDOCS%%share/doc/cgicc/HTTPHeader_8h-source.html
 %%PORTDOCS%%share/doc/cgicc/HTTPHeader_8h.html
-%%PORTDOCS%%share/doc/cgicc/HTTPHeaders_8h-source.html
 %%PORTDOCS%%share/doc/cgicc/HTTPPlainHeader_8h-source.html
 %%PORTDOCS%%share/doc/cgicc/HTTPPlainHeader_8h.html
 %%PORTDOCS%%share/doc/cgicc/HTTPRedirectHeader_8h-source.html
@@ -80,8 +83,8 @@ lib/libcgicc.so.3
 %%PORTDOCS%%share/doc/cgicc/bugs_8tmpl-source.html
 %%PORTDOCS%%share/doc/cgicc/cgi-overview_8tmpl-source.html
 %%PORTDOCS%%share/doc/cgicc/cgi_overview.html
-%%PORTDOCS%%share/doc/cgicc/cgicc-logo.jpg
-%%PORTDOCS%%share/doc/cgicc/cgicc.css
+%%PORTDOCS%%share/doc/cgicc/cgicc-doc.css
+%%PORTDOCS%%share/doc/cgicc/cgicc.png
 %%PORTDOCS%%share/doc/cgicc/cgicc_bugs.html
 %%PORTDOCS%%share/doc/cgicc/cgicc_demos.html
 %%PORTDOCS%%share/doc/cgicc/cgicc_license.html
@@ -89,6 +92,8 @@ lib/libcgicc.so.3
 %%PORTDOCS%%share/doc/cgicc/cgicc_tutorial.html
 %%PORTDOCS%%share/doc/cgicc/classcgicc_1_1CgiEnvironment-members.html
 %%PORTDOCS%%share/doc/cgicc/classcgicc_1_1CgiEnvironment.html
+%%PORTDOCS%%share/doc/cgicc/classcgicc_1_1CgiInput-members.html
+%%PORTDOCS%%share/doc/cgicc/classcgicc_1_1CgiInput.html
 %%PORTDOCS%%share/doc/cgicc/classcgicc_1_1Cgicc-members.html
 %%PORTDOCS%%share/doc/cgicc/classcgicc_1_1Cgicc.html
 %%PORTDOCS%%share/doc/cgicc/classcgicc_1_1FormEntry-members.html
@@ -144,14 +149,12 @@ lib/libcgicc.so.3
 %%PORTDOCS%%share/doc/cgicc/classcgicc_1_1comment-members.html
 %%PORTDOCS%%share/doc/cgicc/classcgicc_1_1comment.gif
 %%PORTDOCS%%share/doc/cgicc/classcgicc_1_1comment.html
-%%PORTDOCS%%share/doc/cgicc/classes.html
 %%PORTDOCS%%share/doc/cgicc/config_8h-source.html
 %%PORTDOCS%%share/doc/cgicc/cookie_8cpp-source.html
 %%PORTDOCS%%share/doc/cgicc/cookie_8cpp.html
 %%PORTDOCS%%share/doc/cgicc/demos_8tmpl-source.html
 %%PORTDOCS%%share/doc/cgicc/dns_8cpp-source.html
 %%PORTDOCS%%share/doc/cgicc/dns_8cpp.html
-%%PORTDOCS%%share/doc/cgicc/doxygen.css
 %%PORTDOCS%%share/doc/cgicc/doxygen.gif
 %%PORTDOCS%%share/doc/cgicc/files.html
 %%PORTDOCS%%share/doc/cgicc/functions.html
@@ -176,4 +179,3 @@ lib/libcgicc.so.3
 %%PORTDOCS%%share/doc/cgicc/upload_8cpp-source.html
 %%PORTDOCS%%share/doc/cgicc/upload_8cpp.html
 %%PORTDOCS%%@dirrm share/doc/cgicc
-@dirrm include/cgicc