CVS commit: pkgsrc/geography/merkaartor

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Jun  7 11:11:43 UTC 2025

Modified Files:
        pkgsrc/geography/merkaartor: Makefile

Log Message:
geography/merkaartor: Remediate apple thinking differently

Upstream has code to build a mac app instead of a normal unix program,
when building on a machine where APPLE is defined in cmake.  Get rid
of that, in the hopes that it will build on mac.  (Still builds on
NetBSD.)

(Perhaps this should be a general facility, turned on by a variable,
but it's possible there are ok uses of if(APPLE).)


To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 pkgsrc/geography/merkaartor/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/merkaartor/Makefile
diff -u pkgsrc/geography/merkaartor/Makefile:1.149 pkgsrc/geography/merkaartor/Makefile:1.150
--- pkgsrc/geography/merkaartor/Makefile:1.149  Sat May 17 23:23:11 2025
+++ pkgsrc/geography/merkaartor/Makefile        Sat Jun  7 11:11:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.149 2025/05/17 23:23:11 gdt Exp $
+# $NetBSD: Makefile,v 1.150 2025/06/07 11:11:43 gdt Exp $
 
 DISTNAME=      merkaartor-0.20.0
 PKGREVISION=   14
@@ -22,6 +22,12 @@ USE_TOOLS+=  pkg-config
 
 CMAKE_CONFIGURE_ARGS+= -DGPSD=ON
 
+# Remediate 'apple is special' code.
+SUBST_CLASSES+=                macfix
+SUBST_STAGE.macfix=    pre-configure
+SUBST_FILES.macfix=    CMakeLists.txt
+SUBST_SED.macfix=      -e 's/APPLE/APP_SKIP_LE/'
+
 # Dependencies, generally in the order they are searched for, or
 # ordered following pkgsrc conventions.