Attachment #123503 for bug #166857

View | Details | Raw Unified | Return to bug 166857
Collapse All | Expand All




# $FreeBSD: ports/graphics/mapnik/Makefile,v 1.21 2011/12/28 03:53:49 linimon Exp $
#

PORTNAME=	mapnik
PORTVERSION=	2.0.1
DISTVERSIONPREFIX=	v
CATEGORIES=	graphics geography
MASTER_SITES=	http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/
MASTER_SITE_SUBDIR=	mapnik
DISTNAME=	mapnik-${PORTVERSION}

MAINTAINER=	wenheping@gmail.com
COMMENT=	A Free Toolkit For Developing Mapping Applications

USE_GNOME=	pkgconfig libxml2
MAKE_JOBS_SAFE=	yes

CONFLICTS=	mapnik-1.*

INPUT_PLUGINS=	raster shape

OPTIONS=	CAIRO "Enable cairo rendering" on \

Lines 1-2 Link Here

(-)graphics/mapnik/distinfo (-2 / +2 lines)
1	SHA256 (mapnik-2.0.0.tar.bz2) = 036477761e56a4e0ccad58d9426bbde39566aecdb9cb845469c1221292fab6bc	1	SHA256 (mapnik-v2.0.1.tar.bz2) = fe3da0b1adbb48f55ebd01ab0e95e5183f512154249f1d407b7e59aa9176ba8c
2	SIZE (mapnik-2.0.0.tar.bz2) = 12302295	2	SIZE (mapnik-v2.0.1.tar.bz2) = 12018783




--- bindings/python/build.py.orig	2011-10-08 18:47:26.408387316 +0400
+++ bindings/python/build.py	2011-10-08 18:49:32.905390831 +0400
@@ -144,10 +144,6 @@
     os.mkdir('mapnik')
 file('mapnik/paths.py','w').write(paths % (env['MAPNIK_LIB_DIR']))
 
-try:
-    os.chmod('mapnik/paths.py',0666)
-except: pass
-
 # install the core mapnik python files, including '__init__.py' and 'paths.py'
 if 'install' in COMMAND_LINE_TARGETS:
     init_files = glob.glob('mapnik/*.py')

Lines 1-11 Link Here

(-)graphics/mapnik/files/patch-include-mapnik-grid.hpp (-11 lines)
1	--- include/mapnik/grid/grid.hpp.orig 2011-10-09 13:38:31.962692544 +0400
2	+++ include/mapnik/grid/grid.hpp 2011-10-09 13:38:53.371691622 +0400
3	@@ -284,7 +284,7 @@
4	{
5
6	#ifdef MAPNIK_BIG_ENDIAN
7	- unsigned a1 = (int)((rgba1 & 0xff) * opacity) & 0xff; // adjust for desired opacity
8	+ unsigned a = (int)((rgba1 & 0xff) * opacity) & 0xff; // adjust for desired opacity
9	#else
10	unsigned a = (int)(((rgba1 >> 24) & 0xff) * opacity) & 0xff; // adjust for desired opacity
11	#endif




--- src/build.py.orig	2012-04-11 14:29:19.000000000 +0400
+++ src/build.py	2012-04-11 14:34:13.000000000 +0400
@@ -80,6 +80,8 @@
 
 if env['PLATFORM'] == 'Darwin':
     mapnik_libname = 'libmapnik.dylib'
+elif env['PLATFORM'] == 'FreeBSD':
+    mapnik_libname = 'libmapnik.so.' + ("%d" % int(ABI_VERSION[0]))
 else:
     mapnik_libname = 'libmapnik.so.' + ("%d.%d" % (int(ABI_VERSION[0]),int(ABI_VERSION[1])))
 
@@ -326,8 +328,12 @@
         os.symlink(os.path.basename(src), trgt)
 
     major, minor, micro = ABI_VERSION
-    
-    soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), int(major), int(minor), int(micro))
+
+    if env['PLATFORM'] == 'FreeBSD':
+        soFile = "%s.%d" % (os.path.basename(str(mapnik[0])), int(major))
+    else:
+        soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), int(major), int(minor), int(micro))
+   
     target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], soFile)
     
     if 'uninstall' not in COMMAND_LINE_TARGETS:
