Index: head/graphics/gd2/Makefile
===================================================================
--- head/graphics/gd2/Makefile	(revision 83939)
+++ head/graphics/gd2/Makefile	(revision 83940)
@@ -1,79 +1,79 @@
 # New ports collection makefile for:	gd
 # Date created:         27 Mar 1998
 # Whom:                 jeff@cetlink.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gd
-PORTVERSION=	2.0.11
+PORTVERSION=	2.0.12
 PORTREVISION=   1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/ \
 		${MASTER_SITE_RINGSERVER}
 MASTER_SITE_SUBDIR=	graphics/gd
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	A graphics library for fast creation of images
 
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		freetype:${PORTSDIR}/print/freetype2
 
 LATEST_LINK=	gd2
 
 .ifndef WITHOUT_XPM
 # Temporary hack, until X-less XPM building is added to USE_XPM:
 .ifndef WITHOUT_X11
 USE_XPM=	yes
 .else
 LIB_DEPENDS+=	Xpm:${PORTSDIR}/graphics/xpm
 .endif
 .else
 MAKE_ARGS+=	-DWITHOUT_XPM
 .endif
 
 INSTALLS_SHLIB=	yes
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ARGS+=	-j2
 .for v in WRKSRC INSTALL_PROGRAM INSTALL_DATA INSTALL_SCRIPT
 MAKE_ARGS+=	$v="${$v}"
 .endfor
 
 .if defined(HAVE_UNISYS_LICENSE) || \
     (defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES")
 WITH_LZW=	yes
 .endif
 
 .if !defined(WITH_LZW)
 pre-fetch:
 	@${ECHO_CMD} "************************************************************"
 	@${ECHO_CMD} "*      If you live outside US and Canada, you can define   *"
 	@${ECHO_CMD} "*      WITH_LZW to enable GIF compression support.         *"
 	@${ECHO_CMD} "************************************************************"
 .endif
 
 post-extract:
 	@${CP} ${FILESDIR}/g* ${WRKSRC}
 
 post-patch:
 .if !defined(WITH_LZW)
-	${MV} ${WRKSRC}/gd_gif_out.c ${WRKSRC}/gd_gif_out.c.nogif && \
+	@${MV} ${WRKSRC}/gd_gif_out.c ${WRKSRC}/gd_gif_out.c.nogif && \
 		${SED} -e "s|#define LZW_LICENCED||g" \
 			< ${WRKSRC}/gd_gif_out.c.nogif \
 			> ${WRKSRC}/gd_gif_out.c
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR}
 .endif
 
 .if defined(GD_FONTS)
 USE_PERL5_BUILD=yes
 SCRIPTS_ENV+=	GD_FONTS="${GD_FONTS}"
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/graphics/gd2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.62
\ No newline at end of property
+1.63
\ No newline at end of property
Index: head/graphics/gd2/distinfo
===================================================================
--- head/graphics/gd2/distinfo	(revision 83939)
+++ head/graphics/gd2/distinfo	(revision 83940)
@@ -1 +1 @@
-MD5 (gd-2.0.11.tar.gz) = e2b6a14e7ac9781789e5d9f189af8475
+MD5 (gd-2.0.12.tar.gz) = de82080fbac781cfcd512c3c299066d7

Property changes on: head/graphics/gd2/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.19
\ No newline at end of property
Index: head/graphics/gd2/files/Makefile.bsd
===================================================================
--- head/graphics/gd2/files/Makefile.bsd	(revision 83939)
+++ head/graphics/gd2/files/Makefile.bsd	(revision 83940)
@@ -1,61 +1,61 @@
 PROGS!=	make -V BIN_PROGRAMS -f ${WRKSRC}/makefile.sample
 PROGS+=	gd2togif gdcmpgif giftogd2
 PROGS+=	annotate	# new utility, not included in makefile.sample
 TESTS=	gdtest gddemo gd2time gdtestft testac fontsizetest fontwheeltest
 SRCS=	gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c \
 	gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c \
 	gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c \
 	gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h \
