Changes 0.11.5:

* Use compressed GIF support from libgd

5 files changed, 61 insertions, 79 deletions

diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index 8188d24f98b..d78801e9d46 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:14:50 tv Exp $
-#
+# $NetBSD: Makefile,v 1.15 2005/01/19 09:05:44 adam Exp $
 
-DISTNAME=	gdchart0.11.4dev
-PKGNAME=	gdchart-0.11.4
-PKGREVISION=	3
+DISTNAME=	gdchart0.11.5dev
+PKGNAME=	gdchart-0.11.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.fred.net/brv/chart/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -12,30 +10,27 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.fred.net/brv/chart/
 COMMENT=	Easy to use, fast C API for creating charts and graphs
 
-MAKEFILE=	makefile
-
-USE_BUILDLINK3=	YES
-USE_LIBTOOL=	YES
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
 
 TEST_TARGET=	gdc_samp1 gdc_samp2 gdc_pie_samp ft_samp
 
 post-patch:
-	for fn in ${WRKSRC}/*.[ch]; do					      \
-		${SED} 's/^#ifdef HAVE_JPEG/#ifndef NO_JPEG/' $${fn}	      \
-			> $${fn}.new;					      \
-		${MV} $${fn}.new $${fn};				      \
+	for fn in ${WRKSRC}/*.[ch]; do					\
+		${SED} 's/^#ifdef HAVE_JPEG/#ifndef NO_JPEG/' $${fn}	\
+			> $${fn}.new;					\
+		${MV} $${fn}.new $${fn};				\
 	done
 
 do-install:
-	${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/libgdchart.la \
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libgdchart.la \
 		 ${PREFIX}/lib
 	${LIBTOOL} -n --finish ${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
 	${INSTALL_DATA_DIR} -d -m 0755 ${PREFIX}/share/doc/gdchart
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gdchart
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/gdchart
 	${INSTALL_DATA_DIR} -d -m 0755 ${PREFIX}/share/examples/gdchart
 	${INSTALL_DATA} ${WRKSRC}/gdc_samp1.c ${PREFIX}/share/examples/gdchart
 	${INSTALL_DATA} ${WRKSRC}/gdc_samp2.c ${PREFIX}/share/examples/gdchart
@@ -43,4 +38,5 @@ do-install:
 		${PREFIX}/share/examples/gdchart
 
 .include "../../graphics/gd/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdchart/PLIST b/graphics/gdchart/PLIST
index a9e042d4e77..f82a704bfe3 100644
--- a/graphics/gdchart/PLIST
+++ b/graphics/gdchart/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/01/19 09:05:44 adam Exp $
 include/gdc.h
 include/gdchart.h
 include/gdcpie.h
-include/gifencode.h
 lib/libgdchart.la
-share/doc/gdchart/README
+share/doc/gdchart/README.txt
 share/examples/gdchart/gdc_pie_samp.c
 share/examples/gdchart/gdc_samp1.c
 share/examples/gdchart/gdc_samp2.c
diff --git a/graphics/gdchart/distinfo b/graphics/gdchart/distinfo
index 457bc981cc2..8109643a863 100644
--- a/graphics/gdchart/distinfo
+++ b/graphics/gdchart/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/06/24 08:04:24 adam Exp $
+$NetBSD: distinfo,v 1.8 2005/01/19 09:05:44 adam Exp $
 
-SHA1 (gdchart0.11.4dev.tar.gz) = 639a04061c92f36140e877bc307b76878ee3f6d7
-Size (gdchart0.11.4dev.tar.gz) = 52031 bytes
-SHA1 (patch-aa) = 82b2b49e8eaab7184af73f68821a61f2719847cd
-SHA1 (patch-ac) = 950101d61d77549a94f7ee738d38f5a12537ef01
+SHA1 (gdchart0.11.5dev.tar.gz) = c23e1cd233c38ac007b57420c20a5fa7fa206841
+Size (gdchart0.11.5dev.tar.gz) = 38783 bytes
+SHA1 (patch-aa) = 8f27d077d15c0d203ecd4e4b01c574e035dabce1
+SHA1 (patch-ac) = ef965196fc1e32b110242d975ff5dce939e8b4d8
diff --git a/graphics/gdchart/patches/patch-aa b/graphics/gdchart/patches/patch-aa
index ffd8f5edf59..a118a7be3c4 100644
--- a/graphics/gdchart/patches/patch-aa
+++ b/graphics/gdchart/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/06/24 08:04:24 adam Exp $
+$NetBSD: patch-aa,v 1.4 2005/01/19 09:05:44 adam Exp $
 
---- gdc.h.orig	2003-06-23 20:44:44.000000000 +0200
-+++ gdc.h	2003-06-23 20:44:53.000000000 +0200
-@@ -127,7 +127,7 @@
+--- gdc.h.orig	2004-12-17 18:12:06.000000000 +0000
++++ gdc.h
+@@ -126,7 +126,7 @@ short	cnt_nl( char*, int* );
  #endif
  
  #ifdef GDC_LIB
diff --git a/graphics/gdchart/patches/patch-ac b/graphics/gdchart/patches/patch-ac
index 8161ff54413..3a7694aabda 100644
--- a/graphics/gdchart/patches/patch-ac
+++ b/graphics/gdchart/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.6 2003/06/24 08:04:24 adam Exp $
+$NetBSD: patch-ac,v 1.7 2005/01/19 09:05:44 adam Exp $
 
---- makefile.orig	Tue Mar 11 04:03:06 2003
-+++ makefile
+--- Makefile.orig	2004-12-17 17:53:47.000000000 +0000
++++ Makefile
 @@ -1,4 +1,4 @@
 -CC=gcc
-+LIB_OBJS= gifencode.o price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o
++LIB_OBJS=price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o
  # gcc 2.7.1 or better is required
  # CFLAGS=
  # CFLAGS=-g -ansi -pedantic
@@ -23,20 +23,18 @@ $NetBSD: patch-ac,v 1.6 2003/06/24 08:04:24 adam Exp $
  
  # INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include 
  
-@@ -18,9 +18,9 @@ PREFIX_LIB = /usr/local/lib
+@@ -18,8 +18,8 @@ PREFIX_LIB = /usr/local/lib
  # GDChart requires the gd library - www.boutell.com/gd/
- # libgd 1.8.4 or better is required.  Don't use 2.0.0
+ # gd 2.0.28 or better is required (GIF support has returned to libgd)
  # if it's not installed in a standard location edit these lines for your installation
--GD_INCL=../gd-1.8.4/
--GD_LD=../gd-1.8.4/
--GD_LIB=libgd.a
+-GD_INCL=/usr/local/include/
+-GD_LD=/usr/local/lib/
 +GD_INCL=${BUILDLINK_PREFIX.gd}/include/
 +GD_LD=${BUILDLINK_PREFIX.gd}/lib/
-+GD_LIB=libgd.so
- # if you're using gd2.x, use these lines
- # (it's typically built as a shared lib)
- # GD_INCL  = ../gd-2.0.0/
-@@ -66,73 +66,72 @@ LIB_PATHS   = -L$(GD_LD) -L$(GDC_LD)
+ GD_LIB=libgd.so
+ # a static libgd is also available
+ # GD_LIB=libgd.a
+@@ -63,70 +63,70 @@ LIB_PATHS   = -L$(GD_LD) -L$(GDC_LD)
  # LIB_PATHS = $(LIB_PATHS) -Xlinker -rpath -Xlinker $(PNG_LD) -Xlinker -rpath -Xlinker $(ZLIB_LD)
  
  
@@ -61,85 +59,74 @@ $NetBSD: patch-ac,v 1.6 2003/06/24 08:04:24 adam Exp $
 +	${LIBTOOL} $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c ft_samp.c
  
  # --- link the samples ---
- gdc_samp1: $(GDC_LD)libgdc.a gdc_samp1.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
+-gdc_samp1: $(GDC_LD)libgdc.a gdc_samp1.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
 -	$(CC) -o gdc_samp1 \
-+	${LIBTOOL} $(CC) -o gdc_samp1 \
++gdc_samp1: $(GDC_LD)libgdchart.a gdc_samp1.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
++	${LIBTOOL} --mode=link $(CC) -o gdc_samp1 \
  			 gdc_samp1.o \
  			 $(LIB_PATHS) \
 -			 -lgdc -lgd -lz -lpng $(LIBS) -lm
 +			 -lgdchart -lgd -lz -lpng $(LIBS) -lm
  
- gdc_samp2: $(GDC_LD)libgdc.a gdc_samp2.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
+-gdc_samp2: $(GDC_LD)libgdc.a gdc_samp2.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
 -	$(CC) -o gdc_samp2 \
-+	${LIBTOOL} $(CC) -o gdc_samp2 \
- 			 gdc.o gdchart.o price_conv.o gifencode.o \
++gdc_samp2: $(GDC_LD)libgdchart.a gdc_samp2.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
++	${LIBTOOL} --mode=link $(CC) -o gdc_samp2 \
+ 			 gdc.o gdchart.o price_conv.o \
  			 gdc_samp2.o \
  			 $(LIB_PATHS) \
 -			 -lgdc -lgd -lz -lpng $(LIBS) -lm
 +			 -lgdchart -lgd -lz -lpng $(LIBS) -lm
  
- gdc_pie_samp: $(GDC_LD)libgdc.a gdc_pie_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
+-gdc_pie_samp: $(GDC_LD)libgdc.a gdc_pie_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
 -	$(CC) -o gdc_pie_samp \
-+	${LIBTOOL} $(CC) -o gdc_pie_samp \
- 			 gdc.o gdc_pie.o price_conv.o gifencode.o \
++gdc_pie_samp: $(GDC_LD)libgdchart.a gdc_pie_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
++	${LIBTOOL} --mode=link $(CC) -o gdc_pie_samp \
+ 			 gdc.o gdc_pie.o price_conv.o \
  			 gdc_pie_samp.o \
  			 $(LIB_PATHS) \
 -			 -lgdc -lgd -lz -lpng $(LIBS) -lm
 +			 -lgdchart -lgd -lz -lpng $(LIBS) -lm
  
- ft_samp: $(GDC_LD)libgdc.a ft_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
+-ft_samp: $(GDC_LD)libgdc.a ft_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
 -	$(CC) -o ft_samp \
-+	${LIBTOOL} $(CC) -o ft_samp \
- 			 gdc.o gdchart.o price_conv.o gifencode.o \
++ft_samp: $(GDC_LD)libgdchart.a ft_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
++	${LIBTOOL} --mode=link $(CC) -o ft_samp \
+ 			 gdc.o gdchart.o price_conv.o \
  			 ft_samp.o \
  			 $(LIB_PATHS) \
 -			 -lgdc -lgd -lz -lpng $(LIBS) -lm
 +			 -lgdchart -lgd -lz -lpng $(LIBS) -lm
  
  # --- compile the lib ---
- gdc.h: $(GD_INCL)gd.h $(GD_INCL)gdfonts.h $(GD_INCL)gdfontt.h $(GD_INCL)gdfontmb.h $(GD_INCL)gdfontg.h $(GD_INCL)gdfontl.h $(GDC_INCL)gifencode.h $(GDC_INCL)array_alloc.h
- 
- gifencode.o: gifencode.c gifencode.h $(GDC_INCL)gdc.h
--	$(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c
+ gdc.h: $(GD_INCL)gd.h $(GD_INCL)gdfonts.h $(GD_INCL)gdfontt.h $(GD_INCL)gdfontmb.h $(GD_INCL)gdfontg.h $(GD_INCL)gdfontl.h $(GDC_INCL)array_alloc.h
  
  price_conv.o: price_conv.c
 -	$(CC) $(CFLAGS) -c price_conv.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c price_conv.c
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c price_conv.c
  
  gdc.o: gdc.c $(GDC_INCL)gdc.h
 -	$(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc.c
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc.c
  
  gdc_pie.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdcpie.h gdc_pie.c
 -	$(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc_pie.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc_pie.c
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc_pie.c
  
  gdchart.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h gdchart.c
 -	$(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c
  
  array_alloc.o: array_alloc.c array_alloc.h
 -	$(CC) $(CFLAGS) -c array_alloc.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c array_alloc.c
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c array_alloc.c
  
--libgdc.a: gifencode.o price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o
--	ar cr libgdc.a gdc.o gdchart.o gdc_pie.o price_conv.o gifencode.o array_alloc.o
+-libgdc.a: price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o
+-	ar cr libgdc.a gdc.o gdchart.o gdc_pie.o price_conv.o array_alloc.o
 -	ranlib libgdc.a
-+libgdchart.a: $(LIB_OBJS)
-+	$(LIBTOOL) --mode=link $(CC) -o libgdchart.la $(LIB_OBJS:.o=.lo) -L${GD_LD} -lgd -version-info 0:11 -rpath $(PREFIX)/lib
++libgdchart.a: ${LIB_OBJS}
++	${LIBTOOL} --mode=link ${CC} -o libgdchart.la ${LIB_OBJS:.o=.lo} \
++		-L${GD_LD} -lgd -version-info 0:11 -rpath ${PREFIX}/lib
  
  # --- supporting libraries ---
  # should be compile & installed separately
-@@ -140,9 +139,9 @@ libgdc.a: gifencode.o price_conv.o gdc.o
- # 	cd $(GD_LD) ; make -f Makefile $(GD_LIB)
- 
- # ----- install -----
--install: gdc.h gdchart.h gdcpie.h gifencode.h libgdc.a
-+install: gdc.h gdchart.h gdcpie.h gifencode.h libgdchart.a
- 	cp gdc.h  gdchart.h  gdcpie.h  gifencode.h $(PREFIX_INC)/
--	cp libgdc.a $(PREFIX_LIB)/
-+	$(LIBTOOL) --mode=install ${BSD_INSTALL_DATA} libgdchart.la ${PREFIX}/lib
- 
- # --- clean ---
- clean: