diff options
| author | kim <kim> | 2017-04-15 15:50:42 +0000 |
|---|---|---|
| committer | kim <kim> | 2017-04-15 15:50:42 +0000 |
| commit | e75537d6c7199e338f1e1c167dffc5f0cd82689d (patch) | |
| tree | 71c2ba2a73cbb23a774f1fb9a1dcf2fa56f01ade /graphics/gd | |
| parent | 7d971450111e200903a41900cbcbee8826b74e7f (diff) | |
| download | pkgsrc-e75537d6c7199e338f1e1c167dffc5f0cd82689d.tar.gz | |
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.
Diffstat (limited to 'graphics/gd')
| -rw-r--r-- | graphics/gd/Makefile | 7 | ||||
| -rw-r--r-- | graphics/gd/buildlink3.mk | 7 | ||||
| -rw-r--r-- | graphics/gd/options.mk | 12 |
3 files changed, 17 insertions, 9 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 748375ae8d9..de76c863a70 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -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=${BUILDLINK_PREFIX.fontconfig} 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" diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk index 8f3273490a4..db8b252a6f8 100644 --- a/graphics/gd/buildlink3.mk +++ b/graphics/gd/buildlink3.mk @@ -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/gd 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 diff --git a/graphics/gd/options.mk b/graphics/gd/options.mk index df703e21f23..e11c0fdb675 100644 --- a/graphics/gd/options.mk +++ b/graphics/gd/options.mk @@ -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} |