Attachment #136781 for bug #182078




LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
		libicuuc.so:${PORTSDIR}/devel/icu \
		libboost_system.so:${PORTSDIR}/devel/boost-libs \
		libboost_python.so:${PORTSDIR}/devel/boost-python-libs
BUILD_DEPENDS=	${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \
		${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu

USE_BZIP2=	yes
USES=		pkgconfig scons
USE_GNOME=	libxml2
USE_PYTHON=	2.6+
USE_LDCONFIG=	yes
USE_SCONS=	yes
WARNING_CXXFLAGS?=	-w

INPUT_PLUGINS=	geojson python raster shape

DOCSDIR2=	${DOCSDIR}/docs
DOC_FILES2=	*

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MCAIRO}

LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo
.else
MAKE_ARGS+=	CAIRO=False
.endif

.if ${PORT_OPTIONS:MCSV}

.if ${PORT_OPTIONS:MJPEG}
LIB_DEPENDS+=   jpeg:${PORTSDIR}/graphics/jpeg
.else
MAKE_ARGS+=	JPEG=False
.endif

.if ${PORT_OPTIONS:MPNG}
LIB_DEPENDS+=   png15:${PORTSDIR}/graphics/png
.else
MAKE_ARGS+=	PNG=False
.endif

.if ${PORT_OPTIONS:MTIFF}
LIB_DEPENDS+=   tiff:${PORTSDIR}/graphics/tiff
.else
MAKE_ARGS+=	TIFF=False
.endif

.include <bsd.port.pre.mk>

IGNORE=		does not install: runs out of virtual memory
.endif

MAKE_ARGS+=	WARNING_CXXFLAGS=${WARNING_CXXFLAGS}
MAKE_ARGS+=	INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`"
MAKE_ARGS+=	JOBS=${MAKE_JOBS_NUMBER}
MAKE_ARGS+=	${MAKE_ENV}

pre-configure:
.if ${PORT_OPTIONS:MSQLITE3}

	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \
		${WRKSRC}/SConstruct

do-install:
	@cd ${INSTALL_WRKSRC} && ${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} \
		${SCONS_INSTALL_TARGET}

post-install:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
.endif

.include <bsd.port.post.mk>




--- bindings/python/mapnik_text_placement.cpp.orig	2013-09-14 06:44:28.000000000 +0400
+++ bindings/python/mapnik_text_placement.cpp	2013-09-14 06:46:57.000000000 +0400
@@ -194,7 +194,11 @@
     ListNodeWrap(object l) : formatting::list_node(), wrapper<formatting::list_node>()
     {
         stl_input_iterator<formatting::node_ptr> begin(l), end;
-        children_.insert(children_.end(), begin, end);
+        while (begin != end)
+        {
+           children_.push_back(*begin);
+           ++begin;
+        }
     }
 
     /* TODO: Add constructor taking variable number of arguments.

Return to bug 182078

Lines 14-32 Link Here

(-)Makefile (-24 / +17 lines)
14	LICENSE= LGPL21	14	LICENSE= LGPL21
15	LICENSE_FILE= ${WRKSRC}/COPYING	15	LICENSE_FILE= ${WRKSRC}/COPYING
16		16
17	LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \	17	LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \
18	icuuc:${PORTSDIR}/devel/icu \	18	libicuuc.so:${PORTSDIR}/devel/icu \
19	boost_system:${PORTSDIR}/devel/boost-libs \	19	libboost_system.so:${PORTSDIR}/devel/boost-libs \
20	boost_python:${PORTSDIR}/devel/boost-python-libs	20	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
21	BUILD_DEPENDS= ${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \	21	BUILD_DEPENDS= ${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \
22	${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu	22	${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu
23		23
24	USE_BZIP2= yes	24	USE_BZIP2= yes
25	USES= pkgconfig	25	USES= pkgconfig scons
26	USE_GNOME= libxml2	26	USE_GNOME= libxml2
27	USE_PYTHON= 2.6+	27	USE_PYTHON= 2.6+
28	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
29	USE_SCONS= yes
30	WARNING_CXXFLAGS?= -w	29	WARNING_CXXFLAGS?= -w
31		30
32	INPUT_PLUGINS= geojson python raster shape	31	INPUT_PLUGINS= geojson python raster shape
Lines 54-60 Link Here
54	DOCSDIR2= ${DOCSDIR}/docs	53	DOCSDIR2= ${DOCSDIR}/docs
55	DOC_FILES2= *	54	DOC_FILES2= *
56		55
57	NO_STAGE= yes
58	.include <bsd.port.options.mk>	56	.include <bsd.port.options.mk>
59		57
60	.if ${PORT_OPTIONS:MCAIRO}	58	.if ${PORT_OPTIONS:MCAIRO}
Lines 61-67 Link Here
61	LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo	59	LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo
62	BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo	60	BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo
63	.else	61	.else
64	SCONS_ARGS+= CAIRO=False	62	MAKE_ARGS+= CAIRO=False
65	.endif	63	.endif
66		64
67	.if ${PORT_OPTIONS:MCSV}	65	.if ${PORT_OPTIONS:MCSV}
Lines 97-115 Link Here
97	.if ${PORT_OPTIONS:MJPEG}	95	.if ${PORT_OPTIONS:MJPEG}
98	LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg	96	LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg
99	.else	97	.else
100	SCONS_ARGS+= JPEG=False	98	MAKE_ARGS+= JPEG=False
101	.endif	99	.endif
102		100
103	.if ${PORT_OPTIONS:MPNG}	101	.if ${PORT_OPTIONS:MPNG}
104	LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png	102	LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
105	.else	103	.else
106	SCONS_ARGS+= PNG=False	104	MAKE_ARGS+= PNG=False
107	.endif	105	.endif
108		106
109	.if ${PORT_OPTIONS:MTIFF}	107	.if ${PORT_OPTIONS:MTIFF}
110	LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff	108	LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff
111	.else	109	.else
112	SCONS_ARGS+= TIFF=False	110	MAKE_ARGS+= TIFF=False
113	.endif	111	.endif
114		112
115	.include <bsd.port.pre.mk>	113	.include <bsd.port.pre.mk>
Lines 118-126 Link Here
118	IGNORE= does not install: runs out of virtual memory	116	IGNORE= does not install: runs out of virtual memory
119	.endif	117	.endif
120		118
121	SCONS_ARGS+= WARNING_CXXFLAGS=${WARNING_CXXFLAGS}	119	MAKE_ARGS+= WARNING_CXXFLAGS=${WARNING_CXXFLAGS}
122	SCONS_ARGS+= INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} \| ${TR} ' ' ,`"	120	MAKE_ARGS+= INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} \| ${TR} ' ' ,`"
123	SCONS_ARGS+= JOBS=${MAKE_JOBS_NUMBER}	121	MAKE_ARGS+= JOBS=${MAKE_JOBS_NUMBER}
		122	MAKE_ARGS+= ${MAKE_ENV}
124		123
125	pre-configure:	124	pre-configure:
126	.if ${PORT_OPTIONS:MSQLITE3}	125	.if ${PORT_OPTIONS:MSQLITE3}
Lines 137-152 Link Here
137	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \	136	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \
138	${WRKSRC}/SConstruct	137	${WRKSRC}/SConstruct
139		138
140	do-install:
141	@cd ${INSTALL_WRKSRC} && ${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} \
142	${SCONS_INSTALL_TARGET}
143
144	post-install:	139	post-install:
145	.if ${PORT_OPTIONS:MDOCS}	140	@${MKDIR} ${STAGEDIR}${DOCSDIR}
146	@${MKDIR} ${DOCSDIR}	141	${INSTALL_DATA} ${DOC_FILES1:S\|^\|${DOCSRCDIR1}/\|} ${STAGEDIR}${DOCSDIR}
147	${INSTALL_DATA} ${DOC_FILES1:S\|^\|${DOCSRCDIR1}/\|} ${DOCSDIR}	142	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
148	@${MKDIR} ${DOCSDIR2}	143	${INSTALL_DATA} ${DOC_FILES2:S\|^\|${DOCSRCDIR2}/\|} ${STAGEDIR}${DOCSDIR2}
149	${INSTALL_DATA} ${DOC_FILES2:S\|^\|${DOCSRCDIR2}/\|} ${DOCSDIR2}
150	.endif
151		144
152	.include <bsd.port.post.mk>	145	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-bindings-python-mapnik_text_placement.cpp (+15 lines)
	1	--- bindings/python/mapnik_text_placement.cpp.orig 2013-09-14 06:44:28.000000000 +0400
	2	+++ bindings/python/mapnik_text_placement.cpp 2013-09-14 06:46:57.000000000 +0400
	3	@@ -194,7 +194,11 @@
	4	ListNodeWrap(object l) : formatting::list_node(), wrapper<formatting::list_node>()
	5	{
	6	stl_input_iterator<formatting::node_ptr> begin(l), end;
	7	- children_.insert(children_.end(), begin, end);
	8	+ while (begin != end)
	9	+ {
	10	+ children_.push_back(*begin);
	11	+ ++begin;
	12	+ }
	13	}
	14
	15	/* TODO: Add constructor taking variable number of arguments.