@@ -342,13 +348,17 @@
     target2 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], os.path.basename(str(mapnik[0])))
     if 'uninstall' not in COMMAND_LINE_TARGETS:
         if 'install' in COMMAND_LINE_TARGETS:




--- utils/mapnik-config/mapnik-config.template.sh.orig	2011-10-08 20:02:02.011385698 +0400
+++ utils/mapnik-config/mapnik-config.template.sh	2011-10-08 20:02:21.915390000 +0400
@@ -48,11 +48,11 @@
       ;;
 
     -v)
-      echo $CONFIG_VERSION
+      echo $CONFIG_MAPNIK_VERSION
       ;;
 
     --version)
-      echo $CONFIG_VERSION
+      echo $CONFIG_MAPNIK_VERSION
       ;;
 
     --json)




include/mapnik/box2d.hpp
include/mapnik/css_color_grammar.hpp
include/mapnik/css_color_grammar_deprecated.hpp
include/mapnik/expression.hpp
include/mapnik/expression_evaluator.hpp
include/mapnik/expression_grammar.hpp
include/mapnik/expression_node.hpp

include/mapnik/warp.hpp
include/mapnik/wkt/wkt_factory.hpp
include/mapnik/wkt/wkt_grammar.hpp
lib/libmapnik.so
lib/libmapnik.so.2
%%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
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
%%PYTHON_SITELIBDIR%%/mapnik/_mapnik.so
%%PYTHON_SITELIBDIR%%/mapnik2/__init__.py
@dirrm %%PYTHON_SITELIBDIR%%/mapnik
%%PYTHON_SITELIBDIR%%/mapnik2/paths.py
%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/wms130.py
%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/WMS.py
%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/wms111.py
%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/modserver.py
%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/cgiserver.py
%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/__init__.py
%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/common.py
%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/configparser.py
%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/exceptions.py
%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/wsgi.py
%%PYTHON_SITELIBDIR%%/mapnik2/_mapnik2.so
@dirrm %%PYTHON_SITELIBDIR%%/mapnik2/ogcserver
@dirrm %%PYTHON_SITELIBDIR%%/mapnik2
@dirrm lib/mapnik/input
@dirrm lib/mapnik/fonts
@dirrm lib/mapnik
@dirrm include/mapnik/grid
@dirrm include/mapnik/svg
@dirrm include/mapnik/wkt

Return to bug 166857

Lines 93-98 Link Here

(-)graphics/mapnik/pkg-plist (-48 / +40 lines)
93	include/mapnik/box2d.hpp	93	include/mapnik/box2d.hpp
94	include/mapnik/css_color_grammar.hpp	94	include/mapnik/css_color_grammar.hpp
95	include/mapnik/css_color_grammar_deprecated.hpp	95	include/mapnik/css_color_grammar_deprecated.hpp
		96	include/mapnik/expression.hpp
