summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/gd/Makefile31
-rw-r--r--graphics/gd/files/md54
-rw-r--r--graphics/gd/files/patch-sum4
-rw-r--r--graphics/gd/patches/patch-aa174
-rw-r--r--graphics/gd/pkg/COMMENT2
-rw-r--r--graphics/gd/pkg/DESCR33
-rw-r--r--graphics/gd/pkg/PLIST14
7 files changed, 206 insertions, 56 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index c5e196eeacd..df56bf43b9d 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 1999/08/26 15:26:26 agc Exp $
+# $NetBSD: Makefile,v 1.11 1999/11/01 03:29:29 jlam Exp $
# FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
#
-DISTNAME= gd-1.6.3
+DISTNAME= gd-1.7.3
CATEGORIES= graphics
MASTER_SITES= http://www.boutell.com/gd/http/
@@ -10,8 +10,31 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.boutell.com/gd/
USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
+USE_X11= yes
-DEPENDS+= png-1.0.3:../../graphics/png
+DEPENDS+= freetype-*:../../graphics/freetype
+DEPENDS+= png-*:../../graphics/png
+DEPENDS+= xpm-*:../../graphics/xpm
+
+NO_CONFIGURE= yes
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+DEPENDS+= zlib-*:../../devel/zlib
+CPPFLAGS+= -I${LOCALBASE}/include # zlib.h
+.endif
+
+# When the API changes and breaks binary-compatibility with the previous
+# version, increment the MAJOR by 1 and reset the MINOR to 0. Otherwise,
+# bump the MINOR when a new version comes out.
+#
+GD_MAJOR= 1
+GD_MINOR= 7
+MAKE_ENV+= GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}"
+
+MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include # png.h
+CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/X11 # xpm.h
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/files/md5 b/graphics/gd/files/md5
index 30a46bdc720..c34aa337968 100644
--- a/graphics/gd/files/md5
+++ b/graphics/gd/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/08/26 15:26:27 agc Exp $
+$NetBSD: md5,v 1.6 1999/11/01 03:29:30 jlam Exp $
-MD5 (gd-1.6.3.tar.gz) = 519bfbb55e3b315dd3d5a37ab56c2d84
+MD5 (gd-1.7.3.tar.gz) = c3690ae8c2cc0710e1777c697b876297
diff --git a/graphics/gd/files/patch-sum b/graphics/gd/files/patch-sum
index d364e5f1971..9fcee657e37 100644
--- a/graphics/gd/files/patch-sum
+++ b/graphics/gd/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.2 1999/08/26 15:26:28 agc Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/01 03:29:30 jlam Exp $
-MD5 (patch-aa) = 0c87c22700449b7774111879ee16c7ef
+MD5 (patch-aa) = dbf124363cae0edf06b034e7eaac20c0
diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa
index 98fc8347e10..aac2df21507 100644
--- a/graphics/gd/patches/patch-aa
+++ b/graphics/gd/patches/patch-aa
@@ -1,22 +1,154 @@
-$NetBSD: patch-aa,v 1.4 1999/08/26 15:26:28 agc Exp $
+$NetBSD: patch-aa,v 1.5 1999/11/01 03:29:30 jlam Exp $
-Use NetBSD libtool
-
---- configure 1999/08/26 15:11:27 1.1
-+++ configure 1999/08/26 15:12:16
-@@ -1366,6 +1366,7 @@
- fi
-
-
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1523,6 +1524,7 @@
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
- exec 5>>./config.log
-+fi
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
+--- Makefile.orig Wed Oct 13 17:20:11 1999
++++ Makefile Sat Oct 30 23:28:34 1999
+@@ -11,27 +11,27 @@
+
+ #If the install command is not in your path, provide
+ #an explicit path for it here, or install manually.
+-INSTALL=install
++INSTALL=$(LIBTOOL) install -c
+
+ #If you don't have FreeType and/or Xpm installed, including the
+ #header files, uncomment this (default).
+-CFLAGS=-O
++#CFLAGS=-O
+ #If you do have FreeType 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_LIBTTF
++CFLAGS+=-O -DHAVE_XPM -DHAVE_LIBTTF
+
+ #If you don't have FreeType and/or Xpm fully installed, uncomment this
+ #(default).
+-LIBS=-lm -lgd -lpng -lz
++#LIBS=-lm -lgd -lpng -lz
+
+ #If you do have FreeType 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 -lttf -lXpm -lX11
++LIBS=$(LIBGD) -lm -lpng -lz -lttf -lintl -lXpm -lX11
+
+ #Typical install locations for freetype, zlib, xpm and libpng header files.
+ #If yours are somewhere else, change this.
+-INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11
++INCLUDEDIRS=${CPPFLAGS}
+
+ #Typical install locations for freetype, zlib, xpm and libpng libraries.
+ #If yours are somewhere else, other than a standard location
+@@ -39,16 +39,16 @@
+ #-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.
+-LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib
++LIBDIRS=${LDFLAGS}
+
+ #Location where libgd.a should be installed by "make install".
+-INSTALL_LIB=/usr/local/lib
++INSTALL_LIB=${PREFIX}/lib
+
+ #Location where .h files should be installed by "make install".
+-INSTALL_INCLUDE=/usr/local/include
++INSTALL_INCLUDE=${PREFIX}/include
+
+ #Location where useful non-test programs should be installed by "make install".
+-INSTALL_BIN=/usr/local/bin
++INSTALL_BIN=${PREFIX}/bin
+
+ #
+ #
+@@ -58,7 +58,7 @@
+
+ VERSION=1.7
+
+-CC=$(COMPILER) $(INCLUDEDIRS)
++CC=$(LIBTOOL) $(COMPILER) $(INCLUDEDIRS)
+ LINK=$(CC) $(LIBDIRS) $(LIBS)
+
+ PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS)
+@@ -66,10 +66,12 @@
+ BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
+ TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
+
+-all: libgd.a $(PROGRAMS)
++LIBGD=libgd.la
+
+-install: libgd.a $(BIN_PROGRAMS)
+- $(INSTALL) -m 644 libgd.a $(INSTALL_LIB)/libgd.a
++all: $(LIBGD) $(PROGRAMS)
++
++install: $(LIBGD) $(BIN_PROGRAMS)
++ $(INSTALL) -m 644 $(LIBGD) $(INSTALL_LIB)
+ $(INSTALL) -m 755 pngtogd $(INSTALL_BIN)/pngtogd
+ $(INSTALL) -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2
+ $(INSTALL) -m 755 gdtopng $(INSTALL_BIN)/gdtopng
+@@ -87,50 +89,47 @@
+ $(INSTALL) -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
+ $(INSTALL) -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
+
+-gddemo: gddemo.o libgd.a
++gddemo: gddemo.o $(LIBGD)
+ $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS)
+
+-pngtogd: pngtogd.o libgd.a
++pngtogd: pngtogd.o $(LIBGD)
+ $(CC) pngtogd.o -o pngtogd $(LIBDIRS) $(LIBS)
+
+-webpng: webpng.o libgd.a
++webpng: webpng.o $(LIBGD)
+ $(CC) webpng.o -o webpng $(LIBDIRS) $(LIBS)
+
+-pngtogd2: pngtogd2.o libgd.a
++pngtogd2: pngtogd2.o $(LIBGD)
+ $(CC) pngtogd2.o -o pngtogd2 $(LIBDIRS) $(LIBS)
+
+-gdtopng: gdtopng.o libgd.a
++gdtopng: gdtopng.o $(LIBGD)
+ $(CC) gdtopng.o -o gdtopng $(LIBDIRS) $(LIBS)
+
+-gd2topng: gd2topng.o libgd.a
++gd2topng: gd2topng.o $(LIBGD)
+ $(CC) gd2topng.o -o gd2topng $(LIBDIRS) $(LIBS)
+
+-gd2copypal: gd2copypal.o libgd.a
++gd2copypal: gd2copypal.o $(LIBGD)
+ $(CC) gd2copypal.o -o gd2copypal $(LIBDIRS) $(LIBS)
+
+-gdparttopng: gdparttopng.o libgd.a
++gdparttopng: gdparttopng.o $(LIBGD)
+ $(CC) gdparttopng.o -o gdparttopng $(LIBDIRS) $(LIBS)
+
+-gdtest: gdtest.o libgd.a
++gdtest: gdtest.o $(LIBGD)
+ $(CC) gdtest.o -o gdtest $(LIBDIRS) $(LIBS)
+
+-gd2time: gd2time.o libgd.a
++gd2time: gd2time.o $(LIBGD)
+ $(CC) gd2time.o -o gd2time $(LIBDIRS) $(LIBS)
+
+-gdtestttf: gdtestttf.o libgd.a
++gdtestttf: gdtestttf.o $(LIBGD)
+ $(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS)
+
+-libgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
++GD_OBJS= gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
+ gd_io_ss.o gd_png.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
+- gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o \
+- gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
+- rm -f libgd.a
+- $(AR) rc libgd.a gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \
+- gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gdxpm.o \
+- gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
+- gdtables.o gdttf.o gdcache.o gdkanji.o
+- -ranlib libgd.a
++ gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o
+
+-clean:
+- rm -f *.o *.a ${PROGRAMS}
++$(LIBGD): $(GD_OBJS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
++ rm -f $(LIBGD)
++ $(CC) -o $(LIBGD) $(GD_OBJS:.o=.lo) -rpath ${PREFIX}/lib \
++ -version-info $(GD_MAJOR):$(GD_MINOR)
+
++clean:
++ $(LIBTOOL) rm -f *.o *.a ${PROGRAMS}
diff --git a/graphics/gd/pkg/COMMENT b/graphics/gd/pkg/COMMENT
index e59d31d35dc..b505900641d 100644
--- a/graphics/gd/pkg/COMMENT
+++ b/graphics/gd/pkg/COMMENT
@@ -1 +1 @@
-A graphics library for fast PNG creation
+graphics library for fast PNG creation
diff --git a/graphics/gd/pkg/DESCR b/graphics/gd/pkg/DESCR
index ac93e67ac56..891ec697dff 100644
--- a/graphics/gd/pkg/DESCR
+++ b/graphics/gd/pkg/DESCR
@@ -1,22 +1,15 @@
-DESCRIPTION
- gd is a graphics library. It allows your code to quickly draw
- images complete with lines, arcs, text, multiple colors, cut
- and paste from other images, and flood fills, and write out
- the result as a .GIF file. This is particularly useful in
- World Wide Web applications, where .GIF is the format used for
- inline images.
+ gd is a graphics library. It allows your code to quickly draw images
+ complete with lines, arcs, text, multiple colors, cut and paste from
+ other images, and flood fills, and write out the result as a .PNG
+ file. This is particularly useful in World Wide Web applications,
+ where .PNG is one of the formats accepted for inline images by most
+ browsers.
- gd is not a paint program. If you are looking for a paint
- program, try xpaint by David Koblas, available by anonymous
- FTP from ftp.netcom.com in pub/ko/koblas. (That package is
- for the X Window System; for the Mac and the PC, paint
- programs are considerably easier to find.)
+ gd is not a paint program. If you are looking for a paint program, you
+ are looking in the wrong place. If you are not a programmer, you are
+ looking in the wrong place.
- gd does not provide for every possible desirable graphics
- operation. It is not necessary or desirable for gd to become
- a kitchen-sink graphics package, but gd incorporates most of
- the commonly requested features for a 2D package.
-
-AUTHOR
- gd was written by Thomas Boutell and is currently distributed by
- boutell.com, Inc.
+ gd does not provide for every possible desirable graphics operation.
+ It is not necessary or desirable for gd to become a kitchen-sink
+ graphics package, but incorporates most of the commonly requested
+ features for an 8-bit 2D package.
diff --git a/graphics/gd/pkg/PLIST b/graphics/gd/pkg/PLIST
index c58373dae88..1a358b73135 100644
--- a/graphics/gd/pkg/PLIST
+++ b/graphics/gd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1999/08/26 15:26:29 agc Exp $
+@comment $NetBSD: PLIST,v 1.5 1999/11/01 03:29:31 jlam Exp $
bin/pngtogd
bin/pngtogd2
bin/gdtopng
@@ -6,12 +6,14 @@ bin/gd2topng
bin/gd2copypal
bin/gdparttopng
bin/webpng
+bin/bdftogd
include/gd.h
+include/gdcache.h
include/gd_io.h
-include/gdfontt.h
-include/gdfonts.h
-include/gdfontmb.h
-include/gdfontl.h
include/gdfontg.h
-lib/libgd.so.0.0
+include/gdfontl.h
+include/gdfontmb.h
+include/gdfonts.h
+include/gdfontt.h
lib/libgd.a
+lib/libgd.so.1.7
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-02 06:04:31 +0000