ports/79603: Maintainer update: version 1.29 of port textproc/xml2rfc

[Jonathan Lennox]

>Number:         79603
>Category:       ports
>Synopsis:       Maintainer update: version 1.29 of port textproc/xml2rfc
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 06 14:00:19 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Lennox
>Release:        FreeBSD 5.3-RELEASE-p2 i386
>Organization:
Columbia University
>Environment:
System: FreeBSD cnr.cs.columbia.edu 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #9: Sat Dec 4 12:36:03 EST 2004 lennox at cnr.cs.columbia.edu:/usr/obj/usr/src/sys/CNR i386


	
>Description:

Version 1.29 of xml2rfc has been released.

This version implements the new version of the required IETF boilerplate
(RFC 3978), which will become mandatory for Internet-Drafts on May 6.

The patch below also adds -f arguments to the install target's ${LN} commands, so
install over a previous, partially incomplete install doesn't fail.

>How-To-Repeat:
>Fix:

diff -ur xml2rfc.orig/Makefile xml2rfc/Makefile
--- xml2rfc.orig/Makefile	Wed Apr  6 09:25:41 2005
+++ xml2rfc/Makefile	Wed Apr  6 09:39:28 2005
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/textproc/xml2rfc/Makefile,v 1.9 2005/01/19 21:16:14 edwin Exp $
 
 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 @@
 
 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 @@
 	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 -ur xml2rfc.orig/distinfo xml2rfc/distinfo
--- xml2rfc.orig/distinfo	Wed Apr  6 09:25:41 2005
+++ xml2rfc/distinfo	Wed Apr  6 09:27:31 2005
@@ -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 -ur xml2rfc.orig/files/patch-xml2rfc.tcl xml2rfc/files/patch-xml2rfc.tcl
--- xml2rfc.orig/files/patch-xml2rfc.tcl	Wed Apr  6 09:25:41 2005
+++ xml2rfc/files/patch-xml2rfc.tcl	Wed Apr  6 09:28:45 2005
@@ -6,8 +6,8 @@
 @@ -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 -ur xml2rfc.orig/pkg-plist xml2rfc/pkg-plist
--- xml2rfc.orig/pkg-plist	Wed Apr  6 09:25:41 2005
+++ xml2rfc/pkg-plist	Wed Apr  6 09:34:45 2005
@@ -16,12 +16,13 @@
 %%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
>Release-Note:
>Audit-Trail:
>Unformatted: