Update tkpiechart to 5.4, and adapt to tk-8.3.2 and stooop-4.1.1

10 files changed, 74 insertions, 49 deletions

diff --git a/graphics/tkpiechart/Makefile b/graphics/tkpiechart/Makefile
index f15a054a6c7..cd175d8f64a 100644
--- a/graphics/tkpiechart/Makefile
+++ b/graphics/tkpiechart/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2000/08/30 08:23:15 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/30 21:04:51 jwise Exp $
 
-DISTNAME=	tkpiechart-5.3
+DISTNAME=	tkpiechart-5.4
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.multimania.com/jfontain/
+MASTER_SITES=	http://jfontain.free.fr/
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.mygale.org/~jfontain/
+HOMEPAGE=	http://jfontain.free.fr/
 
-DEPENDS+=	tk-8.0.5:../../x11/tk80
+DEPENDS+=	tk-8.3.2:../../x11/tk
 DEPENDS+=	stooop>=3.7:../../devel/stooop
 
 NO_CONFIGURE=	yes
@@ -23,7 +23,7 @@ post-patch:
 	${CHMOD} a+x ${WRKSRC}/instapkg.tcl
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/tkpiechart
-	cd ${WRKSRC}; ./instapkg.tcl ${PREFIX}/lib/tkpiechart
+	${MKDIR} ${PREFIX}/lib/tcl/tkpiechart
+	cd ${WRKSRC}; ./instapkg.tcl ${PREFIX}/lib/tcl/tkpiechart
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tkpiechart/files/md5 b/graphics/tkpiechart/files/md5
index f4ceb957f2d..775b496afa8 100644
--- a/graphics/tkpiechart/files/md5
+++ b/graphics/tkpiechart/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/06/07 22:45:49 tron Exp $
+$NetBSD: md5,v 1.2 2000/08/30 21:04:53 jwise Exp $
 
