- Update to 2.2.0

- Change MASTER_SITES to github
- Add license
- Use new LIB_DEPENDS format
- Use clang with new compiler features, if possible
- Remove BROKEN for 7.x
- Only default option is postgis now
- Support staging
- Pass maintainership to submitter

Submitted by:	rhurlin@gwdg.de(via Email)

graphics/qgis/Makefile

@@ -2,48 +2,56 @@
 # $FreeBSD$
 
 PORTNAME=	qgis
-PORTVERSION=	1.8.0
-PORTREVISION=	5
+PORTVERSION=	2.2.0
 CATEGORIES=	graphics geography
-MASTER_SITES=	http://qgis.org/downloads/ \
-		http://download.osgeo.org/qgis/src/
 
-MAINTAINER=	wen@FreeBSD.org
+MAINTAINER=	rhurlin@gwdg.de
 COMMENT=	Geographical Information System (GIS) data viewer
 
-LIB_DEPENDS=	geos:${PORTSDIR}/graphics/geos \
-		proj:${PORTSDIR}/graphics/proj \
-		gsl:${PORTSDIR}/math/gsl \
-		qwt:${PORTSDIR}/x11-toolkits/qwt5 \
-		gdal:${PORTSDIR}/graphics/gdal \
-		spatialite:${PORTSDIR}/databases/spatialite \
-		spatialindex:${PORTSDIR}/devel/spatialindex
+LICENSE=	GPLv2
 
-USE_BZIP2=	yes
+LIB_DEPENDS=	libgeos.so:${PORTSDIR}/graphics/geos \
+		libproj.so:${PORTSDIR}/graphics/proj \
+		libgsl.so:${PORTSDIR}/math/gsl \
+		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
+		libgdal.so:${PORTSDIR}/graphics/gdal \
+		libspatialite.so:${PORTSDIR}/databases/spatialite \
+		libspatialindex.so:${PORTSDIR}/devel/spatialindex \
+		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+
+BUILD_DEPENDS=	txt2tags:${PORTSDIR}/textproc/txt2tags
+
+WRKSRC=	${WRKDIR}/${PORTNAME}-QGIS-${GH_COMMIT}
+
+USE_GITHUB=
+GH_ACCOUNT=	qgis
+GH_COMMIT=	1c3699e
+GH_TAGNAME=	${GH_COMMIT}
+
+USES=		compiler:features bison cmake gmake
+### GCC can not build src/crssync/CMakeFiles/synccrsdb
+#USE_GCC=	4.8+
 USE_PYTHON=	yes
-USES=		bison cmake
 USE_SQLITE=	yes
 USE_QT4=	gui svg xml network sql designer testlib linguist_build \
 		qmake_build moc_build rcc_build uic_build
 
 USE_LDCONFIG=	yes
 
-MAN1=		qgis.1
-
 OPTIONS_DEFINE=		GRASS POSTGIS MAPSERVER PYTHON
+OPTIONS_DEFAULT=	POSTGIS PYTHON
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 800000
-BROKEN=		does not compile on 7.X
-.endif
-
 .if ${PORT_OPTIONS:MGRASS}
-CMAKE_ARGS+=	-DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.2
+CMAKE_ARGS+=	-DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.3
 RUN_DEPENDS+=	${LOCALBASE}/lib/gdalplugins/gdal_GRASS.so:${PORTSDIR}/graphics/gdal-grass
+FORCE_MAKE_JOBS=	NO
+INFO=		qgis/grass/modules/qgis.g
+PLIST_SUB+=	GRASS=""
 .else
 CMAKE_ARGS+=	-DWITH_GRASS:BOOL=FALSE
+PLIST_SUB+=	GRASS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPOSTGIS}
@@ -58,7 +66,7 @@ PLIST_SUB+=	PGSQL="@comment "
 .if ${PORT_OPTIONS:MMAPSERVER}
 CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=TRUE
 PLIST_SUB+=	QGIS_FCGI=""
-LIB_DEPENDS+=	fcgi.0:${PORTSDIR}/www/fcgi
+LIB_DEPENDS+=	libfcgi.so:${PORTSDIR}/www/fcgi
 .else
 CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=FALSE
 PLIST_SUB+=	QGIS_FCGI="@comment "
@@ -67,13 +75,15 @@ PLIST_SUB+=	QGIS_FCGI="@comment "
 .if ${PORT_OPTIONS:MPYTHON}
 CMAKE_ARGS+=	-DWITH_BINDINGS:BOOL=TRUE
 PLIST_SUB+=	QGIS_PYTHON=""
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sip>=4.8.2:${PORTSDIR}/devel/py-sip \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.5.4:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.5.4:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.5.4:${PORTSDIR}/graphics/py-qt4-svg \
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:${PORTSDIR}/devel/py-sip \
 		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=4.5.4:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.6.5:${PORTSDIR}/databases/py-sqlite3
+		${PYTHON_SITELIBDIR}/PyQt4/Qsci.so:${PORTSDIR}/devel/py-qt4-qscintilla2 \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
+		${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
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/osgeo/gdal.pyc:${PORTSDIR}/graphics/py-gdal
 .else
 CMAKE_ARGS+=	-DWITH_BINDINGS:BOOL=FALSE
 PLIST_SUB+=	QGIS_PYTHON="@comment "

graphics/qgis/distinfo

@@ -1,2 +1,2 @@
-SHA256 (qgis-1.8.0.tar.bz2) = 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab
-SIZE (qgis-1.8.0.tar.bz2) = 29997204
+SHA256 (qgis-2.2.0.tar.gz) = 920a56a61c365ee79cc576a4453b0bd23d859b49de0b2da1180266d28b9b1242
+SIZE (qgis-2.2.0.tar.gz) = 72233255