Date: Sat, 14 Feb 2004 13:00:11 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/62814: Update port: ftp/curlpp Message-ID: <20040214130011.312e0131.tkato@prontomail.com> Resent-Message-ID: <200402140410.i1E4A8Gw097233@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62814
>Category: ports
>Synopsis: Update port: ftp/curlpp
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 13 20:10:08 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Support CXXFLAGS properly
New file:
files/patch-configure
files/patch-src::types.hpp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/ftp/curlpp/Makefile ftp/curlpp/Makefile
--- /usr/ports/ftp/curlpp/Makefile Mon Feb 9 13:01:36 2004
+++ ftp/curlpp/Makefile Fri Feb 13 02:02:47 2004
@@ -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 @@
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 -urN /usr/ports/ftp/curlpp/files/patch-configure ftp/curlpp/files/patch-configure
--- /usr/ports/ftp/curlpp/files/patch-configure Thu Jan 1 09:00:00 1970
+++ ftp/curlpp/files/patch-configure Fri Feb 13 02:02:29 2004
@@ -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 -urN /usr/ports/ftp/curlpp/files/patch-src::types.hpp ftp/curlpp/files/patch-src::types.hpp
--- /usr/ports/ftp/curlpp/files/patch-src::types.hpp Thu Jan 1 09:00:00 1970
+++ ftp/curlpp/files/patch-src::types.hpp Fri Feb 13 02:09:55 2004
@@ -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
+ };
+ };
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040214130011.312e0131.tkato>