summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/gd/Makefile13
-rw-r--r--graphics/gd/distinfo1
-rw-r--r--graphics/gd/files/patch-ac2
-rw-r--r--graphics/gd/files/patch-gif15
-rw-r--r--graphics/gd1/Makefile13
-rw-r--r--graphics/gd1/distinfo1
-rw-r--r--graphics/gd1/files/patch-ac2
-rw-r--r--graphics/gd1/files/patch-gif15
-rw-r--r--graphics/gd2/Makefile13
-rw-r--r--graphics/gd2/distinfo1
-rw-r--r--graphics/gd2/files/patch-ac2
-rw-r--r--graphics/gd2/files/patch-gif15
12 files changed, 81 insertions, 12 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index d58e80f3fa93..d469e912da33 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -7,19 +7,23 @@
PORTNAME= gd
PORTVERSION= 1.8.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/ \
+ http://virtual-estates.net/~mi/port-stuff/ \
${MASTER_SITE_RINGSERVER}
MASTER_SITE_SUBDIR= graphics/gd
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gd_gif_in.c.bz2
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER?= billf@FreeBSD.org
-BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
+BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 \
+ bzip2:${PORTSDIR}/archivers/bzip2
LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- freetype.7:${PORTSDIR}/print/freetype2
+ freetype:${PORTSDIR}/print/freetype2
.if defined(WITH_X11)
USE_XLIB= yes
@@ -28,6 +32,9 @@ USE_XPM= yes
INSTALLS_SHLIB= yes
+post-extract:
+ bzip2 -d < ${_DISTDIR}/gd_gif_in.c.bz2 > ${WRKSRC}/gd_gif_in.c
+
pre-everything:
.if !defined(WITH_X11)
@${ECHO_MSG} "If you want to compile in X support use "
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index 0a9ba962c815..ed8787c2bd67 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1 +1,2 @@
MD5 (gd-1.8.4.tar.gz) = 2aef76e79f206f9798233f025f5dd28d
+MD5 (gd_gif_in.c.bz2) = 54132aea09471bb997672436dd9a1a96
diff --git a/graphics/gd/files/patch-ac b/graphics/gd/files/patch-ac
index 415662373e4c..8ddd65b3acd2 100644
--- a/graphics/gd/files/patch-ac
+++ b/graphics/gd/files/patch-ac
@@ -156,7 +156,7 @@
gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
gdfontg.o gdtables.o gdft.o gdttf.o gdcache.o gdkanji.o wbmp.o \
- gd_wbmp.o gdhelpers.o gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \
-+ gd_wbmp.o gdhelpers.o
++ gd_wbmp.o gdhelpers.o gd_gif_in.o
+INCS= gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \
gdfontg.h gdhelpers.h
+
diff --git a/graphics/gd/files/patch-gif b/graphics/gd/files/patch-gif
new file mode 100644
index 000000000000..e156fa2dd01f
--- /dev/null
+++ b/graphics/gd/files/patch-gif
@@ -0,0 +1,15 @@
+This patch together with the old implementation (from gd-1.5) of
+gd_gif_in.c restore GD's ability to read GIF images. The writing of such
+images is troubled because of Unisys' zeal in patent enforcement.
+
+--- gd.h Tue Feb 6 14:44:01 2001
++++ gd.h Fri Jul 27 16:10:38 2001
+@@ -95,2 +95,4 @@
+ gdImagePtr gdImageCreate(int sx, int sy);
++gdImagePtr gdImageCreateFromGif(FILE *fd);
++gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr in);
+ gdImagePtr gdImageCreateFromPng(FILE *fd);
+--- gd_gif_in.c Fri Jul 27 16:13:45 2001
++++ gd_gif_in.c Fri Jul 27 16:14:46 2001
+@@ -6,1 +6,0 @@
+-#include "io.h"
diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile
index d58e80f3fa93..d469e912da33 100644
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@@ -7,19 +7,23 @@
PORTNAME= gd
PORTVERSION= 1.8.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/ \
+ http://virtual-estates.net/~mi/port-stuff/ \
${MASTER_SITE_RINGSERVER}
MASTER_SITE_SUBDIR= graphics/gd
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gd_gif_in.c.bz2
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER?= billf@FreeBSD.org
-BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
+BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 \
+ bzip2:${PORTSDIR}/archivers/bzip2
LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- freetype.7:${PORTSDIR}/print/freetype2
+ freetype:${PORTSDIR}/print/freetype2
.if defined(WITH_X11)
USE_XLIB= yes
@@ -28,6 +32,9 @@ USE_XPM= yes
INSTALLS_SHLIB= yes
+post-extract:
+ bzip2 -d < ${_DISTDIR}/gd_gif_in.c.bz2 > ${WRKSRC}/gd_gif_in.c
+
pre-everything:
.if !defined(WITH_X11)
@${ECHO_MSG} "If you want to compile in X support use "
diff --git a/graphics/gd1/distinfo b/graphics/gd1/distinfo
index 0a9ba962c815..ed8787c2bd67 100644
--- a/graphics/gd1/distinfo
+++ b/graphics/gd1/distinfo
@@ -1 +1,2 @@
MD5 (gd-1.8.4.tar.gz) = 2aef76e79f206f9798233f025f5dd28d
+MD5 (gd_gif_in.c.bz2) = 54132aea09471bb997672436dd9a1a96
diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac
index 415662373e4c..8ddd65b3acd2 100644
--- a/graphics/gd1/files/patch-ac
+++ b/graphics/gd1/files/patch-ac
@@ -156,7 +156,7 @@
gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
gdfontg.o gdtables.o gdft.o gdttf.o gdcache.o gdkanji.o wbmp.o \
- gd_wbmp.o gdhelpers.o gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \
-+ gd_wbmp.o gdhelpers.o
++ gd_wbmp.o gdhelpers.o gd_gif_in.o
+INCS= gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \
gdfontg.h gdhelpers.h
+
diff --git a/graphics/gd1/files/patch-gif b/graphics/gd1/files/patch-gif
new file mode 100644
index 000000000000..e156fa2dd01f
--- /dev/null
+++ b/graphics/gd1/files/patch-gif
@@ -0,0 +1,15 @@
+This patch together with the old implementation (from gd-1.5) of
+gd_gif_in.c restore GD's ability to read GIF images. The writing of such
+images is troubled because of Unisys' zeal in patent enforcement.
+
+--- gd.h Tue Feb 6 14:44:01 2001
++++ gd.h Fri Jul 27 16:10:38 2001
+@@ -95,2 +95,4 @@
+ gdImagePtr gdImageCreate(int sx, int sy);
++gdImagePtr gdImageCreateFromGif(FILE *fd);
++gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr in);
+ gdImagePtr gdImageCreateFromPng(FILE *fd);
+--- gd_gif_in.c Fri Jul 27 16:13:45 2001
++++ gd_gif_in.c Fri Jul 27 16:14:46 2001
+@@ -6,1 +6,0 @@
+-#include "io.h"
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile
index d58e80f3fa93..d469e912da33 100644
--- a/graphics/gd2/Makefile
+++ b/graphics/gd2/Makefile
@@ -7,19 +7,23 @@
PORTNAME= gd
PORTVERSION= 1.8.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/ \
+ http://virtual-estates.net/~mi/port-stuff/ \
${MASTER_SITE_RINGSERVER}
MASTER_SITE_SUBDIR= graphics/gd
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gd_gif_in.c.bz2
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER?= billf@FreeBSD.org
-BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
+BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 \
+ bzip2:${PORTSDIR}/archivers/bzip2
LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- freetype.7:${PORTSDIR}/print/freetype2
+ freetype:${PORTSDIR}/print/freetype2
.if defined(WITH_X11)
USE_XLIB= yes
@@ -28,6 +32,9 @@ USE_XPM= yes
INSTALLS_SHLIB= yes
+post-extract:
+ bzip2 -d < ${_DISTDIR}/gd_gif_in.c.bz2 > ${WRKSRC}/gd_gif_in.c
+
pre-everything:
.if !defined(WITH_X11)
@${ECHO_MSG} "If you want to compile in X support use "
diff --git a/graphics/gd2/distinfo b/graphics/gd2/distinfo
index 0a9ba962c815..ed8787c2bd67 100644
--- a/graphics/gd2/distinfo
+++ b/graphics/gd2/distinfo
@@ -1 +1,2 @@
MD5 (gd-1.8.4.tar.gz) = 2aef76e79f206f9798233f025f5dd28d
+MD5 (gd_gif_in.c.bz2) = 54132aea09471bb997672436dd9a1a96
diff --git a/graphics/gd2/files/patch-ac b/graphics/gd2/files/patch-ac
index 415662373e4c..8ddd65b3acd2 100644
--- a/graphics/gd2/files/patch-ac
+++ b/graphics/gd2/files/patch-ac
@@ -156,7 +156,7 @@
gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
gdfontg.o gdtables.o gdft.o gdttf.o gdcache.o gdkanji.o wbmp.o \
- gd_wbmp.o gdhelpers.o gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \
-+ gd_wbmp.o gdhelpers.o
++ gd_wbmp.o gdhelpers.o gd_gif_in.o
+INCS= gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \
gdfontg.h gdhelpers.h
+
diff --git a/graphics/gd2/files/patch-gif b/graphics/gd2/files/patch-gif
new file mode 100644
index 000000000000..e156fa2dd01f
--- /dev/null
+++ b/graphics/gd2/files/patch-gif
@@ -0,0 +1,15 @@
+This patch together with the old implementation (from gd-1.5) of
+gd_gif_in.c restore GD's ability to read GIF images. The writing of such
+images is troubled because of Unisys' zeal in patent enforcement.
+
+--- gd.h Tue Feb 6 14:44:01 2001
++++ gd.h Fri Jul 27 16:10:38 2001
+@@ -95,2 +95,4 @@
+ gdImagePtr gdImageCreate(int sx, int sy);
++gdImagePtr gdImageCreateFromGif(FILE *fd);
++gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr in);
+ gdImagePtr gdImageCreateFromPng(FILE *fd);
+--- gd_gif_in.c Fri Jul 27 16:13:45 2001
++++ gd_gif_in.c Fri Jul 27 16:14:46 2001
+@@ -6,1 +6,0 @@
+-#include "io.h"