CVS commit: pkgsrc/geography/libgeotiff

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat May 17 21:00:16 UTC 2025

Modified Files:
        pkgsrc/geography/libgeotiff: Makefile distinfo
Added Files:
        pkgsrc/geography/libgeotiff/patches: patch-bin_geotifcp.c

Log Message:
geography/libgeotiff: Remediate open-coded getopt declaration

and instead include the POSIX-required header.  Should fix the build
on SmartOS, where the compiler objected to the open-coded type not
matching the POSIX-required and system-provided type.  The mystery is
why other systems built ok.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/geography/libgeotiff/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/geography/libgeotiff/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/libgeotiff/patches/patch-bin_geotifcp.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/libgeotiff/Makefile
diff -u pkgsrc/geography/libgeotiff/Makefile:1.40 pkgsrc/geography/libgeotiff/Makefile:1.41
--- pkgsrc/geography/libgeotiff/Makefile:1.40   Thu Apr 24 14:14:08 2025
+++ pkgsrc/geography/libgeotiff/Makefile        Sat May 17 21:00:16 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2025/04/24 14:14:08 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2025/05/17 21:00:16 gdt Exp $
 
 VERSION=       1.7.4
 #RC=           rc1
 DISTNAME=      libgeotiff-${VERSION}${RC}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    geography
 MASTER_SITES=  https://download.osgeo.org/geotiff/libgeotiff/
 

Index: pkgsrc/geography/libgeotiff/distinfo
diff -u pkgsrc/geography/libgeotiff/distinfo:1.13 pkgsrc/geography/libgeotiff/distinfo:1.14
--- pkgsrc/geography/libgeotiff/distinfo:1.13   Wed Feb 19 12:03:02 2025
+++ pkgsrc/geography/libgeotiff/distinfo        Sat May 17 21:00:16 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2025/02/19 12:03:02 gdt Exp $
+$NetBSD: distinfo,v 1.14 2025/05/17 21:00:16 gdt Exp $
 
 BLAKE2s (libgeotiff-1.7.4.tar.gz) = 9556f37e0789acdfe5cc6a0086e95271c19573b2f4689d58674794cada8f73d6
 SHA512 (libgeotiff-1.7.4.tar.gz) = 72e81075348ef92c56f84c51bb8234eaf38e10fd88dc786c317ee6c1cf9fb1c07178b8cf4fc6348b1ddf6e42d5888861f8c57dac57273a278d157c59e9803eb1
 Size (libgeotiff-1.7.4.tar.gz) = 549848 bytes
+SHA1 (patch-bin_geotifcp.c) = 43f99c407cb61d327567b1bcd994c190c7258de7

Added files:

Index: pkgsrc/geography/libgeotiff/patches/patch-bin_geotifcp.c
diff -u /dev/null pkgsrc/geography/libgeotiff/patches/patch-bin_geotifcp.c:1.1
--- /dev/null   Sat May 17 21:00:16 2025
+++ pkgsrc/geography/libgeotiff/patches/patch-bin_geotifcp.c    Sat May 17 21:00:16 2025
@@ -0,0 +1,29 @@
+$NetBSD: patch-bin_geotifcp.c,v 1.1 2025/05/17 21:00:16 gdt Exp $
+
+Due to build failure on SmartOS because of a type conflict between
+getopt being declared directly and the POSIX-required definition
+apparently provided by stdlib.h, heavy-handedly modernize to align
+with POSIX, including <unistd.h> as specified.
+  https://pubs.opengroup.org/onlinepubs/9799919799/functions/getopt.html
+
+Not yet submitted upstream, pending bulk results.
+
+--- bin/geotifcp.c.orig        2025-05-17 20:53:21.317680774 +0000
++++ bin/geotifcp.c
+@@ -14,6 +14,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <unistd.h>
+ 
+ /* GeoTIFF overrides */
+ 
+@@ -37,8 +38,6 @@
+ #define       TRUE    1
+ #define       FALSE   0
+ 
+-int getopt(int nargc, char** nargv, char* ostr);
+-
+ static  int outtiled = -1;
+ static  uint32_t tilewidth;
+ static  uint32_t tilelength;