Attachment #150459 for bug #195875




# $FreeBSD: head/graphics/qgis/Makefile 374303 2014-12-08 16:48:38Z tijl $

PORTNAME=	qgis
PORTVERSION=	2.6.1
PORTREVISION=	1
CATEGORIES=	graphics geography

MAINTAINER=	rhurlin@gwdg.de


USE_GITHUB=
GH_ACCOUNT=	qgis
GH_COMMIT=	e2a51df
GH_TAGNAME=	${GH_COMMIT}

USES=		bison cmake fortran gmake python


.include <bsd.port.options.mk>

.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033
USES+=		compiler:features
.else
USES+=		compiler:gcc-c++11-lib
BUILD_DEPENDS+=	flex>=2.5.39:${PORTSDIR}/textproc/flex
CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex
CXXFLAGS+=	-I${LOCALBASE}/include/flex
.endif

.if ${PORT_OPTIONS:MGRASS}

		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:${PORTSDIR}/graphics/py-qt4-svg \
		${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3 \
		${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:${PORTSDIR}/databases/pyspatialite \
		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:${PORTSDIR}/databases/py-psycopg2
.else
CMAKE_ARGS+=	-DWITH_BINDINGS:BOOL=FALSE
PLIST_SUB+=	QGIS_PYTHON="@comment "

Lines 1-2 Link Here

(-)qgis/distinfo (-2 / +2 lines)
1	SHA256 (qgis-2.6.0.tar.gz) = da73333e65a9e7c3276b68d1b17bd56352a0b6b364d094965437b9dc56b5dedf	1	SHA256 (qgis-2.6.1.tar.gz) = dfadd5f088acb1e2e588897857b789bdf89b192238c2d9eeb7382b11312f9f4c
2	SIZE (qgis-2.6.0.tar.gz) = 70096139	2	SIZE (qgis-2.6.1.tar.gz) = 70057271




include/qgis/ui_qgsquerybuilderbase.h
include/qgis/ui_qgssublayersdialogbase.h
lib/libqgis_analysis.so
lib/libqgis_analysis.so.2.6.1
lib/libqgis_core.so
lib/libqgis_core.so.2.6.1
lib/libqgis_gui.so
lib/libqgis_gui.so.2.6.1
lib/libqgis_networkanalysis.so
lib/libqgis_networkanalysis.so.2.6.1
%%GRASS%%lib/libqgisgrass.so
%%GRASS%%lib/libqgisgrass.so.2.6.1
%%QGIS_PYTHON%%lib/libqgispython.so
%%QGIS_PYTHON%%lib/libqgispython.so.2.6.1
lib/qgis/crssync
%%GRASS%%lib/qgis/grass/bin/qgis.g.browser
%%GRASS%%lib/qgis/grass/modules/qgis.d.rast

%%DATADIR%%/i18n/qgis_fi.qm
%%DATADIR%%/i18n/qgis_fr.qm
%%DATADIR%%/i18n/qgis_gl.qm
%%DATADIR%%/i18n/qgis_hi.qm
%%DATADIR%%/i18n/qgis_hr.qm
%%DATADIR%%/i18n/qgis_hu.qm
%%DATADIR%%/i18n/qgis_id.qm

Return to bug 195875

Lines 510-526 Link Here

(-)qgis/pkg-plist (-6 / +7 lines)
510	include/qgis/ui_qgsquerybuilderbase.h	510	include/qgis/ui_qgsquerybuilderbase.h
511	include/qgis/ui_qgssublayersdialogbase.h	511	include/qgis/ui_qgssublayersdialogbase.h
512	lib/libqgis_analysis.so	512	lib/libqgis_analysis.so
513	lib/libqgis_analysis.so.2.6.0	513	lib/libqgis_analysis.so.2.6.1
514	lib/libqgis_core.so	514	lib/libqgis_core.so
515	lib/libqgis_core.so.2.6.0	515	lib/libqgis_core.so.2.6.1
516	lib/libqgis_gui.so	516	lib/libqgis_gui.so
517	lib/libqgis_gui.so.2.6.0	517	lib/libqgis_gui.so.2.6.1
518	lib/libqgis_networkanalysis.so	518	lib/libqgis_networkanalysis.so
519	lib/libqgis_networkanalysis.so.2.6.0	519	lib/libqgis_networkanalysis.so.2.6.1
520	%%GRASS%%lib/libqgisgrass.so	520	%%GRASS%%lib/libqgisgrass.so
521	%%GRASS%%lib/libqgisgrass.so.2.6.0	521	%%GRASS%%lib/libqgisgrass.so.2.6.1
522	%%QGIS_PYTHON%%lib/libqgispython.so	522	%%QGIS_PYTHON%%lib/libqgispython.so
523	%%QGIS_PYTHON%%lib/libqgispython.so.2.6.0	523	%%QGIS_PYTHON%%lib/libqgispython.so.2.6.1
524	lib/qgis/crssync	524	lib/qgis/crssync
525	%%GRASS%%lib/qgis/grass/bin/qgis.g.browser	525	%%GRASS%%lib/qgis/grass/bin/qgis.g.browser
526	%%GRASS%%lib/qgis/grass/modules/qgis.d.rast	526	%%GRASS%%lib/qgis/grass/modules/qgis.d.rast
Lines 1478-1483 Link Here
1478	%%DATADIR%%/i18n/qgis_fi.qm	1478	%%DATADIR%%/i18n/qgis_fi.qm
1479	%%DATADIR%%/i18n/qgis_fr.qm	1479	%%DATADIR%%/i18n/qgis_fr.qm
1480	%%DATADIR%%/i18n/qgis_gl.qm	1480	%%DATADIR%%/i18n/qgis_gl.qm
		1481	%%DATADIR%%/i18n/qgis_hi.qm
1481	%%DATADIR%%/i18n/qgis_hr.qm	1482	%%DATADIR%%/i18n/qgis_hr.qm
1482	%%DATADIR%%/i18n/qgis_hu.qm	1483	%%DATADIR%%/i18n/qgis_hu.qm
1483	%%DATADIR%%/i18n/qgis_id.qm	1484	%%DATADIR%%/i18n/qgis_id.qm

Lines 2-9 Link Here

(-)qgis/Makefile (-5 / +8 lines)
2	# $FreeBSD: head/graphics/qgis/Makefile 374303 2014-12-08 16:48:38Z tijl $	2	# $FreeBSD: head/graphics/qgis/Makefile 374303 2014-12-08 16:48:38Z tijl $
3		3
4	PORTNAME= qgis	4	PORTNAME= qgis
5	PORTVERSION= 2.6.0	5	PORTVERSION= 2.6.1
6	PORTREVISION= 1
7	CATEGORIES= graphics geography	6	CATEGORIES= graphics geography
8		7
9	MAINTAINER= rhurlin@gwdg.de	8	MAINTAINER= rhurlin@gwdg.de
Lines 25-31 Link Here
25		24
26	USE_GITHUB=	25	USE_GITHUB=
27	GH_ACCOUNT= qgis	26	GH_ACCOUNT= qgis
28	GH_COMMIT= 5016213	27	GH_COMMIT= e2a51df
29	GH_TAGNAME= ${GH_COMMIT}	28	GH_TAGNAME= ${GH_COMMIT}
30		29
31	USES= bison cmake fortran gmake python	30	USES= bison cmake fortran gmake python
Lines 44-53 Link Here
44		43
45	.include <bsd.port.options.mk>	44	.include <bsd.port.options.mk>
46		45
47	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000	46	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033
48	USES+= compiler:features	47	USES+= compiler:features
49	.else	48	.else
50	USES+= compiler:gcc-c++11-lib	49	USES+= compiler:gcc-c++11-lib
		50	BUILD_DEPENDS+= flex>=2.5.39:${PORTSDIR}/textproc/flex
		51	CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex
		52	CXXFLAGS+= -I${LOCALBASE}/include/flex
51	.endif	53	.endif
52		54
53	.if ${PORT_OPTIONS:MGRASS}	55	.if ${PORT_OPTIONS:MGRASS}
Lines 104-110 Link Here
104	${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:${PORTSDIR}/graphics/py-qt4-svg \	106	${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 \	107	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
106	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3 \	108	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3 \
107	${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:${PORTSDIR}/databases/pyspatialite	109	${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:${PORTSDIR}/databases/pyspatialite \
		110	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:${PORTSDIR}/databases/py-psycopg2
108	.else	111	.else
109	CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=FALSE	112	CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=FALSE
110	PLIST_SUB+= QGIS_PYTHON="@comment "	113	PLIST_SUB+= QGIS_PYTHON="@comment "