CVS commit: pkgsrc/geography/osm2pgsql

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Jan  5 14:14:13 UTC 2025

Modified Files:
        pkgsrc/geography/osm2pgsql: Makefile

Log Message:
geography/osm2pgsql: Convert to cmake/build.mk

  - drop ad-hoc build dir creation and use

Minor other changes to get this closer to building:

  - drop WRKSRC setting because it just restates the default
  - add python to tools, as documented by upstream
  - add python/application.mk to work around upstream CMakefile
    finding and objecting to 2.7.

(Didn't build before this commit, and still doesn't, but this is
progress.  Likely an update is needed, as this version seems to have
aged out of what our current cmake supports.)


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/geography/osm2pgsql/Makefile

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

Modified files:

Index: pkgsrc/geography/osm2pgsql/Makefile
diff -u pkgsrc/geography/osm2pgsql/Makefile:1.54 pkgsrc/geography/osm2pgsql/Makefile:1.55
--- pkgsrc/geography/osm2pgsql/Makefile:1.54    Sun Dec 29 15:09:49 2024
+++ pkgsrc/geography/osm2pgsql/Makefile Sun Jan  5 14:14:13 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2024/12/29 15:09:49 adam Exp $
+# $NetBSD: Makefile,v 1.55 2025/01/05 14:14:13 gdt Exp $
 
 DISTNAME=      osm2pgsql-1.3.0
-PKGREVISION=   23
+PKGREVISION=   24
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=openstreetmap/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -11,16 +11,12 @@ HOMEPAGE=   https://github.com/openstreetm
 COMMENT=       OpenStreetMap data to PostgreSQL converter
 LICENSE=       gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}/osm2pgsql-${PKGVERSION_NOREV}
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-# osm2pgsql does not allow srcdir builds (and separate is better anyway)
-post-extract:
-       ${RUN} mkdir -p ${WRKSRC}/build
-CONFIGURE_DIRS=        build
-CMAKE_ARG_PATH=        ${WRKSRC}
+.include "../../devel/cmake/build.mk"
 
+# Test dependencies.
+USE_TOOLS+=    python
 CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=ON
 TEST_TARGET=   test
 
@@ -29,6 +25,9 @@ TEST_TARGET=  test
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
+# Per README, not needed, as python is for running tests, but
+# without it cmake finds 2.7 and errors out.
+.include "../../lang/python/application.mk"
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"