Date: Mon, 11 Oct 1999 09:42:47 -0500 From: Ade Lovett <ade@lovett.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/14261: Upgrade graphics/gd Message-ID: <E11agf1-000LvF-00@anaconda.lovett.com>
next in thread | raw e-mail | index | archive | help
>Number: 14261 >Category: ports >Synopsis: Upgrade graphics/gd >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 11 07:50:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Ade Lovett >Release: FreeBSD 3.3-STABLE i386 >Organization: Lovett Network Consultancy >Environment: Up to date ports tree >Description: Distfiles survey reports that gd-1.6.3 is no longer available from the author site. In addition, a recent update to the Makefile left this port without a MAINTAINER tag (should be ports@freebsd.org from the commit messages) >How-To-Repeat: cd graphics/gd; make fetch >Fix: This one is a little more complicated. The author has removed the use of GNU configure for this package, citing many emails from confused people as the reason, replacing it with a 'regular' Makefile, which has to be editted manually to DTRT. The attached patch make the necessary modifications to bring the port up to version 1.7.3, however since the Makefile has no support for it, we lose the shared library, so anyone upgrading this port will need to make very certain that any shared libraries from previous graphics/gd ports/packages are removed. If necessary, I can sit down and hack in a Makefile to also do the shared libraries, but this would almost certainly be in the form of a completely separate file using the make macros from /usr/share/mk/* -- Thoughts on this would be appreciated. Version: 1.6.3 -> 1.7.3 Changes: Makefile files/md5 pkg/PLIST Adds: patches/patch-ac Removes: patches/patch-ab cvs diff: Diffing . Index: Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/gd/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 1999/10/07 17:36:44 1.13 +++ Makefile 1999/10/09 00:24:14 @@ -1,26 +1,23 @@ # New ports collection makefile for: gd -# Version required: 1.6.3 +# Version required: 1.7.3 # Date created: 27 Mar 1998 # Whom: jeff@cetlink.net # # $FreeBSD: ports/graphics/gd/Makefile,v 1.13 1999/10/07 17:36:44 fenner 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/ +MAINTAINER= ports@freebsd.org + LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png FETCH_BEFORE_ARGS= -b -USE_LIBTOOL= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" -CONFIGURE_ARGS+= --includedir=${PREFIX}/include/gd \ - --libdir=${PREFIX}/lib pre-install: ${MKDIR} ${PREFIX}/include/gd - ${MKDIR} ${PREFIX}/share/examples/gd .include <bsd.port.mk> cvs diff: Diffing files Index: files/md5 =================================================================== RCS file: /home/ncvs/ports/graphics/gd/files/md5,v retrieving revision 1.6 diff -u -r1.6 md5 --- md5 1999/09/04 23:36:48 1.6 +++ md5 1999/10/09 00:17:50 @@ -1 +1 @@ -MD5 (gd-1.6.3.tar.gz) = 519bfbb55e3b315dd3d5a37ab56c2d84 +MD5 (gd-1.7.3.tar.gz) = 42fe379ce109ab94537b83d68d6bc637 cvs diff: Diffing patches Index: patches/patch-ab =================================================================== RCS file: /home/ncvs/ports/graphics/gd/patches/patch-ab,v retrieving revision 1.1 diff -u -r1.1 patch-ab --- patch-ab 1999/07/24 23:56:45 1.1 +++ patch-ab 1999/10/09 00:24:57 @@ -1,20 +0,0 @@ ---- Makefile.in.old Sat Jul 24 14:37:54 1999 -+++ Makefile.in Sat Jul 24 14:40:09 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 - - --libgd_la_LIBADD = @LIBS@ -lm -+libgd_la_LIBADD = @LIBS@ -lm -L$(libdir) -lpng - - bin_PROGRAMS = pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng - -@@ -138,7 +138,7 @@ - LTLIBRARIES = $(lib_LTLIBRARIES) - - --DEFS = @DEFS@ -I. -I$(srcdir) -+DEFS = @DEFS@ -I. -I$(srcdir) -I$(includedir) - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ cvs diff: Diffing pkg Index: pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/graphics/gd/pkg/PLIST,v retrieving revision 1.5 diff -u -r1.5 PLIST --- PLIST 1999/08/01 02:43:16 1.5 +++ PLIST 1999/10/09 01:50:49 @@ -1,3 +1,4 @@ +bin/bdftogd bin/pngtogd bin/pngtogd2 bin/gdtopng @@ -7,14 +8,11 @@ bin/webpng include/gd/gd.h include/gd/gd_io.h +include/gd/gdcache.h include/gd/gdfontg.h include/gd/gdfontl.h include/gd/gdfontmb.h include/gd/gdfonts.h include/gd/gdfontt.h lib/libgd.a -lib/libgd.so -lib/libgd.so.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @dirrm include/gd --- /dev/null Mon Oct 11 09:33:02 1999 +++ patches/patch-ac Fri Oct 8 21:01:22 1999 @@ -0,0 +1,108 @@ +--- Makefile.orig Tue Sep 28 11:24:50 1999 ++++ Makefile Fri Oct 8 21:00:47 1999 +@@ -3,19 +3,19 @@ + #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). +-COMPILER=gcc ++#COMPILER=gcc + + #If the ar command fails on your system, consult the ar manpage + #for your system. +-AR=ar ++#AR=ar + + #If the install command is not in your path, provide + #an explicit path for it here, or install manually. +-INSTALL=install ++#INSTALL=install + + #If you don't have FreeType and/or Xpm installed, including the + #header files, uncomment this (default). +-CFLAGS=-O ++CFLAGS += -I$(LOCALBASE)/include + #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 +@@ -31,7 +31,7 @@ + + #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=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 + + #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=-L. -L$(LOCALBASE)/lib + + #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/gd + + #Location where useful non-test programs should be installed by "make install". +-INSTALL_BIN=/usr/local/bin ++INSTALL_BIN=$(PREFIX)/bin + + # + # +@@ -58,8 +58,8 @@ + + VERSION=1.7 + +-CC=$(COMPILER) $(INCLUDEDIRS) +-LINK=$(CC) $(LIBDIRS) $(LIBS) ++#CC=$(COMPILER) $(INCLUDEDIRS) ++#LINK=$(CC) $(LIBDIRS) $(LIBS) + + PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS) + +@@ -69,23 +69,23 @@ + all: libgd.a $(PROGRAMS) + + install: libgd.a $(BIN_PROGRAMS) +- $(INSTALL) -m 644 libgd.a $(INSTALL_LIB)/libgd.a +- $(INSTALL) -m 755 pngtogd $(INSTALL_BIN)/pngtogd +- $(INSTALL) -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 +- $(INSTALL) -m 755 gdtopng $(INSTALL_BIN)/gdtopng +- $(INSTALL) -m 755 gd2topng $(INSTALL_BIN)/gd2topng +- $(INSTALL) -m 755 gd2copypal $(INSTALL_BIN)/gd2copypal +- $(INSTALL) -m 755 gdparttopng $(INSTALL_BIN)/gdparttopng +- $(INSTALL) -m 755 webpng $(INSTALL_BIN)/webpng +- $(INSTALL) -m 755 bdftogd $(INSTALL_BIN)/bdftogd +- $(INSTALL) -m 644 gd.h $(INSTALL_INCLUDE)/gd.h +- $(INSTALL) -m 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h +- $(INSTALL) -m 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h +- $(INSTALL) -m 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h +- $(INSTALL) -m 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h +- $(INSTALL) -m 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h +- $(INSTALL) -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h +- $(INSTALL) -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h ++ $(INSTALL) -c -m 644 libgd.a $(INSTALL_LIB)/libgd.a ++ $(INSTALL) -c -m 755 pngtogd $(INSTALL_BIN)/pngtogd ++ $(INSTALL) -c -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 ++ $(INSTALL) -c -m 755 gdtopng $(INSTALL_BIN)/gdtopng ++ $(INSTALL) -c -m 755 gd2topng $(INSTALL_BIN)/gd2topng ++ $(INSTALL) -c -m 755 gd2copypal $(INSTALL_BIN)/gd2copypal ++ $(INSTALL) -c -m 755 gdparttopng $(INSTALL_BIN)/gdparttopng ++ $(INSTALL) -c -m 755 webpng $(INSTALL_BIN)/webpng ++ $(INSTALL) -c -m 755 bdftogd $(INSTALL_BIN)/bdftogd ++ $(INSTALL) -c -m 644 gd.h $(INSTALL_INCLUDE)/gd.h ++ $(INSTALL) -c -m 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h ++ $(INSTALL) -c -m 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h ++ $(INSTALL) -c -m 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h ++ $(INSTALL) -c -m 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h ++ $(INSTALL) -c -m 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h ++ $(INSTALL) -c -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h ++ $(INSTALL) -c -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h + + gddemo: gddemo.o libgd.a + $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E11agf1-000LvF-00>