pkg/52148: make tiff optional for gd

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

>Number:         52148
>Category:       pkg
>Synopsis:       make tiff optional for gd
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Apr 09 23:00:00 +0000 2017
>Originator:     Kimmo Suominen
>Release:        NetBSD 7.0.2
>Organization:
	
>Environment:
	
	
System: NetBSD equinoxe.gw.com 7.0.2 NetBSD 7.0.2 (XEN3_DOMU.201610210724Z) amd64
Architecture: x86_64
Machine: amd64
>Description:
	Make tiff option when building gd, as tiff has many long-standing
	vulnerabilities.
>How-To-Repeat:
	
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gd/Makefile,v
retrieving revision 1.114
diff -u -r1.114 Makefile
--- Makefile	28 Feb 2017 15:19:59 -0000	1.114
+++ Makefile	9 Apr 2017 22:20:07 -0000
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.114 2017/02/28 15:19:59 ryoon Exp $
 
 DISTNAME=	libgd-2.2.4
-#PKGREVISION=	1
 PKGNAME=	${DISTNAME:S/libgd/gd/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libgd/}
 EXTRACT_SUFX=	.tar.xz
@@ -25,7 +24,6 @@
 CONFIGURE_ARGS+=	--with-freetype=${BUILDLINK_PREFIX.freetype2}
 CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_PREFIX.jpeg}
 CONFIGURE_ARGS+=	--with-png=${BUILDLINK_PREFIX.png}
-CONFIGURE_ARGS+=	--with-tiff=${BUILDLINK_PREFIX.tiff}
 CONFIGURE_ARGS+=	--with-webp=${BUILDLINK_PREFIX.libwebp}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 REPLACE_PERL+=		src/bdftogd
@@ -37,7 +35,6 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gd/buildlink3.mk,v
retrieving revision 1.40
diff -u -r1.40 buildlink3.mk
--- buildlink3.mk	28 Feb 2017 15:19:59 -0000	1.40
+++ buildlink3.mk	9 Apr 2017 22:20:07 -0000
@@ -14,6 +14,10 @@
 pkgbase := gd
 .include "../../mk/pkg-build-options.mk"
 
+.if !empty(PKG_BUILD_OPTIONS.gd:Mtiff)
+.include "../../graphics/tiff/buildlink3.mk"
+.endif
+
 .if !empty(PKG_BUILD_OPTIONS.gd:Mx11)
 .include "../../x11/libXpm/buildlink3.mk"
 .endif
@@ -23,7 +27,6 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # GD_BUILDLINK3_MK
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gd/options.mk,v
retrieving revision 1.5
diff -u -r1.5 options.mk
--- options.mk	2 Aug 2016 18:29:21 -0000	1.5
+++ options.mk	9 Apr 2017 22:20:07 -0000
@@ -1,10 +1,17 @@
 # $NetBSD: options.mk,v 1.5 2016/08/02 18:29:21 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gd
-PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUPPORTED_OPTIONS=	tiff x11
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mtiff)
+.include "../../graphics/tiff/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-tiff=${BUILDLINK_PREFIX.tiff}
+.else
+CONFIGURE_ARGS+=	--without-tiff
+.endif
+
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libXpm/buildlink3.mk"
 CONFIGURE_ENV+=		X11BASE=${X11BASE}

>Unformatted: