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

Collapse All | Expand All

(-)qgis/Makefile (-11 / +24 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/graphics/qgis/Makefile 408979 2016-02-16 07:00:07Z lme $
2
# $FreeBSD: head/graphics/qgis/Makefile 408979 2016-02-16 07:00:07Z lme $
3
3
4
PORTNAME=	qgis
4
PORTNAME=	qgis
5
PORTVERSION=	2.12.2
5
PORTVERSION=	2.12.3
6
PORTREVISION=	1
7
CATEGORIES=	graphics geography
6
CATEGORIES=	graphics geography
8
7
9
MAINTAINER=	rhurlin@gwdg.de
8
MAINTAINER=	rhurlin@gwdg.de
Lines 24-47 Link Here
24
23
25
USE_GITHUB=	yes
24
USE_GITHUB=	yes
26
GH_PROJECT=	${PORTNAME:tu}
25
GH_PROJECT=	${PORTNAME:tu}
27
GH_TAGNAME=	B403532
26
GH_TAGNAME=	99ac688
28
27
29
USES=		cpe bison cmake execinfo fortran gmake sqlite python
28
USES=		cpe bison cmake execinfo fortran gmake python sqlite
30
USE_QT4=	gui svg xml network sql designer testlib linguist_build \
29
USE_QT4=	gui svg xml network sql designer testlib linguist_build \
31
		qmake_build moc_build rcc_build uic_build
30
		qmake_build moc_build rcc_build uic_build
32
31
33
USE_LDCONFIG=	yes
32
USE_LDCONFIG=	yes
34
33
35
OPTIONS_DEFINE=		POSTGIS PYTHON GRASS SERVER
34
OPTIONS_DEFINE=		PYTHON POSTGIS GRASS SERVER
36
OPTIONS_GROUP=		DEVELOPER
35
OPTIONS_GROUP=		DEVELOPER
37
OPTIONS_GROUP_DEVELOPER=	CUSTOMWIDGETS ASTYLE DEBUG
36
OPTIONS_GROUP_DEVELOPER=	CUSTOMWIDGETS ASTYLE DEBUG
38
OPTIONS_DEFAULT=	POSTGIS PYTHON
37
OPTIONS_DEFAULT=	PYTHON POSTGIS
39
OPTIONS_SUB=		yes
38
OPTIONS_SUB=		yes
40
NO_OPTIONS_SORT=	yes
39
NO_OPTIONS_SORT=	yes
41
ASTYLE_DESC=		Enable AStyle for QGis
40
ASTYLE_DESC=		Enable AStyle for QGis
42
CUSTOMWIDGETS_DESC=	Enable QT4/QGis Custom Widgets
41
CUSTOMWIDGETS_DESC=	Enable QT4/QGis Custom Widgets
43
DEBUG_DESC=		Write Debugging Output to Console
42
DEBUG_DESC=		Write Debugging Output to Console
44
SERVER_DESC=	Enable QGIS server
43
SERVER_DESC=		Enable QGIS server
45
44
46
CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=FALSE
45
CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=FALSE
47
46
Lines 69-78 Link Here
69
POSTGIS_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=TRUE
68
POSTGIS_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=TRUE
70
POSTGIS_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=FALSE
69
POSTGIS_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=FALSE
71
70
72
SERVER_LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
73
SERVER_CMAKE_ON=	-DWITH_SERVER:BOOL=TRUE
74
SERVER_CMAKE_OFF=	-DWITH_SERVER:BOOL=FALSE
75
76
PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
71
PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
77
			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
72
			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
78
			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
73
			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
Lines 98-103 Link Here
98
PYTHON_CMAKE_ON=	-DWITH_BINDINGS:BOOL=TRUE
93
PYTHON_CMAKE_ON=	-DWITH_BINDINGS:BOOL=TRUE
99
PYTHON_CMAKE_OFF=	-DWITH_BINDINGS:BOOL=FALSE
94
PYTHON_CMAKE_OFF=	-DWITH_BINDINGS:BOOL=FALSE
100
95
96
SERVER_LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
97
SERVER_CMAKE_ON=	-DWITH_SERVER:BOOL=TRUE
98
SERVER_CMAKE_OFF=	-DWITH_SERVER:BOOL=FALSE
99
101
.include <bsd.port.options.mk>
100
.include <bsd.port.options.mk>
102
101
103
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033
102
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033
Lines 112-116 Link Here
112
pre-patch:
111
pre-patch:
113
	@${REINPLACE_CMD} -e 's|tr( "QGIS code revision" ) + QString( "</td><td><a href=\\"https://github.com/qgis/QGIS/commit/%1\\">%1</a></td>" ).arg( QGis::QGIS_DEV_VERSION )|tr( "QGIS code revision" ) + "</td><td>" + tr( "${GH_TAGNAME}" ) + "</td>"|g' \
112
	@${REINPLACE_CMD} -e 's|tr( "QGIS code revision" ) + QString( "</td><td><a href=\\"https://github.com/qgis/QGIS/commit/%1\\">%1</a></td>" ).arg( QGis::QGIS_DEV_VERSION )|tr( "QGIS code revision" ) + "</td><td>" + tr( "${GH_TAGNAME}" ) + "</td>"|g' \
114
		${WRKSRC}/src/app/qgisapp.cpp
113
		${WRKSRC}/src/app/qgisapp.cpp
114
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033
115
# [Ugly workaround!] Because of GitHub #76aa035 from 2015-05-23
116
# 'Hide shared library symbols by default on GCC and Clang',
117
# some layer properties are not visible on FreeBSD > 9.x
118
	@${REINPLACE_CMD} -e 's|SET(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")|#SET(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")|g' \
119
		${WRKSRC}/src/analysis/CMakeLists.txt \
120
		${WRKSRC}/src/app/CMakeLists.txt \
121
		${WRKSRC}/src/core/CMakeLists.txt \
122
		${WRKSRC}/src/customwidgets/CMakeLists.txt \
123
		${WRKSRC}/src/gui/CMakeLists.txt \
124
		${WRKSRC}/src/plugins/CMakeLists.txt \
125
		${WRKSRC}/src/python/CMakeLists.txt \
126
		${WRKSRC}/src/server/CMakeLists.txt
127
.endif
115
128
116
.include <bsd.port.mk>
129
.include <bsd.port.mk>
(-)qgis/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (qgis-QGIS-2.12.2-B403532_GH0.tar.gz) = 47b3c1d67af3a02c6c387036c032245e044d5bd65fd2c8c4da2bcc45ff86ccfd
1
SHA256 (qgis-QGIS-2.12.3-99ac688_GH0.tar.gz) = 550fc21c7a8c4b7a5f1997fdfcc338916a880050a94eee792218c61a12a7fd9e
2
SIZE (qgis-QGIS-2.12.2-B403532_GH0.tar.gz) = 80837408
2
SIZE (qgis-QGIS-2.12.3-99ac688_GH0.tar.gz) = 80834484
(-)qgis/pkg-plist (-9 / +9 lines)
Lines 631-651 Link Here
631
include/qgis/ui_qgsquerybuilderbase.h
631
include/qgis/ui_qgsquerybuilderbase.h
632
include/qgis/ui_qgssublayersdialogbase.h
632
include/qgis/ui_qgssublayersdialogbase.h
633
lib/libqgis_analysis.so
633
lib/libqgis_analysis.so
634
lib/libqgis_analysis.so.2.12.2
634
lib/libqgis_analysis.so.2.12.3
635
lib/libqgis_app.so
635
lib/libqgis_app.so
636
lib/libqgis_app.so.2.12.2
636
lib/libqgis_app.so.2.12.3
637
lib/libqgis_core.so
637
lib/libqgis_core.so
638
lib/libqgis_core.so.2.12.2
638
lib/libqgis_core.so.2.12.3
639
lib/libqgis_gui.so
639
lib/libqgis_gui.so
640
lib/libqgis_gui.so.2.12.2
640
lib/libqgis_gui.so.2.12.3
641
lib/libqgis_networkanalysis.so
641
lib/libqgis_networkanalysis.so
642
lib/libqgis_networkanalysis.so.2.12.2
642
lib/libqgis_networkanalysis.so.2.12.3
643
%%SERVER%%lib/libqgis_server.so
643
%%SERVER%%lib/libqgis_server.so
644
%%SERVER%%lib/libqgis_server.so.2.12.2
644
%%SERVER%%lib/libqgis_server.so.2.12.3
645
%%GRASS%%lib/libqgisgrass6.so
645
%%GRASS%%lib/libqgisgrass6.so
646
%%GRASS%%lib/libqgisgrass6.so.2.12.2
646
%%GRASS%%lib/libqgisgrass6.so.2.12.3
647
%%PYTHON%%lib/libqgispython.so
647
%%PYTHON%%lib/libqgispython.so
648
%%PYTHON%%lib/libqgispython.so.2.12.2
648
%%PYTHON%%lib/libqgispython.so.2.12.3
649
%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py
649
%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py
650
lib/qgis/crssync
650
lib/qgis/crssync
651
%%GRASS%%lib/qgis/grass/bin/qgis.g.browser6
651
%%GRASS%%lib/qgis/grass/bin/qgis.g.browser6
Lines 691-697 Link Here
691
lib/qgis/plugins/libzonalstatisticsplugin.so
691
lib/qgis/plugins/libzonalstatisticsplugin.so
692
lib/qgis/qgis_help
692
lib/qgis/qgis_help
693
%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so
693
%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so
694
%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.12.2
694
%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.12.3
695
man/man1/qbrowser.1.gz
695
man/man1/qbrowser.1.gz
696
man/man1/qgis.1.gz
696
man/man1/qgis.1.gz
697
%%DATADIR%%/FindQGIS.cmake
697
%%DATADIR%%/FindQGIS.cmake

Return to bug 206412