-	gdkanji.c gdtables.c gdxpm.c jisx0208.h mathmake.c \
+	gdkanji.c gdtables.c gdxpm.c jisx0208.h \
 	wbmp.c wbmp.h
 SRCS+=	gd_gif_in.c gd_gif_out.c gd_biggif_out.c gd_lzw_out.c
 MAKEDIR=/usr/share/mk
 LIB=gd
 SHLIB_MAJOR=4
 SHLIB_MINOR=0
 INCS=	gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
 	gdfonts.h gdfontt.h
 SHLIB_NAME!=	make -V SHLIB_NAME LIB=${LIB} \
 	SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} -f ${MAKEDIR}/bsd.lib.mk
 
 CFLAGS+=-I${.CURDIR} -I${LOCALBASE}/include/freetype2/ \
 	-I${LOCALBASE}/include/freetype2/freetype -I${LOCALBASE}/include \
 	-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ
 LDADD=	-L${LOCALBASE}/lib -lpng -lz -ljpeg -lfreetype -lm
 
 .ifndef WITHOUT_XPM
 CFLAGS+=-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_XPM
 LDADD+=	-L${X11BASE}/lib -lXpm
 .ifdef WITHOUT_X11
 CFLAGS+=-DXPM_NOX
 .else
 LDADD+=	-lX11
 .endif
 .endif
 
 # The package comes with tests, but without any sort of test-harness,
 # to run them all automaticly. So building tests is disabled here.	-mi
 all: lib${LIB}.a ${SHLIB_NAME} ${PROGS} # ${TESTS}
 
 lib${LIB}.a ${SHLIB_NAME}: ${SRCS}
 	make LIB=${LIB} SRCS="${SRCS}" \
 		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
 		CFLAGS="${CFLAGS}" -ECFLAGS LDADD="${LDADD}" \
 		-f ${MAKEDIR}/bsd.lib.mk ${.TARGET}
 
 ${PROGS} ${TESTS}: ${SHLIB_NAME} lib${LIB}.a
 	make PROG=${.TARGET} NOMAN=1 LDADD="-L. -lgd" \
 		CFLAGS="${CFLAGS}" -ECFLAGS -f ${MAKEDIR}/bsd.prog.mk
 
 install:
 	mkdir -p ${PREFIX}/include
 	make LIB=${LIB} LIBDIR=${PREFIX}/lib NOPROFILE=true \
 		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
 		-f ${MAKEDIR}/bsd.lib.mk install
 	cd ${.CURDIR} && ${INSTALL_DATA} ${INCS} ${PREFIX}/include
 	cd ${.CURDIR} && ${INSTALL_PROGRAM} ${PROGS} ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${.CURDIR}/bdftogd ${PREFIX}/bin/
 
 .if exists(${.CURDIR}/Makefile.fonts)
 .include "Makefile.fonts"
 .endif

Property changes on: head/graphics/gd2/files/Makefile.bsd
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/graphics/gd2/files/patch-gd.c
===================================================================
--- head/graphics/gd2/files/patch-gd.c	(revision 83939)
+++ head/graphics/gd2/files/patch-gd.c	(revision 83940)
@@ -1,40 +1,27 @@
---- gd.c	Thu Apr 25 14:15:15 2002
-+++ gd.c	Thu Apr 25 12:43:55 2002
-@@ -2211,7 +2230,17 @@
- }
- 
+--- gd.c.orig	Sat Mar 29 17:25:42 2003
++++ gd.c	Wed May 14 16:46:34 2003
+@@ -2696,6 +2696,16 @@
  void
--gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c)
-+gdImagePolygon(gdImagePtr im, gdPointPtr p, int n, int c)
-+{
+ gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c)
+ {
 +	if (!n) {
 +		return;
 +	}
 +	gdImageLine(im, p->x, p->y, p[n-1].x, p[n-1].y, c);
 +	gdImageOpenPolygon(im, p, n, c);
 +}	
 +
 +void
 +gdImageOpenPolygon (gdImagePtr im, gdPointPtr p, int n, int c)
- {
++{
    int i;
    int lx, ly;
-@@ -2221,7 +2250,6 @@
-     }
+   if (!n)
+@@ -2710,7 +2720,6 @@
+ 
    lx = p->x;
    ly = p->y;
 -  gdImageLine (im, lx, ly, p[n - 1].x, p[n - 1].y, c);
    for (i = 1; (i < n); i++)
      {
        p++;
-@@ -2461,8 +2489,8 @@
-     {
-       for (x = 0; (x < sx); x++)
- 	{
--	  p1 = im1->pixels[y][x];
--	  p2 = im2->pixels[y][x];
-+	  p1 = im1->trueColor ? gdImageTrueColorPixel(im1, x, y) : gdImagePalettePixel(im1, x, y);
-+	  p2 = im2->trueColor ? gdImageTrueColorPixel(im2, x, y) : gdImagePalettePixel(im2, x, y);
- 	  if (gdImageRed (im1, p1) != gdImageRed (im2, p2))
- 	    {
- 	      cmpStatus |= GD_CMP_COLOR + GD_CMP_IMAGE;

Property changes on: head/graphics/gd2/files/patch-gd.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/graphics/gd2/pkg-plist
===================================================================
--- head/graphics/gd2/pkg-plist	(revision 83939)
+++ head/graphics/gd2/pkg-plist	(revision 83940)
@@ -1,25 +1,25 @@
 bin/annotate
 bin/bdftogd
 bin/gd2copypal
 bin/gd2togif
 bin/gd2topng
 bin/gdcmpgif
 bin/gdparttopng
 bin/gdtopng
 bin/giftogd2
 bin/pngtogd
 bin/pngtogd2
 bin/webpng
 include/gd.h
 include/gd_io.h
 include/gdcache.h
 include/gdfontg.h
 include/gdfontl.h
 include/gdfontmb.h
 include/gdfonts.h
 include/gdfontt.h
 lib/libgd.a
 lib/libgd.so
 lib/libgd.so.4
-%%PORTDOCS%%share/doc/gd/index.html
-%%PORTDOCS%%@dirrm share/doc/gd
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%

Property changes on: head/graphics/gd2/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property