From owner-svn-ports-head@FreeBSD.ORG Mon Oct 7 20:15:06 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 68B0A912; Mon, 7 Oct 2013 20:15:06 +0000 (UTC) (envelope-from madpilot@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 557DF2F58; Mon, 7 Oct 2013 20:15:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r97KF69U035686; Mon, 7 Oct 2013 20:15:06 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r97KF5tv035684; Mon, 7 Oct 2013 20:15:05 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201310072015.r97KF5tv035684@svn.freebsd.org> From: Guido Falsi Date: Mon, 7 Oct 2013 20:15:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329735 - in head/graphics/mapnik: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2013 20:15:06 -0000 Author: madpilot Date: Mon Oct 7 20:15:05 2013 New Revision: 329735 URL: http://svnweb.freebsd.org/changeset/ports/329735 Log: - Fix build with clang - Convert to USES scons - Use new LIB_DEPENDS format - Support staging PR: ports/182078 Submitted by: Alexey Illarionov Added: head/graphics/mapnik/files/patch-bindings-python-mapnik_text_placement.cpp (contents, props changed) Modified: head/graphics/mapnik/Makefile Modified: head/graphics/mapnik/Makefile ============================================================================== --- head/graphics/mapnik/Makefile Mon Oct 7 20:12:48 2013 (r329734) +++ head/graphics/mapnik/Makefile Mon Oct 7 20:15:05 2013 (r329735) @@ -14,19 +14,18 @@ COMMENT= A Free Toolkit For Developing M LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \ - icuuc:${PORTSDIR}/devel/icu \ - boost_system:${PORTSDIR}/devel/boost-libs \ - boost_python:${PORTSDIR}/devel/boost-python-libs +LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \ + libicuuc.so:${PORTSDIR}/devel/icu \ + libboost_system.so:${PORTSDIR}/devel/boost-libs \ + libboost_python.so:${PORTSDIR}/devel/boost-python-libs BUILD_DEPENDS= ${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \ ${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu USE_BZIP2= yes -USES= pkgconfig +USES= pkgconfig scons USE_GNOME= libxml2 USE_PYTHON= 2.6+ USE_LDCONFIG= yes -USE_SCONS= yes WARNING_CXXFLAGS?= -w INPUT_PLUGINS= geojson python raster shape @@ -54,14 +53,13 @@ DOCSRCDIR2= ${WRKSRC}/docs DOCSDIR2= ${DOCSDIR}/docs DOC_FILES2= * -NO_STAGE= yes .include .if ${PORT_OPTIONS:MCAIRO} LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo .else -SCONS_ARGS+= CAIRO=False +MAKE_ARGS+= CAIRO=False .endif .if ${PORT_OPTIONS:MCSV} @@ -97,19 +95,19 @@ BUILD_DEPENDS+= sqlite3>=3.7.12:${PORTSD .if ${PORT_OPTIONS:MJPEG} LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg .else -SCONS_ARGS+= JPEG=False +MAKE_ARGS+= JPEG=False .endif .if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .else -SCONS_ARGS+= PNG=False +MAKE_ARGS+= PNG=False .endif .if ${PORT_OPTIONS:MTIFF} LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff .else -SCONS_ARGS+= TIFF=False +MAKE_ARGS+= TIFF=False .endif .include @@ -118,9 +116,10 @@ SCONS_ARGS+= TIFF=False IGNORE= does not install: runs out of virtual memory .endif -SCONS_ARGS+= WARNING_CXXFLAGS=${WARNING_CXXFLAGS} -SCONS_ARGS+= INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`" -SCONS_ARGS+= JOBS=${MAKE_JOBS_NUMBER} +MAKE_ARGS+= WARNING_CXXFLAGS=${WARNING_CXXFLAGS} +MAKE_ARGS+= INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`" +MAKE_ARGS+= JOBS=${MAKE_JOBS_NUMBER} +MAKE_ARGS+= ${MAKE_ENV} pre-configure: .if ${PORT_OPTIONS:MSQLITE3} @@ -137,16 +136,10 @@ post-patch: @${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \ ${WRKSRC}/SConstruct -do-install: - @cd ${INSTALL_WRKSRC} && ${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} \ - ${SCONS_INSTALL_TARGET} - post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR} - @${MKDIR} ${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR2} + ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} .include Added: head/graphics/mapnik/files/patch-bindings-python-mapnik_text_placement.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/mapnik/files/patch-bindings-python-mapnik_text_placement.cpp Mon Oct 7 20:15:05 2013 (r329735) @@ -0,0 +1,15 @@ +--- bindings/python/mapnik_text_placement.cpp.orig 2013-09-14 06:44:28.000000000 +0400 ++++ bindings/python/mapnik_text_placement.cpp 2013-09-14 06:46:57.000000000 +0400 +@@ -194,7 +194,11 @@ + ListNodeWrap(object l) : formatting::list_node(), wrapper() + { + stl_input_iterator begin(l), end; +- children_.insert(children_.end(), begin, end); ++ while (begin != end) ++ { ++ children_.push_back(*begin); ++ ++begin; ++ } + } + + /* TODO: Add constructor taking variable number of arguments.