From owner-svn-ports-all@FreeBSD.ORG Fri Sep 20 06:34:16 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8896FD80; Fri, 20 Sep 2013 06:34:16 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7605021B1; Fri, 20 Sep 2013 06:34:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8K6YGQh033785; Fri, 20 Sep 2013 06:34:16 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8K6YGeg033784; Fri, 20 Sep 2013 06:34:16 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201309200634.r8K6YGeg033784@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Fri, 20 Sep 2013 06:34:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327657 - head/ftp/curlpp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Sep 2013 06:34:16 -0000 Author: sunpoet Date: Fri Sep 20 06:34:15 2013 New Revision: 327657 URL: http://svnweb.freebsd.org/changeset/ports/327657 Log: - Fix build without libstdc++ by removing hardcoded libstdc++ linkage [1] - Convert to new LIB_DEPENDS format - Convert to new OPTIONS simplifier Reported by: pkg-fallout [1] Modified: head/ftp/curlpp/Makefile Modified: head/ftp/curlpp/Makefile ============================================================================== --- head/ftp/curlpp/Makefile Fri Sep 20 06:23:33 2013 (r327656) +++ head/ftp/curlpp/Makefile Fri Sep 20 06:34:15 2013 (r327657) @@ -10,7 +10,7 @@ MASTER_SITES= GOOGLE_CODE MAINTAINER= sunpoet@FreeBSD.org COMMENT= C++ wrapper for libcurl -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl OPTIONS_DEFINE= BOOST DOCS EXAMPELS @@ -21,15 +21,15 @@ LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes USES= pathfix +BOOST_BUILD_DEPENDS= boost-libs>=1.20.0:${PORTSDIR}/devel/boost-libs +BOOST_RUN_DEPENDS= ${BOOST_BUILD_DEPENDS} +BOOST_CONFIGURE_ON= --with-boost=${LOCALBASE} +BOOST_CONFIGURE_OFF= --without-boost + .include -.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-patch: + @${REINPLACE_CMD} -e 's| -lstdc++||' ${WRKSRC}/configure post-install: .if ${PORT_OPTIONS:MDOCS}