ports/150896: [PATCH] Unbreak, restore editors/xml2rfc-xxe4.6.1 and update to 0.7.8

Fri Sep 24 02:00:12 UTC 2010

>Number:         150896
>Category:       ports
>Synopsis:       [PATCH] Unbreak, restore editors/xml2rfc-xxe4.6.1 and update to 0.7.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 24 02:00:11 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Marcin Cieslak
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
http://saper.info
>Environment:
System: FreeBSD radziecki.saper.info 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r212217M: Wed Sep 22 08:56:19 CEST
>Description:
- Update to 0.7.8

Please restore all files from attic, the port was deleted as BROKEN.

Requires an update to editors/xxe (posted separately)

Added file(s):
- files/patch-xml2rfc_catalog.xml

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- xml2rfc-xxe4.6.1-0.7.8.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/editors/xml2rfc-xxe.orig/Makefile /usr/ports/editors/xml2rfc-xxe/Makefile
--- /usr/ports/editors/xml2rfc-xxe.orig/Makefile	2009-12-08 15:30:01.000000000 +0100
+++ /usr/ports/editors/xml2rfc-xxe/Makefile	2010-09-24 02:35:10.175138377 +0200
@@ -6,30 +6,32 @@
 #
 
 PORTNAME=	xml2rfc-xxe
-PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTVERSION=	0.7.8
 CATEGORIES=	editors
