From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 13 23:20:07 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B3901065672 for ; Sat, 13 Nov 2010 23:20:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 258738FC14 for ; Sat, 13 Nov 2010 23:20:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oADNK7V3068262 for ; Sat, 13 Nov 2010 23:20:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oADNK6u7068261; Sat, 13 Nov 2010 23:20:06 GMT (envelope-from gnats) Resent-Date: Sat, 13 Nov 2010 23:20:06 GMT Resent-Message-Id: <201011132320.oADNK6u7068261@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Bartosz Fabianowski Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A29D21065674 for ; Sat, 13 Nov 2010 23:18:19 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 8E99C8FC18 for ; Sat, 13 Nov 2010 23:18:19 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id oADNIIXL070575 for ; Sat, 13 Nov 2010 23:18:19 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id oADNIHNP070574; Sat, 13 Nov 2010 23:18:17 GMT (envelope-from nobody) Message-Id: <201011132318.oADNIHNP070574@www.freebsd.org> Date: Sat, 13 Nov 2010 23:18:17 GMT From: Bartosz Fabianowski To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/152220: [PATCH] graphics/mapnik: update to 0.7.1 and unbreak X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2010 23:20:07 -0000 >Number: 152220 >Category: ports >Synopsis: [PATCH] graphics/mapnik: update to 0.7.1 and unbreak >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Nov 13 23:20:06 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Bartosz Fabianowski >Release: 8.1-STABLE >Organization: >Environment: >Description: The attached patch updates graphics/mapnik to the most recent 0.7.1 release and unbreaks it. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN mapnik.orig/Makefile mapnik/Makefile --- mapnik.orig/Makefile 2010-03-28 07:37:08.000000000 +0100 +++ mapnik/Makefile 2010-11-13 23:16:04.000000000 +0000 @@ -6,34 +6,34 @@ # PORTNAME= mapnik -PORTVERSION= 0.6.1 -PORTREVISION= 4 +PORTVERSION= 0.7.1 CATEGORIES= graphics geography MASTER_SITES= ${MASTER_SITE_BERLIOS}/${PORTNAME}/ MAINTAINER= wenheping@gmail.com COMMENT= A Free Toolkit For Developing Mapping Applications -LIB_DEPENDS= geos:${PORTSDIR}/graphics/geos \ - proj:${PORTSDIR}/graphics/proj \ - ltdl:${PORTSDIR}/devel/libltdl22 \ - png:${PORTSDIR}/graphics/png \ - tiff:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ + tiff.4:${PORTSDIR}/graphics/tiff \ + jpeg.11:${PORTSDIR}/graphics/jpeg \ + proj.6:${PORTSDIR}/graphics/proj \ + icutu.38:${PORTSDIR}/devel/icu \ + freetype.9:${PORTSDIR}/print/freetype2 \ cairo.2:${PORTSDIR}/graphics/cairo \ - iconv:${PORTSDIR}/converters/libiconv -BUILD_DEPENDS= ${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \ - ${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu \ + cairomm-1.0.1:${PORTSDIR}/graphics/cairomm +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config \ ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo \ - ${LOCALBASE}/include/cairomm-1.0/cairomm/cairomm.h:${PORTSDIR}/graphics/cairomm \ + ${LOCALBASE}/include/boost/python.hpp:${PORTSDIR}/devel/boost-python-libs +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo \ ${LOCALBASE}/include/boost/python.hpp:${PORTSDIR}/devel/boost-python-libs -BROKEN= Does not build with boost-1.41 - -USE_PGSQL= yes USE_BZIP2= yes -NO_BUILD= yes USE_PYTHON= 2.4+ +USE_SCONS= yes USE_LDCONFIG= yes +USE_GNOME= libxml2 +USE_AUTOTOOLS= libltdl:22 +USE_PGSQL= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include @@ -42,7 +42,4 @@ @${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \ ${WRKSRC}/SConstruct -do-install: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} scons/scons.py install - .include diff -ruN mapnik.orig/distinfo mapnik/distinfo --- mapnik.orig/distinfo 2009-09-02 18:12:43.000000000 +0100 +++ mapnik/distinfo 2010-11-13 23:08:10.000000000 +0000 @@ -1,3 +1,2 @@ -MD5 (mapnik-0.6.1.tar.bz2) = 44093af694321ef2034b1fd2edc998c9 -SHA256 (mapnik-0.6.1.tar.bz2) = 59b1c19817ed65ba8f0d3a2ac8f06ecf5c12f452d10170fa04f6824ea257437f -SIZE (mapnik-0.6.1.tar.bz2) = 7466271 +SHA256 (mapnik-0.7.1.tar.bz2) = 0d04e8cbc2a060ce09ba13ccdcd7bf8bd02bed77a84a3dd1191e4d75fba95b8d +SIZE (mapnik-0.7.1.tar.bz2) = 10021260 diff -ruN mapnik.orig/pkg-plist mapnik/pkg-plist --- mapnik.orig/pkg-plist 2009-05-20 22:47:51.000000000 +0100 +++ mapnik/pkg-plist 2010-11-13 23:08:10.000000000 +0000 @@ -1,142 +1,144 @@ bin/shapeindex -include/mapnik/boolean_filter.hpp -include/mapnik/font_set.hpp -include/mapnik/cairo_renderer.hpp -include/mapnik/version.hpp -include/mapnik/wkb.hpp -include/mapnik/coord.hpp -include/mapnik/utils.hpp -include/mapnik/filter.hpp -include/mapnik/pool.hpp -include/mapnik/image_util.hpp -include/mapnik/rule.hpp -include/mapnik/load_map.hpp -include/mapnik/datasource_cache.hpp -include/mapnik/text_path.hpp +include/mapnik/agg_renderer.hpp include/mapnik/arrow.hpp -include/mapnik/memory_datasource.hpp -include/mapnik/query.hpp -include/mapnik/math_expr.hpp -include/mapnik/filter_factory.hpp -include/mapnik/label_collision_detector.hpp -include/mapnik/fill.hpp -include/mapnik/geometry.hpp -include/mapnik/filter_featureset.hpp include/mapnik/attribute.hpp -include/mapnik/line_pattern_symbolizer.hpp -include/mapnik/point_symbolizer.hpp -include/mapnik/params.hpp -include/mapnik/regex_filter.hpp -include/mapnik/libxml2_loader.hpp -include/mapnik/image_view.hpp -include/mapnik/feature_factory.hpp -include/mapnik/local_datasource.hpp -include/mapnik/style_factory.hpp include/mapnik/attribute_collector.hpp -include/mapnik/text_symbolizer.hpp -include/mapnik/line_symbolizer.hpp -include/mapnik/raster.hpp -include/mapnik/polygon_symbolizer.hpp -include/mapnik/css_color_parser.hpp -include/mapnik/geom_util.hpp -include/mapnik/image_reader.hpp +include/mapnik/attribute_descriptor.hpp +include/mapnik/boolean_filter.hpp +include/mapnik/cairo_renderer.hpp +include/mapnik/color.hpp +include/mapnik/color_factory.hpp +include/mapnik/comparison.hpp +include/mapnik/config.hpp include/mapnik/config_error.hpp -include/mapnik/polygon_pattern_symbolizer.hpp -include/mapnik/image_data.hpp -include/mapnik/octree.hpp +include/mapnik/coord.hpp +include/mapnik/coord_array.hpp +include/mapnik/css_color_parser.hpp +include/mapnik/ctrans.hpp +include/mapnik/datasource.hpp +include/mapnik/datasource_cache.hpp +include/mapnik/distance.hpp include/mapnik/ellipsoid.hpp -include/mapnik/raster_symbolizer.hpp -include/mapnik/vertex.hpp -include/mapnik/scale_denominator.hpp -include/mapnik/stroke.hpp +include/mapnik/enumeration.hpp +include/mapnik/envelope.hpp include/mapnik/expression.hpp -include/mapnik/value.hpp -include/mapnik/logical.hpp -include/mapnik/datasource.hpp -include/mapnik/map.hpp -include/mapnik/placement_finder.hpp -include/mapnik/unicode.hpp -include/mapnik/coord_array.hpp include/mapnik/factory.hpp -include/mapnik/graphics.hpp -include/mapnik/style.hpp -include/mapnik/jpeg_io.hpp -include/mapnik/color_factory.hpp -include/mapnik/plugin.hpp -include/mapnik/gamma.hpp include/mapnik/feature.hpp -include/mapnik/hit_test_filter.hpp -include/mapnik/symbolizer.hpp -include/mapnik/png_io.hpp +include/mapnik/feature_factory.hpp include/mapnik/feature_layer_desc.hpp -include/mapnik/layer.hpp +include/mapnik/feature_style_processor.hpp +include/mapnik/feature_type_style.hpp +include/mapnik/fill.hpp +include/mapnik/filter.hpp include/mapnik/filter_expression.hpp -include/mapnik/label_placement.hpp -include/mapnik/envelope.hpp -include/mapnik/markers_converter.hpp +include/mapnik/filter_factory.hpp +include/mapnik/filter_featureset.hpp include/mapnik/filter_parser.hpp +include/mapnik/filter_visitor.hpp include/mapnik/font_engine_freetype.hpp -include/mapnik/quad_tree.hpp -include/mapnik/enumeration.hpp +include/mapnik/font_set.hpp +include/mapnik/gamma.hpp +include/mapnik/geom_util.hpp +include/mapnik/geometry.hpp +include/mapnik/global.hpp +include/mapnik/graphics.hpp +include/mapnik/hextree.hpp +include/mapnik/hit_test_filter.hpp +include/mapnik/image_data.hpp +include/mapnik/image_reader.hpp +include/mapnik/image_util.hpp +include/mapnik/image_view.hpp +include/mapnik/jpeg_io.hpp +include/mapnik/label_collision_detector.hpp +include/mapnik/label_placement.hpp +include/mapnik/layer.hpp +include/mapnik/libxml2_loader.hpp +include/mapnik/line_pattern_symbolizer.hpp +include/mapnik/line_symbolizer.hpp +include/mapnik/load_map.hpp +include/mapnik/logical.hpp +include/mapnik/map.hpp +include/mapnik/markers_converter.hpp +include/mapnik/markers_symbolizer.hpp +include/mapnik/math_expr.hpp +include/mapnik/memory.hpp +include/mapnik/memory_datasource.hpp include/mapnik/memory_featureset.hpp -include/mapnik/agg_renderer.hpp -include/mapnik/feature_style_processor.hpp -include/mapnik/attribute_descriptor.hpp +include/mapnik/octree.hpp +include/mapnik/params.hpp +include/mapnik/placement_finder.hpp +include/mapnik/plugin.hpp +include/mapnik/png_io.hpp +include/mapnik/point_symbolizer.hpp +include/mapnik/polygon_pattern_symbolizer.hpp +include/mapnik/polygon_symbolizer.hpp +include/mapnik/pool.hpp +include/mapnik/proj_transform.hpp include/mapnik/projection.hpp -include/mapnik/feature_type_style.hpp include/mapnik/ptree_helpers.hpp -include/mapnik/global.hpp -include/mapnik/config.hpp -include/mapnik/ctrans.hpp +include/mapnik/quad_tree.hpp +include/mapnik/query.hpp +include/mapnik/raster.hpp +include/mapnik/raster_symbolizer.hpp +include/mapnik/regex_filter.hpp +include/mapnik/rule.hpp +include/mapnik/save_map.hpp +include/mapnik/scale_denominator.hpp +include/mapnik/shield_symbolizer.hpp include/mapnik/spatial.hpp -include/mapnik/color.hpp +include/mapnik/stroke.hpp +include/mapnik/style.hpp +include/mapnik/style_factory.hpp +include/mapnik/symbolizer.hpp +include/mapnik/text_path.hpp +include/mapnik/text_symbolizer.hpp +include/mapnik/unicode.hpp +include/mapnik/utils.hpp +include/mapnik/value.hpp +include/mapnik/version.hpp +include/mapnik/vertex.hpp include/mapnik/vertex_transform.hpp include/mapnik/vertex_vector.hpp -include/mapnik/markers_symbolizer.hpp -include/mapnik/save_map.hpp -include/mapnik/shield_symbolizer.hpp -include/mapnik/memory.hpp -include/mapnik/filter_visitor.hpp -include/mapnik/comparison.hpp -include/mapnik/proj_transform.hpp -include/mapnik/distance.hpp +include/mapnik/wall_clock_timer.hpp +include/mapnik/wkb.hpp lib/libmapnik.so lib/libmapnik.so.0 lib/mapnik/input/postgis.input lib/mapnik/input/raster.input lib/mapnik/input/shape.input -lib/mapnik/fonts/DejaVuSerif-BoldItalic.ttf -lib/mapnik/fonts/DejaVuSerifCondensed-BoldItalic.ttf -lib/mapnik/fonts/DejaVuSerif-Italic.ttf -lib/mapnik/fonts/DejaVuSerifCondensed-Italic.ttf -lib/mapnik/fonts/DejaVuSansMono-Oblique.ttf -lib/mapnik/fonts/DejaVuSerifCondensed-Bold.ttf -lib/mapnik/fonts/DejaVuSansCondensed-Oblique.ttf -lib/mapnik/fonts/DejaVuSansCondensed-Bold.ttf -lib/mapnik/fonts/DejaVuSans-Oblique.ttf -lib/mapnik/fonts/DejaVuSansCondensed.ttf -lib/mapnik/fonts/DejaVuSansMono-Bold.ttf -lib/mapnik/fonts/DejaVuSans.ttf lib/mapnik/fonts/DejaVuSans-Bold.ttf +lib/mapnik/fonts/DejaVuSans-BoldOblique.ttf lib/mapnik/fonts/DejaVuSans-ExtraLight.ttf -lib/mapnik/fonts/DejaVuSerif.ttf -lib/mapnik/fonts/DejaVuSerifCondensed.ttf +lib/mapnik/fonts/DejaVuSans-Oblique.ttf +lib/mapnik/fonts/DejaVuSans.ttf +lib/mapnik/fonts/DejaVuSansCondensed-Bold.ttf lib/mapnik/fonts/DejaVuSansCondensed-BoldOblique.ttf +lib/mapnik/fonts/DejaVuSansCondensed-Oblique.ttf +lib/mapnik/fonts/DejaVuSansCondensed.ttf +lib/mapnik/fonts/DejaVuSansMono-Bold.ttf lib/mapnik/fonts/DejaVuSansMono-BoldOblique.ttf -lib/mapnik/fonts/DejaVuSans-BoldOblique.ttf -lib/mapnik/fonts/DejaVuSerif-Bold.ttf +lib/mapnik/fonts/DejaVuSansMono-Oblique.ttf lib/mapnik/fonts/DejaVuSansMono.ttf +lib/mapnik/fonts/DejaVuSerif-Bold.ttf +lib/mapnik/fonts/DejaVuSerif-BoldItalic.ttf +lib/mapnik/fonts/DejaVuSerif-Italic.ttf +lib/mapnik/fonts/DejaVuSerif.ttf +lib/mapnik/fonts/DejaVuSerifCondensed-Bold.ttf +lib/mapnik/fonts/DejaVuSerifCondensed-BoldItalic.ttf +lib/mapnik/fonts/DejaVuSerifCondensed-Italic.ttf +lib/mapnik/fonts/DejaVuSerifCondensed.ttf +lib/mapnik/fonts/unifont-5.1.20080907.ttf %%PYTHON_SITELIBDIR%%/mapnik/__init__.py %%PYTHON_SITELIBDIR%%/mapnik/paths.py -%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/wms130.py %%PYTHON_SITELIBDIR%%/mapnik/ogcserver/WMS.py -%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/wms111.py -%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/modserver.py -%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/cgiserver.py %%PYTHON_SITELIBDIR%%/mapnik/ogcserver/__init__.py +%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/cgiserver.py %%PYTHON_SITELIBDIR%%/mapnik/ogcserver/common.py %%PYTHON_SITELIBDIR%%/mapnik/ogcserver/configparser.py %%PYTHON_SITELIBDIR%%/mapnik/ogcserver/exceptions.py +%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/modserver.py +%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/wms111.py +%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/wms130.py %%PYTHON_SITELIBDIR%%/mapnik/ogcserver/wsgi.py %%PYTHON_SITELIBDIR%%/mapnik/_mapnik.so @dirrm %%PYTHON_SITELIBDIR%%/mapnik/ogcserver >Release-Note: >Audit-Trail: >Unformatted: