Tue Dec 9 11:42:10 2014 UTC ()
Make libvpx a default-on option instead of a hard dependency.
Based on patch by Thomas Orgis on pkgsrc-users.


(wiz)
diff -r1.101 -r1.102 pkgsrc/graphics/gd/Makefile
diff -r1.30 -r1.31 pkgsrc/graphics/gd/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/graphics/gd/options.mk
cvs diff -r1.101 -r1.102 pkgsrc/graphics/gd/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gd/Makefile 2014/10/09 14:06:35 1.101
+++ pkgsrc/graphics/gd/Makefile 2014/12/09 11:42:10 1.102
@@ -1,38 +1,36 @@ @@ -1,38 +1,36 @@
1# $NetBSD: Makefile,v 1.101 2014/10/09 14:06:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.102 2014/12/09 11:42:10 wiz Exp $
2 2
3DISTNAME= libgd-2.1.0 3DISTNAME= libgd-2.1.0
4PKGNAME= ${DISTNAME:S/libgd/gd/} 4PKGNAME= ${DISTNAME:S/libgd/gd/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://cdn.bitbucket.org/libgd/gd-libgd/downloads/ 7MASTER_SITES= http://cdn.bitbucket.org/libgd/gd-libgd/downloads/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= adam@NetBSD.org 10MAINTAINER= adam@NetBSD.org
11HOMEPAGE= http://libgd.bitbucket.org/ 11HOMEPAGE= http://libgd.bitbucket.org/
12COMMENT= Graphics library for the dynamic creation of images 12COMMENT= Graphics library for the dynamic creation of images
13 13
14.include "options.mk" 14.include "options.mk"
15 15
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= perl:run 17USE_TOOLS+= perl:run
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --with-fontconfig=${BUILDLINK_PREFIX.fontconfig} 19CONFIGURE_ARGS+= --with-fontconfig=${BUILDLINK_PREFIX.fontconfig}
20CONFIGURE_ARGS+= --with-freetype=${BUILDLINK_PREFIX.freetype2} 20CONFIGURE_ARGS+= --with-freetype=${BUILDLINK_PREFIX.freetype2}
21CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} 21CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg}
22CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png} 22CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png}
23CONFIGURE_ARGS+= --with-tiff=${BUILDLINK_PREFIX.tiff} 23CONFIGURE_ARGS+= --with-tiff=${BUILDLINK_PREFIX.tiff}
24CONFIGURE_ARGS+= --with-vpx=${BUILDLINK_PREFIX.libvpx} 
25CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 24CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
26REPLACE_PERL+= src/bdftogd 25REPLACE_PERL+= src/bdftogd
27PTHREAD_AUTO_VARS= yes 26PTHREAD_AUTO_VARS= yes
28 27
29.include "../../converters/libiconv/buildlink3.mk" 28.include "../../converters/libiconv/buildlink3.mk"
30.include "../../devel/zlib/buildlink3.mk" 29.include "../../devel/zlib/buildlink3.mk"
31.include "../../fonts/fontconfig/buildlink3.mk" 30.include "../../fonts/fontconfig/buildlink3.mk"
32.include "../../graphics/freetype2/buildlink3.mk" 31.include "../../graphics/freetype2/buildlink3.mk"
33.include "../../graphics/png/buildlink3.mk" 32.include "../../graphics/png/buildlink3.mk"
34.include "../../graphics/tiff/buildlink3.mk" 33.include "../../graphics/tiff/buildlink3.mk"
35.include "../../multimedia/libvpx/buildlink3.mk" 
36.include "../../mk/jpeg.buildlink3.mk" 34.include "../../mk/jpeg.buildlink3.mk"
37.include "../../mk/pthread.buildlink3.mk" 35.include "../../mk/pthread.buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.30 -r1.31 pkgsrc/graphics/gd/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/gd/buildlink3.mk 2013/09/04 12:31:24 1.30
+++ pkgsrc/graphics/gd/buildlink3.mk 2014/12/09 11:42:10 1.31
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1# $NetBSD: buildlink3.mk,v 1.30 2013/09/04 12:31:24 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.31 2014/12/09 11:42:10 wiz Exp $
2 2
3BUILDLINK_TREE+= gd 3BUILDLINK_TREE+= gd
4 4
5.if !defined(GD_BUILDLINK3_MK) 5.if !defined(GD_BUILDLINK3_MK)
6GD_BUILDLINK3_MK:= 6GD_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gd+= gd>=2.0.15nb1 8BUILDLINK_API_DEPENDS.gd+= gd>=2.0.15nb1
9BUILDLINK_ABI_DEPENDS.gd+= gd>=2.1.0 9BUILDLINK_ABI_DEPENDS.gd+= gd>=2.1.0
10BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd 10BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd
11 11
12pkgbase := gd 12pkgbase := gd
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
15.if !empty(PKG_BUILD_OPTIONS.gd:Mx11) 15.if !empty(PKG_BUILD_OPTIONS.gd:Mx11)
16.include "../../x11/libXpm/buildlink3.mk" 16.include "../../x11/libXpm/buildlink3.mk"
17.endif 17.endif
18 18
19.include "../../devel/zlib/buildlink3.mk" 19.include "../../devel/zlib/buildlink3.mk"
20.include "../../fonts/fontconfig/buildlink3.mk" 20.include "../../fonts/fontconfig/buildlink3.mk"
21.include "../../graphics/freetype2/buildlink3.mk" 21.include "../../graphics/freetype2/buildlink3.mk"
22.include "../../graphics/png/buildlink3.mk" 22.include "../../graphics/png/buildlink3.mk"
23.include "../../graphics/tiff/buildlink3.mk" 23.include "../../graphics/tiff/buildlink3.mk"
 24.if !empty(PKG_BUILD_OPTIONS.gd:Mlibvpx)
