Use subst.mk instead of sed and patches.

6 files changed, 8 insertions, 65 deletions

diff --git a/graphics/tkpiechart/Makefile b/graphics/tkpiechart/Makefile
index eac03a3311f..5eea20178aa 100644
--- a/graphics/tkpiechart/Makefile
+++ b/graphics/tkpiechart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/30 01:51:46 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/09 20:42:59 minskim Exp $
 
 DISTNAME=	tkpiechart-5.4
 CATEGORIES=	graphics
@@ -16,11 +16,12 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-pre-patch:
-	for f in source.tcl instapkg.tcl; do				\
-		${MV} ${WRKSRC}/$$f ${WRKSRC}/$$f-prepatch;		\
-		${SED} -e '/Id/s|\$$||g' ${WRKSRC}/$$f-prepatch > ${WRKSRC}/$$f; \
-	done
+SUBST_CLASSES+=		patch
+SUBST_MESSAGE.patch=	"Remove version numbers for required packages."
+SUBST_STAGE.patch=	post-patch
+SUBST_FILES.patch=	demo demo.tcl instapkg.tcl piechart.htm
+SUBST_SED.patch=	-e '/require/s/stooop 3.7/stooop/g' \
+			-e '/require/s/switched 1.4/switched/g'
 
 post-patch:
 	${CHMOD} a+x ${WRKSRC}/instapkg.tcl
diff --git a/graphics/tkpiechart/distinfo b/graphics/tkpiechart/distinfo
index 3a1e7441475..89657ec67f0 100644
--- a/graphics/tkpiechart/distinfo
+++ b/graphics/tkpiechart/distinfo
@@ -1,8 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/03/30 01:51:18 minskim Exp $
+$NetBSD: distinfo,v 1.4 2004/04/09 20:42:59 minskim Exp $
 
 SHA1 (tkpiechart-5.4.tar.gz) = 20f0b07f7421311c58b845e3ee4842411b3de87a
 Size (tkpiechart-5.4.tar.gz) = 45341 bytes
-SHA1 (patch-ac) = 0176a50b0324654c1b3396bca57e9337e48e0533
-SHA1 (patch-ad) = 4b1349e0c652ae5ee324d3bcd318077187ef4ec0
-SHA1 (patch-ae) = b9ea234844b67c038c5e131880e6afe535453790
-SHA1 (patch-af) = b5b7d00f4d18e93b90bc4408218bc19412ec7d41
diff --git a/graphics/tkpiechart/patches/patch-ac b/graphics/tkpiechart/patches/patch-ac
deleted file mode 100644
index 9fe33719aa5..00000000000
--- a/graphics/tkpiechart/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2004/03/30 01:51:18 minskim Exp $
-
---- demo.orig	2000-03-26 04:21:54.000000000 -0600
-+++ demo
-@@ -6,3 +6,3 @@ set rcsId {$Id: demo,v 1.42.1.1 2000/03/
- 
--if {[catch {package require stooop 3.7}]} {
-+if {[catch {package require stooop}]} {
-     # in case stooop package is not installed
-@@ -11,3 +11,3 @@ if {[catch {package require stooop 3.7}]
- namespace import stooop::*
--if {[catch {package require switched 1.4}]} {
-+if {[catch {package require switched}]} {
-     # in case switched package is not installed
diff --git a/graphics/tkpiechart/patches/patch-ad b/graphics/tkpiechart/patches/patch-ad
deleted file mode 100644
index 6d02d2606f3..00000000000
--- a/graphics/tkpiechart/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/03/30 01:51:18 minskim Exp $
-
---- demo.tcl.orig	2000-03-26 04:21:55.000000000 -0600
-+++ demo.tcl	2004-03-29 19:40:26.000000000 -0600
-@@ -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.3 2004/03/30 01:51:18 minskim Exp $}
- 
- package provide switched [lindex {$Revision: 1.3 $} 1]
diff --git a/graphics/tkpiechart/patches/patch-ae b/graphics/tkpiechart/patches/patch-ae
deleted file mode 100644
index f74900e8be2..00000000000
--- a/graphics/tkpiechart/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2000/09/03 14:49:47 wiz Exp $
---- 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
deleted file mode 100644
index f5bf43a4e47..00000000000
--- a/graphics/tkpiechart/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.2 2000/09/03 14:49:48 wiz Exp $
---- 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>