aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordaichi <daichi@FreeBSD.org>2003-07-01 13:03:52 +0800
committerdaichi <daichi@FreeBSD.org>2003-07-01 13:03:52 +0800
commit7f8d715c28f38b55e5014fef2169c0868260e5c1 (patch)
treeb1e6f7bdd333581c653ad9413847aaee25b38166
parenteaf3b46eee252dec1e275e8653781af58884c0f8 (diff)
downloadfreebsd-ports-gnome-7f8d715c28f38b55e5014fef2169c0868260e5c1.tar.gz
freebsd-ports-gnome-7f8d715c28f38b55e5014fef2169c0868260e5c1.tar.zst
freebsd-ports-gnome-7f8d715c28f38b55e5014fef2169c0868260e5c1.zip
update graphics/gd2: 2.0.11 --> 2.0.12
PR: 52235 Submitted by: Mathieu Arnold <m@absolight.net> (maintainer)
-rw-r--r--graphics/gd2/Makefile4
-rw-r--r--graphics/gd2/distinfo2
-rw-r--r--graphics/gd2/files/Makefile.bsd2
-rw-r--r--graphics/gd2/files/patch-gd.c31
-rw-r--r--graphics/gd2/pkg-plist4
5 files changed, 15 insertions, 28 deletions
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile
index 0c619802b6e0..c807f5f6ee90 100644
--- a/graphics/gd2/Makefile
+++ b/graphics/gd2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gd
-PORTVERSION= 2.0.11
+PORTVERSION= 2.0.12
PORTREVISION= 1
CATEGORIES+= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
@@ -59,7 +59,7 @@ post-extract:
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
diff --git a/graphics/gd2/distinfo b/graphics/gd2/distinfo
index 74122c5448ea..27af20894bef 100644
--- a/graphics/gd2/distinfo
+++ b/graphics/gd2/distinfo
@@ -1 +1 @@
-MD5 (gd-2.0.11.tar.gz) = e2b6a14e7ac9781789e5d9f189af8475
+MD5 (gd-2.0.12.tar.gz) = de82080fbac781cfcd512c3c299066d7
diff --git a/graphics/gd2/files/Makefile.bsd b/graphics/gd2/files/Makefile.bsd
index 7620499d69cf..933366a12136 100644
--- a/graphics/gd2/files/Makefile.bsd
+++ b/graphics/gd2/files/Makefile.bsd
@@ -6,7 +6,7 @@ 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
diff --git a/graphics/gd2/files/patch-gd.c b/graphics/gd2/files/patch-gd.c
index 2ba623c62281..2ed96f17cfe5 100644
--- a/graphics/gd2/files/patch-gd.c
+++ b/graphics/gd2/files/patch-gd.c
@@ -1,12 +1,9 @@
---- 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;
+ }
@@ -16,25 +13,15 @@
+
+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;
diff --git a/graphics/gd2/pkg-plist b/graphics/gd2/pkg-plist
index baf9c27df669..a8b71306fc99 100644
--- a/graphics/gd2/pkg-plist
+++ b/graphics/gd2/pkg-plist
@@ -21,5 +21,5 @@ 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%%