Date: Mon, 18 Jun 2001 01:48:19 +0200 (CEST) From: Anders Nordby <anders@fix.no> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/28243: Update port: graphics/gdchart Message-ID: <20010617234819.2A3463C8E@totem.fix.no>
next in thread | raw e-mail | index | archive | help
>Number: 28243 >Category: ports >Synopsis: Update port: graphics/gdchart >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jun 17 16:50:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Anders Nordby >Release: FreeBSD 4.3-STABLE i386 >Organization: Fluxpod Information eXchange >Environment: kern.osreldate: 430000 (4.3-STABLE) kern.osreldate: 500018 (5.0-20010420-CURRENT) >Description: Update gdchart to this development version. It is stable, includes support for more graphics formats, and can be used by the recently submitted py-gdchart as a dependency. Removes these patches: files/patch-gdc_samp1.c files/patch-gdc_pie.c files/patch-gdc_pie_samp.c files/patch-gdc.c files/patch-gdc_samp2.c Adds this patch: files/patch-gdc.h >How-To-Repeat: <Code/input/activities to reproduce the problem (multiple lines)> >Fix: diff -Nur gdchart.old/Makefile gdchart/Makefile --- gdchart.old/Makefile Mon Jun 18 00:24:52 2001 +++ gdchart/Makefile Mon Jun 18 01:08:10 2001 @@ -6,41 +6,38 @@ # PORTNAME= gdchart -PORTVERSION= 0.9.4b +PORTVERSION= 0.10.1 CATEGORIES= graphics MASTER_SITES= http://www.fred.net/brv/chart/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ -DISTNAME= ${PORTNAME}0.94b +DISTNAME= ${PORTNAME}${PORTVERSION}dev MAINTAINER= anders@fix.no LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd MAKEFILE= makefile +WRKSRC= ${WRKDIR}/${DISTNAME} do-install: ${INSTALL_DATA} ${WRKSRC}/libgdchart.a ${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/gdchart.h ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/gdc.h ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/gdcpie.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/gifencode.h ${PREFIX}/include .if !defined(NOPORTDOCS) post-install: @${INSTALL} -d -m 0755 ${PREFIX}/share/doc/gdchart ${INSTALL_DATA} ${WRKSRC}/gdc_samp1.c ${PREFIX}/share/doc/gdchart ${INSTALL_DATA} ${WRKSRC}/gdc_samp2.c ${PREFIX}/share/doc/gdchart - ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/gdchart - ${INSTALL_DATA} ${WRKSRC}/NOTES-092b.txt ${PREFIX}/share/doc/gdchart - ${INSTALL_DATA} ${WRKSRC}/NOTES-093b.txt ${PREFIX}/share/doc/gdchart - ${INSTALL_DATA} ${WRKSRC}/NOTES-094b.txt ${PREFIX}/share/doc/gdchart + ${INSTALL_DATA} ${WRKSRC}/gdc_pie_samp.c ${PREFIX}/share/doc/gdchart + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gdchart @${ECHO} "================================================================================" - @${ECHO} "Have a look at the sample code and README(s) in ${PREFIX}/share/doc/${PORTNAME}." + @${ECHO} "Have a look at the sample code and README in ${PREFIX}/share/doc/${PORTNAME}." @${ECHO} "To compile gdc_samp1, try something like:" @${ECHO} @${ECHO} "gcc -I${PREFIX}/include -o gdc_samp1 gdc_samp1.c -L${PREFIX}/lib -lgdchart -lgd" - @${ECHO} - @${ECHO} "NB: gdchart will produce PNGs, not GIFs, as newer versions of gd stopped" - @${ECHO} "supporting GIFs." @${ECHO} "================================================================================" .endif diff -Nur gdchart.old/distinfo gdchart/distinfo --- gdchart.old/distinfo Mon Jun 18 00:24:52 2001 +++ gdchart/distinfo Mon Jun 18 00:27:27 2001 @@ -1 +1 @@ -MD5 (gdchart0.94b.tar.gz) = 261e0a1527f4a50f0eaae7171275a0ee +MD5 (gdchart0.10.1dev.tar.gz) = d40cba84e7532508ee1637133b6179ee diff -Nur gdchart.old/files/patch-gdc.c gdchart/files/patch-gdc.c --- gdchart.old/files/patch-gdc.c Mon Jun 18 00:24:52 2001 +++ gdchart/files/patch-gdc.c Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- gdc.c.orig Mon Jun 4 02:41:42 2001 -+++ gdc.c Mon Jun 4 02:41:51 2001 -@@ -158,7 +158,7 @@ - if( GDC_generate_gif ) - { - fflush(fptr); // clear anything buffered -- gdImageGif(im, fptr); -+ gdImagePng(im, fptr); - } - - if( GDC_hold_img & GDC_EXPOSE_IMAGE ) diff -Nur gdchart.old/files/patch-gdc.h gdchart/files/patch-gdc.h --- gdchart.old/files/patch-gdc.h Thu Jan 1 01:00:00 1970 +++ gdchart/files/patch-gdc.h Mon Jun 18 00:51:26 2001 @@ -0,0 +1,11 @@ +--- gdc.h.orig Mon Jun 18 00:51:01 2001 ++++ gdc.h Mon Jun 18 00:51:16 2001 +@@ -9,7 +9,7 @@ + #define _GDC_H + + #include <math.h> +-#include <values.h> ++#include <limits.h> + #ifdef GDC_INCL + #include "gd.h" + #include "gdfonts.h" diff -Nur gdchart.old/files/patch-gdc_pie.c gdchart/files/patch-gdc_pie.c --- gdchart.old/files/patch-gdc_pie.c Mon Jun 18 00:24:52 2001 +++ gdchart/files/patch-gdc_pie.c Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- gdc_pie.c.orig Fri Nov 13 05:00:55 1998 -+++ gdc_pie.c Mon Jun 4 02:42:16 2001 -@@ -1,7 +1,7 @@ - /* GDCHART 0.94b GDC_PIE.C 12 Nov 1998 */ - - #include <stdio.h> --#include <values.h> -+#include <limits.h> - #include <math.h> - - #define GDC_INCL -@@ -610,7 +610,7 @@ - rad -= GDCPIE_label_dist; - } - -- gdImageGif(im, gif_fptr); -+ gdImagePng(im, gif_fptr); - - gdImageDestroy(im); - return; diff -Nur gdchart.old/files/patch-gdc_pie_samp.c gdchart/files/patch-gdc_pie_samp.c --- gdchart.old/files/patch-gdc_pie_samp.c Mon Jun 18 00:24:52 2001 +++ gdchart/files/patch-gdc_pie_samp.c Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- gdc_pie_samp.c.orig Mon Jun 4 01:25:29 2001 -+++ gdc_pie_samp.c Mon Jun 4 01:25:51 2001 -@@ -4,7 +4,7 @@ - /* vi: :set tabstop=4 */ - - #include <stdio.h> --#include <values.h> -+#include <limits.h> - #include <math.h> - - #include "gdc.h" diff -Nur gdchart.old/files/patch-gdc_samp1.c gdchart/files/patch-gdc_samp1.c --- gdchart.old/files/patch-gdc_samp1.c Mon Jun 18 00:24:52 2001 +++ gdchart/files/patch-gdc_samp1.c Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- gdc_samp1.c.orig Mon Jun 4 01:22:38 2001 -+++ gdc_samp1.c Mon Jun 4 01:23:00 2001 -@@ -9,7 +9,7 @@ - /* for CGI use un-comment the "Content-Type" line */ - - #include <stdio.h> --#include <values.h> -+#include <limits.h> - - #include "gdc.h" - #include "gdchart.h" diff -Nur gdchart.old/files/patch-gdc_samp2.c gdchart/files/patch-gdc_samp2.c --- gdchart.old/files/patch-gdc_samp2.c Mon Jun 18 00:24:52 2001 +++ gdchart/files/patch-gdc_samp2.c Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- gdc_samp2.c.orig Mon Jun 4 01:24:03 2001 -+++ gdc_samp2.c Mon Jun 4 01:24:22 2001 -@@ -13,7 +13,7 @@ - */ - - #include <stdio.h> --#include <values.h> -+#include <limits.h> - - #include "gdc.h" - #include "gdchart.h" diff -Nur gdchart.old/files/patch-gdchart.c gdchart/files/patch-gdchart.c --- gdchart.old/files/patch-gdchart.c Mon Jun 18 00:24:52 2001 +++ gdchart/files/patch-gdchart.c Mon Jun 18 00:56:50 2001 @@ -1,15 +1,6 @@ ---- gdchart.c.orig Mon Apr 19 00:37:46 1999 -+++ gdchart.c Mon Jun 4 02:40:16 2001 -@@ -3,7 +3,7 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <values.h> -+#include <limits.h> - #include <math.h> - #include <string.h> - #include <stdarg.h> -@@ -517,7 +517,7 @@ +--- gdchart.c.orig Sat Nov 4 02:49:46 2000 ++++ gdchart.c Mon Jun 18 00:56:42 2001 +@@ -664,7 +664,7 @@ if( GDC_xaxis && xlbl ) { @@ -18,16 +9,7 @@ for( i=0; i<num_points; ++i ) { -@@ -727,7 +727,7 @@ - } - else - { -- if( bg_img = gdImageCreateFromGif(in) ) // = -+ if( bg_img = gdImageCreateFromPng(in) ) // = - { - int bgxpos = gdImageSX(bg_img)<GIFWIDTH? GIFWIDTH/2 - gdImageSX(bg_img)/2: 0, - bgypos = gdImageSY(bg_img)<GIFHEIGHT? GIFHEIGHT/2 - gdImageSY(bg_img)/2: 0; -@@ -1028,7 +1028,7 @@ +@@ -1196,7 +1196,7 @@ int num_xlbls = /* maximum x lables that'll fit */ /* each xlbl + avg due to num_lf_xlbls */ graphwidth / @@ -36,21 +18,12 @@ (num_lf_xlbls*(GDC_fontc[GDC_xaxisfont_size].h-1))/num_points ); int labelcolor = GDC_XLabelColor==GDC_DFLTCOLOR? LineColor: clrallocate( im, GDC_XLabelColor ); -@@ -1036,7 +1036,7 @@ - for( i=0; i<num_points+(do_bar?2:0); ++i ) - if( (i%(1+num_points/num_xlbls) == 0) || // # x labels are regulated - (num_xlbls >= num_points) || -- GDC_xlabel_spacing == MAXSHORT ) -+ GDC_xlabel_spacing == SHRT_MAX ) +@@ -1226,7 +1226,7 @@ + /* labeled points */ + if( (!GDC_xlabel_ctl && ( (i%(1+num_points/num_xlbls) == 0) || // # x labels are regulated + num_xlbls >= num_points || +- GDC_xlabel_spacing == MAXSHORT )) ++ GDC_xlabel_spacing == SHRT_MAX )) + || + (GDC_xlabel_ctl && xi>=0 && *(GDC_xlabel_ctl+xi)) ) { - int xi = do_bar? i-1: i; - -@@ -1817,7 +1817,7 @@ - if( GDC_generate_gif ) - { - fflush(gif_fptr); // clear anything buffered -- gdImageGif( im, gif_fptr ); -+ gdImagePng( im, gif_fptr ); - } - - if( bg_img ) diff -Nur gdchart.old/files/patch-makefile gdchart/files/patch-makefile --- gdchart.old/files/patch-makefile Mon Jun 18 00:24:52 2001 +++ gdchart/files/patch-makefile Mon Jun 18 01:15:57 2001 @@ -1,64 +1,92 @@ ---- makefile.orig Mon Apr 19 01:22:38 1999 -+++ makefile Mon Jun 4 02:25:37 2001 -@@ -1,45 +1,49 @@ - GDC_INCL = . --GD_INCL = gd1.3 --GD_LIB = gd1.3 -+GD_INCL = $(PREFIX)/include/gd -+GD_LIB = $(PREFIX)/lib +--- makefile.orig Sat Nov 4 02:49:46 2000 ++++ makefile Mon Jun 18 01:15:50 2001 +@@ -2,8 +2,8 @@ + GDC_LIB = . + + # GDChart requires the gd library - www.boutell.com/gd/ +-GD_INCL = ../gd-1.8.3 +-GD_LIB = ../gd-1.8.3 ++GD_INCL = $(LOCALBASE)/include/gd ++GD_LIB = $(LOCALBASE)/lib + + # libgd requires libpng + # PNG_INCL = ../libpng-1.0.8 +@@ -30,37 +30,35 @@ + # LIB_PATHS = $(LIB_PATHS) -R$(PNG_LIB) -R$(ZLIB_LIB) + # LIB_PATHS = $(LIB_PATHS) -Xlinker -rpath -Xlinker $(PNG_LIB) -Xlinker -rpath -Xlinker $(ZLIB_LIB) -CC=gcc - -all: gdc_samp1 gdc_samp2 gdc_pie_samp +all: libgdchart.a - # compile the samples - gdc_samp1: gdc.o gdchart.o price_conv.o gdc_samp1.o $(GD_LIB)/libgd.a -- $(CC) -o gdc_samp1 gdc.o gdchart.o price_conv.o gdc_samp1.o -L$(GD_LIB) -lgd -lm -+ $(CC) $(CFLAGS) -o gdc_samp1 gdc.o gdchart.o price_conv.o gdc_samp1.o -L$(GD_LIB) -lgd -lm + # --- compile the samples --- + gdc_pie_samp.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie_samp.c +- $(CC) -I$(GDC_INCL) -c gdc_pie_samp.c ++ $(CC) $(CFLAGS) -I$(GDC_INCL) -c gdc_pie_samp.c gdc_samp1.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp1.c -- $(CC) -I$(GDC_INCL) -c gdc_samp1.c -+ $(CC) $(CFLAGS) -I$(GDC_INCL) -c gdc_samp1.c - - gdc_samp2: gdc.o gdchart.o price_conv.o gdc_samp2.o $(GD_LIB)/libgd.a -- $(CC) -o gdc_samp2 gdc.o gdchart.o price_conv.o gdc_samp2.o -L$(GD_LIB) -lgd -lm -+ $(CC) $(CFLAGS) -o gdc_samp2 gdc.o gdchart.o price_conv.o gdc_samp2.o -L$(GD_LIB) -lgd -lm +- $(CC) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_samp1.c ++ $(CC) $(CFLAGS) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_samp1.c gdc_samp2.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp2.c -- $(CC) -I$(GDC_INCL) -c gdc_samp2.c -+ $(CC) $(CFLAGS) -I$(GDC_INCL) -c gdc_samp2.c - - gdc_pie_samp: gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o $(GD_LIB)/libgd.a -- $(CC) -o gdc_pie_samp gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o -L$(GD_LIB) -lgd -lm -+ $(CC) $(CFLAGS) -o gdc_pie_samp gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o -L$(GD_LIB) -lgd -lm +- $(CC) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_samp2.c ++ $(CC) $(CFLAGS) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_samp2.c - gdc_pie_samp.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie_samp.c -- $(CC) -I$(GDC_INCL) -c gdc_pie_samp.c -+ $(CC) $(CFLAGS) -I$(GDC_INCL) -c gdc_pie_samp.c + # --- link the samples --- + gdc_samp1: gdc.o gdchart.o price_conv.o gdc_samp1.o gifencode.o $(GD_LIB)/libgd.a +- $(CC) -o gdc_samp1 \ ++ $(CC) $(CFLAGS) -o gdc_samp1 \ + gdc.o gdchart.o price_conv.o gifencode.o \ + gdc_samp1.o \ + $(LIB_PATHS) \ + -lgd -lz -lpng $(JPEG_LK) -lm + + gdc_samp2: gdc.o gdchart.o price_conv.o gdc_samp2.o gifencode.o $(GD_LIB)/libgd.a +- $(CC) -o gdc_samp2 \ ++ $(CC) $(CFLAGS) -o gdc_samp2 \ + gdc.o gdchart.o price_conv.o gifencode.o \ + gdc_samp2.o \ + $(LIB_PATHS) \ + -lgd -lz -lpng $(JPEG_LK) -lm + + gdc_pie_samp: gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o gifencode.o $(GD_LIB)/libgd.a +- $(CC) -o gdc_pie_samp \ ++ $(CC) $(CFLAGS) -o gdc_pie_samp \ + gdc.o gdc_pie.o price_conv.o gifencode.o \ + gdc_pie_samp.o \ + $(LIB_PATHS) \ +@@ -68,24 +66,31 @@ # --- compile the lib --- + gifencode.o: gifencode.c gifencode.h +- $(CC) -I$(GD_INCL) -c gifencode.c ++ $(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c + price_conv.o: price_conv.c - $(CC) -c price_conv.c + $(CC) $(CFLAGS) -c price_conv.c - gdc.o: gdc.c gdc.h -- $(CC) -I$(GD_INCL) -I$(GDC_INCL) -c gdc.c -+ $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) -c gdc.c - - gdc_pie.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie.c -- $(CC) -I$(GD_INCL) -I$(GDC_INCL) -c gdc_pie.c -+ $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) -c gdc_pie.c - - gdchart.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdchart.c -- $(CC) -I$(GD_INCL) -I$(GDC_INCL) -c gdchart.c -+ $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) -c gdchart.c - - $(GD_LIB)/libgd.a: - cd $(GD_LIB) ; make -f Makefile libgd.a + gdc.o: gdc.c $(GDC_INCL)/gdc.h $(GDC_INCL)/gifencode.h +- $(CC) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdc.c ++ $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdc.c + + gdc_pie.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gifencode.h $(GDC_INCL)/gdcpie.h gdc_pie.c +- $(CC) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_pie.c ++ $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_pie.c + + gdchart.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gifencode.h $(GDC_INCL)/gdchart.h gdchart.c +- $(CC) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdchart.c ++ $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(JPEG_DEF) -c gdchart.c + + # --- supporting libraries --- + # should be compile & installed separately + # $(GD_LIB)/libgd.a: + # cd $(GD_LIB) ; make -f Makefile libgd.a + -+libgdchart.a: gdc.o gdc_pie.o gdchart.o price_conv.o -+ $(AR) rc libgdchart.a gdc.o gdc_pie.o gdchart.o price_conv.o ++libgdchart.a: gdc.o gdc_pie.o gdchart.o price_conv.o gifencode.o ++ $(AR) rc libgdchart.a gdc.o gdc_pie.o gdchart.o price_conv.o \ ++ gifencode.o + @if [ -x $(RANLIB) ] ; then \ + $(RANLIB) libgdchart.a; \ + fi; diff -Nur gdchart.old/pkg-descr gdchart/pkg-descr --- gdchart.old/pkg-descr Mon Jun 18 00:24:52 2001 +++ gdchart/pkg-descr Mon Jun 18 01:04:48 2001 @@ -1,5 +1,5 @@ GDChart is an easy to use, high performance library/C API for creating charts -and graphs in PNG format. +and graphs in GIF, PNG, JPEG and WBMP format. WWW: http://www.fred.net/brv/chart/ diff -Nur gdchart.old/pkg-plist gdchart/pkg-plist --- gdchart.old/pkg-plist Mon Jun 18 00:24:52 2001 +++ gdchart/pkg-plist Mon Jun 18 01:08:00 2001 @@ -2,10 +2,9 @@ include/gdchart.h include/gdc.h include/gdcpie.h +include/gifencode.h %%PORTDOCS%%share/doc/gdchart/gdc_samp1.c %%PORTDOCS%%share/doc/gdchart/gdc_samp2.c -%%PORTDOCS%%share/doc/gdchart/README.txt -%%PORTDOCS%%share/doc/gdchart/NOTES-092b.txt -%%PORTDOCS%%share/doc/gdchart/NOTES-093b.txt -%%PORTDOCS%%share/doc/gdchart/NOTES-094b.txt +%%PORTDOCS%%share/doc/gdchart/gdc_pie_samp.c +%%PORTDOCS%%share/doc/gdchart/README %%PORTDOCS%%@dirrm share/doc/gdchart >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?20010617234819.2A3463C8E>