Update to 0.10.1, which includes support for more graphics formats.

PR:		28243
Submitted by:	    maintainer

12 files changed, 102 insertions, 158 deletions

diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index 492281cd514f..323e3474846e 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -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 --git a/graphics/gdchart/distinfo b/graphics/gdchart/distinfo
index 1fce917cfabf..36408ba470c4 100644
--- a/graphics/gdchart/distinfo
+++ b/graphics/gdchart/distinfo
@@ -1 +1 @@
-MD5 (gdchart0.94b.tar.gz) = 261e0a1527f4a50f0eaae7171275a0ee
+MD5 (gdchart0.10.1dev.tar.gz) = d40cba84e7532508ee1637133b6179ee
diff --git a/graphics/gdchart/files/patch-gdc.c b/graphics/gdchart/files/patch-gdc.c
deleted file mode 100644
index cd1fa0e5fe4e..000000000000
--- a/graphics/gdchart/files/patch-gdc.c
+++ /dev/null
@@ -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 --git a/graphics/gdchart/files/patch-gdc.h b/graphics/gdchart/files/patch-gdc.h
new file mode 100644
index 000000000000..1143a8acac6c
--- /dev/null
+++ b/graphics/gdchart/files/patch-gdc.h
@@ -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 --git a/graphics/gdchart/files/patch-gdc_pie.c b/graphics/gdchart/files/patch-gdc_pie.c
deleted file mode 100644
index 85f77d27ef96..000000000000
--- a/graphics/gdchart/files/patch-gdc_pie.c
+++ /dev/null
@@ -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 --git a/graphics/gdchart/files/patch-gdc_pie_samp.c b/graphics/gdchart/files/patch-gdc_pie_samp.c
deleted file mode 100644
index e436c53d4452..000000000000
--- a/graphics/gdchart/files/patch-gdc_pie_samp.c
+++ /dev/null
@@ -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 --git a/graphics/gdchart/files/patch-gdc_samp1.c b/graphics/gdchart/files/patch-gdc_samp1.c
deleted file mode 100644
index 89e509e10545..000000000000
--- a/graphics/gdchart/files/patch-gdc_samp1.c
+++ /dev/null
@@ -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 --git a/graphics/gdchart/files/patch-gdc_samp2.c b/graphics/gdchart/files/patch-gdc_samp2.c
deleted file mode 100644
index 284c84ce0835..000000000000
--- a/graphics/gdchart/files/patch-gdc_samp2.c
+++ /dev/null
@@ -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 --git a/graphics/gdchart/files/patch-gdchart.c b/graphics/gdchart/files/patch-gdchart.c
index 4f105010fa87..24e151a02e6b 100644
--- a/graphics/gdchart/files/patch-gdchart.c
+++ b/graphics/gdchart/files/patch-gdchart.c
@@ -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 --git a/graphics/gdchart/files/patch-makefile b/graphics/gdchart/files/patch-makefile
index 6a2c01c7eb91..696ad4f13d42 100644
--- a/graphics/gdchart/files/patch-makefile
+++ b/graphics/gdchart/files/patch-makefile
@@ -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
+-	$(CC) -I$(GDC_INCL) $(JPEG_DEF) -c gdc_samp2.c
++	$(CC) $(CFLAGS) -I$(GDC_INCL) $(JPEG_DEF) -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
+ # --- 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_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_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.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)/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
+ 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)/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
+ 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
  
- $(GD_LIB)/libgd.a:
- 	cd $(GD_LIB) ; make -f Makefile libgd.a
+ # --- 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 --git a/graphics/gdchart/pkg-descr b/graphics/gdchart/pkg-descr
index fb70f8f5354c..bafa0eb1a891 100644
--- a/graphics/gdchart/pkg-descr
+++ b/graphics/gdchart/pkg-descr
@@ -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 --git a/graphics/gdchart/pkg-plist b/graphics/gdchart/pkg-plist
index fb8ea813f160..1995c922cd22 100644
--- a/graphics/gdchart/pkg-plist
+++ b/graphics/gdchart/pkg-plist
@@ -2,10 +2,9 @@ lib/libgdchart.a
 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