diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 40a634c673b..442b0021c90 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,25 +1,17 @@ -# $OpenBSD: Makefile,v 1.4 1999/08/17 12:40:34 downsj Exp $ +# $OpenBSD: Makefile,v 1.5 1999/11/16 08:03:23 kevlo Exp $ # $FreeBSD: Makefile,v 1.5 1998/06/25 03:13:16 vanilla Exp $ -DISTNAME= gd-1.6.3 +DISTNAME= gd-1.7.3 CATEGORIES= graphics MASTER_SITES= http://www.boutell.com/gd/http/ \ ftp://ftp.boutell.com/pub/boutell/gd/ -NEED_VERSION= 1.73 - LIB_DEPENDS= png.1.3:${PORTSDIR}/graphics/png \ ttf.1.2:${PORTSDIR}/print/freetype MAINTAINER= brad@openbsd.org HOMEPAGE= http://www.boutell.com/gd/ -SEPARATE_BUILD= concurrent -GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS=-L/usr/local/lib -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-static - post-install: @${MKDIR} ${PREFIX}/share/examples/gd ${INSTALL_DATA} ${WRKSRC}/demoin.png ${PREFIX}/share/examples/gd diff --git a/graphics/gd/files/md5 b/graphics/gd/files/md5 index 80021c410e6..5556bca729a 100644 --- a/graphics/gd/files/md5 +++ b/graphics/gd/files/md5 @@ -1,3 +1,3 @@ -MD5 (gd-1.6.3.tar.gz) = 519bfbb55e3b315dd3d5a37ab56c2d84 -RMD160 (gd-1.6.3.tar.gz) = 7341fa2b2e1663842bdd48c0c3768a1da793043c -SHA1 (gd-1.6.3.tar.gz) = 22b85c304c487eb7e92cb895113e6e4044dbb475 +MD5 (gd-1.7.3.tar.gz) = c3690ae8c2cc0710e1777c697b876297 +RMD160 (gd-1.7.3.tar.gz) = 49c22838dca46f2a0667d9c359ec636b2bcdb4b2 +SHA1 (gd-1.7.3.tar.gz) = e770d3a384420630c59d9869d2418fbb6467e87f diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa index d6bcc47680e..a6912955ec7 100644 --- a/graphics/gd/patches/patch-aa +++ b/graphics/gd/patches/patch-aa @@ -1,25 +1,26 @@ ---- Makefile.in.orig Fri Jul 23 18:13:22 1999 -+++ Makefile.in Sun Jul 25 15:56:58 1999 -@@ -88,7 +88,7 @@ - libgd_la_SOURCES = gd.c gd_io.c gd_io_file.c gd_io_dp.c gd_io_ss.c gd_png.c gd_ss.c gd_gd.c gd_gd2.c gdfontt.c gdfonts.c gdfontmb.c gdfontl.c gdfontg.c gdttf.c gdcache.c gd.h gdcache.h gdfontl.h gdfonts.h gd_io.h gdfontg.h gdfontmb.h gdfontt.h +--- Makefile.orig Wed Oct 13 21:20:11 1999 ++++ Makefile Tue Nov 16 15:51:06 1999 +@@ -15,19 +15,21 @@ + #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_LIBTTF --libgd_la_LIBADD = @LIBS@ -lm -+libgd_la_LIBADD = @LIBS@ -lm -L$(libdir) -lpng + #If you don't have FreeType and/or Xpm fully installed, uncomment this + #(default). +-LIBS=-lm -lgd -lpng -lz ++#LIBS=-lm -lgd -lpng -lz - bin_PROGRAMS = pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng + #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=-lm -lgd -lpng -lz -lttf -lX11 -@@ -138,11 +138,11 @@ - LTLIBRARIES = $(lib_LTLIBRARIES) - - --DEFS = @DEFS@ -I. -I$(srcdir) -+DEFS = @DEFS@ -I. -I$(srcdir) -I$(includedir) - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libgd_la_LDFLAGS = -+libgd_la_LDFLAGS = -version-info 1:6:0 - libgd_la_DEPENDENCIES = - libgd_la_OBJECTS = gd.lo gd_io.lo gd_io_file.lo gd_io_dp.lo gd_io_ss.lo \ - gd_png.lo gd_ss.lo gd_gd.lo gd_gd2.lo gdfontt.lo gdfonts.lo gdfontmb.lo \ + #Typical install locations for freetype, zlib, xpm and libpng header files. + #If yours are somewhere else, change this. diff --git a/graphics/gd/pkg/PLIST b/graphics/gd/pkg/PLIST index 7a48ab469f7..8028714b936 100644 --- a/graphics/gd/pkg/PLIST +++ b/graphics/gd/pkg/PLIST @@ -1,3 +1,4 @@ +bin/bdftogd bin/pngtogd bin/pngtogd2 bin/gdtopng @@ -7,14 +8,13 @@ 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 -lib/libgd.la -lib/libgd.so.1.6 @exec /sbin/ldconfig -m %B/lib share/examples/gd/demoin.png share/examples/gd/index.html