CVS commit: pkgsrc/geography/R-maptools

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb 18 10:39:42 UTC 2026

Modified Files:
        pkgsrc/geography/R-maptools: Makefile distinfo
Added Files:
        pkgsrc/geography/R-maptools/patches: patch-src_pip.c

Log Message:
R-maptools: fix build

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/R-maptools/Makefile \
    pkgsrc/geography/R-maptools/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/geography/R-maptools/patches/patch-src_pip.c

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

Modified files:

Index: pkgsrc/geography/R-maptools/Makefile
diff -u pkgsrc/geography/R-maptools/Makefile:1.7 pkgsrc/geography/R-maptools/Makefile:1.8
--- pkgsrc/geography/R-maptools/Makefile:1.7    Wed Feb 19 12:50:44 2025
+++ pkgsrc/geography/R-maptools/Makefile        Wed Feb 18 10:39:42 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2025/02/19 12:50:44 mef Exp $
+# $NetBSD: Makefile,v 1.8 2026/02/18 10:39:42 wiz Exp $
 
 R_PKGNAME=     maptools
 R_PKGVER=      1.1-7
+PKGREVISION=   1
 CATEGORIES=    geography
 
 MAINTAINER=    wen%NetBSD.org@localhost
Index: pkgsrc/geography/R-maptools/distinfo
diff -u pkgsrc/geography/R-maptools/distinfo:1.7 pkgsrc/geography/R-maptools/distinfo:1.8
--- pkgsrc/geography/R-maptools/distinfo:1.7    Sat Jun  3 13:09:14 2023
+++ pkgsrc/geography/R-maptools/distinfo        Wed Feb 18 10:39:42 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2023/06/03 13:09:14 mef Exp $
+$NetBSD: distinfo,v 1.8 2026/02/18 10:39:42 wiz Exp $
 
 BLAKE2s (R/maptools_1.1-7.tar.gz) = 90303ac2ad6dfb70795b447bbd6f64d98006de4251f41247af4667c1e80fafb1
 SHA512 (R/maptools_1.1-7.tar.gz) = 8b071733e401c4b8117e260bbb6248a6d545ddcd98c23ee656a1ae68b20f3d0cf5f050b1d59434b3586ea0d909a46d7c27a5738de99ce73da90103d8662dda44
 Size (R/maptools_1.1-7.tar.gz) = 1381947 bytes
+SHA1 (patch-src_pip.c) = a119e3d8b68bb9411f78ac132bc566873d8f90ba

Added files:

Index: pkgsrc/geography/R-maptools/patches/patch-src_pip.c
diff -u /dev/null pkgsrc/geography/R-maptools/patches/patch-src_pip.c:1.1
--- /dev/null   Wed Feb 18 10:39:42 2026
+++ pkgsrc/geography/R-maptools/patches/patch-src_pip.c Wed Feb 18 10:39:42 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_pip.c,v 1.1 2026/02/18 10:39:42 wiz Exp $
+
+Calloc/Free are gone, use standard functions.
+
+--- src/pip.c.orig     2022-06-11 18:30:18.000000000 +0000
++++ src/pip.c
+@@ -42,7 +42,7 @@ SEXP R_point_in_polygon_mt(SEXP px, SEXP py, SEXP polx
+       SEXP ret;
+ 
+       pol.lines = LENGTH(polx); /* check later that first == last */
+-      pol.p = (PLOT_POINT *) Calloc(pol.lines, PLOT_POINT); /* Calloc does error handling */
++      pol.p = (PLOT_POINT *) calloc(pol.lines, sizeof(PLOT_POINT));
+       for (i = 0; i < LENGTH(polx); i++) {
+               pol.p[i].x = NUMERIC_POINTER(polx)[i];
+               pol.p[i].y = NUMERIC_POINTER(poly)[i];
+@@ -70,7 +70,7 @@ For each query point q, InPoly returns one of four cha
+                       default: INTEGER_POINTER(ret)[i] = -1; break;
+               }
+       }
+-      Free(pol.p);
++      free(pol.p);
+       return(ret);
+ }
+