diff options
author | rillig <rillig@pkgsrc.org> | 2019-11-03 19:30:32 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2019-11-03 19:30:32 +0000 |
commit | de90321faa2cb881bb1a9b82259ec01e54fd0566 (patch) | |
tree | f7a9981004a3672de5b0c505775a9043c464460b /geography/qgis | |
parent | 668a035f6586a571d9d7f2f11e71a7d4c48d8b2b (diff) | |
download | pkgsrc-de90321faa2cb881bb1a9b82259ec01e54fd0566.tar.gz |
geography: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
Diffstat (limited to 'geography/qgis')
-rw-r--r-- | geography/qgis/Makefile | 20 | ||||
-rw-r--r-- | geography/qgis/options.mk | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/geography/qgis/Makefile b/geography/qgis/Makefile index 8ebbb017124..34b8306b9d7 100644 --- a/geography/qgis/Makefile +++ b/geography/qgis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.79 2019/10/29 19:30:11 bouyer Exp $ +# $NetBSD: Makefile,v 1.80 2019/11/03 19:30:34 rillig Exp $ DISTNAME= qgis-3.8.3 CATEGORIES= geography @@ -22,31 +22,31 @@ PLIST_SRC= PLIST .include "options.mk" -DEPENDS+= qca2-qt5-ossl-[0-9]*:../../security/qca2-qt5-ossl +DEPENDS+= qca2-qt5-ossl-[0-9]*:../../security/qca2-qt5-ossl # This is needed to find qca2. -CMAKE_PREFIX_PATH+=${QTDIR} +CMAKE_PREFIX_PATH+= ${QTDIR} # This could be used if we want to build pdf doc, which is currently false -#BUILD_DEPENDS+= txt2tags-[0-9]*:../../wip/txt2tags +#BUILD_DEPENDS+= txt2tags-[0-9]*:../../wip/txt2tags # Disable building of QGIS.app # (XXX For now, we might want to find a way to do this later.) SUBST_CLASSES+= xapple SUBST_STAGE.xapple= pre-configure SUBST_MESSAGE.xapple= Disabling APPLE App in cmake scripts -xapple_FIND_CMD= cd ${WRKSRC} && \ +xapple_FIND_CMD= cd ${WRKSRC} && \ find . -name '*.cmake' -o -name CMakeLists.txt SUBST_FILES.xapple= ${xapple_FIND_CMD:sh} SUBST_SED.xapple+= -e 's,APPLE,XAPPLE,' SUBST_SED.xapple+= -e 's,MACOSX_BUNDLE ,,' -CMAKE_ARGS+= -DWITH_QTWEBKIT=FALSE -CMAKE_ARGS+= -DQWT_DIR=${QWT_DIR} +CMAKE_ARGS+= -DWITH_QTWEBKIT=FALSE +CMAKE_ARGS+= -DQWT_DIR=${QWT_DIR} # Useful for package development: -#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=TRUE +#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=TRUE -CONFIGURE_DIRS=build -CMAKE_ARG_PATH=.. +CONFIGURE_DIRS= build +CMAKE_ARG_PATH= .. pre-configure: ${MKDIR} ${WRKSRC}/build diff --git a/geography/qgis/options.mk b/geography/qgis/options.mk index ead8cff804b..68dccb9b3a1 100644 --- a/geography/qgis/options.mk +++ b/geography/qgis/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.15 2019/10/29 19:30:11 bouyer Exp $ +# $NetBSD: options.mk,v 1.16 2019/11/03 19:30:34 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qgis PKG_SUPPORTED_OPTIONS= python @@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= python # supported by gdal-lib and as a result we get a # warning when qgis is launched. # XXX fix gdal-lib and reenable this. -PKG_SUGGESTED_OPTIONS+= python +PKG_SUGGESTED_OPTIONS+= python .include "../../mk/bsd.options.mk" |