Changes 2.1.0:

* gdColorMapLookup() answers the RGB values according to given color map
* Added support of variable resolution
* new filter gdImagePixelate()
* merged improvements that PHP GD team had made to GD Graphics Library
* bugfixes

9 files changed, 59 insertions, 99 deletions

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 63b3a661ece..c330f5c92a3 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,38 +1,38 @@
-# $NetBSD: Makefile,v 1.95 2013/06/04 22:16:17 tron Exp $
+# $NetBSD: Makefile,v 1.96 2013/09/02 21:17:42 adam Exp $
 
-DISTNAME=	gd-2.0.35
-PKGREVISION=	15
+DISTNAME=	libgd-2.1.0
+PKGNAME=	${DISTNAME:S/libgd/gd/}
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.libgd.org/releases/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	https://bitbucket.org/libgd/gd-libgd/downloads/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://www.libgd.org/
+HOMEPAGE=	http://libgd.bitbucket.org/
 COMMENT=	Graphics library for the dynamic creation of images
 
 .include "options.mk"
 
-# fails in test not finding libgd.a
-MAKE_JOBS_SAFE=		no
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		yes
-REPLACE_PERL+=		bdftogd
+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-vpx=${BUILDLINK_PREFIX.libvpx}
+CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
+REPLACE_PERL+=		src/bdftogd
 PTHREAD_AUTO_VARS=	yes
 
-# Make sure configure doesn't find an old (possibly non-Pkgsrc)
-# libpng12-config executable.  If it does, it will override the Pkgsrc
-# version, but fail to configure, and fail to build in PNG support.
-CONFIGURE_ENV+=		ac_cv_path_LIBPNG12_CONFIG=""
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/jpeg.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 --git a/graphics/gd/PLIST b/graphics/gd/PLIST
index ce723e5b48f..ed098b31dd0 100644
--- a/graphics/gd/PLIST
+++ b/graphics/gd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/11/03 13:13:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/09/02 21:17:42 adam Exp $
 bin/annotate
 bin/bdftogd
 bin/gd2copypal
@@ -14,6 +14,8 @@ bin/pngtogd2
 bin/webpng
 include/entities.h
 include/gd.h
+include/gd_color_map.h
+include/gd_errors.h
 include/gd_io.h
 include/gdcache.h
 include/gdfontg.h
@@ -22,4 +24,6 @@ include/gdfontmb.h
 include/gdfonts.h
 include/gdfontt.h
 include/gdfx.h
+include/gdpp.h
 lib/libgd.la
+lib/pkgconfig/gdlib.pc
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index 1b735476329..6b354873e87 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2013/06/04 22:16:17 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2013/09/02 21:17:42 adam Exp $
 
 BUILDLINK_TREE+=	gd
 
@@ -14,16 +14,15 @@ pkgbase := gd
 
 .if !empty(PKG_BUILD_OPTIONS.gd:Mx11)
 .include "../../x11/libXpm/buildlink3.mk"
-#.include "../../x11/libXp/buildlink3.mk"
-#.include "../../mk/xaw.buildlink3.mk"
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/jpeg.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"
 .endif # GD_BUILDLINK3_MK
 
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index 2a77eaced46..f19a9f23eb8 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.32 2011/01/06 18:01:21 drochner Exp $
+$NetBSD: distinfo,v 1.33 2013/09/02 21:17:42 adam Exp $
 
-SHA1 (gd-2.0.35.tar.bz2) = ccf34a610abff2dbf133a20c4d2a4aa94939018a
-RMD160 (gd-2.0.35.tar.bz2) = f452a2c333b2ba9b7b4c143983ec2af18a335516
-Size (gd-2.0.35.tar.bz2) = 1212730 bytes
-SHA1 (patch-aa) = 726107579811ce1f33b00bd4dbf13040c48120bb
-SHA1 (patch-ab) = 70bfe427ae1ace5a17090dd158a64addb8d7b964
-SHA1 (patch-ac) = d166ed4d0a3510c610e8aa233d312e15d96f4667
-SHA1 (patch-ad) = 27631984f613c4c1c6f57cea23c36ae7d48271ac
+SHA1 (libgd-2.1.0.tar.xz) = 66c56fc07246b66ba649c83e996fd2085ea2f9e2
+RMD160 (libgd-2.1.0.tar.xz) = 3fcdf88e1ca653ffd40ddba607dbc317ca87bf63
+Size (libgd-2.1.0.tar.xz) = 2004304 bytes
+SHA1 (patch-aa) = 00198349dd9cff60f1f5738524096a251057eb16
+SHA1 (patch-ab) = 300ffacf47d7421fc9efb7b3fd9e93f011de1b4b
diff --git a/graphics/gd/options.mk b/graphics/gd/options.mk
index b1c1a2c04bc..4066910781f 100644
--- a/graphics/gd/options.mk
+++ b/graphics/gd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2009/04/12 00:29:26 sno Exp $
+# $NetBSD: options.mk,v 1.2 2013/09/02 21:17:42 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gd
 PKG_SUPPORTED_OPTIONS=	x11
