From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 5 20:20:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 612E68F8 for ; Wed, 5 Jun 2013 20:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 44C291F28 for ; Wed, 5 Jun 2013 20:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r55KK023022340 for ; Wed, 5 Jun 2013 20:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r55KK0xK022339; Wed, 5 Jun 2013 20:20:00 GMT (envelope-from gnats) Resent-Date: Wed, 5 Jun 2013 20:20:00 GMT Resent-Message-Id: <201306052020.r55KK0xK022339@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, nemysis Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B7AB5544 for ; Wed, 5 Jun 2013 20:12:38 +0000 (UTC) (envelope-from nemysis@gmx.ch) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by mx1.freebsd.org (Postfix) with ESMTP id 45BA01EBD for ; Wed, 5 Jun 2013 20:12:38 +0000 (UTC) Received: from mailout-de.gmx.net ([10.1.76.35]) by mrigmx.server.lan (mrigmx002) with ESMTP (Nemesis) id 0MJ0dz-1Uhq280lkf-002b55 for ; Wed, 05 Jun 2013 22:12:37 +0200 Received: (qmail invoked by alias); 05 Jun 2013 20:12:36 -0000 Received: from 5-80.77-83.cust.bluewin.ch (EHLO something.email.com) [83.77.80.5] by mail.gmx.net (mp035) with SMTP; 05 Jun 2013 22:12:36 +0200 Received: by something.email.com (sSMTP sendmail emulation); Wed, 05 Jun 2013 22:12:35 +0200 Message-Id: <20130605201238.B7AB5544@hub.freebsd.org> Date: Wed, 05 Jun 2013 22:12:35 +0200 From: nemysis To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/179349: [PATCH] graphics/mapnik: Cc: littlesavage@rambler.ru X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jun 2013 20:20:01 -0000 >Number: 179349 >Category: ports >Synopsis: [PATCH] graphics/mapnik: >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jun 05 20:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.1-RELEASE-p3 amd64 >Organization: >Environment: System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013 >Description: - Trim comment - Add docs - Cleanup Makefile - Trim pkg-descr - Trim pkg-plist Port maintainer (littlesavage@rambler.ru) is cc'd. Generated with FreeBSD Port Tools 0.99_7 (mode: change, diff: ports) >How-To-Repeat: Build log https://redports.org/buildarchive/20130605001100-40096/ >Fix: --- mapnik-2.1.0_3.patch begins here --- diff -ruN /usr/ports/graphics/mapnik/Makefile ./Makefile --- /usr/ports/graphics/mapnik/Makefile 2013-06-04 12:13:17.000000000 +0200 +++ ./Makefile 2013-06-05 01:55:41.000000000 +0200 @@ -9,10 +9,9 @@ MASTER_SITES= http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/ MAINTAINER= littlesavage@rambler.ru -COMMENT= A Free Toolkit For Developing Mapping Applications +COMMENT= Free Toolkit For Developing Mapping Applications LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \ png15:${PORTSDIR}/graphics/png \ @@ -25,12 +24,12 @@ ${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu USE_BZIP2= yes +USES= pkgconfig +USE_GNOME= libxml2 USE_PYTHON= 2.6+ USE_LDCONFIG= yes USE_SCONS= yes USE_AUTOTOOLS= libltdl -USES= pkgconfig -USE_GNOME= libxml2 MAKE_JOBS_SAFE= yes WARNING_CXXFLAGS?= -w @@ -50,6 +49,15 @@ POSTGIS_DESC= PostGIS input plugin SQLITE3_DESC= SQLite input plugin +PORTDOCS= * + +DOCSRCDIR1= ${WRKSRC} +DOC_FILES1= AUTHORS.md CHANGELOG.md README.md + +DOCSRCDIR2= ${WRKSRC}/docs +DOCSDIR2= ${DOCSDIR}/docs +DOC_FILES2= * + .include .if ${PORT_OPTIONS:MCAIRO} @@ -131,11 +139,11 @@ pre-configure: .if ${PORT_OPTIONS:MSQLITE3} @if ! ${LOCALBASE}/bin/sqlite3 :memory: 'create virtual table foo using rtree(pkid, xmin, xmax, ymin, ymax)' > /dev/null 2>&1; then \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "The SQLite plugin requires libsqlite3 built with RTREE support"; \ - ${ECHO_MSG} "Please, reinstall 'databases/sqlite3' port with R*Tree module enabled"; \ - ${ECHO_MSG} "" ; \ - ${FALSE} ; \ + ${ECHO_MSG} "" ; \ + ${ECHO_MSG} "The SQLite plugin requires libsqlite3 built with RTREE support"; \ + ${ECHO_MSG} "Please, reinstall 'databases/sqlite3' port with R*Tree module enabled"; \ + ${ECHO_MSG} "" ; \ + ${FALSE} ; \ fi .endif @@ -145,6 +153,14 @@ do-install: @cd ${INSTALL_WRKSRC} && ${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} \ - ${SCONS_INSTALL_TARGET} + ${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 .include diff -ruN /usr/ports/graphics/mapnik/pkg-plist ./pkg-plist --- /usr/ports/graphics/mapnik/pkg-plist 2013-06-02 18:53:03.000000000 +0200 +++ ./pkg-plist 2013-06-05 02:04:15.000000000 +0200 @@ -194,6 +194,28 @@ lib/libmapnik.so lib/libmapnik.so.2 lib/libmapnik.so.2.1 +lib/mapnik/fonts/DejaVuSans-Bold.ttf +lib/mapnik/fonts/DejaVuSans-BoldOblique.ttf +lib/mapnik/fonts/DejaVuSans-ExtraLight.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/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 %%CSV%%lib/mapnik/input/csv.input %%GDAL%%lib/mapnik/input/gdal.input lib/mapnik/input/geojson.input @@ -205,28 +227,6 @@ lib/mapnik/input/raster.input lib/mapnik/input/shape.input %%SQLITE%%lib/mapnik/input/sqlite.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/printing.py %%PYTHON_SITELIBDIR%%/mapnik/paths.py @@ -237,11 +237,11 @@ @dirrm lib/mapnik/input @dirrm lib/mapnik/fonts @dirrm lib/mapnik -@dirrm include/mapnik/formatting -@dirrm include/mapnik/grid -@dirrm include/mapnik/json -@dirrm include/mapnik/svg -@dirrm include/mapnik/text_placements -@dirrm include/mapnik/util @dirrm include/mapnik/wkt +@dirrm include/mapnik/util +@dirrm include/mapnik/text_placements +@dirrm include/mapnik/svg +@dirrm include/mapnik/json +@dirrm include/mapnik/grid +@dirrm include/mapnik/formatting @dirrm include/mapnik --- mapnik-2.1.0_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: