- Fix build on -current

- Support CXXFLAGS properly

PR:		ports/62814
Submitted by:	Ports Fury

3 files changed, 53 insertions, 22 deletions

diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile
index c41cc1cbe649..1ce2e7b63afb 100644
--- a/ftp/curlpp/Makefile
+++ b/ftp/curlpp/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	curlpp
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,35 +16,21 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C++ wrapper for libcurl
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
 
+USE_GCC=	3.3
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-
-INSTALLS_SHLIB=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502000
-BROKEN=		"Does not compile"
-.endif
-
-.if ${OSVERSION} < 500035
-USE_GCC=	3.1
-.else
-CONFIGURE_ENV+=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|^#! /bin/sh|#!${LOCALBASE}/bin/bash|" ${WRKSRC}/configure
+CONFIGURE_ARGS=	--disable-ewarning
+INSTALLS_SHLIB=	yes
 
-.if !defined(NOPORTDOCS)
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} ${WRKSRC}/test/README ${EXAMPLESDIR}
-	@${CP} ${WRKSRC}/test/example*.cpp ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/test/README ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/test/example*.cpp ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/ftp/curlpp/files/patch-configure b/ftp/curlpp/files/patch-configure
new file mode 100644
index 000000000000..9bf57dcfb718
--- /dev/null
+++ b/ftp/curlpp/files/patch-configure
@@ -0,0 +1,31 @@
+--- 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-src::types.hpp b/ftp/curlpp/files/patch-src::types.hpp
new file mode 100644
index 000000000000..15b672dfdb83
--- /dev/null
+++ b/ftp/curlpp/files/patch-src::types.hpp
@@ -0,0 +1,13 @@
+--- 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 
+       };
+    };
+