- Update to 1.1.20070216

- Cleanup and make more consistent with similar ports
- Take maintainership

3 files changed, 46 insertions, 26 deletions

diff --git a/textproc/xhtml-11/Makefile b/textproc/xhtml-11/Makefile
index dbda5e70f1bb..e66f459b8fc5 100644
--- a/textproc/xhtml-11/Makefile
+++ b/textproc/xhtml-11/Makefile
@@ -6,36 +6,51 @@
 #
 
 PORTNAME=	xhtml
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.${RECDATE}
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.w3.org/TR/xhtml11/
+MASTER_SITES=	http://www.w3.org/TR/2007/WD-xhtml11-${RECDATE}/
 DISTNAME=	xhtml11
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	W3C's XHTML 1.1 DTD
 
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
-BROKEN=		Checksum mismatch
+RECDATE=	20070216
 
 LATEST_LINK=	xhtml-11
-WRKSRC=		${WRKDIR}/xhtml11-20010531
+WRKSRC=		${WRKDIR}/xhtml11-20070216
 NO_BUILD=	yes
-PLIST_SUB=	XMLCATMGR=${XMLCATMGR} DTDDIR=${DTDDIR} \
-		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
+PLIST_SUB+=	XMLCAT_ADD="${XMLCAT_ADD}" \
+		XMLCAT_RM="${XMLCAT_RM}" \
+		SGMLCAT_ADD="${SGMLCAT_ADD}" \
+		SGMLCAT_RM="${SGMLCAT_RM}"
 
-DTDDIR=		${PREFIX}/share/xml/${PORTNAME}/${PORTVERSION}
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
+SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
+XMLCAT=		${PREFIX}/share/xml/catalog.ports
+
+XMLCAT_ADD=	${XMLCATMGR} -c ${XMLCAT} add nextCatalog \
+		    ${PREFIX}/${DTDDIR}/catalog.xml
+XMLCAT_RM=	${XMLCATMGR} -c ${XMLCAT} remove \
+		    ${PREFIX}/${DTDDIR}/catalog.xml
+SGMLCAT_ADD=	${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \
+		    ${PREFIX}/${DTDDIR}/xhtml11.cat
+SGMLCAT_RM=	${XMLCATMGR} -sc ${SGMLCAT} remove \
+		    ${PREFIX}/${DTDDIR}/xhtml11.cat
+
+DTDDIR=		share/xml/${PORTNAME}/1.1/dtd
+XSDDIR=		share/xml/${PORTNAME}/1.1/xsd
 
 do-install:
-	${MKDIR} ${DTDDIR}
-	${INSTALL_DATA} ${WRKSRC}/DTD/* ${DTDDIR}
+	${MKDIR} ${PREFIX}/${DTDDIR}
+	${INSTALL_DATA} ${WRKSRC}/DTD/* ${PREFIX}/${DTDDIR}
+	${MKDIR} ${PREFIX}/${XSDDIR}
+	${INSTALL_DATA} ${WRKSRC}/SCHEMA/* ${PREFIX}/${XSDDIR}
 
 post-install:
-	${XMLCATMGR} -sc ${CATALOG_PORTS_SGML}	\
-		add CATALOG ${DTDDIR}/xhtml11.cat
+#	${XMLCAT_ADD}
+	${SGMLCAT_ADD}
 
 .include <bsd.port.mk>
diff --git a/textproc/xhtml-11/distinfo b/textproc/xhtml-11/distinfo
index f9bfb694c147..35c9beeac391 100644
--- a/textproc/xhtml-11/distinfo
+++ b/textproc/xhtml-11/distinfo
@@ -1,3 +1,3 @@
-MD5 (xhtml11.tgz) = 00c3fe896f3d29419dbda4186aa98fe1
-SHA256 (xhtml11.tgz) = f6fa0fa6c3a9de7e8e29ab5f947285a1e84c47640a4802036970e76da27c79be
-SIZE (xhtml11.tgz) = 117488
+MD5 (xhtml11.tgz) = 919abed7ec7d2c0ce432b5d69ed685f6
+SHA256 (xhtml11.tgz) = 9ff808fcb264ca2c13d540194cdd2286d1cdd7c346e622620d2e4c0e39265945
+SIZE (xhtml11.tgz) = 192036
diff --git a/textproc/xhtml-11/pkg-plist b/textproc/xhtml-11/pkg-plist
index 6790561eaae4..db7c0444527a 100644
--- a/textproc/xhtml-11/pkg-plist
+++ b/textproc/xhtml-11/pkg-plist
@@ -1,11 +1,16 @@
-share/xml/xhtml/1.1/VERSION
-share/xml/xhtml/1.1/xhtml11-flat.dtd
-share/xml/xhtml/1.1/xhtml11-model-1.mod
-@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/xhtml11.cat
-share/xml/xhtml/1.1/xhtml11.cat
-@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/xhtml11.cat
-share/xml/xhtml/1.1/xhtml11.dtd
-share/xml/xhtml/1.1/xml1.dcl
-share/xml/xhtml/1.1/xml1n.dcl
+@unexec %%SGMLCAT_RM%%
+share/xml/xhtml/1.1/dtd/VERSION
+share/xml/xhtml/1.1/dtd/xhtml11-flat.dtd
+share/xml/xhtml/1.1/dtd/xhtml11-model-1.mod
+share/xml/xhtml/1.1/dtd/xhtml11.cat
+share/xml/xhtml/1.1/dtd/xhtml11.dtd
+share/xml/xhtml/1.1/dtd/xml1.dcl
+share/xml/xhtml/1.1/dtd/xml1n.dcl
+share/xml/xhtml/1.1/xsd/xhtml11-model-1.xsd
+share/xml/xhtml/1.1/xsd/xhtml11-modules-1.xsd
+share/xml/xhtml/1.1/xsd/xhtml11.xsd
+@dirrm share/xml/xhtml/1.1/dtd
+@dirrm share/xml/xhtml/1.1/xsd
 @dirrm share/xml/xhtml/1.1
 @dirrmtry share/xml/xhtml
+@exec %%SGMLCAT_ADD%%