From owner-freebsd-ports Sat Dec 15 17:50:29 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9FE0737B416 for ; Sat, 15 Dec 2001 17:50:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id fBG1o1O83446; Sat, 15 Dec 2001 17:50:01 -0800 (PST) (envelope-from gnats) Date: Sat, 15 Dec 2001 17:50:01 -0800 (PST) Message-Id: <200112160150.fBG1o1O83446@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: John Merryweather Cooper Subject: Re: ports/32889: Port graphics/gd fails to build Reply-To: John Merryweather Cooper Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR ports/32889; it has been noted by GNATS. From: John Merryweather Cooper To: bdluevel@heitec.net Cc: FreeBSD-gnats-submit@freebsd.org Subject: Re: ports/32889: Port graphics/gd fails to build Date: Sat, 15 Dec 2001 17:46:37 -0800 --=_7tCqrGA+HQ0/zt Content-Type: text/plain; format=flowed; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit On 2001.12.15 17:34 bdluevel@heitec.net wrote: > > >Number: 32889 > >Category: ports > >Synopsis: Port graphics/gd fails to build > >Confidential: no > >Severity: non-critical > >Priority: low > >Responsible: freebsd-ports > >State: open > >Quarter: > >Keywords: > >Date-Required: > >Class: sw-bug > >Submitter-Id: current-users > >Arrival-Date: Sat Dec 15 17:40:01 PST 2001 > >Closed-Date: > >Last-Modified: > >Originator: bdluevel@heitec.net > >Release: FreeBSD 4.4-STABLE i386 > >Organization: > >Environment: > System: FreeBSD 4.4-STABLE #0: Sun Dec 16 00:38:21 CET 2001 > > >Description: > The patch 'patch-ac' of the port graphics/gd is lacking a space > after the end of line 24. Because of this, the "patch" stage of > the build fails. > > >How-To-Repeat: > cd /usr/ports/graphics/gd > make clean > make patch > > >Fix: > I'm afraid a diff will not show the missing space visibly; anyway, > it's after the -DHAVE_LIBTTF in the added line. > > --- files/.vimbk/patch-ac.vimbk Sat Dec 15 15:59:57 2001 > +++ files/patch-ac Sun Dec 16 02:20:20 2001 > @@ -21,7 +21,7 @@ > #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_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \ > - # -DHAVE_LIBFREETYPE -DHAVE_LIBTTF > + # -DHAVE_LIBFREETYPE -DHAVE_LIBTTF > > +.if defined(WITH_X11) > +CFLAGS+=-DHAVE_XPM > >Release-Note: > >Audit-Trail: > >Unformatted: > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-ports" in the body of the message > There's also a problem with the symlinking during the install. See attached. Note, I've already sent this patch to lioux (but without a PR). -- jmc || MacroHard -- \ || the perfection of form over | ----------------------------------|| substance, marketing over | Web: http://www.borgsdemons.com || performance, and greed over | || design . . . | =====================================================================/ Public Key: http://www.borgsdemons.com/Personal/pgpkey.asc | =====================================================================\ --=_7tCqrGA+HQ0/zt Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="fix-gd.txt" # This is a patch for gd to update it to gd.new # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # STEP 2: Run the 'patch' program with this file as input. # #### End of Preamble #### #### Patch data follows #### diff -u 'gd/files/patch-ac' 'gd.new/files/patch-ac' Index: ./files/patch-ac --- ./files/patch-ac Sat Dec 15 06:59:57 2001 +++ ./files/patch-ac Sat Dec 15 13:42:45 2001 @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Dec 15 12:52:57 2001 -+++ Makefile Sat Dec 15 12:55:02 2001 +--- Makefile Thu Feb 22 09:03:43 2001 ++++ Makefile.new Sat Dec 15 12:23:02 2001 @@ -3,22 +3,30 @@ #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 @@ -21,10 +21,10 @@ #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_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \ - # -DHAVE_LIBFREETYPE -DHAVE_LIBTTF + # -DHAVE_LIBFREETYPE -DHAVE_LIBTTF +.if defined(WITH_X11) -+CFLAGS+=-DHAVE_XPM ++CFLAGS+=-DHAVE_XPM +.endif + +.if defined(JISX0208) @@ -63,7 +63,7 @@ + +.if defined(WITH_X11) +INCLUDEDIRS+=-I${X11BASE}/include/X11 -I${X11BASE}/include -+.endif ++.endif #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location @@ -107,8 +107,6 @@ -all: libgd.a $(PROGRAMS) +SOVER=2 -+ -+.SUFFIXES: .c .so .o -install: libgd.a $(BIN_PROGRAMS) - sh ./install-item 644 libgd.a $(INSTALL_LIB)/libgd.a @@ -128,6 +126,8 @@ - sh ./install-item 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h - sh ./install-item 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h - sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h ++.SUFFIXES: .c .so .o ++ +.c.so: + $(CC) -fpic -DPIC $(CFLAGS) -o $@ -c $< + @@ -137,7 +137,7 @@ + -mkdir -p $(INSTALL_LIB) $(INSTALL_INCLUDE) $(INSTALL_BIN) + ${BSD_INSTALL_DATA} libgd.a $(INSTALL_LIB)/libgd.a + ${BSD_INSTALL_DATA} libgd.so.$(SOVER) $(INSTALL_LIB)/libgd.so.$(SOVER) -+ -ln -sf libgd.so.$(SOVER) $(INSTALL_LIB)/libgd.so ++ -ln -sf $(INSTALL_LIB)/libgd.so.$(SOVER) $(INSTALL_LIB)/libgd.so + ${BSD_INSTALL_PROGRAM} pngtogd $(INSTALL_BIN)/pngtogd + ${BSD_INSTALL_PROGRAM} pngtogd2 $(INSTALL_BIN)/pngtogd2 + ${BSD_INSTALL_PROGRAM} gdtopng $(INSTALL_BIN)/gdtopng @@ -157,7 +157,7 @@ gddemo: gddemo.o libgd.a $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) -@@ -138,18 +167,21 @@ +@@ -138,19 +167,21 @@ gdtestttf: gdtestttf.o libgd.a $(CC) --verbose gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS) @@ -170,7 +170,7 @@ +INCS= gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \ gdfontg.h gdhelpers.h + -+libgd.a: $(INCS) $(OBJS) ++libgd.a: $(INCS) $(OBJS) 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 gd_jpeg.o gdxpm.o \ @@ -179,10 +179,10 @@ - gd_wbmp.o gdhelpers.o + $(AR) rc libgd.a $(OBJS) -ranlib libgd.a -+ -+libgd.so.$(SOVER): $(INCS) $(OBJS:.o=.so) + ++libgd.so.$(SOVER): $(INCS) $(OBJS:.o=.so) + $(CC) -shared -Wl,-x,-soname,$@ -o $@ $(OBJS:.o=.so) $(LIBDIRS) $(LIBS) + ln -sf libgd.so.$(SOVER) libgd.so - clean: rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp + #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Sat Dec 15 13:48:03 2001 # Generated by : makepatch 2.00 # Recurse directories : Yes # p 'files/patch-ac' 7134 1008452565 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Sat Dec 15 13:48:03 2001] #### #### Checksum: 122 4088 39139 #### --=_7tCqrGA+HQ0/zt-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message