Tue May 14 01:39:30 2019 UTC ()
geography/qgis: Declare python3 incompatible

With 37, the build fails with complaints about future and the wrong
version.  With 27, it builds.  Definitive documentation is scarce, but
signs point to 27 being standard for 2.18, and 3 perhaps working,
perhaps not.  Because qgis 2.18 should be updated to 3.x anyway, don't
worry and just set the variables for now.


(gdt)
diff -r1.73 -r1.74 pkgsrc/geography/qgis/Makefile
diff -r1.12 -r1.13 pkgsrc/geography/qgis/options.mk
cvs diff -r1.73 -r1.74 pkgsrc/geography/qgis/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/qgis/Makefile 2019/04/25 07:32:56 1.73
+++ pkgsrc/geography/qgis/Makefile 2019/05/14 01:39:30 1.74
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.73 2019/04/25 07:32:56 maya Exp $ 1# $NetBSD: Makefile,v 1.74 2019/05/14 01:39:30 gdt Exp $
2 2
3DISTNAME= qgis-2.18.28 3DISTNAME= qgis-2.18.28
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= geography 5CATEGORIES= geography
6MASTER_SITES= https://qgis.org/downloads/ 6MASTER_SITES= https://qgis.org/downloads/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= brook@nmsu.edu 9MAINTAINER= brook@nmsu.edu
10HOMEPAGE= http://www.qgis.org/ 10HOMEPAGE= http://www.qgis.org/
11COMMENT= Geographic Information System (GIS) 11COMMENT= Geographic Information System (GIS)
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15USE_LANGUAGES= c c++ fortran77 15USE_LANGUAGES= c c++ fortran77
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
cvs diff -r1.12 -r1.13 pkgsrc/geography/qgis/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/geography/qgis/Attic/options.mk 2019/04/26 14:12:39 1.12
+++ pkgsrc/geography/qgis/Attic/options.mk 2019/05/14 01:39:30 1.13
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: options.mk,v 1.12 2019/04/26 14:12:39 maya Exp $ 1# $NetBSD: options.mk,v 1.13 2019/05/14 01:39:30 gdt Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qgis 3PKG_OPTIONS_VAR= PKG_OPTIONS.qgis
4PKG_SUPPORTED_OPTIONS= python 4PKG_SUPPORTED_OPTIONS= python
5# Don't enable python by default because it is not 5# Don't enable python by default because it is not
6# supported by gdal-lib and as a result we get a 6# supported by gdal-lib and as a result we get a
7# warning when qgis is launched. 7# warning when qgis is launched.
8# XXX fix gdal-lib and reenable this. 8# XXX fix gdal-lib and reenable this.
9PKG_SUGGESTED_OPTIONS+= python 9PKG_SUGGESTED_OPTIONS+= python
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13.if empty(PKG_OPTIONS:Mpython) 13.if empty(PKG_OPTIONS:Mpython)
14CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=FALSE 14CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=FALSE
15PYTHON_FOR_BUILD_ONLY= YES 15PYTHON_FOR_BUILD_ONLY= YES
16.include "../../lang/python/application.mk" 16.include "../../lang/python/application.mk"
17.else 17.else
18CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=TRUE 18CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=TRUE
19CMAKE_ARGS+= -DSIP_BINARY_PATH:PATH=${BUILDLINK_PREFIX.py-sip}/bin 19CMAKE_ARGS+= -DSIP_BINARY_PATH:PATH=${BUILDLINK_PREFIX.py-sip}/bin
20CMAKE_ARGS+= -DWITH_INTERNAL_MARKUPSAFE=FALSE 20CMAKE_ARGS+= -DWITH_INTERNAL_MARKUPSAFE=FALSE
21PLIST_SRC+= ${PKGDIR}/PLIST.python 21PLIST_SRC+= ${PKGDIR}/PLIST.python
22#PYTHON_VERSIONS_INCOMPATIBLE= 36 # ?not yet ported as of ? 22PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # Documentation implies 27 is supported, 3x not.
23.include "../../lang/python/application.mk" 23.include "../../lang/python/application.mk"
24.include "../../math/py-numpy/buildlink3.mk" 24.include "../../math/py-numpy/buildlink3.mk"
25.include "../../x11/py-qt4/buildlink3.mk" 25.include "../../x11/py-qt4/buildlink3.mk"
26.include "../../x11/py-qt4-qscintilla/buildlink3.mk" 26.include "../../x11/py-qt4-qscintilla/buildlink3.mk"
27.include "../../x11/py-sip/buildlink3.mk" 27.include "../../x11/py-sip/buildlink3.mk"
28DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests 28DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
29DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2 29DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
30DEPENDS+= ${PYPKGPREFIX}-gdal-[0-9]*:../../geography/py-gdal 30DEPENDS+= ${PYPKGPREFIX}-gdal-[0-9]*:../../geography/py-gdal
31DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 31DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
32DEPENDS+= ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe 32DEPENDS+= ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe
33.endif 33.endif