Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715185578199450"
MIME-Version: 1.0
Date: Wed, 8 May 2024 16:26:18 +0000
From: "Greg Troxel" <gdt@netbsd.org>
Subject: CVS commit: pkgsrc/geography/qgis
To: pkgsrc-changes@NetBSD.org
Reply-To: gdt@netbsd.org
Message-Id: <20240508162618.EE3B5FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1715185578199450
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gdt
Date:		Wed May  8 16:26:18 UTC 2024

Modified Files:
	pkgsrc/geography/qgis: Makefile

Log Message:
geography/qgis: Sort includes of bl3 files

This appears to have no effect; the problem where both system and
pkgsrc sqlite3 are used remains unchanged.

Tidying cherry-picked from wip/qgis-lts by adam@.


To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 pkgsrc/geography/qgis/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1715185578199450
Content-Disposition: inline
Content-Length: 2581
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/geography/qgis/Makefile
diff -u pkgsrc/geography/qgis/Makefile:1.207 pkgsrc/geography/qgis/Makefile:1.208
--- pkgsrc/geography/qgis/Makefile:1.207	Wed May  8 15:04:34 2024
+++ pkgsrc/geography/qgis/Makefile	Wed May  8 16:26:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2024/05/08 15:04:34 gdt Exp $
+# $NetBSD: Makefile,v 1.208 2024/05/08 16:26:18 gdt Exp $
 
 # This is intentionally 3.28 Long Term Release.  Please do not update
 # to later branches, and instead discuss whether/how we want multiple
@@ -94,32 +94,32 @@ CMAKE_ARGS+=	-DQWT_DIR=${QWT_DIR}
 # \todo Hoist this to become a general facility where a variable controls
 # actually showing build output.
 
-.include "../../lang/python/pyversion.mk"
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
-##.include "../../devel/qjson/buildlink3.mk"
 .include "../../devel/protobuf/buildlink3.mk"
+#.include "../../devel/qjson/buildlink3.mk"
 .include "../../geography/gdal-lib/buildlink3.mk"
+.include "../../geography/libspatialite/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
+.include "../../geography/spatialindex/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
 .include "../../math/gsl/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../www/fcgi/buildlink3.mk"
-.include "../../databases/sqlite3/buildlink3.mk"
-.include "../../geography/libspatialite/buildlink3.mk"
-.include "../../geography/spatialindex/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"
 .include "../../security/qca2-qt5/buildlink3.mk"
 .include "../../security/qt5-qtkeychain/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../www/fcgi/buildlink3.mk"
+.include "../../x11/qt5-qscintilla/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtlocation/buildlink3.mk"
+.include "../../x11/qt5-qtserialport/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qwt6-qt5/buildlink3.mk"
-.include "../../x11/qt5-qscintilla/buildlink3.mk"
-.include "../../x11/qt5-qtserialport/buildlink3.mk"
-.include "../../x11/qt5-qtlocation/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


--_----------=_1715185578199450--