Update curlpp to version 0.3.1, which not only lets it build with

the new gcc in -CURRENT, but also makes a giant leap forward WRT
example programs: they actually run instead of dumping core now!

7 files changed, 9 insertions, 95 deletions

diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile
index 3e1aa987b102..26cb5f2cac72 100644
--- a/ftp/curlpp/Makefile
+++ b/ftp/curlpp/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	curlpp
-PORTVERSION=	0.3.0
-PORTREVISION=	3
+PORTVERSION=	0.3.1
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/ftp/curlpp/distinfo b/ftp/curlpp/distinfo
index cbf2287c4f2a..22278496e1c6 100644
--- a/ftp/curlpp/distinfo
+++ b/ftp/curlpp/distinfo
@@ -1,2 +1,2 @@
-MD5 (curlpp-0.3.0.tar.gz) = 985ff6899592bc4d8a257f8ce1a0882f
-SIZE (curlpp-0.3.0.tar.gz) = 220247
+MD5 (curlpp-0.3.1.tar.gz) = fe735d11d8bdf0115c11d12b002c3f44
+SIZE (curlpp-0.3.1.tar.gz) = 257749
diff --git a/ftp/curlpp/files/patch-configure b/ftp/curlpp/files/patch-configure
deleted file mode 100644
index 9bf57dcfb718..000000000000
--- a/ftp/curlpp/files/patch-configure
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.orig	Thu Jun 19 05:17:22 2003
-+++ configure	Fri Feb 13 02:02:21 2004
-@@ -6598,19 +6598,6 @@
-    { echo "configure: error: *** curl-config not found. You need a working libcurl installation." 1>&2; exit 1; }
- fi
- 
--echo $ac_n "checking if libcurl version is >= 7.10.0""... $ac_c" 1>&6
--echo "configure:6603: checking if libcurl version is >= 7.10.0" >&5
--curl_version_needed="16#070a00"
--curl_version=`$HAVECURL --vernum`
--curl_version=$(echo "16#"$curl_version)
--if let $curl_version -ge $curl_version_needed; then
--   echo "$ac_t""yes" 1>&6
--else
--   echo "$ac_t""no" 1>&6
--   { echo "configure: error: *** libcurl is too old. You need a libcurl installation newer
--                 or equal to 7.10.0." 1>&2; exit 1; }
--fi
--
- echo $ac_n "checking warning make an error on compilation""... $ac_c" 1>&6
- echo "configure:6616: checking warning make an error on compilation" >&5
- # Check whether --enable-ewarning or --disable-ewarning was given.
-@@ -6646,7 +6633,7 @@
- 
- 
- 
--CXXFLAGS="$CFLAGS $CURLPP_CFLAGS"
-+CXXFLAGS="$CXXFLAGS $CURLPP_CFLAGS"
- 
- trap '' 1 2 15
- cat > confcache <<\EOF
diff --git a/ftp/curlpp/files/patch-curlpp_config.in b/ftp/curlpp/files/patch-curlpp_config.in
deleted file mode 100644
index 682848cbd28e..000000000000
--- a/ftp/curlpp/files/patch-curlpp_config.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- curlpp-config.in.orig	Mon Dec  1 16:30:57 2003
-+++ curlpp-config.in	Mon Dec  1 16:31:10 2003
-@@ -74,7 +74,7 @@
-        	;;
- 
-     --libs)
--       	echo -L@libdir@ -lcurlpp @LDFLAGS@ @LIBS@ 
-+       	echo -L@libdir@ -lcurlpp -lutilspp @LDFLAGS@ @LIBS@ 
-        	;;
- 
-     *)
diff --git a/ftp/curlpp/files/patch-src::curl.cpp b/ftp/curlpp/files/patch-src::curl.cpp
deleted file mode 100644
index 027a8284e2cf..000000000000
--- a/ftp/curlpp/files/patch-src::curl.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: src/curl.cpp
-===================================================================
-RCS file: /home/cvs/ringlet/c/contrib/net/curlpp/src/curl.cpp,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- src/curl.cpp	13 Apr 2004 17:20:29 -0000	1.1.1.1
-+++ src/curl.cpp	20 Apr 2004 11:18:15 -0000	1.2
-@@ -193,13 +193,21 @@
- void 
- curlpp::curl::passwd_function( passwd_function_t function )
- {
-+#if LIBCURL_VERSION_NUM < 0x070b01
-    option( CURLOPT_PASSWDFUNCTION, ( void * ) function );
-+#else
-+   runtime_assert( false, "The CURLOPT_PASSWDFUNCTION option has been deprecated." );
-+#endif
- }
- 
- void
- curlpp::curl::passwd_data( passwd_trait *trait )
- {
-+#if LIBCURL_VERSION_NUM < 0x070b01
-    option( CURLOPT_PASSWDDATA, static_cast< void * >( trait ) );
-+#else
-+   runtime_assert( false, "The CURLOPT_PASSWDDATA option has been deprecated." );
-+#endif
- }
- 
- void
diff --git a/ftp/curlpp/files/patch-src::types.hpp b/ftp/curlpp/files/patch-src::types.hpp
deleted file mode 100644
index 15b672dfdb83..000000000000
--- a/ftp/curlpp/files/patch-src::types.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/types.hpp.orig	Wed Jan  8 11:28:59 2003
-+++ src/types.hpp	Fri Feb 13 02:09:44 2004
-@@ -47,8 +47,8 @@
-    namespace time_condition
-    {
-       enum type { 
--         if_mod_since = TIMECOND_IFMODSINCE, 
--         if_unmod_sice = TIMECOND_IFUNMODSINCE 
-+         if_mod_since = CURL_TIMECOND_IFMODSINCE, 
-+         if_unmod_sice = CURL_TIMECOND_IFUNMODSINCE 
-       };
-    };
- 
diff --git a/ftp/curlpp/pkg-plist b/ftp/curlpp/pkg-plist
index c9b410a1ad75..6f290a9c6830 100644
--- a/ftp/curlpp/pkg-plist
+++ b/ftp/curlpp/pkg-plist
@@ -63,13 +63,13 @@ lib/libutilspp.so
 lib/libutilspp.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/example01.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/example02.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/example03.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/example04.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/example10.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/example05.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/example06.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/example07.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/example08.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/example09.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/example11.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/example12.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/example13.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/example14.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/example15.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/example16.cpp
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%