96	include/mapnik/expression_evaluator.hpp	97	include/mapnik/expression_evaluator.hpp
97	include/mapnik/expression_grammar.hpp	98	include/mapnik/expression_grammar.hpp
98	include/mapnik/expression_node.hpp	99	include/mapnik/expression_node.hpp
Lines 146-201 Link Here
146	include/mapnik/warp.hpp	147	include/mapnik/warp.hpp
147	include/mapnik/wkt/wkt_factory.hpp	148	include/mapnik/wkt/wkt_factory.hpp
148	include/mapnik/wkt/wkt_grammar.hpp	149	include/mapnik/wkt/wkt_grammar.hpp
149	lib/libmapnik2.so	150	lib/libmapnik.so
150	lib/libmapnik2.so.2	151	lib/libmapnik.so.2
151	%%GDAL%%lib/mapnik2/input/gdal.input	152	%%GDAL%%lib/mapnik/input/gdal.input
152	%%OGR%%lib/mapnik2/input/ogr.input	153	%%OGR%%lib/mapnik/input/ogr.input
153	%%OSM%%lib/mapnik2/input/osm.input	154	%%OSM%%lib/mapnik/input/osm.input
154	%%POSTGIS%%lib/mapnik2/input/postgis.input	155	%%POSTGIS%%lib/mapnik/input/postgis.input
155	lib/mapnik2/input/raster.input	156	lib/mapnik/input/raster.input
156	lib/mapnik2/input/shape.input	157	lib/mapnik/input/shape.input
157	%%SQLITE%%lib/mapnik2/input/sqlite.input	158	%%SQLITE%%lib/mapnik/input/sqlite.input
158	lib/mapnik2/fonts/unifont-5.1.20080907.ttf	159	lib/mapnik/fonts/unifont-5.1.20080907.ttf
159	lib/mapnik2/fonts/DejaVuSerif-BoldItalic.ttf	160	lib/mapnik/fonts/DejaVuSerif-BoldItalic.ttf
160	lib/mapnik2/fonts/DejaVuSerifCondensed-BoldItalic.ttf	161	lib/mapnik/fonts/DejaVuSerifCondensed-BoldItalic.ttf
161	lib/mapnik2/fonts/DejaVuSerif-Italic.ttf	162	lib/mapnik/fonts/DejaVuSerif-Italic.ttf
162	lib/mapnik2/fonts/DejaVuSerifCondensed-Italic.ttf	163	lib/mapnik/fonts/DejaVuSerifCondensed-Italic.ttf
163	lib/mapnik2/fonts/DejaVuSansMono-Oblique.ttf	164	lib/mapnik/fonts/DejaVuSansMono-Oblique.ttf
164	lib/mapnik2/fonts/DejaVuSerifCondensed-Bold.ttf	165	lib/mapnik/fonts/DejaVuSerifCondensed-Bold.ttf
165	lib/mapnik2/fonts/DejaVuSansCondensed-Oblique.ttf	166	lib/mapnik/fonts/DejaVuSansCondensed-Oblique.ttf
166	lib/mapnik2/fonts/DejaVuSansCondensed-Bold.ttf	167	lib/mapnik/fonts/DejaVuSansCondensed-Bold.ttf
167	lib/mapnik2/fonts/DejaVuSans-Oblique.ttf	168	lib/mapnik/fonts/DejaVuSans-Oblique.ttf
168	lib/mapnik2/fonts/DejaVuSansCondensed.ttf	169	lib/mapnik/fonts/DejaVuSansCondensed.ttf
169	lib/mapnik2/fonts/DejaVuSansMono-Bold.ttf	170	lib/mapnik/fonts/DejaVuSansMono-Bold.ttf
170	lib/mapnik2/fonts/DejaVuSans.ttf	171	lib/mapnik/fonts/DejaVuSans.ttf
171	lib/mapnik2/fonts/DejaVuSans-Bold.ttf	172	lib/mapnik/fonts/DejaVuSans-Bold.ttf
172	lib/mapnik2/fonts/DejaVuSans-ExtraLight.ttf	173	lib/mapnik/fonts/DejaVuSans-ExtraLight.ttf
173	lib/mapnik2/fonts/DejaVuSerif.ttf	174	lib/mapnik/fonts/DejaVuSerif.ttf
174	lib/mapnik2/fonts/DejaVuSerifCondensed.ttf	175	lib/mapnik/fonts/DejaVuSerifCondensed.ttf
175	lib/mapnik2/fonts/DejaVuSansCondensed-BoldOblique.ttf	176	lib/mapnik/fonts/DejaVuSansCondensed-BoldOblique.ttf
176	lib/mapnik2/fonts/DejaVuSansMono-BoldOblique.ttf	177	lib/mapnik/fonts/DejaVuSansMono-BoldOblique.ttf
177	lib/mapnik2/fonts/DejaVuSans-BoldOblique.ttf	178	lib/mapnik/fonts/DejaVuSans-BoldOblique.ttf
178	lib/mapnik2/fonts/DejaVuSerif-Bold.ttf	179	lib/mapnik/fonts/DejaVuSerif-Bold.ttf
179	lib/mapnik2/fonts/DejaVuSansMono.ttf	180	lib/mapnik/fonts/DejaVuSansMono.ttf
		181	%%PYTHON_SITELIBDIR%%/mapnik/__init__.py
		182	%%PYTHON_SITELIBDIR%%/mapnik/printing.py
		183	%%PYTHON_SITELIBDIR%%/mapnik/paths.py
		184	%%PYTHON_SITELIBDIR%%/mapnik/_mapnik.so
