View | Details | Raw Unified | Return to bug 194060 | Differences between
and this patch

Collapse All | Expand All

(-)qgis/Makefile (-11 / +30 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	qgis
4
PORTNAME=	qgis
5
PORTVERSION=	2.4.0
5
PORTVERSION=	2.4.0
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	graphics geography
7
CATEGORIES=	graphics geography
8
8
9
MAINTAINER=	rhurlin@gwdg.de
9
MAINTAINER=	rhurlin@gwdg.de
Lines 28-43 Link Here
28
GH_COMMIT=	00ab94f
28
GH_COMMIT=	00ab94f
29
GH_TAGNAME=	${GH_COMMIT}
29
GH_TAGNAME=	${GH_COMMIT}
30
30
31
USES=		bison cmake gmake python
31
USES=		bison cmake fortran gmake python
32
USE_SQLITE=	yes
32
USE_SQLITE=	yes
33
USE_QT4=	gui svg xml network sql designer testlib linguist_build \
33
USE_QT4=	gui svg xml network sql designer testlib linguist_build \
34
		qmake_build moc_build rcc_build uic_build
34
		qmake_build moc_build rcc_build uic_build
35
35
36
USE_LDCONFIG=	yes
36
USE_LDCONFIG=	yes
37
37
38
OPTIONS_DEFINE=		GRASS POSTGIS MAPSERVER PYTHON
38
OPTIONS_DEFINE=		GRASS POSTGIS PYTHON MAPSERVER
39
OPTIONS_DEFAULT=	POSTGIS PYTHON
39
OPTIONS_DEFAULT=	POSTGIS PYTHON
40
40
41
.if !defined(MAINTAINER_MODE)
42
CMAKE_ARGS+=	-Wno-dev
43
.endif
44
41
.include <bsd.port.options.mk>
45
.include <bsd.port.options.mk>
42
46
43
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
47
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
Lines 47-54 Link Here
47
.endif
51
.endif
48
52
49
.if ${PORT_OPTIONS:MGRASS}
53
.if ${PORT_OPTIONS:MGRASS}
50
CMAKE_ARGS+=	-DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.3
54
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000
51
RUN_DEPENDS+=	${LOCALBASE}/lib/gdalplugins/gdal_GRASS.so:${PORTSDIR}/graphics/gdal-grass
55
BROKEN=		GRASS plugin not supported on FreeBSD 8.x (does not have utempter.h)
56
.endif
57
BUILD_DEPENDS+=	grass64:${PORTSDIR}/databases/grass \
58
		${LOCALBASE}/lib/gdalplugins/gdal_GRASS.so:${PORTSDIR}/graphics/gdal-grass
59
RUN_DEPENDS+=	grass64:${PORTSDIR}/databases/grass \
60
		${LOCALBASE}/lib/gdalplugins/gdal_GRASS.so:${PORTSDIR}/graphics/gdal-grass
61
CMAKE_ARGS+=	-DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.4
52
FORCE_MAKE_JOBS=	NO
62
FORCE_MAKE_JOBS=	NO
53
PLIST_SUB+=	GRASS=""
63
PLIST_SUB+=	GRASS=""
54
.else
64
.else
Lines 57-63 Link Here
57
.endif
67
.endif
58
68
59
.if ${PORT_OPTIONS:MPOSTGIS}
69
.if ${PORT_OPTIONS:MPOSTGIS}
60
USE_PGSQL=	YES
70
USES+=		pgsql
61
CMAKE_ARGS+=	-DWITH_POSTGRESQL:BOOL=TRUE
71
CMAKE_ARGS+=	-DWITH_POSTGRESQL:BOOL=TRUE
62
PLIST_SUB+=	PGSQL=""
72
PLIST_SUB+=	PGSQL=""
63
.else
73
.else
Lines 67-77 Link Here
67
77
68
.if ${PORT_OPTIONS:MMAPSERVER}
78
.if ${PORT_OPTIONS:MMAPSERVER}
69
CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=TRUE
79
CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=TRUE
70
PLIST_SUB+=	QGIS_FCGI=""
80
PLIST_SUB+=	QGIS_MAPSERVER=""
71
LIB_DEPENDS+=	libfcgi.so:${PORTSDIR}/www/fcgi
81
LIB_DEPENDS+=	libfcgi.so:${PORTSDIR}/www/fcgi \
82
		libmapserver.so:${PORTSDIR}/graphics/mapserver
72
.else
83
.else
73
CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=FALSE
84
CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=FALSE
74
PLIST_SUB+=	QGIS_FCGI="@comment "
85
PLIST_SUB+=	QGIS_MAPSERVER="@comment "
75
.endif
86
.endif
76
87
77
.if ${PORT_OPTIONS:MPYTHON}
88
.if ${PORT_OPTIONS:MPYTHON}
Lines 79-91 Link Here
79
PLIST_SUB+=	QGIS_PYTHON=""
90
PLIST_SUB+=	QGIS_PYTHON=""
80
BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:${PORTSDIR}/devel/py-sip \
91
BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:${PORTSDIR}/devel/py-sip \
81
		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \
92
		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \
82
		${PYTHON_SITELIBDIR}/PyQt4/Qsci.so:${PORTSDIR}/devel/py-qt4-qscintilla2 \
93
		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
83
		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
94
		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
84
		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
95
		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
85
		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:${PORTSDIR}/graphics/py-qt4-svg \
96
		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:${PORTSDIR}/graphics/py-qt4-svg \
86
		${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
97
		${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
87
		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3
98
		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3
88
RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/osgeo/gdal.pyc:${PORTSDIR}/graphics/py-gdal
99
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gdal>=1.11.1:${PORTSDIR}/graphics/py-gdal \
100
		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \
101
		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \
102
		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
103
		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
104
		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:${PORTSDIR}/graphics/py-qt4-svg \
105
		${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
106
		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3 \
107
		${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:${PORTSDIR}/databases/pyspatialite
89
.else
108
.else
90
CMAKE_ARGS+=	-DWITH_BINDINGS:BOOL=FALSE
109
CMAKE_ARGS+=	-DWITH_BINDINGS:BOOL=FALSE
91
PLIST_SUB+=	QGIS_PYTHON="@comment "
110
PLIST_SUB+=	QGIS_PYTHON="@comment "
(-)qgis/pkg-plist (-3 / +3 lines)
Lines 1-9 Link Here
1
%%QGIS_FCGI%%%%QT_BINDIR%%/admin.sld
1
%%QGIS_MAPSERVER%%%%QT_BINDIR%%/admin.sld
2
%%QT_BINDIR%%/qbrowser
2
%%QT_BINDIR%%/qbrowser
3
%%QT_BINDIR%%/qgis
3
%%QT_BINDIR%%/qgis
4
%%QT_BINDIR%%/qgis_bench
4
%%QT_BINDIR%%/qgis_bench
5
%%QGIS_FCGI%%%%QT_BINDIR%%/qgis_mapserv.fcgi
5
%%QGIS_MAPSERVER%%%%QT_BINDIR%%/qgis_mapserv.fcgi
6
%%QGIS_FCGI%%%%QT_BINDIR%%/wms_metadata.xml
6
%%QGIS_MAPSERVER%%%%QT_BINDIR%%/wms_metadata.xml
7
include/qgis/Bezier3D.h
7
include/qgis/Bezier3D.h
8
include/qgis/CloughTocherInterpolator.h
8
include/qgis/CloughTocherInterpolator.h
9
include/qgis/DualEdgeTriangulation.h
9
include/qgis/DualEdgeTriangulation.h

Return to bug 194060