Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Mar 2014 22:11:50 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r349688 - head/textproc/libwps
Message-ID:  <201403302211.s2UMBoKR006547@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sun Mar 30 22:11:50 2014
New Revision: 349688
URL: http://svnweb.freebsd.org/changeset/ports/349688
QAT: https://qat.redports.org/buildarchive/r349688/

Log:
  Use c++11 shared pointers when possible

Modified:
  head/textproc/libwps/Makefile

Modified: head/textproc/libwps/Makefile
==============================================================================
--- head/textproc/libwps/Makefile	Sun Mar 30 22:10:10 2014	(r349687)
+++ head/textproc/libwps/Makefile	Sun Mar 30 22:11:50 2014	(r349688)
@@ -13,7 +13,6 @@ COMMENT=	Microsoft file word processor f
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 LIB_DEPENDS=	libwpd-0.9.so:${PORTSDIR}/textproc/libwpd
 
 OPTIONS_DEFINE=	DOCS
@@ -21,10 +20,19 @@ OPTIONS_DEFINE=	DOCS
 CONFIGURE_ARGS=	--disable-werror
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-USES=		libtool pkgconfig pathfix
+USES=		libtool pkgconfig pathfix compiler:features
 USE_LDCONFIG=	yes
 PORTDOCS=	*
 DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 DOCS_CONFIGURE_OFF=	--without-docs
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_FEATURES:Mlibc++}
+CONFIGURE_ARGS=	--with-sharedptr=c++11
+.else
+BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+CONFIGURE_ARGS=	--with-sharedptr=boost
+.endif
+
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403302211.s2UMBoKR006547>