180	%%PYTHON_SITELIBDIR%%/mapnik2/__init__.py	185	%%PYTHON_SITELIBDIR%%/mapnik2/__init__.py
181	%%PYTHON_SITELIBDIR%%/mapnik2/printing.py	186	@dirrm %%PYTHON_SITELIBDIR%%/mapnik
182	%%PYTHON_SITELIBDIR%%/mapnik2/paths.py
183	%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/wms130.py
184	%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/WMS.py
185	%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/wms111.py
186	%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/modserver.py
187	%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/cgiserver.py
188	%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/__init__.py
189	%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/common.py
190	%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/configparser.py
191	%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/exceptions.py
192	%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/wsgi.py
193	%%PYTHON_SITELIBDIR%%/mapnik2/_mapnik2.so
194	@dirrm %%PYTHON_SITELIBDIR%%/mapnik2/ogcserver
195	@dirrm %%PYTHON_SITELIBDIR%%/mapnik2	187	@dirrm %%PYTHON_SITELIBDIR%%/mapnik2
196	@dirrm lib/mapnik2/input	188	@dirrm lib/mapnik/input
197	@dirrm lib/mapnik2/fonts	189	@dirrm lib/mapnik/fonts
198	@dirrm lib/mapnik2	190	@dirrm lib/mapnik
199	@dirrm include/mapnik/grid	191	@dirrm include/mapnik/grid
200	@dirrm include/mapnik/svg	192	@dirrm include/mapnik/svg
201	@dirrm include/mapnik/wkt	193	@dirrm include/mapnik/wkt

Lines 5-16 Link Here

(-)graphics/mapnik/Makefile (-7 / +4 lines)
5	# $FreeBSD: ports/graphics/mapnik/Makefile,v 1.21 2011/12/28 03:53:49 linimon Exp $	5	# $FreeBSD: ports/graphics/mapnik/Makefile,v 1.21 2011/12/28 03:53:49 linimon Exp $
6	#	6	#
7		7
8	PORTNAME= mapnik2	8	PORTNAME= mapnik
9	PORTVERSION= 2.0.0	9	PORTVERSION= 2.0.1
		10	DISTVERSIONPREFIX= v
10	CATEGORIES= graphics geography	11	CATEGORIES= graphics geography
11	MASTER_SITES= BERLIOS	12	MASTER_SITES= http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/
12	MASTER_SITE_SUBDIR= mapnik
13	DISTNAME= mapnik-${PORTVERSION}
14		13
15	MAINTAINER= wenheping@gmail.com	14	MAINTAINER= wenheping@gmail.com
16	COMMENT= A Free Toolkit For Developing Mapping Applications	15	COMMENT= A Free Toolkit For Developing Mapping Applications
Lines 38-45 Link Here
38	USE_GNOME= pkgconfig libxml2	37	USE_GNOME= pkgconfig libxml2
39	MAKE_JOBS_SAFE= yes	38	MAKE_JOBS_SAFE= yes
40		39
41	CONFLICTS= mapnik-1.*
42
43	INPUT_PLUGINS= raster shape	40	INPUT_PLUGINS= raster shape
44		41
45	OPTIONS= CAIRO "Enable cairo rendering" on \	42	OPTIONS= CAIRO "Enable cairo rendering" on \

Lines 1-13 Link Here

(-)graphics/mapnik/files/patch-bindings-python-build.py (-13 lines)
1	--- bindings/python/build.py.orig 2011-10-08 18:47:26.408387316 +0400
2	+++ bindings/python/build.py 2011-10-08 18:49:32.905390831 +0400
3	@@ -144,10 +144,6 @@
4	os.mkdir('mapnik')
5	file('mapnik/paths.py','w').write(paths % (env['MAPNIK_LIB_DIR']))
6
7	-try:
8	- os.chmod('mapnik/paths.py',0666)
9	-except: pass
10	-
11	# install the core mapnik python files, including '__init__.py' and 'paths.py'
12	if 'install' in COMMAND_LINE_TARGETS:
13	init_files = glob.glob('mapnik/*.py')

