Bug 108295 - Update port: ftp/curlpp from 0.6.1 to 0.7.0
Summary: Update port: ftp/curlpp from 0.6.1 to 0.7.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Peter Pentchev
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-01-24 11:50 UTC by Vasil Dimov
Modified: 2007-01-26 13:30 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Vasil Dimov freebsd_committer freebsd_triage 2007-01-24 11:50:17 UTC
Update ftp/curlpp from 0.6.1 to 0.7.0.

There is the following problem with downloading the archive:

It seems that the only way to download curlpp-0.7.0.tar.gz is to fetch
http://rrette.com/textpattern/index.php?s=file_download&id=1
Even if we manage to hack this into MASTER_SITES,DISTFILES,etc it seems
suspicious - possibly when 0.7.1 is out this link will automatically
point to it, thus breaking the port. Maybe the archive should be
mirrored to the FreeBSD cluster or the authors be contacted with a
request to give a permanent link (actually I decided to CC: both of
them right now).

Fix: 

-- 
Vasil Dimov
gro.DSBeerF@dv
%
Look, that's why there's rules, understand?
So that you think before you break 'em.
    -- (Terry Pratchett, Thief of Time)--KdD44bBog34vbXYojQ5pXEzyElWH6y93eNZseIvayaKkpXMc
Content-Type: text/plain; name="curlpp_0.7.0.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="curlpp_0.7.0.diff"

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/curlpp/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	14 Jan 2007 19:50:31 -0000	1.17
+++ Makefile	24 Jan 2007 11:39:46 -0000
@@ -7,9 +7,11 @@
 #
 
 PORTNAME=	curlpp
-PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTVERSION=	0.7.0
 CATEGORIES=	ftp
+# XXX manually download curlpp-0.7.0.tar.gz from
+# http://rrette.com/textpattern/index.php?s=file_download&id=1
+# see also http://rrette.com/textpattern/index.php?s=cURLpp
 MASTER_SITES=	http://rrette.com/downloads/sources/
 
 MAINTAINER=	roam@FreeBSD.org
@@ -17,7 +19,7 @@
 
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 
-USE_GCC=	3.4
+USE_GCC=	3.4+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/ftp/curlpp/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	26 Sep 2006 14:46:01 -0000	1.7
+++ distinfo	24 Jan 2007 11:39:46 -0000
@@ -1,3 +1,3 @@
-MD5 (curlpp-0.6.1.tar.gz) = 9f843154cc3d23fd547cc6cbfdb99e90
-SHA256 (curlpp-0.6.1.tar.gz) = 7812059a562dbd4b26b69e4c32d9a4149b4957e4a0428efed7b712fc8f704afe
-SIZE (curlpp-0.6.1.tar.gz) = 433513
+MD5 (curlpp-0.7.0.tar.gz) = 34cd0c82795b9f245930335bb5e2e764
+SHA256 (curlpp-0.7.0.tar.gz) = c211937ff8c92ab371cf08cc256340bb62bb85167443730c27fac061fcb79bbe
+SIZE (curlpp-0.7.0.tar.gz) = 457303
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/ftp/curlpp/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	26 Sep 2006 14:46:01 -0000	1.5
+++ pkg-plist	24 Jan 2007 11:39:46 -0000
@@ -8,6 +8,7 @@
 include/curlpp/Info.hpp
 include/curlpp/Info.inl
 include/curlpp/Infos.hpp
+include/curlpp/Multi.hpp
 include/curlpp/NonCopyable.hpp
 include/curlpp/Option.hpp
 include/curlpp/Option.inl
