From amdmi3@amdmi3.ru  Wed Jun 29 01:30:18 2011
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F20A71065675
	for <freebsd-gnats-submit@freebsd.org>; Wed, 29 Jun 2011 01:30:18 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.116.15])
	by mx1.freebsd.org (Postfix) with ESMTP id A96638FC14
	for <freebsd-gnats-submit@freebsd.org>; Wed, 29 Jun 2011 01:30:18 +0000 (UTC)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLSv1:CAMELLIA256-SHA:256)
	(Exim 4.76)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1QbjcB-0001Ld-30; Wed, 29 Jun 2011 05:30:51 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id A1A14B84D;
	Wed, 29 Jun 2011 05:30:14 +0400 (MSD)
Received: by hades.panopticon (Postfix, from userid 1000)
	id 8296DB823; Wed, 29 Jun 2011 05:30:14 +0400 (MSD)
Message-Id: <20110629013014.8296DB823@hades.panopticon>
Date: Wed, 29 Jun 2011 05:30:14 +0400 (MSD)
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: wenheping@gmail.com
Subject: [PATCH] graphics/mapnik: fix fetch add more options
X-Send-Pr-Version: 3.113
X-GNATS-Notify: wenheping@gmail.com

>Number:         158412
>Category:       ports
>Synopsis:       [PATCH] graphics/mapnik: fix fetch add more options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wen
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 29 01:40:07 UTC 2011
>Closed-Date:    Wed Jun 29 14:58:51 UTC 2011
>Last-Modified:  Wed Jun 29 15:00:17 UTC 2011
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Tue Mar  8 09:48:52 MSK
>Description:
- Fix incorrectly set MASTER_SITES (see output of make fetch-urlall-list before and after patch)
- Make PostGIS input plugin optional
- Add options for other input plugins, including OSM
- Mark MAKE_JOBS_SAFE
- Cosmetix fix around SCONS_ENV

Port maintainer (wenheping@gmail.com) is cc'd.

Also please note that the port doesn't respect CXX/CXXFLAGS:

...
scons: done reading SConscript files.
scons: Building targets ...
g++ -o agg/src/agg_arc.o -c -O2 -fPIC -DNDEBUG -pthread -D_THREAD_SAFE -D_REENTRANT -Iagg/include agg/src/agg_arc.cpp
g++ -o agg/src/agg_arrowhead.o -c -O2 -fPIC -DNDEBUG -pthread -D_THREAD_SAFE -D_REENTRANT -Iagg/include agg/src/agg_arrowhead.cpp
...

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- mapnik-0.7.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/graphics/mapnik/Makefile,v
retrieving revision 1.17
diff -u -u -r1.17 Makefile
--- Makefile	24 May 2011 23:53:38 -0000	1.17
+++ Makefile	29 Jun 2011 00:01:18 -0000
@@ -7,8 +7,9 @@
 
 PORTNAME=	mapnik
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	graphics geography
-MASTER_SITES=	${MASTER_SITE_BERLIOS}/${PORTNAME}/
+MASTER_SITES=	BERLIOS
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	A Free Toolkit For Developing Mapping Applications
@@ -28,16 +29,23 @@
 LICENSE=	LGPL21
 LICENSE_FILE=   ${WRKSRC}/COPYING
 
-USE_PGSQL=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	2.5+
 USE_LDCONFIG=	yes
 USE_SCONS=	yes
 USE_AUTOTOOLS=	libltdl
 USE_GNOME=	pkgconfig libxml2
+MAKE_JOBS_SAFE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-OPTIONS=	CAIRO "Enable cairo rendering" on
+INPUT_PLUGINS=	raster shape
+
+OPTIONS=	CAIRO "Enable cairo rendering" on \
+		POSTGIS "Postgis input plugin" on \
+		GDAL "gdal input plugin" off \
+		OGR "ogr input plugin" off \
+		SQLITE "SQLite input plugin" off \
+		OSM "OSM input plugin" off
 
 .include <bsd.port.options.mk>
 
