[pkgsrc/trunk]: pkgsrc/graphics/libwebp Make tiff option when building libweb...

[kim <kim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4bd0938ba691
branches:  trunk
changeset: 361160:4bd0938ba691
user:      kim <kim%pkgsrc.org@localhost>
date:      Sat Apr 15 15:48:12 2017 +0000

description:
Make tiff option when building libwebp, as tiff has many long-standing
vulnerabilities. Still enabled by default, as before. Ok by wiz@.

Fixes PR pkg/52149 and adds tiff to PKG_SUGGESTED_OPTIONS.

diffstat:

 graphics/libwebp/Makefile   |   6 ++++--
 graphics/libwebp/options.mk |  12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r a1856c8c5f89 -r 4bd0938ba691 graphics/libwebp/Makefile
--- a/graphics/libwebp/Makefile Sat Apr 15 15:46:57 2017 +0000
+++ b/graphics/libwebp/Makefile Sat Apr 15 15:48:12 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/02/28 14:40:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2017/04/15 15:48:12 kim Exp $
 
 DISTNAME=      libwebp-0.6.0
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  http://downloads.webmproject.org/releases/webp/
 
@@ -9,6 +10,8 @@
 COMMENT=       WebP image format library and tools
 LICENSE=       modified-bsd
 
+.include "options.mk"
+
 USE_LIBTOOL=   yes
 GNU_CONFIGURE= yes
 
@@ -29,6 +32,5 @@
 
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a1856c8c5f89 -r 4bd0938ba691 graphics/libwebp/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libwebp/options.mk       Sat Apr 15 15:48:12 2017 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2017/04/15 15:48:12 kim Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.libwebp
+PKG_SUPPORTED_OPTIONS= tiff
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mtiff)
+.include "../../graphics/tiff/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-tiff
+.endif