Update tcl-gdbm to 0.8, as the old distfile had disappeared from the

master site.  While here, USE_LIBTOOL and LTCONFIG_OVERRIDE, and adapt
to tcl-8.3.2.

7 files changed, 35 insertions, 74 deletions

diff --git a/databases/tcl-gdbm/Makefile b/databases/tcl-gdbm/Makefile
index 97fc763791b..16028f16731 100644
--- a/databases/tcl-gdbm/Makefile
+++ b/databases/tcl-gdbm/Makefile
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2000/06/13 10:40:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/29 21:05:46 jwise Exp $
 #
 
-DISTNAME=	Tclgdbm0.6
-PKGNAME=	tcl-gdbm-0.6
-CATEGORIES=	databases
-MASTER_SITES=	http://www.tcltk.com/ftp/ellson/
+DISTNAME=	tclgdbm-0.8
+PKGNAME=	tcl-gdbm-0.8
+CATEGORIES=	databases tcl
+MASTER_SITES=	http://www.graphviz.org/pub/tclgdbm/
 
 MAINTAINER=	bouyer@netbsd.org
 
-DEPENDS+=	tcl-8.0.5:../../lang/tcl80
+DEPENDS+=	tcl-8.3.2:../../lang/tcl80
 DEPENDS+=	gdbm>=1.7.3:../../databases/gdbm
 
 GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/tcl-gdbm/files/md5 b/databases/tcl-gdbm/files/md5
index c6f781fb242..22cc578c3dd 100644
--- a/databases/tcl-gdbm/files/md5
+++ b/databases/tcl-gdbm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/07/07 15:14:26 bouyer Exp $
+$NetBSD: md5,v 1.2 2000/08/29 21:05:48 jwise Exp $
 
-MD5 (Tclgdbm0.6.tar.gz) = 8af7b3056f4d93cdb921e3302461df75
+MD5 (tclgdbm-0.8.tar.gz) = f293c3247f1c1e341979b684cebbb9fb
diff --git a/databases/tcl-gdbm/files/patch-sum b/databases/tcl-gdbm/files/patch-sum
index c871b072e44..f9ee6d53881 100644
--- a/databases/tcl-gdbm/files/patch-sum
+++ b/databases/tcl-gdbm/files/patch-sum
@@ -1,5 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:31 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/29 21:05:48 jwise Exp $
 
-MD5 (patch-aa) = 4a912570ea0aa4b7a5913e5ea63e6e2c
-MD5 (patch-ab) = 537311c49b0c77ad9cba587dec2e18c3
-MD5 (patch-ac) = 4f88772c007786efe5ef88e086a653e3
+MD5 (patch-aa) = f41c2af96f7daff13b5c879be0aa11c7
diff --git a/databases/tcl-gdbm/patches/patch-aa b/databases/tcl-gdbm/patches/patch-aa
index 3bc1b9bded4..de2ef064e35 100644
--- a/databases/tcl-gdbm/patches/patch-aa
+++ b/databases/tcl-gdbm/patches/patch-aa
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/07/07 15:14:26 bouyer Exp $
-
---- configure.orig	Tue Jul  6 14:49:35 1999
-+++ configure	Tue Jul  6 14:52:54 1999
-@@ -624,7 +624,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+--- Makefile.in.orig	Thu Jun  8 15:35:14 2000
++++ Makefile.in	Tue Aug 29 16:32:25 2000
+@@ -35,7 +35,7 @@
+ DESTDIR =
  
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(libdir)/tcl/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
  
--file=${exec_prefix}/lib/tclConfig.sh
-+file=${exec_prefix}/lib/tcl8.0/tclConfig.sh
- . $file
+ top_builddir = .
+@@ -127,7 +127,7 @@
  
