CVS commit: pkgsrc/graphics/libwebp

["Kimmo Suominen" <kim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kim
Date:           Sat Apr 15 15:48:13 UTC 2017

Modified Files:
        pkgsrc/graphics/libwebp: Makefile
Added Files:
        pkgsrc/graphics/libwebp: options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/libwebp/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/libwebp/options.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/libwebp/Makefile
diff -u pkgsrc/graphics/libwebp/Makefile:1.21 pkgsrc/graphics/libwebp/Makefile:1.22
--- pkgsrc/graphics/libwebp/Makefile:1.21       Tue Feb 28 14:40:47 2017
+++ pkgsrc/graphics/libwebp/Makefile    Sat Apr 15 15:48:12 2017
@@ -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 @@ HOMEPAGE=      http://developers.google.com/s
 COMMENT=       WebP image format library and tools
 LICENSE=       modified-bsd
 
+.include "options.mk"
+
 USE_LIBTOOL=   yes
 GNU_CONFIGURE= yes
 
@@ -29,6 +32,5 @@ PKGCONFIG_OVERRIDE+=  src/libwebp.pc.in
 
 .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"

Added files:

Index: pkgsrc/graphics/libwebp/options.mk
diff -u /dev/null pkgsrc/graphics/libwebp/options.mk:1.1
--- /dev/null   Sat Apr 15 15:48:13 2017
+++ pkgsrc/graphics/libwebp/options.mk  Sat Apr 15 15:48:12 2017
@@ -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