Libtoolize this package so we get shared libraries (they are required by

net/ntop2).  While here, also enable jpeg support.  Bump PKGREVISION to 2.
Reviewed by wiz.

5 files changed, 31 insertions, 26 deletions

diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index 580363350ca..99c2ad5bd15 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/10/07 20:12:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/17 13:49:07 jmmv Exp $
 #
 
 DISTNAME=	gdchart0.10.1dev
 PKGNAME=	gdchart-0.10.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.fred.net/brv/chart/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -15,6 +15,7 @@ COMMENT=	Easy to use, fast C API for creating charts and graphs
 MAKEFILE=	makefile
 
 USE_BUILDLINK2=	YES
+USE_LIBTOOL=	YES
 
 post-patch:
 	for fn in ${WRKSRC}/*.[ch]; do					      \
@@ -24,13 +25,13 @@ post-patch:
 	done
 
 do-install:
-	${INSTALL_DATA}	${WRKSRC}/libgdchart.a ${PREFIX}/lib
+	${LIBTOOL} --mode=install ${INSTALL_DATA} ${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
-
-post-install:
 	${INSTALL_DATA_DIR} -d -m 0755 ${PREFIX}/share/doc/gdchart
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gdchart
 	${INSTALL_DATA_DIR} -d -m 0755 ${PREFIX}/share/examples/gdchart
@@ -40,4 +41,5 @@ post-install:
 		${PREFIX}/share/examples/gdchart
 
 .include "../../graphics/gd/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdchart/PLIST b/graphics/gdchart/PLIST
index b2a20d1ae24..3c9a3408f65 100644
--- a/graphics/gdchart/PLIST
+++ b/graphics/gdchart/PLIST
@@ -1,12 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:49 zuntum Exp $
-include/gdchart.h
+@comment $NetBSD: PLIST,v 1.2 2003/01/17 13:49:07 jmmv Exp $
 include/gdc.h
+include/gdchart.h
 include/gdcpie.h
 include/gifencode.h
 lib/libgdchart.a
+lib/libgdchart.la
+lib/libgdchart.so
+lib/libgdchart.so.0
+lib/libgdchart.so.0.10
 share/doc/gdchart/README
+share/examples/gdchart/gdc_pie_samp.c
 share/examples/gdchart/gdc_samp1.c
 share/examples/gdchart/gdc_samp2.c
-share/examples/gdchart/gdc_pie_samp.c
 @dirrm share/examples/gdchart
 @dirrm share/doc/gdchart
diff --git a/graphics/gdchart/buildlink2.mk b/graphics/gdchart/buildlink2.mk
index f70f77e42c8..4e9ac4de5a0 100644
--- a/graphics/gdchart/buildlink2.mk
+++ b/graphics/gdchart/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/07 20:12:13 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/01/17 13:49:07 jmmv Exp $
 #
 
 .if !defined(GDCHART_BUILDLINK2_MK)
 GDCHART_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gdchart
-BUILDLINK_DEPENDS.gdchart?=		gdchart>=0.10.1nb1
+BUILDLINK_DEPENDS.gdchart?=		gdchart>=0.10.1nb2
 BUILDLINK_PKGSRCDIR.gdchart?=		../../graphics/gdchart
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gdchart=gdchart
diff --git a/graphics/gdchart/distinfo b/graphics/gdchart/distinfo
index ff88a8d2e57..3f29babcafc 100644
--- a/graphics/gdchart/distinfo
+++ b/graphics/gdchart/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/10/18 11:39:23 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/01/17 13:49:07 jmmv Exp $
 
 SHA1 (gdchart0.10.1dev.tar.gz) = 52edc97cb45fc441afc4728c812cd33ddab9ef5c
 Size (gdchart0.10.1dev.tar.gz) = 40708 bytes
-SHA1 (patch-gdc.h) = 21876306acb359b4487cf35bf871b67e68778f0e
-SHA1 (patch-gdchart.c) = b64571899b38ef026af076c6876af20c74b98ab8
 SHA1 (patch-aa) = 6755bc77ee3e5bfb4dc92459d41f6ad4f8f76e75
 SHA1 (patch-ab) = 100c284c8f9400785ef9eff42c81a9f13d73c1e5
-SHA1 (patch-ac) = 766c3880e3ac842889b310d38e96b907adb59e92
+SHA1 (patch-ac) = 4d46784d569d904e4caa0155177e03c4edbd9260
diff --git a/graphics/gdchart/patches/patch-ac b/graphics/gdchart/patches/patch-ac
index 100aec69b97..6d6c0af63d3 100644
--- a/graphics/gdchart/patches/patch-ac
+++ b/graphics/gdchart/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2001/10/18 11:39:24 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2003/01/17 13:49:08 jmmv Exp $
 
 --- makefile.orig	Sat Nov  4 02:49:46 2000
 +++ makefile
-@@ -23,6 +23,8 @@
+@@ -23,6 +23,8 @@ LIB_PATHS   = -L$(GD_LIB) 
  # if not installed in standard paths (/lib, /usr/lib), or LD_LIBRARY_PATH
  # LIB_PATHS   = -L$(GD_LIB) -L$(PNG_LIB) -L$(ZLIB_LIB) -L$(JPEG_LIB)
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1 2001/10/18 11:39:24 wiz Exp $
  # NOTE:
  # libpng, libz, etc. are usually linked in as dynamic libs
  # either use a link line similar to one of these, or set environment LD_LIBRARY_PATH
-@@ -30,62 +32,66 @@
+@@ -30,62 +32,67 @@ LIB_PATHS   = -L$(GD_LIB) 
  # LIB_PATHS = $(LIB_PATHS) -R$(PNG_LIB) -R$(ZLIB_LIB)
  # LIB_PATHS = $(LIB_PATHS) -Xlinker -rpath -Xlinker $(PNG_LIB) -Xlinker -rpath -Xlinker $(ZLIB_LIB)
  
@@ -81,23 +81,23 @@ $NetBSD: patch-ac,v 1.1 2001/10/18 11:39:24 wiz Exp $
  # --- compile the lib ---
  gifencode.o: gifencode.c gifencode.h
 -	$(CC) -I$(GD_INCL) -c gifencode.c
-+	$(CC) $(CFLAGS) -c gifencode.c
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c gifencode.c
  
  price_conv.o: price_conv.c
 -	$(CC) -c price_conv.c
-+	$(CC) $(CFLAGS) -c price_conv.c
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c price_conv.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) $(JPEG_DEF) -c gdc.c
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(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) $(JPEG_DEF) -c gdc_pie.c
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(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) $(JPEG_DEF) -c gdchart.c
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(JPEG_DEF) -c gdchart.c
  
  # --- supporting libraries ---
  # should be compile & installed separately
@@ -105,10 +105,11 @@ $NetBSD: patch-ac,v 1.1 2001/10/18 11:39:24 wiz Exp $
  # 	cd $(GD_LIB) ; make -f Makefile libgd.a
 +
 +libgdchart.a: $(LIB_OBJS)
-+	$(AR) rc libgdchart.a $(LIB_OBJS)
-+	@if [ -x $(RANLIB) ] ; then \
-+	  $(RANLIB) libgdchart.a; \
-+	fi;
++#	$(AR) rc libgdchart.a $(LIB_OBJS)
++#	@if [ -x $(RANLIB) ] ; then \
++#	  $(RANLIB) libgdchart.a; \
++#	fi;
++	$(LIBTOOL) --mode=link $(CC) -o libgdchart.la $(LIB_OBJS:.o=.lo) $(LDFLAGS) -ljpeg -version-info 0:10:0 -rpath $(PREFIX)
  
  # --- clean ---
  clean: