Tue Jun 16 21:54:24 2020 UTC ()
geography/qgis: Allow SUBST NOOP

(This is the usual pattern of finding files of a certain type where
the subst only happens in some of them.)


(gdt)
diff -r1.91 -r1.92 pkgsrc/geography/qgis/Makefile
cvs diff -r1.91 -r1.92 pkgsrc/geography/qgis/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/qgis/Makefile 2020/06/12 17:50:39 1.91
+++ pkgsrc/geography/qgis/Makefile 2020/06/16 21:54:24 1.92
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.91 2020/06/12 17:50:39 rillig Exp $ 1# $NetBSD: Makefile,v 1.92 2020/06/16 21:54:24 gdt Exp $
2 2
3DISTNAME= qgis-3.8.3 3DISTNAME= qgis-3.8.3
4PKGREVISION= 10 4PKGREVISION= 10
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
@@ -28,26 +28,28 @@ DEPENDS+= qca2-qt5-ossl-[0-9]*:../../se @@ -28,26 +28,28 @@ DEPENDS+= qca2-qt5-ossl-[0-9]*:../../se
28CMAKE_PREFIX_PATH+= ${QTDIR} 28CMAKE_PREFIX_PATH+= ${QTDIR}
29 29
30# This could be used if we want to build pdf doc, which is currently false 30# This could be used if we want to build pdf doc, which is currently false
31#BUILD_DEPENDS+= txt2tags-[0-9]*:../../wip/txt2tags 31#BUILD_DEPENDS+= txt2tags-[0-9]*:../../wip/txt2tags
32 32
33# Disable building of QGIS.app 33# Disable building of QGIS.app
34# (XXX For now, we might want to find a way to do this later.) 34# (XXX For now, we might want to find a way to do this later.)
35SUBST_CLASSES+= xapple 35SUBST_CLASSES+= xapple
36SUBST_STAGE.xapple= pre-configure 36SUBST_STAGE.xapple= pre-configure
37SUBST_MESSAGE.xapple= Disabling APPLE App in cmake scripts 37SUBST_MESSAGE.xapple= Disabling APPLE App in cmake scripts
38xapple_FIND_CMD= cd ${WRKSRC} && \ 38xapple_FIND_CMD= cd ${WRKSRC} && \
39 find . -name '*.cmake' -o -name CMakeLists.txt 39 find . -name '*.cmake' -o -name CMakeLists.txt
40SUBST_FILES.xapple= ${xapple_FIND_CMD:sh} 40SUBST_FILES.xapple= ${xapple_FIND_CMD:sh}
 41# The output of find is a superset of the needed files.
 42SUBST_NOOP_OK.xapple= yes
41SUBST_SED.xapple+= -e 's,APPLE,XAPPLE,' 43SUBST_SED.xapple+= -e 's,APPLE,XAPPLE,'
42SUBST_SED.xapple+= -e 's,MACOSX_BUNDLE ,,' 44SUBST_SED.xapple+= -e 's,MACOSX_BUNDLE ,,'
43SUBST_NOOP_OK.xapple= yes # since SUBST_FILES is generated 45SUBST_NOOP_OK.xapple= yes # since SUBST_FILES is generated
44 46
45SUBST_CLASSES+= pyqt 47SUBST_CLASSES+= pyqt
46SUBST_STAGE.pyqt= pre-configure 48SUBST_STAGE.pyqt= pre-configure
47SUBST_MESSAGE.pyqt= Use correct python version for PyQt5 programs 49SUBST_MESSAGE.pyqt= Use correct python version for PyQt5 programs
48SUBST_FILES.pyqt= cmake/PyQtMacros.cmake 50SUBST_FILES.pyqt= cmake/PyQtMacros.cmake
49SUBST_SED.pyqt+= -e '/^SET/s,pyuic5,&-${PYVERSSUFFIX},' 51SUBST_SED.pyqt+= -e '/^SET/s,pyuic5,&-${PYVERSSUFFIX},'
50SUBST_SED.pyqt+= -e '/^SET/s,pyrcc5,&-${PYVERSSUFFIX},' 52SUBST_SED.pyqt+= -e '/^SET/s,pyrcc5,&-${PYVERSSUFFIX},'
51 53
52CMAKE_ARGS+= -DWITH_QTWEBKIT=FALSE 54CMAKE_ARGS+= -DWITH_QTWEBKIT=FALSE
53CMAKE_ARGS+= -DQWT_DIR=${QWT_DIR} 55CMAKE_ARGS+= -DQWT_DIR=${QWT_DIR}