[pkgsrc/trunk]: pkgsrc/graphics/gd Make libvpx a default-on option instead of...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2f772783aee4
branches:  trunk
changeset: 642990:2f772783aee4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Dec 09 11:42:10 2014 +0000

description:
Make libvpx a default-on option instead of a hard dependency.
Based on patch by Thomas Orgis on pkgsrc-users.

diffstat:

 graphics/gd/Makefile      |   4 +---
 graphics/gd/buildlink3.mk |   4 +++-
 graphics/gd/options.mk    |  13 ++++++++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diffs (70 lines):

diff -r 454ff5515317 -r 2f772783aee4 graphics/gd/Makefile
--- a/graphics/gd/Makefile      Tue Dec 09 10:54:28 2014 +0000
+++ b/graphics/gd/Makefile      Tue Dec 09 11:42:10 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2014/10/09 14:06:35 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2014/12/09 11:42:10 wiz Exp $
 
 DISTNAME=      libgd-2.1.0
 PKGNAME=       ${DISTNAME:S/libgd/gd/}
@@ -21,7 +21,6 @@
 CONFIGURE_ARGS+=       --with-jpeg=${BUILDLINK_PREFIX.jpeg}
 CONFIGURE_ARGS+=       --with-png=${BUILDLINK_PREFIX.png}
 CONFIGURE_ARGS+=       --with-tiff=${BUILDLINK_PREFIX.tiff}
-CONFIGURE_ARGS+=       --with-vpx=${BUILDLINK_PREFIX.libvpx}
 CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
 REPLACE_PERL+=         src/bdftogd
 PTHREAD_AUTO_VARS=     yes
@@ -32,7 +31,6 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 454ff5515317 -r 2f772783aee4 graphics/gd/buildlink3.mk
--- a/graphics/gd/buildlink3.mk Tue Dec 09 10:54:28 2014 +0000
+++ b/graphics/gd/buildlink3.mk Tue Dec 09 11:42:10 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2013/09/04 12:31:24 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2014/12/09 11:42:10 wiz Exp $
 
 BUILDLINK_TREE+=       gd
 
@@ -21,7 +21,9 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.gd:Mlibvpx)
 .include "../../multimedia/libvpx/buildlink3.mk"
+.endif
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # GD_BUILDLINK3_MK
diff -r 454ff5515317 -r 2f772783aee4 graphics/gd/options.mk
--- a/graphics/gd/options.mk    Tue Dec 09 10:54:28 2014 +0000
+++ b/graphics/gd/options.mk    Tue Dec 09 11:42:10 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2013/09/02 21:17:42 adam Exp $
+# $NetBSD: options.mk,v 1.3 2014/12/09 11:42:10 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gd
-PKG_SUPPORTED_OPTIONS= x11
-PKG_SUGGESTED_OPTIONS= # empty
+PKG_SUPPORTED_OPTIONS= libvpx x11
+PKG_SUGGESTED_OPTIONS= libvpx
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,3 +13,10 @@
 .else
 CONFIGURE_ARGS+=       --without-xpm
 .endif
+
+.if !empty(PKG_OPTIONS:Mlibvpx)
+.include "../../multimedia/libvpx/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-vpx=${BUILDLINK_PREFIX.libvpx}
+.else
+CONFIGURE_ARGS+=       --without-vpx
+.endif