CVS commit: pkgsrc/graphics/tiff

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Dec 17 17:56:37 UTC 2023

Modified Files:
        pkgsrc/graphics/tiff: Makefile buildlink3.mk

Log Message:
tiff: disable libdeflate

Having both zlib and libdeflate doesn't make much sense;
change was incomplete since it would have required a recursive bump
for tiff; and with the branch this close, we don't want that.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 pkgsrc/graphics/tiff/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/tiff/buildlink3.mk

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.164 pkgsrc/graphics/tiff/Makefile:1.165
--- pkgsrc/graphics/tiff/Makefile:1.164 Sun Dec 17 17:01:59 2023
+++ pkgsrc/graphics/tiff/Makefile       Sun Dec 17 17:56:37 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.164 2023/12/17 17:01:59 thor Exp $
+# $NetBSD: Makefile,v 1.165 2023/12/17 17:56:37 wiz Exp $
 
 VERSION_BASE=  4.6.0
 # Accomodate testing unreleased versions.
 #VERSION_RC=   rc3
-PKGREVISION=   2
+PKGREVISION=   3
 DISTNAME=      tiff-${VERSION_BASE}${VERSION_RC}
 CATEGORIES=    graphics
 MASTER_SITES=  https://download.osgeo.org/libtiff/
@@ -25,6 +25,7 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ARGS+=       --enable-rpath
 CONFIGURE_ARGS+=       --enable-cxx
 CONFIGURE_ARGS+=       --with-docdir=${PREFIX}/share/doc/tiff
+CONFIGURE_ARGS+=       --disable-libdeflate
 CONFIGURE_ARGS+=       --disable-sphinx
 CONFIGURE_ARGS+=       --disable-webp
 CONFIGURE_ARGS+=       --disable-zstd
@@ -42,7 +43,6 @@ post-install:
 .include "options.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/libdeflate/buildlink3.mk"
 # XXX for liblzma; there are more potential suppliers
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../graphics/jbigkit/buildlink3.mk"

Index: pkgsrc/graphics/tiff/buildlink3.mk
diff -u pkgsrc/graphics/tiff/buildlink3.mk:1.27 pkgsrc/graphics/tiff/buildlink3.mk:1.28
--- pkgsrc/graphics/tiff/buildlink3.mk:1.27     Sun Dec 17 17:01:59 2023
+++ pkgsrc/graphics/tiff/buildlink3.mk  Sun Dec 17 17:56:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2023/12/17 17:01:59 thor Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2023/12/17 17:56:37 wiz Exp $
 
 BUILDLINK_TREE+=       tiff
 
@@ -10,7 +10,6 @@ BUILDLINK_ABI_DEPENDS.tiff+=  tiff>=4.6.0
 BUILDLINK_PKGSRCDIR.tiff?=     ../../graphics/tiff
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/libdeflate/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../graphics/jbigkit/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"