CVS commit: [pkgsrc-2023Q2] pkgsrc/graphics/tiff

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Aug 18 18:13:39 UTC 2023

Modified Files:
        pkgsrc/graphics/tiff [pkgsrc-2023Q2]: Makefile distinfo
Added Files:
        pkgsrc/graphics/tiff/patches [pkgsrc-2023Q2]: patch-configure

Log Message:
Pullup ticket #6793 - requested by nia
graphics/tiff: build fix

Revisions pulled up:
- graphics/tiff/Makefile                                        1.159
- graphics/tiff/distinfo                                        1.106
- graphics/tiff/patches/patch-configure                         1.6

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Thu Aug 17 10:20:39 UTC 2023

   Modified Files:
        pkgsrc/graphics/tiff: Makefile distinfo
   Added Files:
        pkgsrc/graphics/tiff/patches: patch-configure

   Log Message:
   tiff: Use only libs_private to express a dependency on liblzma

   requires_private assumes the presence of a .pc file, which is not
   the case on NetBSD 9.x. This allows builds external from pkgsrc
   dependending on libtiff to not fire errors when they fail to find
   a corresponding .pc file for liblzma, but still acknowledge the
   liblzma dependency.

   PR pkg/57539


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.158.2.1 pkgsrc/graphics/tiff/Makefile
cvs rdiff -u -r1.105 -r1.105.2.1 pkgsrc/graphics/tiff/distinfo
cvs rdiff -u -r0 -r1.6.2.2 pkgsrc/graphics/tiff/patches/patch-configure

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

Modified files:

Index: pkgsrc/graphics/tiff/Makefile
diff -u pkgsrc/graphics/tiff/Makefile:1.158 pkgsrc/graphics/tiff/Makefile:1.158.2.1
--- pkgsrc/graphics/tiff/Makefile:1.158 Mon Jun 19 17:34:13 2023
+++ pkgsrc/graphics/tiff/Makefile       Fri Aug 18 18:13:39 2023
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.158 2023/06/19 17:34:13 schmonz Exp $
+# $NetBSD: Makefile,v 1.158.2.1 2023/08/18 18:13:39 bsiegert Exp $
 
 VERSION_BASE=  4.5.1
 # Accomodate testing unreleased versions.
 #VERSION_RC=   rc3
 DISTNAME=      tiff-${VERSION_BASE}${VERSION_RC}
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  https://download.osgeo.org/libtiff/
 

Index: pkgsrc/graphics/tiff/distinfo
diff -u pkgsrc/graphics/tiff/distinfo:1.105 pkgsrc/graphics/tiff/distinfo:1.105.2.1
--- pkgsrc/graphics/tiff/distinfo:1.105 Wed Jun 14 13:03:31 2023
+++ pkgsrc/graphics/tiff/distinfo       Fri Aug 18 18:13:39 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.105 2023/06/14 13:03:31 gdt Exp $
+$NetBSD: distinfo,v 1.105.2.1 2023/08/18 18:13:39 bsiegert Exp $
 
 BLAKE2s (tiff-4.5.1.tar.gz) = dab23619781a7f2ea39727f7bb80d6e97406644b3f9478bed64ab1f37ca06cce
 SHA512 (tiff-4.5.1.tar.gz) = 64ad2ae84f3cc67b9774d10cdeed41ab66cde9b50276dd4134318c963d26bea60de8c0b0297e77f47963bae163e0d28ed482fa8e809b1e0fb7b7c8a7f5a1cb9a
 Size (tiff-4.5.1.tar.gz) = 3785721 bytes
 SHA1 (patch-Makefile.in) = 7c3a6214da2d631df064893bba8809c357d856cf
+SHA1 (patch-configure) = 48c3f6103e35049e0bd4a5f32a508cd9439c1f3f

Added files:

Index: pkgsrc/graphics/tiff/patches/patch-configure
diff -u /dev/null pkgsrc/graphics/tiff/patches/patch-configure:1.6.2.2
--- /dev/null   Fri Aug 18 18:13:39 2023
+++ pkgsrc/graphics/tiff/patches/patch-configure        Fri Aug 18 18:13:39 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-configure,v 1.6.2.2 2023/08/18 18:13:39 bsiegert Exp $
+
+NetBSD versions before 10.0 do not include liblzma.pc as part
+of the base system, so avoid problems compiling external packages
+by referring to a .pc file that doesn't exist.
+
+The dependency is still expressed through tiff_libs_private.
+
+--- configure.orig     2023-06-09 13:27:09.000000000 +0000
++++ configure
+@@ -19181,7 +19181,6 @@ $as_echo "#define LZMA_SUPPORT 1" >>conf
+ 
+   LIBS="-llzma $LIBS"
+   tiff_libs_private="-llzma ${tiff_libs_private}"
+-  tiff_requires_private="liblzma ${tiff_requires_private}"
+ 
+   if test "$HAVE_RPATH" = "yes" -a "x$with_lzma_lib_dir" != "x" ; then
+     LIBDIR="-R $with_lzma_lib_dir $LIBDIR"