@@ -49,10 +57,52 @@
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo
 .endif
 
+.if !defined(WITHOUT_POSTGIS)
+INPUT_PLUGINS+=	postgis
+USE_PGSQL=	yes
+PLIST_SUB+=	POSTGIS=""
+.else
+PLIST_SUB+=	POSTGIS="@comment "
+.endif
+
+.if defined(WITH_GDAL)
+INPUT_PLUGINS+=	gdal
+LIB_DEPENDS+=	gdal:${PORTSDIR}/graphics/gdal
+PLIST_SUB+=	GDAL=""
+.else
+PLIST_SUB+=	GDAL="@comment "
+.endif
+
+.if defined(WITH_OGR)
+INPUT_PLUGINS+=	ogr
+LIB_DEPENDS+=	gdal:${PORTSDIR}/graphics/gdal
+PLIST_SUB+=	OGR=""
+.else
+PLIST_SUB+=	OGR="@comment "
+.endif
+
+.if defined(WITH_SQLITE)
+INPUT_PLUGINS+=	sqlite
+LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
+PLIST_SUB+=	SQLITE=""
+.else
+PLIST_SUB+=	SQLITE="@comment "
+.endif
+
+.if defined(WITH_OSM)
+INPUT_PLUGINS+=	osm
+LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+PLIST_SUB+=	OSM=""
+.else
+PLIST_SUB+=	OSM="@comment "
+.endif
+
+SCONS_ENV+=	INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`"
+
 .include <bsd.port.pre.mk>
 
 .if defined (MAKE_JOBS_NUMBER)
-SCONS_ARGS+=     JOBS=${MAKE_JOBS_NUMBER}
+SCONS_ENV+=	JOBS=${MAKE_JOBS_NUMBER}
 .endif
 
 post-patch:
Index: pkg-plist
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/graphics/mapnik/pkg-plist,v
retrieving revision 1.4
diff -u -u -r1.4 pkg-plist
--- pkg-plist	24 May 2011 23:53:38 -0000	1.4
+++ pkg-plist	29 Jun 2011 00:01:18 -0000
@@ -103,9 +103,13 @@
 include/mapnik/distance.hpp
 lib/libmapnik.so
 lib/libmapnik.so.0
-lib/mapnik/input/postgis.input
+%%GDAL%%lib/mapnik/input/gdal.input
+%%OGR%%lib/mapnik/input/ogr.input
+%%OSM%%lib/mapnik/input/osm.input
+%%POSTGIS%%lib/mapnik/input/postgis.input
 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
--- mapnik-0.7.1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wen 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jun 29 01:40:18 UTC 2011 
Responsible-Changed-Why:  
wenheping@gmail.com => wen@ (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158412 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Jun 29 01:40:23 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158412 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: wenheping@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/158412: [PATCH] graphics/mapnik: fix fetch add more options
Date: Wed, 29 Jun 2011 01:40:21 UT

 Maintainer of graphics/mapnik,
 
 Please note that PR ports/158412 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/158412
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: amdmi3 
State-Changed-When: Wed Jun 29 14:58:50 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158412 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/158412: commit references a PR
Date: Wed, 29 Jun 2011 14:58:35 +0000 (UTC)

 amdmi3      2011-06-29 14:58:26 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/mapnik      Makefile pkg-plist 
   Log:
   - Fix incorrectly set MASTER_SITES
   - Make PostGIS input plugin optional
   - Add options for other input plugins, including OSM
   - Mark MAKE_JOBS_SAFE
   - Cosmetix fix around SCONS_ENV
   
   PR:             158412
   Submitted by:   myself
   Approved by:    wen heping <wenheping@gmail.com> (maintainer via private email)
   
   Revision  Changes    Path
   1.18      +54 -4     ports/graphics/mapnik/Makefile
   1.5       +5 -1      ports/graphics/mapnik/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
