4 files changed, 13 insertions, 15 deletions

diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index 1db295948927..5ab6c0317471 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	xml2rfc
-PORTVERSION=	1.28
+PORTVERSION=	1.29
 CATEGORIES=	textproc tcl83
 MASTER_SITES=	http://xml.resource.org/authoring/
 EXTRACT_SUFX=	.tgz
@@ -24,19 +24,20 @@ NO_BUILD=	yes
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/xml2rfc.tcl ${PREFIX}/bin/xml2rfc
-	${LN} ${PREFIX}/bin/xml2rfc ${PREFIX}/bin/xml2txt
-	${LN} ${PREFIX}/bin/xml2rfc ${PREFIX}/bin/xml2html
-	${LN} ${PREFIX}/bin/xml2rfc ${PREFIX}/bin/xml2nroff
+	${LN} -f ${PREFIX}/bin/xml2rfc ${PREFIX}/bin/xml2txt
+	${LN} -f ${PREFIX}/bin/xml2rfc ${PREFIX}/bin/xml2html
+	${LN} -f ${PREFIX}/bin/xml2rfc ${PREFIX}/bin/xml2nroff
 .if !defined (NOPORTDOCS)
 	${MKDIR} ${DOCSDIR} ${DOCSDIR}/contrib
 .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 sample.txt sample.xml
+	    rfc2629.xsd sample.html sample.txt sample.xml xml2rfc-win.png
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .for doc in \
 	alex.rousskov/xml2rfcpp.pl \
+	fred.baker/new-draft.xml \
 	pekka.savola/template.xml \
 	pekka.savola/template0.xml \
 	pekka.savola/template1b.xml \
@@ -44,10 +45,6 @@ do-install:
 	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 5fa7d1251349..af2a2470561c 100644
--- a/textproc/xml2rfc/distinfo
+++ b/textproc/xml2rfc/distinfo
@@ -1,2 +1,2 @@
-MD5 (xml2rfc-1.28.tgz) = 1014d4c6b5d0274e821139c8f9d285e2
-SIZE (xml2rfc-1.28.tgz) = 373593
+MD5 (xml2rfc-1.29.tgz) = 2d656c6b6cceb11e738dd5756fda478e
+SIZE (xml2rfc-1.29.tgz) = 402644
diff --git a/textproc/xml2rfc/files/patch-xml2rfc.tcl b/textproc/xml2rfc/files/patch-xml2rfc.tcl
index db65eb366185..25d5dd88d42c 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 \
--LC_ALL=C exec tclsh "$0" "$0" "$@"
-+LC_ALL=C exec tclsh8.3 "$0" "$0" "$@"
+-exec tclsh "$0" "$0" "$@"
++exec tclsh8.3 "$0" "$0" "$@"
  
  
  #
diff --git a/textproc/xml2rfc/pkg-plist b/textproc/xml2rfc/pkg-plist
index c714ae09625c..6b1e2013a723 100644
--- a/textproc/xml2rfc/pkg-plist
+++ b/textproc/xml2rfc/pkg-plist
@@ -16,12 +16,13 @@ bin/xml2txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2629.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2629.xml
 %%PORTDOCS%%%%DOCSDIR%%/rfc2629.xsd
+%%PORTDOCS%%%%DOCSDIR%%/sample.html
 %%PORTDOCS%%%%DOCSDIR%%/sample.txt
 %%PORTDOCS%%%%DOCSDIR%%/sample.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml2rfc-win.png
 %%PORTDOCS%%%%DOCSDIR%%/contrib/concat.pl
 %%PORTDOCS%%%%DOCSDIR%%/contrib/fast-sync.sh
-%%PORTDOCS%%%%DOCSDIR%%/contrib/new-draft-1.xml
-%%PORTDOCS%%%%DOCSDIR%%/contrib/new-draft-2.xml
+%%PORTDOCS%%%%DOCSDIR%%/contrib/new-draft.xml
 %%PORTDOCS%%%%DOCSDIR%%/contrib/template.xml
 %%PORTDOCS%%%%DOCSDIR%%/contrib/template0.xml
 %%PORTDOCS%%%%DOCSDIR%%/contrib/template1b.xml