3 files changed, 22 insertions, 54 deletions

diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile
index 564847b3a430..551b89ba6ee2 100644
--- a/ftp/curlpp/Makefile
+++ b/ftp/curlpp/Makefile
@@ -7,11 +7,9 @@
 #
 
 PORTNAME=	curlpp
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.3.3
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://rrette.com/
 
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	A C++ wrapper for libcurl
@@ -32,11 +30,16 @@ INSTALLS_SHLIB=	yes
 BROKEN=		"Does not compile on alpha 4.x"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/test/README ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/test/example*.cpp ${EXAMPLESDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/example*.cpp ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/guide.pdf ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/ftp/curlpp/distinfo b/ftp/curlpp/distinfo
index 22278496e1c6..82837dac3961 100644
--- a/ftp/curlpp/distinfo
+++ b/ftp/curlpp/distinfo
@@ -1,2 +1,2 @@
-MD5 (curlpp-0.3.1.tar.gz) = fe735d11d8bdf0115c11d12b002c3f44
-SIZE (curlpp-0.3.1.tar.gz) = 257749
+MD5 (curlpp-0.3.3.tar.gz) = de71a6cf541db1abaa54037aa67b5849
+SIZE (curlpp-0.3.3.tar.gz) = 405504
diff --git a/ftp/curlpp/pkg-plist b/ftp/curlpp/pkg-plist
index 6f290a9c6830..9c504a2ce9a0 100644
--- a/ftp/curlpp/pkg-plist
+++ b/ftp/curlpp/pkg-plist
@@ -5,71 +5,36 @@ include/curlpp/curlpp.hpp
 include/curlpp/easy.hpp
 include/curlpp/exception.hpp
 include/curlpp/file_trait.hpp
+include/curlpp/form.hpp
 include/curlpp/ftp_easy.hpp
 include/curlpp/http_easy.hpp
+include/curlpp/info.hpp
 include/curlpp/memory_trait.hpp
-include/curlpp/registerer.hpp
-include/curlpp/registerer.inl
-include/curlpp/registries.hpp
-include/curlpp/registry.hpp
-include/curlpp/registry.inl
-include/curlpp/registry_base.hpp
-include/curlpp/registry_base.inl
-include/curlpp/registry_manager.hpp
-include/curlpp/registry_manager.inl
-include/curlpp/registry_manager_base.hpp
-include/curlpp/registry_manager_impl.hpp
-include/curlpp/registry_manager_impl.inl
 include/curlpp/slist.hpp
 include/curlpp/storage.hpp
 include/curlpp/storage_trait.hpp
 include/curlpp/stream_trait.hpp
 include/curlpp/types.hpp
-include/curlpp/utilspp/mutex/factory_mutex.hpp
-include/curlpp/utilspp/mutex/factory_mutex_base.hpp
-include/curlpp/utilspp/mutex/factory_mutex_container.hpp
-include/curlpp/utilspp/mutex/factory_mutex_container.inl
-include/curlpp/utilspp/mutex/mutex_factory.hpp
-include/curlpp/utilspp/mutex/mutex_factory.inl
-include/curlpp/utilspp/non_copyable.hpp
-include/curlpp/utilspp/null_type.hpp
-include/curlpp/utilspp/singleton.hpp
-include/curlpp/utilspp/singleton/creation_static.hpp
-include/curlpp/utilspp/singleton/creation_using_new.hpp
-include/curlpp/utilspp/singleton/lifetime_default.hpp
-include/curlpp/utilspp/singleton/lifetime_library.hpp
-include/curlpp/utilspp/singleton/lifetime_library.inl
-include/curlpp/utilspp/singleton/lifetime_with_longevity.hpp
-include/curlpp/utilspp/singleton/lifetime_with_longevity.inl
-include/curlpp/utilspp/singleton/private_members.hpp
-include/curlpp/utilspp/singleton/private_members.inl
-include/curlpp/utilspp/singleton/singleton_holder.hpp
-include/curlpp/utilspp/singleton/singleton_holder.inl
-include/curlpp/utilspp/singleton/threading_single.hpp
-include/curlpp/utilspp/smart_ptr.hpp
-include/curlpp/utilspp/type_list.hpp
-include/curlpp/utilspp/type_trait.hpp
-@dirrm include/curlpp/utilspp/mutex
-@dirrm include/curlpp/utilspp/singleton
-@dirrm include/curlpp/utilspp
 @dirrm include/curlpp
+lib/libcurlpp.a
 lib/libcurlpp.so
 lib/libcurlpp.so.0
-lib/libmutex.so
-lib/libmutex.so.0
-lib/libsingleton.so
-lib/libsingleton.so.0
-lib/libutilspp.so
-lib/libutilspp.so.0
+libdata/pkgconfig/curlpp.pc
+%%PORTDOCS%%%%DOCSDIR%%/guide.pdf
 %%PORTDOCS%%%%EXAMPLESDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/example01.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/example02.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/example03.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/example04.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/example05.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/example06.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/example07.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/example08.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/example09.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/example10.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/example11.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/example12.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/example13.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/example16.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/example14.cpp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%