24.include "../../multimedia/libvpx/buildlink3.mk" 25.include "../../multimedia/libvpx/buildlink3.mk"
 26.endif
25.include "../../mk/jpeg.buildlink3.mk" 27.include "../../mk/jpeg.buildlink3.mk"
26.include "../../mk/pthread.buildlink3.mk" 28.include "../../mk/pthread.buildlink3.mk"
27.endif # GD_BUILDLINK3_MK 29.endif # GD_BUILDLINK3_MK
28 30
29BUILDLINK_TREE+= -gd 31BUILDLINK_TREE+= -gd
cvs diff -r1.2 -r1.3 pkgsrc/graphics/gd/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/gd/options.mk 2013/09/02 21:17:42 1.2
+++ pkgsrc/graphics/gd/options.mk 2014/12/09 11:42:10 1.3
@@ -1,15 +1,22 @@ @@ -1,15 +1,22 @@
1# $NetBSD: options.mk,v 1.2 2013/09/02 21:17:42 adam Exp $ 1# $NetBSD: options.mk,v 1.3 2014/12/09 11:42:10 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gd 3PKG_OPTIONS_VAR= PKG_OPTIONS.gd
4PKG_SUPPORTED_OPTIONS= x11 4PKG_SUPPORTED_OPTIONS= libvpx x11
5PKG_SUGGESTED_OPTIONS= # empty 5PKG_SUGGESTED_OPTIONS= libvpx
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mx11) 9.if !empty(PKG_OPTIONS:Mx11)
10.include "../../x11/libXpm/buildlink3.mk" 10.include "../../x11/libXpm/buildlink3.mk"
11CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE} 11CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
12CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm} 12CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm}
13.else 13.else
14CONFIGURE_ARGS+= --without-xpm 14CONFIGURE_ARGS+= --without-xpm
15.endif 15.endif
 16
 17.if !empty(PKG_OPTIONS:Mlibvpx)
 18.include "../../multimedia/libvpx/buildlink3.mk"
 19CONFIGURE_ARGS+= --with-vpx=${BUILDLINK_PREFIX.libvpx}
 20.else
 21CONFIGURE_ARGS+= --without-vpx
 22.endif