Index: head/graphics/mapnik/Makefile =================================================================== --- head/graphics/mapnik/Makefile (revision 274595) +++ head/graphics/mapnik/Makefile (revision 274596) @@ -1,48 +1,66 @@ # New ports collection makefile for: mapnik # Date created: Nov 10, 2008 # Whom: Wen Heping # # $FreeBSD$ # PORTNAME= mapnik -PORTVERSION= 0.6.1 -PORTREVISION= 5 +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 \ +LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \ png:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ - cairo.2:${PORTSDIR}/graphics/cairo \ - iconv:${PORTSDIR}/converters/libiconv + jpeg:${PORTSDIR}/graphics/jpeg \ + icuuc:${PORTSDIR}/devel/icu \ + boost_system:${PORTSDIR}/devel/boost-libs BUILD_DEPENDS= ${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \ + icu>=4.1.4:${PORTSDIR}/devel/icu \ ${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu \ - ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo \ - ${LOCALBASE}/include/cairomm-1.0/cairomm/cairomm.h:${PORTSDIR}/graphics/cairomm \ + boost-libs>1.41:${PORTSDIR}/devel/boost-libs \ ${LOCALBASE}/include/boost/python.hpp:${PORTSDIR}/devel/boost-python-libs -BROKEN= Does not build with boost-1.41 +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING USE_PGSQL= yes USE_BZIP2= yes -NO_BUILD= yes USE_PYTHON= 2.5+ USE_LDCONFIG= yes +USE_SCONS= yes USE_AUTOTOOLS= libltdl +USE_GNOME= pkgconfig libxml2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +OPTIONS= CAIRO "Enable cairo rendering" on + +.include + +.if defined(WITHOUT_CAIRO) +SCONS_ARGS+= CAIRO=False +.else +LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo \ + cairomm-1.0:${PORTSDIR}/graphics/cairomm +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo +.endif + .include +.if defined (MAKE_JOBS_NUMBER) +SCONS_ARGS+= JOBS=${MAKE_JOBS_NUMBER} +.endif + post-patch: @${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \ ${WRKSRC}/SConstruct do-install: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} scons/scons.py install + @cd ${INSTALL_WRKSRC} && ${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} \ + ${SCONS_INSTALL_TARGET} .include Property changes on: head/graphics/mapnik/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/graphics/mapnik/distinfo =================================================================== --- head/graphics/mapnik/distinfo (revision 274595) +++ head/graphics/mapnik/distinfo (revision 274596) @@ -1,2 +1,2 @@ -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 Property changes on: head/graphics/mapnik/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/graphics/mapnik/pkg-plist =================================================================== --- head/graphics/mapnik/pkg-plist (revision 274595) +++ head/graphics/mapnik/pkg-plist (revision 274596) @@ -1,147 +1,149 @@ bin/shapeindex include/mapnik/boolean_filter.hpp include/mapnik/font_set.hpp include/mapnik/cairo_renderer.hpp include/mapnik/version.hpp +include/mapnik/wall_clock_timer.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/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/config_error.hpp include/mapnik/polygon_pattern_symbolizer.hpp include/mapnik/image_data.hpp include/mapnik/octree.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/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/hextree.hpp include/mapnik/hit_test_filter.hpp include/mapnik/symbolizer.hpp include/mapnik/png_io.hpp include/mapnik/feature_layer_desc.hpp include/mapnik/layer.hpp include/mapnik/filter_expression.hpp include/mapnik/label_placement.hpp include/mapnik/envelope.hpp include/mapnik/markers_converter.hpp include/mapnik/filter_parser.hpp include/mapnik/font_engine_freetype.hpp include/mapnik/quad_tree.hpp include/mapnik/enumeration.hpp include/mapnik/memory_featureset.hpp include/mapnik/agg_renderer.hpp include/mapnik/feature_style_processor.hpp include/mapnik/attribute_descriptor.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/spatial.hpp include/mapnik/color.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 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/unifont-5.1.20080907.ttf 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-ExtraLight.ttf lib/mapnik/fonts/DejaVuSerif.ttf lib/mapnik/fonts/DejaVuSerifCondensed.ttf lib/mapnik/fonts/DejaVuSansCondensed-BoldOblique.ttf lib/mapnik/fonts/DejaVuSansMono-BoldOblique.ttf lib/mapnik/fonts/DejaVuSans-BoldOblique.ttf lib/mapnik/fonts/DejaVuSerif-Bold.ttf lib/mapnik/fonts/DejaVuSansMono.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/common.py %%PYTHON_SITELIBDIR%%/mapnik/ogcserver/configparser.py %%PYTHON_SITELIBDIR%%/mapnik/ogcserver/exceptions.py %%PYTHON_SITELIBDIR%%/mapnik/ogcserver/wsgi.py %%PYTHON_SITELIBDIR%%/mapnik/_mapnik.so @dirrm %%PYTHON_SITELIBDIR%%/mapnik/ogcserver @dirrm %%PYTHON_SITELIBDIR%%/mapnik @dirrm lib/mapnik/input @dirrm lib/mapnik/fonts @dirrm lib/mapnik @dirrm include/mapnik Property changes on: head/graphics/mapnik/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property