-MD5 (tkpiechart-5.3.tar.gz) = 07ceff1b7f198da6f6e3fad92a7d80c8
+MD5 (tkpiechart-5.4.tar.gz) = 85ea32ba43812c71607008352d28f689
diff --git a/graphics/tkpiechart/files/patch-sum b/graphics/tkpiechart/files/patch-sum
deleted file mode 100644
index 49c49e400eb..00000000000
--- a/graphics/tkpiechart/files/patch-sum
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: patch-sum,v 1.2 1999/11/19 12:12:29 agc Exp $
-
-MD5 (patch-aa) = 8cdcb5a079841a8d023f736980ca273f
-MD5 (patch-ab) = c75880978eabe7cd886ce105c4985980
diff --git a/graphics/tkpiechart/patches/patch-aa b/graphics/tkpiechart/patches/patch-aa
deleted file mode 100644
index 66be405d777..00000000000
--- a/graphics/tkpiechart/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/11/19 12:12:30 agc Exp $
-
---- instapkg.tcl	Fri Nov 19 12:05:43 1999
-+++ instapkg.tcl	Fri Nov 19 12:05:51 1999
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # the next line restarts using the interpreter \
--exec tclsh "$0" "$@"
-+exec tclsh8.0 "$0" "$@"
- 
- # Id: instapkg.tcl,v 1.7 1998/11/14 20:15:29 jfontain Exp 
- 
diff --git a/graphics/tkpiechart/patches/patch-ab b/graphics/tkpiechart/patches/patch-ab
deleted file mode 100644
index 0c31d77db9d..00000000000
--- a/graphics/tkpiechart/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/11/19 12:12:30 agc Exp $
-
---- source.tcl.orig	Fri Nov 19 11:57:09 1999
-+++ source.tcl	Fri Nov 19 11:57:10 1999
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # the next line restarts using the interpreter \
--exec tclsh "$0" "$@"
-+exec tclsh8.0 "$0" "$@"
- 
- set rcsId {Id: source.tcl,v 1.9 1997/06/14 23:21:49 jfontain Exp }
- 
diff --git a/graphics/tkpiechart/patches/patch-ac b/graphics/tkpiechart/patches/patch-ac
new file mode 100644
index 00000000000..fad376d9f0d
--- /dev/null
+++ b/graphics/tkpiechart/patches/patch-ac
@@ -0,0 +1,17 @@
+--- demo.orig	Wed Aug 30 16:47:27 2000
++++ demo	Wed Aug 30 16:49:34 2000
+@@ -4,12 +4,12 @@
+ 
+ set rcsId {$Id: patch-ac,v 1.1 2000/08/30 21:04:54 jwise Exp $}
+ 
+-if {[catch {package require stooop 3.7}]} {
++if {[catch {package require stooop}]} {
+     # in case stooop package is not installed
+     source stooop.tcl
+ }
+ namespace import stooop::*
+-if {[catch {package require switched 1.4}]} {
++if {[catch {package require switched}]} {
+     # in case switched package is not installed
+     source switched.tcl
+ }
diff --git a/graphics/tkpiechart/patches/patch-ad b/graphics/tkpiechart/patches/patch-ad
new file mode 100644
index 00000000000..e24084d84d8
--- /dev/null
+++ b/graphics/tkpiechart/patches/patch-ad
@@ -0,0 +1,11 @@
+--- demo.tcl.orig	Wed Aug 30 16:47:32 2000
++++ demo.tcl	Wed Aug 30 16:50:00 2000
+@@ -619,7 +619,7 @@
+ }
+ }
+ namespace import stooop::*
+-if {[catch {package require switched 1.4}]} {
++if {[catch {package require switched}]} {
+ set rcsId {$Id: patch-ad,v 1.1 2000/08/30 21:04:54 jwise Exp $}
+ 
+ package provide switched [lindex {$Revision: 1.1 $} 1]
diff --git a/graphics/tkpiechart/patches/patch-ae b/graphics/tkpiechart/patches/patch-ae
new file mode 100644
index 00000000000..5684f51efe0
--- /dev/null
+++ b/graphics/tkpiechart/patches/patch-ae
@@ -0,0 +1,11 @@
+--- instapkg.tcl.orig	Wed Aug 30 16:47:41 2000
++++ instapkg.tcl	Wed Aug 30 16:50:16 2000
+@@ -22,7 +22,7 @@
+     exit 1
+ }
+ 
+-if {[catch {package require stooop 3.7} message]} {
++if {[catch {package require stooop} message]} {
+     puts stderr "stooop package must be installed first: $message"
+     exit 1
+ }
diff --git a/graphics/tkpiechart/patches/patch-af b/graphics/tkpiechart/patches/patch-af
new file mode 100644
index 00000000000..217e2943b21
--- /dev/null
+++ b/graphics/tkpiechart/patches/patch-af
@@ -0,0 +1,14 @@
+--- piechart.htm.orig	Wed Aug 30 16:47:55 2000
++++ piechart.htm	Wed Aug 30 16:50:38 2000
+@@ -91,9 +91,9 @@
+ on package installation procedures). Once the stooop and tkpiechart packages
+ are properly installed, insert the following code around the beginning
+ of your application (before you create any pie):
+-<pre>package require stooop 3.7
++<pre>package require stooop
+ namespace import stooop::*
+-package require switched 1.4
++package require switched
+ package require tkpiechart 5.4</pre>
+ 
+ <h3>
diff --git a/graphics/tkpiechart/pkg/PLIST b/graphics/tkpiechart/pkg/PLIST
index ddf40178e6a..770c7c3de70 100644
--- a/graphics/tkpiechart/pkg/PLIST
+++ b/graphics/tkpiechart/pkg/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/06/07 22:45:49 tron Exp $
-lib/tkpiechart/boxlabel.tcl
-lib/tkpiechart/canlabel.tcl
-lib/tkpiechart/labarray.tcl
-lib/tkpiechart/objselec.tcl
-lib/tkpiechart/perilabel.tcl
-lib/tkpiechart/pie.tcl
-lib/tkpiechart/pielabel.tcl
-lib/tkpiechart/pkgIndex.tcl
-lib/tkpiechart/selector.tcl
-lib/tkpiechart/slice.tcl
-@dirrm lib/tkpiechart
+@comment $NetBSD: PLIST,v 1.2 2000/08/30 21:04:54 jwise Exp $
+lib/tcl/tkpiechart/boxlabel.tcl
+lib/tcl/tkpiechart/canlabel.tcl
+lib/tcl/tkpiechart/labarray.tcl
+lib/tcl/tkpiechart/objselec.tcl
+lib/tcl/tkpiechart/perilabel.tcl
+lib/tcl/tkpiechart/pie.tcl
+lib/tcl/tkpiechart/pielabel.tcl
+lib/tcl/tkpiechart/pkgIndex.tcl
+lib/tcl/tkpiechart/selector.tcl
+lib/tcl/tkpiechart/slice.tcl
+@dirrm lib/tcl/tkpiechart