4 files changed, 27 insertions, 18 deletions

diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index 1935aa05aa96..91023c8dfedf 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	xml2rfc
-PORTVERSION=	1.24
+PORTVERSION=	1.25
 CATEGORIES=	textproc tcl83
 MASTER_SITES=	http://xml.resource.org/authoring/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	jabley@automagic.org
+MAINTAINER=	lennox@cs.columbia.edu
 COMMENT=	A tool to create RFCs and related documents from XML, as per RFC2629
 
 RUN_DEPENDS=	tclsh8.3:${PORTSDIR}/lang/tcl83
@@ -27,14 +27,19 @@ do-install:
 	${LN} ${PREFIX}/bin/xml2rfc ${PREFIX}/bin/xml2txt
 	${LN} ${PREFIX}/bin/xml2rfc ${PREFIX}/bin/xml2html
 	${LN} ${PREFIX}/bin/xml2rfc ${PREFIX}/bin/xml2nroff
-	${MKDIR} ${PREFIX}/share/doc/xml2rfc
-	for doc in README.html README.txt README.xml \
+.if !defined (NOPORTDOCS)
+	${MKDIR} ${DOCSDIR} ${DOCSDIR}/contrib
+.for doc in README.html README.txt README.xml \
 	    draft-mrose-writing-rfcs.html draft-mrose-writing-rfcs.txt \
 	    rfc2629.dtd rfc2629.html rfc2629.rnc rfc2629.txt rfc2629.xml \
-	    rfc2629.xsd; \
-	do ${INSTALL_DATA} ${WRKSRC}/$${doc} ${PREFIX}/share/doc/xml2rfc; \
-	done
-	${INSTALL_DATA} ${WRKSRC}/.xml2rfc.rc ${PREFIX}/share/doc/xml2rfc/dot.xml2rfc.rc
+	    rfc2629.xsd
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+.endfor
+.for doc in concat.pl fast-sync.sh new-draft.xml template.xml xml2rfcpp.pl
+	${INSTALL_DATA} ${WRKSRC}/contrib/${doc} ${DOCSDIR}/contrib
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/.xml2rfc.rc ${DOCSDIR}/dot.xml2rfc.rc
+.endif
 
 post-install:
 	@${ECHO}
diff --git a/textproc/xml2rfc/distinfo b/textproc/xml2rfc/distinfo
index 9a0dfbf17e74..ed93a2cc6890 100644
--- a/textproc/xml2rfc/distinfo
+++ b/textproc/xml2rfc/distinfo
@@ -1,2 +1,2 @@
-MD5 (xml2rfc-1.24.tgz) = 5023f2c61f2fb182d1fd77d5f59a766e
-SIZE (xml2rfc-1.24.tgz) = 341580
+MD5 (xml2rfc-1.25.tgz) = 64fc47270d4c05c061ad7cb2c8efcd74
+SIZE (xml2rfc-1.25.tgz) = 347529
diff --git a/textproc/xml2rfc/files/patch-xml2rfc.tcl b/textproc/xml2rfc/files/patch-xml2rfc.tcl
index a0ef216941de..6f2c03b5a3e3 100644
--- a/textproc/xml2rfc/files/patch-xml2rfc.tcl
+++ b/textproc/xml2rfc/files/patch-xml2rfc.tcl
@@ -1,15 +1,13 @@
 
 $FreeBSD$
 
---- xml2rfc.tcl.orig	Mon Jun 10 04:32:34 2002
-+++ xml2rfc.tcl	Thu Jul 25 21:33:22 2002
-@@ -1,7 +1,7 @@
+--- xml2rfc.tcl.orig	Mon Aug 16 17:55:38 2004
++++ xml2rfc.tcl	Mon Aug 16 17:55:45 2004
+@@ -1,6 +1,6 @@
  #!/bin/sh
  # the next line restarts using the correct interpreter \
--if   test ! -z "$DISPLAY"; then exec wish "$0" "$0" "$@"; \
--elif test ! -z "$1";       then exec tclsh "$0" "$0" "$@"; \
-+if   test ! -z "$DISPLAY"; then exec wish8.3 "$0" "$0" "$@"; \
-+elif test ! -z "$1";       then exec tclsh8.3 "$0" "$0" "$@"; \
- else                            echo "usage: $0 filename" >&2; exit 1; fi
+-exec tclsh "$0" "$0" "$@"
++exec tclsh8.3 "$0" "$0" "$@"
  
  
+ # NOTE FROM CLIVE
diff --git a/textproc/xml2rfc/pkg-plist b/textproc/xml2rfc/pkg-plist
index a82b4f4a2aca..297d8a9b9a5e 100644
--- a/textproc/xml2rfc/pkg-plist
+++ b/textproc/xml2rfc/pkg-plist
@@ -15,4 +15,10 @@ bin/xml2txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2629.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2629.xml
 %%PORTDOCS%%%%DOCSDIR%%/rfc2629.xsd
+%%PORTDOCS%%%%DOCSDIR%%/contrib/concat.pl
+%%PORTDOCS%%%%DOCSDIR%%/contrib/fast-sync.sh
+%%PORTDOCS%%%%DOCSDIR%%/contrib/new-draft.xml
+%%PORTDOCS%%%%DOCSDIR%%/contrib/template.xml
+%%PORTDOCS%%%%DOCSDIR%%/contrib/xml2rfcpp.pl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%