@@ -8,8 +8,8 @@ PKG_SUGGESTED_OPTIONS=	# empty
 
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libXpm/buildlink3.mk"
-CONFIGURE_ENV+= 	X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
-CONFIGURE_ARGS+=        --with-xpm
+CONFIGURE_ENV+=		X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
+CONFIGURE_ARGS+=	--with-xpm=${BUILDLINK_PREFIX.libXpm}
 .else
-CONFIGURE_ARGS+=        --without-xpm
+CONFIGURE_ARGS+=	--without-xpm
 .endif
diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa
index 10aa61f890e..6f6aa21b2b8 100644
--- a/graphics/gd/patches/patch-aa
+++ b/graphics/gd/patches/patch-aa
@@ -1,25 +1,24 @@
-$NetBSD: patch-aa,v 1.18 2007/07/01 07:54:25 adam Exp $
+$NetBSD: patch-aa,v 1.19 2013/09/02 21:17:42 adam Exp $
 
---- entities.h.orig	2007-03-31 19:24:42.000000000 +0200
-+++ entities.h
-@@ -14,7 +14,12 @@ extern "C" {
- static struct entities_s {
- 	char	*name;
- 	int	value;
--} entities[] = {
-+};
-+
-+extern struct entities_s entities[];
+--- src/entities.h.orig	2013-06-25 09:58:23.000000000 +0000
++++ src/entities.h
+@@ -14,7 +14,11 @@ extern "C" {
+ 	static struct entities_s {
+ 		char	*name;
+ 		int	value;
+-	} entities[] = {
++	};
++	extern struct entities_s entities[];
 +
 +#if 0
 +struct entities_s entities[] = {
- 	{"AElig", 198},
- 	{"Aacute", 193},
- 	{"Acirc", 194},
-@@ -268,6 +273,7 @@ static struct entities_s {
- 	{"zwj", 8205},
- 	{"zwnj", 8204},
- };
+ 		{"AElig", 198},
+ 		{"Aacute", 193},
+ 		{"Acirc", 194},
+@@ -268,6 +272,7 @@ extern "C" {
+ 		{"zwj", 8205},
+ 		{"zwnj", 8204},
+ 	};
 +#endif
  
  #define ENTITY_NAME_LENGTH_MAX 8
diff --git a/graphics/gd/patches/patch-ab b/graphics/gd/patches/patch-ab
index 0eeef451646..5ce9e8d78e5 100644
--- a/graphics/gd/patches/patch-ab
+++ b/graphics/gd/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.9 2011/01/06 18:01:21 drochner Exp $
+$NetBSD: patch-ab,v 1.10 2013/09/02 21:17:42 adam Exp $
 
---- gdft.c.orig	2007-04-19 12:54:56.000000000 +0000
-+++ gdft.c
-@@ -25,6 +25,261 @@
- #define R_OK 04			/* Needed in Windows */
+--- src/gdft.c.orig	2013-06-25 09:58:23.000000000 +0000
++++ src/gdft.c
+@@ -35,6 +35,261 @@
+ #endif
  #endif
  
 +struct entities_s entities[] = {
@@ -262,14 +262,5 @@ $NetBSD: patch-ab,v 1.9 2011/01/06 18:01:21 drochner Exp $
 +};
 +
  /* number of antialised colors for indexed bitmaps */
- #define NUMCOLORS 8
+ #define GD_NUMCOLORS 8
  
-@@ -1659,7 +1914,7 @@ static char * font_path(char **fontpath,
- BGD_DECLARE(int) gdFTUseFontConfig(int flag)
- {
- #ifdef HAVE_LIBFONTCONFIG
--	fontConfigFlag = 1;
-+	fontConfigFlag = flag;
- 	return 1;
- #else
- 	return 0;
diff --git a/graphics/gd/patches/patch-ac b/graphics/gd/patches/patch-ac
deleted file mode 100644
index b301435fa23..00000000000
--- a/graphics/gd/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2009/04/12 00:29:26 sno Exp $
-
---- configure.orig	2008-09-22 17:26:32.000000000 +0200
-+++ configure
-@@ -23117,7 +23117,7 @@ if test "${with_xpm+set}" = set; then
-      CPPFLAGS="$CPPFLAGS -I$withval/include"
-    fi
- else
--  withval=yes
-+  withval=no
- fi
- 
- 
diff --git a/graphics/gd/patches/patch-ad b/graphics/gd/patches/patch-ad
deleted file mode 100644
index 3c5e92a6b73..00000000000
--- a/graphics/gd/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/10/22 14:39:55 taca Exp $
-
-* Fix for http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3546,
-  similar chagne from PHP's SVN repositry r289557.
-
---- gd_gd.c.orig	2006-04-06 00:52:22.000000000 +0900
-+++ gd_gd.c
-@@ -44,6 +44,10 @@ _gdGetColors (gdIOCtx * in, gdImagePtr i
- 	    {
- 	      goto fail1;
- 	    }
-+	  if (im->colorsTotal > gdMaxColors)
-+	    {
-+	        goto fail1;
-+	    }
- 	}
-       /* Int to accommodate truecolor single-color transparency */
-       if (!gdGetInt (&im->transparent, in))