@@ -82,5 +83,9 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/example10.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 %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
Index: files/patch-curlpp::Info.cpp
===================================================================
RCS file: files/patch-curlpp::Info.cpp
diff -N files/patch-curlpp::Info.cpp
--- files/patch-curlpp::Info.cpp	14 Jan 2007 19:50:31 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
---- curlpp/Info.cpp.orig	Sun Jan 14 19:53:08 2007
-+++ curlpp/Info.cpp	Sun Jan 14 19:53:13 2007
-@@ -5,9 +5,11 @@
- #include "Info.hpp"
- 
- 
-+namespace cURLpp {
-+
- template< >
- void
--cURLpp::InfoTypeConverter< std::string >::get(cURLpp::Easy &handle, 
-+InfoTypeConverter< std::string >::get(cURLpp::Easy &handle, 
- 				              CURLINFO info,
- 				              std::string &value)
- {
-@@ -18,9 +20,11 @@
- 
- template< >
- void 
--cURLpp::InfoTypeConverter< std::list< std::string > >::get(cURLpp::Easy &,
-+InfoTypeConverter< std::list< std::string > >::get(cURLpp::Easy &,
- 			                                   CURLINFO ,
- 						           std::list< std::string > &)
- {
-   
-+}
-+
- }
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2007-01-24 11:50:28 UTC
Responsible Changed
From-To: freebsd-ports-bugs->roam

Over to maintainer
Comment 2 Vasil Dimov freebsd_committer freebsd_triage 2007-01-25 06:18:16 UTC
After the quick reaction from Jean-Philippe Barrette-LaPierre we can
consider the following patch (only MASTER_SITES changed):

--- curlpp_0.7.0.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/curlpp/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	14 Jan 2007 19:50:31 -0000	1.17
+++ Makefile	25 Jan 2007 06:14:13 -0000
@@ -7,17 +7,16 @@
 #
 
 PORTNAME=	curlpp
-PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTVERSION=	0.7.0
 CATEGORIES=	ftp
-MASTER_SITES=	http://rrette.com/downloads/sources/
+MASTER_SITES=	http://rrette.com/files/curlpp/curlpp-${PORTVERSION:R}/
 
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	A C++ wrapper for libcurl
 
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 
-USE_GCC=	3.4
+USE_GCC=	3.4+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/ftp/curlpp/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	26 Sep 2006 14:46:01 -0000	1.7
+++ distinfo	25 Jan 2007 06:14:13 -0000
@@ -1,3 +1,3 @@
-MD5 (curlpp-0.6.1.tar.gz) = 9f843154cc3d23fd547cc6cbfdb99e90
-SHA256 (curlpp-0.6.1.tar.gz) = 7812059a562dbd4b26b69e4c32d9a4149b4957e4a0428efed7b712fc8f704afe
-SIZE (curlpp-0.6.1.tar.gz) = 433513
+MD5 (curlpp-0.7.0.tar.gz) = 34cd0c82795b9f245930335bb5e2e764
+SHA256 (curlpp-0.7.0.tar.gz) = c211937ff8c92ab371cf08cc256340bb62bb85167443730c27fac061fcb79bbe
+SIZE (curlpp-0.7.0.tar.gz) = 457303
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/ftp/curlpp/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	26 Sep 2006 14:46:01 -0000	1.5
+++ pkg-plist	25 Jan 2007 06:14:13 -0000
@@ -8,6 +8,7 @@
 include/curlpp/Info.hpp
 include/curlpp/Info.inl
 include/curlpp/Infos.hpp
+include/curlpp/Multi.hpp
 include/curlpp/NonCopyable.hpp
 include/curlpp/Option.hpp
 include/curlpp/Option.inl
@@ -82,5 +83,9 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/example10.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 %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
Index: files/patch-curlpp::Info.cpp
===================================================================
RCS file: files/patch-curlpp::Info.cpp
diff -N files/patch-curlpp::Info.cpp
--- files/patch-curlpp::Info.cpp	14 Jan 2007 19:50:31 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
---- curlpp/Info.cpp.orig	Sun Jan 14 19:53:08 2007
-+++ curlpp/Info.cpp	Sun Jan 14 19:53:13 2007
-@@ -5,9 +5,11 @@
- #include "Info.hpp"
- 
- 
-+namespace cURLpp {
-+
- template< >
- void
--cURLpp::InfoTypeConverter< std::string >::get(cURLpp::Easy &handle, 
-+InfoTypeConverter< std::string >::get(cURLpp::Easy &handle, 
- 				              CURLINFO info,
- 				              std::string &value)
- {
-@@ -18,9 +20,11 @@
- 
- template< >
- void 
--cURLpp::InfoTypeConverter< std::list< std::string > >::get(cURLpp::Easy &,
-+InfoTypeConverter< std::list< std::string > >::get(cURLpp::Easy &,
- 			                                   CURLINFO ,
- 						           std::list< std::string > &)
- {
-   
-+}
-+
- }
--- curlpp_0.7.0.diff ends here ---

-- 
Vasil Dimov
gro.DSBeerF@dv
%
If two people love each other, there can be no happy end to it.
                -- Ernest Hemingway
Comment 3 dfilter service freebsd_committer freebsd_triage 2007-01-26 13:23:19 UTC
roam        2007-01-26 13:23:12 UTC

  FreeBSD ports repository

  Modified files:
    ftp/curlpp           Makefile distinfo pkg-plist 
  Removed files:
    ftp/curlpp/files     patch-curlpp::Info.cpp 
  Log:
  Update to curlpp-0.7.0.
  In addition to the patch from Vasil, also finally remove the warning
  about the incompatibility with ancient curlpp versions.
  
  PR:             108295
  Submitted by:   vd
  
  Revision  Changes    Path
  1.18      +3 -10     ports/ftp/curlpp/Makefile
  1.8       +3 -3      ports/ftp/curlpp/distinfo
  1.2       +0 -28     ports/ftp/curlpp/files/patch-curlpp::Info.cpp (dead)
  1.6       +5 -0      ports/ftp/curlpp/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 4 Peter Pentchev freebsd_committer freebsd_triage 2007-01-26 13:24:02 UTC
State Changed
From-To: open->closed

I've just committed the update, thanks a lot!