- Update MASTER_SITES

- Convert to new options framework
- Add BOOST option [1]
- Respect EXAMPLES
- Cosmetic change
- Sort PLIST

Requested by:	Brett Gmoser <bgmoser@codexterous.com> [1]

3 files changed, 31 insertions, 23 deletions

diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile
index f99da9aee57c..4af59e4b4f0c 100644
--- a/ftp/curlpp/Makefile
+++ b/ftp/curlpp/Makefile
@@ -10,30 +10,40 @@ PORTNAME=	curlpp
 PORTVERSION=	0.7.3
 PORTREVISION=	1
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		http://rrette.com/files/curlpp/curlpp-${PORTVERSION:R}/
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A C++ wrapper for libcurl
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
-GNU_CONFIGURE=	yes
+OPTIONS_DEFINE=	BOOST DOCS EXAMPELS
+
+CONFIGURE_ARGS=	--disable-ewarning
 CPPFLAGS+=	-I${LOCALBASE}/include
+GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-ewarning --without-boost
+USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MBOOST}
+BUILD_DEPENDS+=	boost-libs>=1.20.0:${PORTSDIR}/devel/boost-libs
+RUN_DEPENDS+=	boost-libs>=1.20.0:${PORTSDIR}/devel/boost-libs
+CONFIGURE_ARGS+=--with-boost=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--without-boost
+.endif
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/example*.cpp ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/guide.pdf ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/guide.pdf ${DOCSDIR}/
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/examples/README ${WRKSRC}/examples/example*.cpp ${EXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/ftp/curlpp/pkg-descr b/ftp/curlpp/pkg-descr
index 02f3b0e8e5b5..f2d102caa020 100644
--- a/ftp/curlpp/pkg-descr
+++ b/ftp/curlpp/pkg-descr
@@ -1,6 +1,4 @@
 curlpp is a C++ wrapper for libcurl.
 
-Author:		Jean-Philippe Barrette-LaPierre <jpbarrette@gmail.com>
-
-WWW:		http://www.curlpp.org/
-		http://code.google.com/p/curlpp/
+WWW: http://www.curlpp.org/
+WWW: http://code.google.com/p/curlpp/
diff --git a/ftp/curlpp/pkg-plist b/ftp/curlpp/pkg-plist
index 636577b1e056..0a37f2755f82 100644
--- a/ftp/curlpp/pkg-plist
+++ b/ftp/curlpp/pkg-plist
@@ -27,8 +27,6 @@ include/curlpp/internal/OptionSetter.inl
 include/curlpp/internal/SList.hpp
 include/curlpp/internal/buildconfig.h
 include/curlpp/internal/global.h
-@dirrm include/curlpp/internal
-@dirrm include/curlpp
 include/utilspp/EmptyType.hpp
 include/utilspp/Functors.hpp
 include/utilspp/NonCopyable.hpp
@@ -61,9 +59,6 @@ include/utilspp/singleton/PrivateMembers.hpp
 include/utilspp/singleton/PrivateMembers.inl
 include/utilspp/singleton/SingletonHolder.hpp
 include/utilspp/singleton/SingletonHolder.inl
-@dirrm include/utilspp/functor
-@dirrm include/utilspp/singleton
-@dirrm include/utilspp
 lib/libcurlpp.a
 lib/libcurlpp.la
 lib/libcurlpp.so
@@ -74,7 +69,6 @@ lib/libutilspp.so
 lib/libutilspp.so.0
 libdata/pkgconfig/curlpp.pc
 %%PORTDOCS%%%%DOCSDIR%%/guide.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example01.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example02.cpp
@@ -101,3 +95,9 @@ libdata/pkgconfig/curlpp.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example23.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example24.cpp
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/utilspp/singleton
+@dirrm include/utilspp/functor
+@dirrm include/utilspp
+@dirrm include/curlpp/internal
+@dirrm include/curlpp