From 818f873ad945893ae515e8d1f6a490303154d39a Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Mon, 17 Feb 2003 13:29:17 +0000
Subject: [PATCH] update to v1.17

---
 textproc/xml2rfc/Makefile                  |  7 +++---
 textproc/xml2rfc/distinfo                  |  6 ++---
 textproc/xml2rfc/files/xml2rfc             |  5 ++--
 textproc/xml2rfc/files/xml2rfc.no_x11      |  9 ++++----
 textproc/xml2rfc/patches/patch-xml2rfc.tcl | 27 ----------------------
 textproc/xml2rfc/pkg/PLIST                 |  6 +----
 6 files changed, 15 insertions(+), 45 deletions(-)
 delete mode 100644 textproc/xml2rfc/patches/patch-xml2rfc.tcl

diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index a041e901af7..f50f5f98091 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.24 2002/10/28 22:43:46 naddy Exp $
+# $OpenBSD: Makefile,v 1.25 2003/02/17 13:29:17 jakob Exp $
 
 COMMENT=	"convert memos written in XML to the RFC format"
 
-VERSION=	1.10
+VERSION=	1.17
 DISTNAME=	xml2rfc-${VERSION}
 CATEGORIES=	textproc
 
@@ -17,8 +17,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-RUN_DEPENDS=	:tcl-8.3.*:lang/tcl/8.3 \
-		:TclXML-*:textproc/TclXML \
+RUN_DEPENDS=	:tcl-8.3.*:lang/tcl/8.3
 
 FLAVORS=	no_x11
 FLAVOR?=
diff --git a/textproc/xml2rfc/distinfo b/textproc/xml2rfc/distinfo
index f4f6dc57b65..8a60a65a2a9 100644
--- a/textproc/xml2rfc/distinfo
+++ b/textproc/xml2rfc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xml2rfc-1.10.tgz) = 9a6fd602e846dece66bceb6b400797a9
-RMD160 (xml2rfc-1.10.tgz) = 6446c669d6674c805a52be3e44742a6f93d55bab
-SHA1 (xml2rfc-1.10.tgz) = 09aba851e9f8f60c92171f872590de3f6bb680eb
+MD5 (xml2rfc-1.17.tgz) = db2b29a21fa5f75ef6646fe559dc09ed
+RMD160 (xml2rfc-1.17.tgz) = a96942c8d7ca17cb35415b1f42197859db66e487
+SHA1 (xml2rfc-1.17.tgz) = 6a789929852a8f6312d3e3b72ac56aae9121d471
diff --git a/textproc/xml2rfc/files/xml2rfc b/textproc/xml2rfc/files/xml2rfc
index 81f5dd39c80..0268ebc17f7 100644
--- a/textproc/xml2rfc/files/xml2rfc
+++ b/textproc/xml2rfc/files/xml2rfc
@@ -1,12 +1,13 @@
 #!/bin/sh
 #
-# $Id: xml2rfc,v 1.2 2001/04/09 18:45:20 jakob Exp $
+# $Id: xml2rfc,v 1.3 2003/02/17 13:29:17 jakob Exp $
 
 wish=y0y0y0/bin/wish8.3
+tclsh=y0y0y0/bin/tclsh8.3
 xml2rfc=y0y0y0/share/xml2rfc/xml2rfc.tcl
 
 if [ $# -gt 0 ]; then
-	exec $wish $xml2rfc xml2rfc $@
+	exec $tclsh $xml2rfc xml2rfc $@
 else
 	exec $wish $xml2rfc
 fi
diff --git a/textproc/xml2rfc/files/xml2rfc.no_x11 b/textproc/xml2rfc/files/xml2rfc.no_x11
index 975f3f3b15e..e4bda2fb9e1 100644
--- a/textproc/xml2rfc/files/xml2rfc.no_x11
+++ b/textproc/xml2rfc/files/xml2rfc.no_x11
@@ -1,7 +1,8 @@
-#!y0y0y0/bin/tclsh8.3
+#!/bin/sh
 #
-# $Id: xml2rfc.no_x11,v 1.1 2001/03/30 15:53:13 jakob Exp $
+# $Id: xml2rfc.no_x11,v 1.2 2003/02/17 13:29:17 jakob Exp $
 
-source y0y0y0/share/xml2rfc/xml2rfc.tcl
+tclsh=y0y0y0/bin/tclsh8.3
+xml2rfc=y0y0y0/share/xml2rfc/xml2rfc.tcl
 
-xml2rfc [lindex $argv 0] [lindex $argv 1]
+exec $tclsh $xml2rfc xml2rfc $@
diff --git a/textproc/xml2rfc/patches/patch-xml2rfc.tcl b/textproc/xml2rfc/patches/patch-xml2rfc.tcl
deleted file mode 100644
index fcacf743504..00000000000
--- a/textproc/xml2rfc/patches/patch-xml2rfc.tcl
+++ /dev/null
@@ -1,27 +0,0 @@
---- xml2rfc.tcl.orig	Tue Jan 15 06:17:41 2002
-+++ xml2rfc.tcl	Thu Jan 24 09:34:47 2002
-@@ -1,6 +1,3 @@
--#!/bin/sh
--# the next line restarts using wish \
--exec wish "$0" "$0" "$@"
- 
- 
- #
-@@ -10,7 +7,7 @@
- #
- 
- 
--if {[catch { package require xml 1.8 } result]} {
-+if {[catch { package require xml 1.9 } result]} {
-     global auto_path
- 
-     puts stderr "unable to find the TclXML package, did you install it?"
-@@ -23,7 +20,7 @@
-     return
- }
- 
--if {[string compare [package require sgml] 1.6]} {
-+if {[string compare [package require sgml] 1.7]} {
-     global auto_path
- 
-     puts stderr \
diff --git a/textproc/xml2rfc/pkg/PLIST b/textproc/xml2rfc/pkg/PLIST
index 0f08b0b9178..0fc64616cc4 100644
--- a/textproc/xml2rfc/pkg/PLIST
+++ b/textproc/xml2rfc/pkg/PLIST
@@ -1,14 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.5 2001/12/22 00:20:32 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.6 2003/02/17 13:29:17 jakob Exp $
 bin/xml2rfc
 share/doc/xml2rfc/README.html
 share/doc/xml2rfc/README.txt
 share/doc/xml2rfc/README.xml
 share/doc/xml2rfc/draft-mrose-writing-rfcs.html
 share/doc/xml2rfc/draft-mrose-writing-rfcs.txt
-share/doc/xml2rfc/draft-mrose-writing-rfcs.xml
-share/doc/xml2rfc/front.WRITING-RFCS.xml
-share/doc/xml2rfc/reference.WRITING-RFCS.xml
-share/doc/xml2rfc/rfc2629-bis.dtd
 share/doc/xml2rfc/rfc2629.dtd
 share/doc/xml2rfc/rfc2629.html
 share/doc/xml2rfc/rfc2629.txt