- update to 2.0.24

67144
Dan Lukes

- update to 2.0.25

3 files changed, 33 insertions, 34 deletions

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 2ba7353925fb..b82d240556d9 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gd
-PORTVERSION=	2.0.22
+PORTVERSION=	2.0.25
 PORTEPOCH=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index f0d4ee99ecac..d482c990643d 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1,2 +1,2 @@
-MD5 (gd-2.0.22.tar.gz) = e1a41daf3bfc221afaf56751dc506f95
-SIZE (gd-2.0.22.tar.gz) = 544033
+MD5 (gd-2.0.25.tar.gz) = 995823da0aba8ad594ca872110448dc7
+SIZE (gd-2.0.25.tar.gz) = 545183
diff --git a/graphics/gd/files/patch-gd.h b/graphics/gd/files/patch-gd.h
index ffd6e24ab637..0d28a17a9fdc 100644
--- a/graphics/gd/files/patch-gd.h
+++ b/graphics/gd/files/patch-gd.h
@@ -1,57 +1,56 @@
---- gd.h.orig	Thu Jan 15 18:42:10 2004
-+++ gd.h	Wed Mar 17 16:52:30 2004
-@@ -273,6 +273,12 @@
+--- gd.h.orig	Tue May 25 13:05:50 2004
++++ gd.h	Wed May 26 09:30:23 2004
+@@ -283,6 +283,12 @@
     /* Deprecated in favor of gdImageCreateFromPngCtx */
-    BGD_EXPORT gdImagePtr gdImageCreateFromPngSource (gdSourcePtr in);
+ BGD_DECLARE(gdImagePtr) gdImageCreateFromPngSource (gdSourcePtr in);
  
 +#ifdef __FreeBSD__
-+   BGD_EXPORT gdImagePtr gdImageCreateFromGif(FILE *fd);
-+   BGD_EXPORT gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr in);
-+   BGD_EXPORT gdImagePtr gdImageCreateFromGifSource(gdSourcePtr in);
++BGD_DECLARE(gdImagePtr) gdImageCreateFromGif(FILE *fd);
++BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr in);
++BGD_DECLARE(gdImagePtr) gdImageCreateFromGifSource(gdSourcePtr in);
 +#endif
 +
-    BGD_EXPORT gdImagePtr gdImageCreateFromGd (FILE * in);
-    BGD_EXPORT gdImagePtr gdImageCreateFromGdCtx (gdIOCtxPtr in);
-    BGD_EXPORT gdImagePtr gdImageCreateFromGdPtr (int size, void *data);
-@@ -397,6 +403,9 @@
+ BGD_DECLARE(gdImagePtr) gdImageCreateFromGd (FILE * in);
+ BGD_DECLARE(gdImagePtr) gdImageCreateFromGdCtx (gdIOCtxPtr in);
+ BGD_DECLARE(gdImagePtr) gdImageCreateFromGdPtr (int size, void *data);
+@@ -411,6 +417,9 @@
    gdPoint, *gdPointPtr;
  
-    BGD_EXPORT void gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c);
+ BGD_DECLARE(void) gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c);
 +#ifdef __FreeBSD__
-+   BGD_EXPORT void gdImageOpenPolygon(gdImagePtr im, gdPointPtr p, int n, int c);
++BGD_DECLARE(void) gdImageOpenPolygon (gdImagePtr im, gdPointPtr p, int n, int c);
 +#endif
-    BGD_EXPORT void gdImageFilledPolygon (gdImagePtr im, gdPointPtr p, int n, int c);
+ BGD_DECLARE(void) gdImageFilledPolygon (gdImagePtr im, gdPointPtr p, int n, int c);
  
  /* These functions still work with truecolor images, 
-@@ -498,6 +507,17 @@
+@@ -512,6 +521,16 @@
  /* Best to free this memory with gdFree(), not free() */
-   BGD_EXPORT void *gdImageJpegPtr (gdImagePtr im, int *size, int quality);
+ BGD_DECLARE(void *) gdImageJpegPtr (gdImagePtr im, int *size, int quality);
  
 +#ifdef __FreeBSD__
-+  BGD_EXPORT void gdImageLzw(gdImagePtr im, FILE *out);
-+  BGD_EXPORT void* gdImageLzwPtr(gdImagePtr im, int *size);
-+  BGD_EXPORT void gdImageLzwCtx(gdImagePtr im, gdIOCtxPtr out);
++BGD_DECLARE(void) gdImageLzw(gdImagePtr im, FILE *out);
++BGD_DECLARE(void *) gdImageLzwPtr(gdImagePtr im, int *size);
++BGD_DECLARE(void) gdImageLzwCtx(gdImagePtr im, gdIOCtxPtr out);
 +
-+  BGD_EXPORT void gdImageBigGif(gdImagePtr im, FILE *out);
-+  BGD_EXPORT void* gdImageBigGifPtr(gdImagePtr im, int *size);
-+  BGD_EXPORT void gdImageBigGifCtx(gdImagePtr im, gdIOCtxPtr out);
++BGD_DECLARE(void) gdImageBigGif(gdImagePtr im, FILE *out);
++BGD_DECLARE(void *) gdImageBigGifPtr(gdImagePtr im, int *size);
++BGD_DECLARE(void) gdImageBigGifCtx(gdImagePtr im, gdIOCtxPtr out);
 +#endif
 +
-+
  /* A custom data sink. For backwards compatibility. Use
  	gdIOCtx instead. */
  /* The sink function must return -1 on error, otherwise the number
-@@ -511,6 +531,13 @@
+@@ -525,6 +544,13 @@
    gdSink, *gdSinkPtr;
  
-    BGD_EXPORT void gdImagePngToSink (gdImagePtr im, gdSinkPtr out);
+ BGD_DECLARE(void) gdImagePngToSink (gdImagePtr im, gdSinkPtr out);
 +
 +#ifdef __FreeBSD__
-+   BGD_EXPORT void gdImageGif(gdImagePtr im, FILE *out);
-+   BGD_EXPORT void* gdImageGifPtr(gdImagePtr im, int *size);
-+   BGD_EXPORT void gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out);
-+   BGD_EXPORT void gdImageGifToSink(gdImagePtr im, gdSinkPtr out);
++BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *out);
++BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size);
++BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out);
++BGD_DECLARE(void) gdImageGifToSink(gdImagePtr im, gdSinkPtr out);
 +#endif
  
-    BGD_EXPORT void gdImageGd (gdImagePtr im, FILE * out);
-    BGD_EXPORT void gdImageGd2 (gdImagePtr im, FILE * out, int cs, int fmt);
+ BGD_DECLARE(void) gdImageGd (gdImagePtr im, FILE * out);
+ BGD_DECLARE(void) gdImageGd2 (gdImagePtr im, FILE * out, int cs, int fmt);