- if test "${TCL_SUPPORTS_STUBS}" = "1"; then
+ pkglib_LTLIBRARIES = libtclgdbm.la
+ man_MANS = tclgdbm.n
+-pkgindexdir = $(libdir)/@PACKAGE@
++pkgindexdir = $(libdir)/tcl/@PACKAGE@
+ pkgindex_DATA = pkgIndex.tcl
+ 
+ # tclStubLib.c is a dummy file just to fool automake
diff --git a/databases/tcl-gdbm/patches/patch-ab b/databases/tcl-gdbm/patches/patch-ab
deleted file mode 100644
index 0e644ac7f48..00000000000
--- a/databases/tcl-gdbm/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/07/07 15:14:26 bouyer Exp $
-
---- tclgdbm.c.orig	Tue Jul  6 14:55:30 1999
-+++ tclgdbm.c	Tue Jul  6 14:55:41 1999
-@@ -7,7 +7,7 @@
- #endif
- 
- #include <stdio.h>
--#include <tcl.h>
-+#include <tcl8.0/tcl.h>
- #include <gdbm.h>
- 
- /*
diff --git a/databases/tcl-gdbm/patches/patch-ac b/databases/tcl-gdbm/patches/patch-ac
deleted file mode 100644
index 4e62a35ed3d..00000000000
--- a/databases/tcl-gdbm/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/07/07 15:14:26 bouyer Exp $
-
---- Makefile.in.orig	Fri Jun  4 14:41:18 1999
-+++ Makefile.in	Tue Jul  6 15:38:03 1999
-@@ -9,10 +9,10 @@
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
--CC              = @CC@
-+CC              = @CC@ -fPIC -DPIC
- SHLIB_CFLAGS    = @TCL_SHLIB_CFLAGS@
- SHLIB_SUFFIX    = @TCL_SHLIB_SUFFIX@
--SHLIB_LD        = @TCL_SHLIB_LD@
-+SHLIB_LD        = ld -Bshareable
- TCL_PREFIX      = @TCL_PREFIX@
- TCL_EXEC_PREFIX	= @TCL_EXEC_PREFIX@
- TCL_CFLAGS      = @TCL_CFLAGS@ @TCL_STUB_FLAGS@
-@@ -23,7 +23,7 @@
- STATIC_LIB      = lib$(PACKAGE).a
- PACKAGEDIR      = $(TCL_EXEC_PREFIX)/lib/$(PACKAGE)
- 
--CFLAGS          = $(TCL_CFLAGS) $(SHLIB_CFLAGS) $(INCLUDES) \
-+CFLAGS          = $(TCL_CFLAGS) $(INCLUDES) \
- 		  -DVERSION=\"$(VERSION)\"
- 
- MAN_INSTALL_DIR = $(TCL_PREFIX)/man/mann
-@@ -31,7 +31,7 @@
- all: $(DLL) pkgIndex.tcl
- 
- $(DLL): $(OBJS)
--	$(SHLIB_LD) -o $@ $(OBJS) $(LIBS)
-+	$(SHLIB_LD) -o $@ $(OBJS) -L${PREFIX}/lib $(LIBS)
- 
- $(STATIC_LIB): $(OBJS)
- 	ar cr $@ $(OBJS)
diff --git a/databases/tcl-gdbm/pkg/PLIST b/databases/tcl-gdbm/pkg/PLIST
index d5f78b8d3d1..30a5f6e414f 100644
--- a/databases/tcl-gdbm/pkg/PLIST
+++ b/databases/tcl-gdbm/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/07/07 15:14:25 bouyer Exp $
-lib/Tclgdbm/Tclgdbm0.6.so
-lib/Tclgdbm/pkgIndex.tcl
+@comment $NetBSD: PLIST,v 1.2 2000/08/29 21:05:50 jwise Exp $
+lib/tcl/tclgdbm/libtclgdbm.so.0.0
+lib/tcl/tclgdbm/libtclgdbm.la
+lib/tcl/tclgdbm/libtclgdbm.a
+lib/tcl/tclgdbm/pkgIndex.tcl
 man/mann/tclgdbm.n
-@dirrm lib/Tclgdbm
+@dirrm lib/tcl/tclgdbm