5 files changed, 27 insertions, 11 deletions

diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index a05dd7f02d26..1db295948927 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	xml2rfc
-PORTVERSION=	1.26
+PORTVERSION=	1.28
 CATEGORIES=	textproc tcl83
 MASTER_SITES=	http://xml.resource.org/authoring/
 EXTRACT_SUFX=	.tgz
@@ -29,15 +29,25 @@ do-install:
 	${LN} ${PREFIX}/bin/xml2rfc ${PREFIX}/bin/xml2nroff
 .if !defined (NOPORTDOCS)
 	${MKDIR} ${DOCSDIR} ${DOCSDIR}/contrib
-.for doc in README.html README.txt README.xml \
+.for doc in LICENSE 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
+	    rfc2629.xsd sample.txt sample.xml
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
-.for doc in concat.pl fast-sync.sh new-draft.xml template.xml xml2rfcpp.pl
+.for doc in \
+	alex.rousskov/xml2rfcpp.pl \
+	pekka.savola/template.xml \
+	pekka.savola/template0.xml \
+	pekka.savola/template1b.xml \
+	rob.austein/concat.pl \
+	rob.austein/fast-sync.sh
 	${INSTALL_DATA} ${WRKSRC}/contrib/${doc} ${DOCSDIR}/contrib
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/contrib/fred.baker/new-draft.xml \
+		${DOCSDIR}/contrib/new-draft-1.xml
+	${INSTALL_DATA} ${WRKSRC}/contrib/pekka.savola/new-draft.xml \
+		${DOCSDIR}/contrib/new-draft-2.xml
 	${INSTALL_DATA} ${WRKSRC}/.xml2rfc.rc ${DOCSDIR}/dot.xml2rfc.rc
 .endif
 
diff --git a/textproc/xml2rfc/distinfo b/textproc/xml2rfc/distinfo
index c8002e000639..5fa7d1251349 100644
--- a/textproc/xml2rfc/distinfo
+++ b/textproc/xml2rfc/distinfo
@@ -1,2 +1,2 @@
-MD5 (xml2rfc-1.26.tgz) = d477dfc6a93c1fb8458e2de0a9bb2037
-SIZE (xml2rfc-1.26.tgz) = 368353
+MD5 (xml2rfc-1.28.tgz) = 1014d4c6b5d0274e821139c8f9d285e2
+SIZE (xml2rfc-1.28.tgz) = 373593
diff --git a/textproc/xml2rfc/files/patch-xml2rfc.tcl b/textproc/xml2rfc/files/patch-xml2rfc.tcl
index 6f2c03b5a3e3..db65eb366185 100644
--- a/textproc/xml2rfc/files/patch-xml2rfc.tcl
+++ b/textproc/xml2rfc/files/patch-xml2rfc.tcl
@@ -6,8 +6,8 @@ $FreeBSD$
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # the next line restarts using the correct interpreter \
--exec tclsh "$0" "$0" "$@"
-+exec tclsh8.3 "$0" "$0" "$@"
+-LC_ALL=C exec tclsh "$0" "$0" "$@"
++LC_ALL=C exec tclsh8.3 "$0" "$0" "$@"
  
  
- # NOTE FROM CLIVE
+ #
diff --git a/textproc/xml2rfc/pkg-descr b/textproc/xml2rfc/pkg-descr
index 0f4113eefc48..636b121855ef 100644
--- a/textproc/xml2rfc/pkg-descr
+++ b/textproc/xml2rfc/pkg-descr
@@ -4,4 +4,4 @@ in RFC 2629.
 
 WWW: http://xml.resource.org/
 
-jabley@automagic.org
+lennox@cs.columbia.edu
diff --git a/textproc/xml2rfc/pkg-plist b/textproc/xml2rfc/pkg-plist
index 297d8a9b9a5e..c714ae09625c 100644
--- a/textproc/xml2rfc/pkg-plist
+++ b/textproc/xml2rfc/pkg-plist
@@ -3,6 +3,7 @@ bin/xml2html
 bin/xml2nroff
 bin/xml2rfc
 bin/xml2txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README.html
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.xml
@@ -15,10 +16,15 @@ bin/xml2txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2629.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2629.xml
 %%PORTDOCS%%%%DOCSDIR%%/rfc2629.xsd
+%%PORTDOCS%%%%DOCSDIR%%/sample.txt
+%%PORTDOCS%%%%DOCSDIR%%/sample.xml
 %%PORTDOCS%%%%DOCSDIR%%/contrib/concat.pl
 %%PORTDOCS%%%%DOCSDIR%%/contrib/fast-sync.sh
-%%PORTDOCS%%%%DOCSDIR%%/contrib/new-draft.xml
+%%PORTDOCS%%%%DOCSDIR%%/contrib/new-draft-1.xml
+%%PORTDOCS%%%%DOCSDIR%%/contrib/new-draft-2.xml
 %%PORTDOCS%%%%DOCSDIR%%/contrib/template.xml
+%%PORTDOCS%%%%DOCSDIR%%/contrib/template0.xml
+%%PORTDOCS%%%%DOCSDIR%%/contrib/template1b.xml
 %%PORTDOCS%%%%DOCSDIR%%/contrib/xml2rfcpp.pl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%