Lines 1-27 Link Here

(-)graphics/mapnik/files/patch-src-build.py (-12 / +15 lines)
1	--- src/build.py.orig 2011-09-26 14:30:13.000000000 +0400	1	--- src/build.py.orig 2012-04-11 14:29:19.000000000 +0400
2	+++ src/build.py 2011-10-08 19:52:17.875391466 +0400	2	+++ src/build.py 2012-04-11 14:34:13.000000000 +0400
3	@@ -79,6 +79,8 @@	3	@@ -80,6 +80,8 @@
4		4
5	if env['PLATFORM'] == 'Darwin':	5	if env['PLATFORM'] == 'Darwin':
6	mapnik_libname = 'libmapnik2.dylib'	6	mapnik_libname = 'libmapnik.dylib'
7	+elif env['PLATFORM'] == 'FreeBSD':	7	+elif env['PLATFORM'] == 'FreeBSD':
8	+ mapnik_libname = 'libmapnik2.so.' + ("%d" % (ABI_VERSION[0]))	8	+ mapnik_libname = 'libmapnik.so.' + ("%d" % int(ABI_VERSION[0]))
9	else:	9	else:
10	mapnik_libname = 'libmapnik2.so.' + ("%d.%d" % (ABI_VERSION[0],ABI_VERSION[1]))	10	mapnik_libname = 'libmapnik.so.' + ("%d.%d" % (int(ABI_VERSION[0]),int(ABI_VERSION[1])))
11		11
12	@@ -320,7 +322,10 @@	12	@@ -326,8 +328,12 @@
		13	os.symlink(os.path.basename(src), trgt)
13		14
14	major, minor, micro = ABI_VERSION	15	major, minor, micro = ABI_VERSION
15		16	-
16	- soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)	17	- soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), int(major), int(minor), int(micro))
		18	+
17	+ if env['PLATFORM'] == 'FreeBSD':	19	+ if env['PLATFORM'] == 'FreeBSD':
18	+ soFile = "%s.%d" % (os.path.basename(str(mapnik[0])), major)	20	+ soFile = "%s.%d" % (os.path.basename(str(mapnik[0])), int(major))
19	+ else:	21	+ else:
20	+ soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)	22	+ soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), int(major), int(minor), int(micro))
		23	+
21	target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], soFile)	24	target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], soFile)
22		25
23	if 'uninstall' not in COMMAND_LINE_TARGETS:	26	if 'uninstall' not in COMMAND_LINE_TARGETS:
24	@@ -335,13 +340,17 @@	27	@@ -342,13 +348,17 @@
25	target2 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], os.path.basename(str(mapnik[0])))	28	target2 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], os.path.basename(str(mapnik[0])))
26	if 'uninstall' not in COMMAND_LINE_TARGETS:	29	if 'uninstall' not in COMMAND_LINE_TARGETS:
27	if 'install' in COMMAND_LINE_TARGETS:	30	if 'install' in COMMAND_LINE_TARGETS:

Lines 1-16 Link Here

(-)graphics/mapnik/files/patch-utils-mapnik-config-mapnik-config.template.sh (-16 lines)
1	--- utils/mapnik-config/mapnik-config.template.sh.orig 2011-10-08 20:02:02.011385698 +0400
2	+++ utils/mapnik-config/mapnik-config.template.sh 2011-10-08 20:02:21.915390000 +0400
3	@@ -48,11 +48,11 @@
4	;;
5
6	-v)
7	- echo $CONFIG_VERSION
8	+ echo $CONFIG_MAPNIK_VERSION
9	;;
10
11	--version)
12	- echo $CONFIG_VERSION
13	+ echo $CONFIG_MAPNIK_VERSION
14	;;
15
16	--json)