CVS commit: pkgsrc/graphics/gd

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

Module Name:    pkgsrc
Committed By:   kim
Date:           Sat Apr 15 15:50:42 UTC 2017

Modified Files:
        pkgsrc/graphics/gd: Makefile buildlink3.mk options.mk

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

Fixes PR pkg/52148 and adds tiff to PKG_SUGGESTED_OPTIONS.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/graphics/gd/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/graphics/gd/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/gd/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/gd/Makefile
diff -u pkgsrc/graphics/gd/Makefile:1.114 pkgsrc/graphics/gd/Makefile:1.115
--- pkgsrc/graphics/gd/Makefile:1.114   Tue Feb 28 15:19:59 2017
+++ pkgsrc/graphics/gd/Makefile Sat Apr 15 15:50:42 2017
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.114 2017/02/28 15:19:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.115 2017/04/15 15:50:42 kim 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-fontconfig=${BUI
 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 @@ PTHREAD_AUTO_VARS=    yes
 .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: pkgsrc/graphics/gd/buildlink3.mk
diff -u pkgsrc/graphics/gd/buildlink3.mk:1.40 pkgsrc/graphics/gd/buildlink3.mk:1.41
--- pkgsrc/graphics/gd/buildlink3.mk:1.40       Tue Feb 28 15:19:59 2017
+++ pkgsrc/graphics/gd/buildlink3.mk    Sat Apr 15 15:50:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.40 2017/02/28 15:19:59 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.41 2017/04/15 15:50:42 kim Exp $
 
 BUILDLINK_TREE+=       gd
 
@@ -14,6 +14,10 @@ BUILDLINK_PKGSRCDIR.gd?=     ../../graphics/
 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 @@ pkgbase := gd
 .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: pkgsrc/graphics/gd/options.mk
diff -u pkgsrc/graphics/gd/options.mk:1.5 pkgsrc/graphics/gd/options.mk:1.6
--- pkgsrc/graphics/gd/options.mk:1.5   Tue Aug  2 18:29:21 2016
+++ pkgsrc/graphics/gd/options.mk       Sat Apr 15 15:50:42 2017
@@ -1,10 +1,18 @@
-# $NetBSD: options.mk,v 1.5 2016/08/02 18:29:21 adam Exp $
+# $NetBSD: options.mk,v 1.6 2017/04/15 15:50:42 kim Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gd
-PKG_SUPPORTED_OPTIONS= x11
+PKG_SUPPORTED_OPTIONS= tiff x11
+PKG_SUGGESTED_OPTIONS= tiff
 
 .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}