-MASTER_SITES=	http://www.fenron.com/~fenner/ietf/
-PKGNAMESUFFIX=	-${XXE_VERSION}
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+PKGNAMESUFFIX=	${XXE_VERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	saper at SAPER.INFO
 COMMENT=	An xml2rfc configuration for XMLMind XML Editor
 
 RUN_DEPENDS=	xxe:${PORTSDIR}/editors/xxe
 
 USE_ZIP=	YES
 NO_BUILD=	YES
+WRKSRC=		${WRKDIR}/xml2rfc
 
 PLIST_SUB=	XXE_DIR=${XXE_DIR}
 
+post-extract:
+	@${RM} -rf ${WRKSRC}/dtd/1.34 ${WRKSRC}/dtd/tmp
+.for i in fwip goober goop.diff patch rfc2629.dtd.orig
+	@${RM} ${WRKSRC}/dtd/${i}
+.endfor
+
 do-install:
 	@cd ${WRKDIR} && tar cf - xml2rfc | \
 		tar -C ${PREFIX}/lib/${XXE_DIR}/addon -xf -
 
-BROKEN=	does not compile
-DEPRECATED=	has been broken for 4 months
-EXPIRATION_DATE=2010-01-08
-
-#.include "${.CURDIR}/../xxe/Makefile.inc"
+.include "../xxe/Makefile.inc"
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/editors/xml2rfc-xxe.orig/distinfo /usr/ports/editors/xml2rfc-xxe/distinfo
--- /usr/ports/editors/xml2rfc-xxe.orig/distinfo	2005-12-09 22:15:49.000000000 +0100
+++ /usr/ports/editors/xml2rfc-xxe/distinfo	2010-09-23 23:11:51.100175645 +0200
@@ -1,3 +1,3 @@
-MD5 (xml2rfc-xxe-0.7.1.zip) = 0afd72afeac9101cf13aab20e1bc56b5
-SHA256 (xml2rfc-xxe-0.7.1.zip) = 4b57617c3e3017494eae1c8d66c3b5c632c7a52541c46b08a985f44824de315d
-SIZE (xml2rfc-xxe-0.7.1.zip) = 125612
+MD5 (xml2rfc-xxe-0.7.8.zip) = 512d77c6b28612417f81d58666e43057
+SHA256 (xml2rfc-xxe-0.7.8.zip) = 1a1a2deb99a9adbfa92ff006396e93f92f638d22903d220348c417b347c4df84
+SIZE (xml2rfc-xxe-0.7.8.zip) = 160746
diff -ruN --exclude=CVS /usr/ports/editors/xml2rfc-xxe.orig/files/patch-xml2rfc_catalog.xml /usr/ports/editors/xml2rfc-xxe/files/patch-xml2rfc_catalog.xml
--- /usr/ports/editors/xml2rfc-xxe.orig/files/patch-xml2rfc_catalog.xml	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/editors/xml2rfc-xxe/files/patch-xml2rfc_catalog.xml	2010-09-24 02:32:10.830850689 +0200
@@ -0,0 +1,15 @@
+Index: xml2rfc_catalog.xml
+===================================================================
+--- xml2rfc_catalog.xml	(wersja 272)
++++ xml2rfc_catalog.xml	(kopia robocza)
+@@ -10,8 +10,8 @@
+               rewritePrefix="http://xml.resource.org/public/rfc/bibxml3/" />
+ 
+   <rewriteURI uriStartString="xml2rfc-rfcindex:"
+-              rewritePrefix="ftp://ftp.isi.edu/in-notes/" />
++              rewritePrefix="ftp://ftp.rfc-editor.org/in-notes/" />
+   <rewriteURI uriStartString="xml2rfc-ietfidstatus:"
+-              rewritePrefix="http://www.fenron.com/~fenner/ietf/" />
++              rewritePrefix="http://fenron.net/~fenner/ietf/" />
+ 
+ </catalog>
diff -ruN --exclude=CVS /usr/ports/editors/xml2rfc-xxe.orig/pkg-descr /usr/ports/editors/xml2rfc-xxe/pkg-descr
--- /usr/ports/editors/xml2rfc-xxe.orig/pkg-descr	2005-12-09 22:15:49.000000000 +0100
+++ /usr/ports/editors/xml2rfc-xxe/pkg-descr	2010-09-23 23:12:21.351714154 +0200
@@ -4,4 +4,4 @@
 locally-installed xml2rfc, conversion to HTML using XSL-FO,
 and more.
 
-WWW:	http://rtg.ietf.org/~fenner/ietf/xml2rfc-xxe/
+WWW:	http://code.google.com/p/xml2rfc-xxe/
diff -ruN --exclude=CVS /usr/ports/editors/xml2rfc-xxe.orig/pkg-plist /usr/ports/editors/xml2rfc-xxe/pkg-plist
--- /usr/ports/editors/xml2rfc-xxe.orig/pkg-plist	2006-10-14 19:31:16.000000000 +0200
+++ /usr/ports/editors/xml2rfc-xxe/pkg-plist	2010-09-24 02:56:08.402121187 +0200
@@ -1,4 +1,7 @@
+lib/%%XXE_DIR%%/addon/xml2rfc/css/structure.css
 lib/%%XXE_DIR%%/addon/xml2rfc/css/xml2rfc.css
+lib/%%XXE_DIR%%/addon/xml2rfc/dtd/num.xml
+lib/%%XXE_DIR%%/addon/xml2rfc/dtd/proc.xml
 lib/%%XXE_DIR%%/addon/xml2rfc/dtd/rfc2629-other.ent
 lib/%%XXE_DIR%%/addon/xml2rfc/dtd/rfc2629-xhtml.ent
 lib/%%XXE_DIR%%/addon/xml2rfc/dtd/rfc2629.dtd
@@ -21,6 +24,7 @@
 lib/%%XXE_DIR%%/addon/xml2rfc/version.txt
 lib/%%XXE_DIR%%/addon/xml2rfc/xml2rfc.jar
 lib/%%XXE_DIR%%/addon/xml2rfc/xml2rfc.xxe
+lib/%%XXE_DIR%%/addon/xml2rfc/xml2rfc.xxe_addon
 lib/%%XXE_DIR%%/addon/xml2rfc/xml2rfc_catalog.xml
 lib/%%XXE_DIR%%/addon/xml2rfc/xml2rfc_help.jar
 lib/%%XXE_DIR%%/addon/xml2rfc/xsl/check-ietf-references.xslt
--- xml2rfc-xxe4.6.1-0.7.8.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

