cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to gd 1.8.3

Browse Source
This commit is contained in:
brad 2000-06-12 17:25:48 +00:00
parent d749a924cb
commit 59cd2c77a2
8 changed files with 84 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
graphics/gd/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2000/05/21 12:39:00 fgsch Exp $ # $OpenBSD: Makefile,v 1.16 2000/06/12 17:25:48 brad Exp $
# $FreeBSD: Makefile,v 1.5 1998/06/25 03:13:16 vanilla Exp $ # $FreeBSD: Makefile,v 1.5 1998/06/25 03:13:16 vanilla Exp $
DISTNAME= gd-1.8.1 DISTNAME= gd-1.8.3
CATEGORIES= graphics CATEGORIES= graphics
NEED_VERSION= 1.230 NEED_VERSION= 1.301
MASTER_SITES= http://www.boutell.com/gd/http/ \ MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/ ftp://ftp.boutell.com/pub/boutell/gd/
@ -20,10 +20,6 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
FAKE= Yes
NO_CONFIGURE= Yes
MAKE_FLAGS= COMPILER="${CC}" MAKE_FLAGS= COMPILER="${CC}"
post-install: post-install:

6
graphics/gd/files/md5
View File

@ -1,3 +1,3 @@
MD5 (gd-1.8.1.tar.gz) = 92d69d3d70d9b29da74dd79f9c7e10ff MD5 (gd-1.8.3.tar.gz) = ad0e7dd1dda2812dbaeaa9706c4be536
RMD160 (gd-1.8.1.tar.gz) = 0637fd4a1bc5751e52442d19801c5624d5562974 RMD160 (gd-1.8.3.tar.gz) = 77ab2f979f67e3a7eee2ddbd344765b80414a14c
SHA1 (gd-1.8.1.tar.gz) = 2c85f5837bc44382ca439f5275586266d934e803 SHA1 (gd-1.8.3.tar.gz) = a0a40813a2a516be35f464a76f7e15af238b45e1

92
graphics/gd/patches/patch-aa
View File

@ -1,6 +1,6 @@
--- Makefile.orig Mon Mar 13 13:25:57 2000 --- Makefile.orig Sat Jun 3 15:26:12 2000
+++ Makefile Wed Mar 15 09:01:03 2000 +++ Makefile Mon Jun 12 13:10:45 2000
@@ -15,23 +15,23 @@ @@ -11,10 +11,10 @@
#If you don't have FreeType, libjpeg and/or Xpm installed, including the #If you don't have FreeType, libjpeg and/or Xpm installed, including the
#header files, uncomment this (default). #header files, uncomment this (default).
@ -8,28 +8,38 @@
+#CFLAGS=-O +#CFLAGS=-O
#If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a #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. #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
+CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
#If you don't have FreeType and/or Xpm fully installed, uncomment this #If you don't have FreeType and/or Xpm fully installed, uncomment this
#(default). #(default).
@@ -23,7 +23,7 @@
#Some systems are very picky about link order. They don't all agree
#on the right order, either.
-LIBS=-lm -lgd -lpng -lz -LIBS=-lm -lgd -lpng -lz
+#LIBS=-lm -lgd -lpng -lz +#LIBS=-lm -lgd -lpng -lz
#If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a
#variation of this and comment out the line above. Note that #variation of this and comment out the line above. Note that
#Xpm requires X11. See also CFLAGS above. @@ -33,14 +33,14 @@
#Some systems are very picky about link order. They don't all agree
#on the right order, either.
-#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
+LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
#Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files. #Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files.
#If yours are somewhere else, change this. #If yours are somewhere else, change this.
-INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 #-I. is important to ensure that the version of gd you are installing
+INCLUDEDIRS=-I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11 #is used, and not an older release in your directory tree somewhere.
-INCLUDEDIRS=-I. -I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11
+INCLUDEDIRS=-I. -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11
#Typical install locations for freetype, zlib, xpm and libpng libraries. #Typical install locations for freetype, zlib, xpm and libpng libraries.
#If yours are somewhere else, other than a standard location #If yours are somewhere else, other than a standard location
@@ -39,16 +39,16 @@ @@ -48,16 +48,16 @@
#-L. as this allows the gd library itself to be found. #-L. as this allows the gd library itself to be found.
#Put -L. first so that old versions of the gd library elsewhere #Put -L. first so that old versions of the gd library elsewhere
#on your system can't cause conflicts while building a new one. #on your system can't cause conflicts while building a new one.
@ -50,43 +60,43 @@
# #
# #
@@ -65,27 +65,39 @@ @@ -74,27 +74,39 @@
BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
+SOLIBGD=libgd.so.18.1 +VER=18.3
+.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES +.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES
all: libgd.a $(PROGRAMS) all: libgd.a $(PROGRAMS)
+.else +.else
+all: libgd.a $(SOLIBGD) $(PROGRAMS) +all: libgd.a libgd.so.${VER} $(PROGRAMS)
+.endif +.endif
+.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES +.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES
install: libgd.a $(BIN_PROGRAMS) install: libgd.a $(BIN_PROGRAMS)
- $(INSTALL) -m 644 libgd.a $(INSTALL_LIB)/libgd.a - sh ./install-item 644 libgd.a $(INSTALL_LIB)/libgd.a
- $(INSTALL) -m 755 pngtogd $(INSTALL_BIN)/pngtogd - sh ./install-item 755 pngtogd $(INSTALL_BIN)/pngtogd
- $(INSTALL) -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 - sh ./install-item 755 pngtogd2 $(INSTALL_BIN)/pngtogd2
- $(INSTALL) -m 755 gdtopng $(INSTALL_BIN)/gdtopng - sh ./install-item 755 gdtopng $(INSTALL_BIN)/gdtopng
- $(INSTALL) -m 755 gd2topng $(INSTALL_BIN)/gd2topng - sh ./install-item 755 gd2topng $(INSTALL_BIN)/gd2topng
- $(INSTALL) -m 755 gd2copypal $(INSTALL_BIN)/gd2copypal - sh ./install-item 755 gd2copypal $(INSTALL_BIN)/gd2copypal
- $(INSTALL) -m 755 gdparttopng $(INSTALL_BIN)/gdparttopng - sh ./install-item 755 gdparttopng $(INSTALL_BIN)/gdparttopng
- $(INSTALL) -m 755 webpng $(INSTALL_BIN)/webpng - sh ./install-item 755 webpng $(INSTALL_BIN)/webpng
- $(INSTALL) -m 755 bdftogd $(INSTALL_BIN)/bdftogd - sh ./install-item 755 bdftogd $(INSTALL_BIN)/bdftogd
- $(INSTALL) -m 644 gd.h $(INSTALL_INCLUDE)/gd.h - sh ./install-item 644 gd.h $(INSTALL_INCLUDE)/gd.h
- $(INSTALL) -m 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h - sh ./install-item 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h
- $(INSTALL) -m 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h - sh ./install-item 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h
- $(INSTALL) -m 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h - sh ./install-item 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h
- $(INSTALL) -m 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h - sh ./install-item 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h
- $(INSTALL) -m 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h - sh ./install-item 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h
- $(INSTALL) -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h - sh ./install-item 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
- $(INSTALL) -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h - sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
+.else +.else
+install: libgd.a $(SOLIBGD) $(BIN_PROGRAMS) +install: libgd.a libgd.so.${VER} $(BIN_PROGRAMS)
+.endif +.endif
+ $(BSD_INSTALL_DATA) -m 644 libgd.a $(INSTALL_LIB) + $(BSD_INSTALL_DATA) -m 644 libgd.a $(INSTALL_LIB)
+ @if [ -f $(SOLIBGD) ]; then \ + @if [ -f libgd.so.${VER} ]; then \
+ $(BSD_INSTALL_DATA) -m 644 $(SOLIBGD) $(INSTALL_LIB); \ + $(BSD_INSTALL_DATA) -m 644 libgd.so.${VER} $(INSTALL_LIB); \
+ fi + fi
+ $(BSD_INSTALL_PROGRAM) pngtogd $(INSTALL_BIN) + $(BSD_INSTALL_PROGRAM) pngtogd $(INSTALL_BIN)
+ $(BSD_INSTALL_PROGRAM) pngtogd2 $(INSTALL_BIN) + $(BSD_INSTALL_PROGRAM) pngtogd2 $(INSTALL_BIN)
@ -107,33 +117,33 @@
gddemo: gddemo.o libgd.a gddemo: gddemo.o libgd.a
$(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS)
@@ -122,15 +134,23 @@ @@ -131,15 +143,23 @@
libgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \ 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 gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \ gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
- gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o \ - gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o gd_wbmp.o \
- gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h - gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
- rm -f libgd.a - rm -f libgd.a
- $(AR) rc libgd.a gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \ - $(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 gd_jpeg.o gdxpm.o \ - gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o \
- gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \ - gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
- gdtables.o gdttf.o gdcache.o gdkanji.o - gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o gd_wbmp.o
- -ranlib libgd.a - -ranlib libgd.a
+ gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o + gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o gd_wbmp.o
+ rm -f ${.TARGET} + rm -f ${.TARGET}
+ $(AR) rc ${.TARGET} ${.ALLSRC} + $(AR) rc ${.TARGET} ${.ALLSRC}
+ -ranlib ${.TARGET} + -ranlib ${.TARGET}
+ +
+$(SOLIBGD): gd.so gd_gd.so gd_gd2.so gd_io.so gd_io_dp.so gd_io_file.so \ +libgd.so.${VER}: gd.so gd_gd.so gd_gd2.so gd_io.so gd_io_dp.so gd_io_file.so \
+ gd_ss.so gd_io_ss.so gd_png.so gd_jpeg.so gdxpm.so gdfontt.so \ + gd_ss.so gd_io_ss.so gd_png.so gd_jpeg.so gdxpm.so gdfontt.so gdfonts.so \
+ gdfonts.so gdfontmb.so gdfontl.so gdfontg.so gdtables.so gdttf.so \ + gdfontmb.so gdfontl.so gdfontg.so gdtables.so gdttf.so gdcache.so \
+ gdcache.so gdkanji.so + gdkanji.so wbmp.o gd_wbmp.so
+ rm -f ${.TARGET} + rm -f ${.TARGET}
+ ld -Bshareable -Bforcearchive -o ${.TARGET} ${.ALLSRC} + ld -Bshareable -Bforcearchive -o ${.TARGET} ${.ALLSRC}
clean: clean:
- rm -f *.o *.a ${PROGRAMS} - rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp
+ rm -f *.o ${PROGRAMS} libgd.a $(SOLIBGD) + rm -f *.o ${PROGRAMS} libgd.a libgd.so.${VER} test/gdtest.jpg test/gdtest.wbmp
+.SUFFIXES: .c .o .so +.SUFFIXES: .c .o .so
+.c.o: +.c.o:

8
graphics/gd/patches/patch-ac Normal file
View File

@ -0,0 +1,8 @@
--- gd.c.orig Mon Jun 12 13:18:39 2000
+++ gd.c Mon Jun 12 13:21:25 2000
@@ -1,5 +1,4 @@
#ifndef _OSD_POSIX /* _OSD_POSIX defines *alloc() in stdlib.h */
-#include <malloc.h>
#endif /*_OSD_POSIX*/
#include <stdio.h>
#include <math.h>

30
graphics/gd/pkg/DESCR
View File

@ -1,19 +1,17 @@
DESCRIPTION gd is a graphics library. It allows your code to quickly draw 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
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.
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
This is particularly useful in World Wide Web applications, where .PNG is one of the formats accepted for inline images by most browsers.
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, you 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 are looking in the wrong place. If you are not a programmer, you are
looking in the wrong place. looking in the wrong place.
gd does not provide for every possible desirable graphics operation. It gd does not provide for every possible desirable graphics operation. It
is not necessary or desirable for gd to become a kitchen-sink graphics is not necessary or desirable for gd to become a kitchen-sink graphics
package, but version 1.6.2 incorporates most of the commonly requested package, but version 1.6.2 incorporates most of the commonly requested
features for an 8-bit 2D package. Support for scalable fonts, and features for an 8-bit 2D package. Support for scalable fonts, and
truecolor images, JPEG and truecolor PNG is planned for version 2.0. truecolor images, JPEG and truecolor PNG is planned for version 2.0.
AUTHOR WWW: ${HOMEPAGE}
gd was written by Thomas Boutell and is distributed by boutell.com, Inc.

3
graphics/gd/pkg/PFRAG.shared Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2000/06/12 17:25:49 brad Exp $
lib/libgd.so.18.3
@exec /sbin/ldconfig -m %B

4
graphics/gd/pkg/PLIST
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2000/06/12 17:25:49 brad Exp $
bin/bdftogd bin/bdftogd
bin/pngtogd bin/pngtogd
bin/pngtogd2 bin/pngtogd2
@ -15,8 +16,7 @@ include/gdfontmb.h
include/gdfontl.h include/gdfontl.h
include/gdfontg.h include/gdfontg.h
lib/libgd.a lib/libgd.a
lib/libgd.so.18.1 %%SHARED%%
@exec /sbin/ldconfig -m %B
share/examples/gd/demoin.png share/examples/gd/demoin.png
share/examples/gd/demoout.png share/examples/gd/demoout.png
share/examples/gd/index.html share/examples/gd/index.html

21
graphics/gd/pkg/PLIST.noshared
View File

@ -1,21 +0,0 @@
bin/bdftogd
bin/pngtogd
bin/pngtogd2
bin/gdtopng
bin/gd2topng
bin/gd2copypal
bin/gdparttopng
bin/webpng
include/gd.h
include/gd_io.h
include/gdcache.h
include/gdfontt.h
include/gdfonts.h
include/gdfontmb.h
include/gdfontl.h
include/gdfontg.h
lib/libgd.a
share/examples/gd/demoin.png
share/examples/gd/demoout.png
share/examples/gd/index.html
@dirrm share/examples/gd