ports/70558: Maintainer update: port textproc/xml2rfc

[Jonathan Lennox]

>Number:         70558
>Category:       ports
>Synopsis:       Maintainer update: 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:   Mon Aug 16 22:30:16 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Lennox
>Release:        FreeBSD 5.2.1-RELEASE-p3 i386
>Organization:
Columbia University
>Environment:
System: FreeBSD cnr.cs.columbia.edu 5.2.1-RELEASE-p3 FreeBSD 5.2.1-RELEASE-p3 #4: Thu Mar 18 16:03:39 EST 2004 lennox at cnr.cs.columbia.edu:/usr/obj/usr/src/sys/CNR i386


	
>Description:

The patch attached below updates the port textproc/xml2rfc to the
just-released version 1.25.

It also:

* Changes the maintainer to myself.  The previous maintainer (Joe Abley,
  <jabley at automagic.com>) and I agreed that I would take over the
  maintenance of this port, since I've submitted the port updates for the
  last four or so revisions of this port.

* Adds a contrib/ subdir of the port's DOCSDIR, containing the contents
  of the contrib directory of the distribution.

* Changes the port's Makefile to be more in line with recommended BSD port
  idioms.

>How-To-Repeat:

>Fix:

--- ./files/patch-xml2rfc.tcl.orig	Thu Jul 25 15:39:48 2002
+++ ./files/patch-xml2rfc.tcl	Mon Aug 16 18:14:27 2004
@@ -1,15 +1,13 @@
 
 $FreeBSD: ports/textproc/xml2rfc/files/patch-xml2rfc.tcl,v 1.1 2002/07/25 19:39:48 naddy Exp $
 
---- 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
--- ./Makefile.orig	Fri Jul  9 18:29:23 2004
+++ ./Makefile	Mon Aug 16 18:08:10 2004
@@ -5,12 +5,12 @@
 # $FreeBSD: ports/textproc/xml2rfc/Makefile,v 1.6 2004/07/09 22:29:23 fenner Exp $
 
 PORTNAME=	xml2rfc
-PORTVERSION=	1.24
+PORTVERSION=	1.25
 CATEGORIES=	textproc tcl83
 MASTER_SITES=	http://xml.resource.org/authoring/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	jabley at automagic.org
+MAINTAINER=	lennox at 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 @@
 	${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}
--- ./distinfo.orig	Fri Jul  9 16:22:30 2004
+++ ./distinfo	Mon Aug 16 17:51:29 2004
@@ -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
--- ./pkg-plist.orig	Mon Aug 16 18:08:53 2004
+++ ./pkg-plist	Mon Aug 16 18:20:08 2004
@@ -15,4 +15,10 @@
 %%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%%
>Release-Note:
>Audit-Trail:
>Unformatted: