summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/gd/Makefile4
-rw-r--r--graphics/gd/distinfo2
-rw-r--r--graphics/gd/files/patch-ac26
-rw-r--r--graphics/gd1/Makefile4
-rw-r--r--graphics/gd1/distinfo2
-rw-r--r--graphics/gd1/files/patch-ac26
-rw-r--r--graphics/gd2/Makefile4
-rw-r--r--graphics/gd2/distinfo2
-rw-r--r--graphics/gd2/files/patch-ac26
9 files changed, 48 insertions, 48 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index bc98b5e3df1e..d6c0a9f45595 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gd
-# Version required: 1.8
+# Version required: 1.8.1
# Date created: 27 Mar 1998
# Whom: jeff@cetlink.net
#
# $FreeBSD$
#
-DISTNAME= gd-1.8
+DISTNAME= gd-1.8.1
CATEGORIES= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index 5e68a3de8ef0..8325406d27c9 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1 +1 @@
-MD5 (gd-1.8.tar.gz) = 81eba35290c2d38beb3aa93ce845e9fb
+MD5 (gd-1.8.1.tar.gz) = 7d3890e728ee5bbde165ef75448d5a3f
diff --git a/graphics/gd/files/patch-ac b/graphics/gd/files/patch-ac
index d7f41e301594..de989ae7c0e6 100644
--- a/graphics/gd/files/patch-ac
+++ b/graphics/gd/files/patch-ac
@@ -1,6 +1,6 @@
---- Makefile.orig Wed Mar 8 14:54:37 2000
-+++ Makefile Fri Mar 10 21:09:49 2000
-@@ -3,35 +3,45 @@
+--- Makefile.orig Mon Mar 13 13:25:57 2000
++++ Makefile Mon Mar 13 15:33:49 2000
+@@ -3,35 +3,44 @@
#If you do not have gcc, change the setting for COMPILER, but you must
#use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc
#compiler; get gcc if you are still using it).
@@ -19,27 +19,28 @@
#If you don't have FreeType, libjpeg and/or Xpm installed, including the
#header files, uncomment this (default).
- #CFLAGS=-O
+-CFLAGS=-O
++#CFLAGS=-O
#If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a
#variation of this and comment out the line above. See also LIBS below.
--CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
--
+-#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
+.if defined(WANT_X11)
+CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
+.else
+CFLAGS+=-DHAVE_JPEG
+.endif
-+
+
#If you don't have FreeType and/or Xpm fully installed, uncomment this
#(default).
--#LIBS=-lm -lgd -lpng -lz
+-LIBS=-lm -lgd -lpng -lz
+LIBS=-lm -lgd -lpng -lz -ljpeg
#If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a
#variation of this and comment out the line above. Note that
#Xpm requires X11. See also CFLAGS above.
+-#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
+.if defined(WANT_X11)
- LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
++LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
+.endif
#Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files.
@@ -49,11 +50,10 @@
+.if defined(WANT_X11)
+CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11
+.endif
-+
#Typical install locations for freetype, zlib, xpm and libpng libraries.
#If yours are somewhere else, other than a standard location
-@@ -39,16 +49,19 @@
+@@ -39,16 +48,19 @@
#-L. as this allows the gd library itself to be found.
#Put -L. first so that old versions of the gd library elsewhere
#on your system can't cause conflicts while building a new one.
@@ -77,7 +77,7 @@
#
#
-@@ -58,34 +71,41 @@
+@@ -58,34 +70,41 @@
VERSION=1.7
@@ -139,7 +139,7 @@
gddemo: gddemo.o libgd.a
$(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS)
-@@ -120,16 +140,19 @@
+@@ -120,16 +139,19 @@
gdtestttf: gdtestttf.o libgd.a
$(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS)
diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile
index bc98b5e3df1e..d6c0a9f45595 100644
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gd
-# Version required: 1.8
+# Version required: 1.8.1
# Date created: 27 Mar 1998
# Whom: jeff@cetlink.net
#
# $FreeBSD$
#
-DISTNAME= gd-1.8
+DISTNAME= gd-1.8.1
CATEGORIES= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/
diff --git a/graphics/gd1/distinfo b/graphics/gd1/distinfo
index 5e68a3de8ef0..8325406d27c9 100644
--- a/graphics/gd1/distinfo
+++ b/graphics/gd1/distinfo
@@ -1 +1 @@
-MD5 (gd-1.8.tar.gz) = 81eba35290c2d38beb3aa93ce845e9fb
+MD5 (gd-1.8.1.tar.gz) = 7d3890e728ee5bbde165ef75448d5a3f
diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac
index d7f41e301594..de989ae7c0e6 100644
--- a/graphics/gd1/files/patch-ac
+++ b/graphics/gd1/files/patch-ac
@@ -1,6 +1,6 @@
---- Makefile.orig Wed Mar 8 14:54:37 2000
-+++ Makefile Fri Mar 10 21:09:49 2000
-@@ -3,35 +3,45 @@
+--- Makefile.orig Mon Mar 13 13:25:57 2000
++++ Makefile Mon Mar 13 15:33:49 2000
+@@ -3,35 +3,44 @@
#If you do not have gcc, change the setting for COMPILER, but you must
#use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc
#compiler; get gcc if you are still using it).
@@ -19,27 +19,28 @@
#If you don't have FreeType, libjpeg and/or Xpm installed, including the
#header files, uncomment this (default).
- #CFLAGS=-O
+-CFLAGS=-O
++#CFLAGS=-O
#If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a
#variation of this and comment out the line above. See also LIBS below.
--CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
--
+-#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
+.if defined(WANT_X11)
+CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
+.else
+CFLAGS+=-DHAVE_JPEG
+.endif
-+
+
#If you don't have FreeType and/or Xpm fully installed, uncomment this
#(default).
--#LIBS=-lm -lgd -lpng -lz
+-LIBS=-lm -lgd -lpng -lz
+LIBS=-lm -lgd -lpng -lz -ljpeg
#If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a
#variation of this and comment out the line above. Note that
#Xpm requires X11. See also CFLAGS above.
+-#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
+.if defined(WANT_X11)
- LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
++LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
+.endif
#Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files.
@@ -49,11 +50,10 @@
+.if defined(WANT_X11)
+CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11
+.endif
-+
#Typical install locations for freetype, zlib, xpm and libpng libraries.
#If yours are somewhere else, other than a standard location
-@@ -39,16 +49,19 @@
+@@ -39,16 +48,19 @@
#-L. as this allows the gd library itself to be found.
#Put -L. first so that old versions of the gd library elsewhere
#on your system can't cause conflicts while building a new one.
@@ -77,7 +77,7 @@
#
#
-@@ -58,34 +71,41 @@
+@@ -58,34 +70,41 @@
VERSION=1.7
@@ -139,7 +139,7 @@
gddemo: gddemo.o libgd.a
$(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS)
-@@ -120,16 +140,19 @@
+@@ -120,16 +139,19 @@
gdtestttf: gdtestttf.o libgd.a
$(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS)
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile
index bc98b5e3df1e..d6c0a9f45595 100644
--- a/graphics/gd2/Makefile
+++ b/graphics/gd2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gd
-# Version required: 1.8
+# Version required: 1.8.1
# Date created: 27 Mar 1998
# Whom: jeff@cetlink.net
#
# $FreeBSD$
#
-DISTNAME= gd-1.8
+DISTNAME= gd-1.8.1
CATEGORIES= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/
diff --git a/graphics/gd2/distinfo b/graphics/gd2/distinfo
index 5e68a3de8ef0..8325406d27c9 100644
--- a/graphics/gd2/distinfo
+++ b/graphics/gd2/distinfo
@@ -1 +1 @@
-MD5 (gd-1.8.tar.gz) = 81eba35290c2d38beb3aa93ce845e9fb
+MD5 (gd-1.8.1.tar.gz) = 7d3890e728ee5bbde165ef75448d5a3f
diff --git a/graphics/gd2/files/patch-ac b/graphics/gd2/files/patch-ac
index d7f41e301594..de989ae7c0e6 100644
--- a/graphics/gd2/files/patch-ac
+++ b/graphics/gd2/files/patch-ac
@@ -1,6 +1,6 @@
---- Makefile.orig Wed Mar 8 14:54:37 2000
-+++ Makefile Fri Mar 10 21:09:49 2000
-@@ -3,35 +3,45 @@
+--- Makefile.orig Mon Mar 13 13:25:57 2000
++++ Makefile Mon Mar 13 15:33:49 2000
+@@ -3,35 +3,44 @@
#If you do not have gcc, change the setting for COMPILER, but you must
#use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc
#compiler; get gcc if you are still using it).
@@ -19,27 +19,28 @@
#If you don't have FreeType, libjpeg and/or Xpm installed, including the
#header files, uncomment this (default).
- #CFLAGS=-O
+-CFLAGS=-O
++#CFLAGS=-O
#If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a
#variation of this and comment out the line above. See also LIBS below.
--CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
--
+-#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
+.if defined(WANT_X11)
+CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
+.else
+CFLAGS+=-DHAVE_JPEG
+.endif
-+
+
#If you don't have FreeType and/or Xpm fully installed, uncomment this
#(default).
--#LIBS=-lm -lgd -lpng -lz
+-LIBS=-lm -lgd -lpng -lz
+LIBS=-lm -lgd -lpng -lz -ljpeg
#If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a
#variation of this and comment out the line above. Note that
#Xpm requires X11. See also CFLAGS above.
+-#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
+.if defined(WANT_X11)
- LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
++LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
+.endif
#Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files.
@@ -49,11 +50,10 @@
+.if defined(WANT_X11)
+CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11
+.endif
-+
#Typical install locations for freetype, zlib, xpm and libpng libraries.
#If yours are somewhere else, other than a standard location
-@@ -39,16 +49,19 @@
+@@ -39,16 +48,19 @@
#-L. as this allows the gd library itself to be found.
#Put -L. first so that old versions of the gd library elsewhere
#on your system can't cause conflicts while building a new one.
@@ -77,7 +77,7 @@
#
#
-@@ -58,34 +71,41 @@
+@@ -58,34 +70,41 @@
VERSION=1.7
@@ -139,7 +139,7 @@
gddemo: gddemo.o libgd.a
$(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS)
-@@ -120,16 +140,19 @@
+@@ -120,16 +139,19 @@
gdtestttf: gdtestttf.o libgd.a
$(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS)