4 files changed, 52 insertions, 32 deletions

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 9939e5da3928..b6f7a5b12e60 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gd
-PORTVERSION=	2.0.17
+PORTVERSION=	2.0.22
 PORTEPOCH=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
@@ -20,7 +20,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-MAKE_ENV=	WRKSRC="${WRKSRC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	WRKSRC="${WRKSRC}" CC=${CC} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 INSTALLS_SHLIB=	yes
 SCRIPTDIR=	${FILESDIR}
@@ -64,6 +64,8 @@ post-extract:
 	@${CP} ${FILESDIR}/g* ${WRKSRC}
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/gdfx.h ${WRKSRC}/gdhelpers.h \
+		${PREFIX}/include/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR}
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index a8fc15e7a25c..f0d4ee99ecac 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1,2 +1,2 @@
-MD5 (gd-2.0.17.tar.gz) = a1c0b12e69df63c22c7f90a4e8618c83
-SIZE (gd-2.0.17.tar.gz) = 541198
+MD5 (gd-2.0.22.tar.gz) = e1a41daf3bfc221afaf56751dc506f95
+SIZE (gd-2.0.22.tar.gz) = 544033
diff --git a/graphics/gd/files/patch-gd.h b/graphics/gd/files/patch-gd.h
index 026f87b14b30..ffd6e24ab637 100644
--- a/graphics/gd/files/patch-gd.h
+++ b/graphics/gd/files/patch-gd.h
@@ -1,41 +1,57 @@
---- gd.h	Thu Jan 16 11:28:09 2003
-+++ gd.h	Mon Mar 24 16:26:14 2003
-@@ -209,4 +209,8 @@
-   gdImagePtr gdImageCreateFromPngSource (gdSourcePtr in);
+--- gd.h.orig	Thu Jan 15 18:42:10 2004
++++ gd.h	Wed Mar 17 16:52:30 2004
+@@ -273,6 +273,12 @@
+    /* Deprecated in favor of gdImageCreateFromPngCtx */
+    BGD_EXPORT gdImagePtr gdImageCreateFromPngSource (gdSourcePtr in);
  
-+  gdImagePtr gdImageCreateFromGif(FILE *fd);
-+  gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr in);
-+  gdImagePtr gdImageCreateFromGifSource(gdSourcePtr in);
++#ifdef __FreeBSD__
++   BGD_EXPORT gdImagePtr gdImageCreateFromGif(FILE *fd);
++   BGD_EXPORT gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr in);
++   BGD_EXPORT gdImagePtr gdImageCreateFromGifSource(gdSourcePtr in);
++#endif
 +
-   gdImagePtr gdImageCreateFromGd (FILE * in);
-   gdImagePtr gdImageCreateFromGdCtx (gdIOCtxPtr in);
-@@ -300,4 +304,5 @@
+    BGD_EXPORT gdImagePtr gdImageCreateFromGd (FILE * in);
+    BGD_EXPORT gdImagePtr gdImageCreateFromGdCtx (gdIOCtxPtr in);
+    BGD_EXPORT gdImagePtr gdImageCreateFromGdPtr (int size, void *data);
+@@ -397,6 +403,9 @@
+   gdPoint, *gdPointPtr;
  
-   void gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c);
-+  void gdImageOpenPolygon(gdImagePtr im, gdPointPtr p, int n, int c);
-   void gdImageFilledPolygon (gdImagePtr im, gdPointPtr p, int n, int c);
+    BGD_EXPORT void gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c);
++#ifdef __FreeBSD__
++   BGD_EXPORT void gdImageOpenPolygon(gdImagePtr im, gdPointPtr p, int n, int c);
++#endif
+    BGD_EXPORT void gdImageFilledPolygon (gdImagePtr im, gdPointPtr p, int n, int c);
  
-@@ -395,4 +400,13 @@
-   void *gdImageJpegPtr (gdImagePtr im, int *size, int quality);
+ /* These functions still work with truecolor images, 
+@@ -498,6 +507,17 @@
+ /* Best to free this memory with gdFree(), not free() */
+   BGD_EXPORT void *gdImageJpegPtr (gdImagePtr im, int *size, int quality);
  
-+  void gdImageLzw(gdImagePtr im, FILE *out);
-+  void* gdImageLzwPtr(gdImagePtr im, int *size);
-+  void gdImageLzwCtx(gdImagePtr im, gdIOCtxPtr out);
++#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);
 +
-+  void gdImageBigGif(gdImagePtr im, FILE *out);
-+  void* gdImageBigGifPtr(gdImagePtr im, int *size);
-+  void gdImageBigGifCtx(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);
++#endif
 +
 +
  /* A custom data sink. For backwards compatibility. Use
  	gdIOCtx instead. */
-@@ -408,4 +422,9 @@
+ /* The sink function must return -1 on error, otherwise the number
+@@ -511,6 +531,13 @@
+   gdSink, *gdSinkPtr;
  
-   void gdImagePngToSink (gdImagePtr im, gdSinkPtr out);
+    BGD_EXPORT void gdImagePngToSink (gdImagePtr im, gdSinkPtr out);
 +
-+  void gdImageGif(gdImagePtr im, FILE *out);
-+  void* gdImageGifPtr(gdImagePtr im, int *size);
-+  void gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out);
-+  void gdImageGifToSink(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);
++#endif
  
-   void gdImageGd (gdImagePtr im, FILE * out);
+    BGD_EXPORT void gdImageGd (gdImagePtr im, FILE * out);
+    BGD_EXPORT void gdImageGd2 (gdImagePtr im, FILE * out, int cs, int fmt);
diff --git a/graphics/gd/pkg-plist b/graphics/gd/pkg-plist
index a8b71306fc99..549dc16325ad 100644
--- a/graphics/gd/pkg-plist
+++ b/graphics/gd/pkg-plist
@@ -18,6 +18,8 @@ include/gdfontl.h
 include/gdfontmb.h
 include/gdfonts.h
 include/gdfontt.h
+include/gdfx.h
+include/gdhelpers.h
 lib/libgd.a
 lib/libgd.so
 lib/libgd.so.4