2 files changed, 41 insertions, 43 deletions

diff --git a/editors/xml2rfc-xxe/Makefile b/editors/xml2rfc-xxe/Makefile
index 6bd1c65cda67..603090b9a6ce 100644
--- a/editors/xml2rfc-xxe/Makefile
+++ b/editors/xml2rfc-xxe/Makefile
@@ -9,24 +9,22 @@ PORTNAME=	xml2rfc-xxe
 PORTVERSION=	0.7.1
 CATEGORIES=	editors
 MASTER_SITES=	http://rtg.ietf.org/~fenner/ietf/
+PKGNAMESUFFIX=	-${XXE_VERSION}
 
 MAINTAINER=	fenner@FreeBSD.org
 COMMENT=	An xml2rfc configuration for XMLMind XML Editor
 
 RUN_DEPENDS=	xxe:${PORTSDIR}/editors/xxe
 
-BROKEN=		Does not build
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
 USE_ZIP=	YES
 NO_BUILD=	YES
 
-XXE_VERSION=	30p1
-PLIST_SUB=	XXE_VERSION=${XXE_VERSION}
+PLIST_SUB=	XXE_DIR=${XXE_DIR}
 
 do-install:
 	@cd ${WRKDIR} && tar cf - xml2rfc | \
-		tar -C ${PREFIX}/lib/xxe-std-${XXE_VERSION}/addon -xf -
+		tar -C ${PREFIX}/lib/${XXE_DIR}/addon -xf -
+
+.include "${.CURDIR}/../xxe/Makefile.inc"
 
 .include <bsd.port.mk>
diff --git a/editors/xml2rfc-xxe/pkg-plist b/editors/xml2rfc-xxe/pkg-plist
index b5e2842d1852..027c2e4fbcc8 100644
--- a/editors/xml2rfc-xxe/pkg-plist
+++ b/editors/xml2rfc-xxe/pkg-plist
@@ -1,36 +1,36 @@
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/css/xml2rfc.css
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/dtd/rfc2629-other.ent
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/dtd/rfc2629-xhtml.ent
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/dtd/rfc2629.dtd
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/empty-draft.xml
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/decrsectlevel.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/emphasis_menu.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/figure.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/incrsectlevel.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/itemizedlist.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/list_menu.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/navigate2.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/navigateNext2.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/navigatePrevious2.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/orderedlist.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/para.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/plain.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/section.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons/table.gif
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/new-draft.xml
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/version.txt
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/xml2rfc.jar
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/xml2rfc.xxe
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/xml2rfc_catalog.xml
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/xml2rfc_help.jar
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/xsl/check-ietf-references.xslt
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/xsl/expand-pi-rfc-include.xslt
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/xsl/rfc2629.xslt
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/xsl/rfc2629toFO.xslt
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/xsl/xsl11toFop.xslt
-lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/xsl/xsl11toXep.xslt
-@dirrm lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/css
-@dirrm lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/dtd
-@dirrm lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/icons
-@dirrm lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc/xsl
-@dirrm lib/xxe-std-%%XXE_VERSION%%/addon/xml2rfc
+lib/%%XXE_DIR%%/addon/xml2rfc/css/xml2rfc.css
+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
+lib/%%XXE_DIR%%/addon/xml2rfc/empty-draft.xml
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/decrsectlevel.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/emphasis_menu.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/figure.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/incrsectlevel.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/itemizedlist.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/list_menu.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/navigate2.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/navigateNext2.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/navigatePrevious2.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/orderedlist.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/para.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/plain.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/section.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/icons/table.gif
+lib/%%XXE_DIR%%/addon/xml2rfc/new-draft.xml
+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_catalog.xml
+lib/%%XXE_DIR%%/addon/xml2rfc/xml2rfc_help.jar
+lib/%%XXE_DIR%%/addon/xml2rfc/xsl/check-ietf-references.xslt
+lib/%%XXE_DIR%%/addon/xml2rfc/xsl/expand-pi-rfc-include.xslt
+lib/%%XXE_DIR%%/addon/xml2rfc/xsl/rfc2629.xslt
+lib/%%XXE_DIR%%/addon/xml2rfc/xsl/rfc2629toFO.xslt
+lib/%%XXE_DIR%%/addon/xml2rfc/xsl/xsl11toFop.xslt
+lib/%%XXE_DIR%%/addon/xml2rfc/xsl/xsl11toXep.xslt
+@dirrm lib/%%XXE_DIR%%/addon/xml2rfc/css
+@dirrm lib/%%XXE_DIR%%/addon/xml2rfc/dtd
+@dirrm lib/%%XXE_DIR%%/addon/xml2rfc/icons
+@dirrm lib/%%XXE_DIR%%/addon/xml2rfc/xsl
+@dirrm lib/%%XXE_DIR%%/addon/xml2rfc