Index: head/textproc/xhtml-11/Makefile
===================================================================
--- head/textproc/xhtml-11/Makefile	(revision 413908)
+++ head/textproc/xhtml-11/Makefile	(revision 413909)
@@ -1,54 +1,55 @@
 # Created by: Kimura Fuyuki <fuyuki@hadaly.org>
 # $FreeBSD$
 
 PORTNAME=	xhtml
 PORTVERSION=	1.1.${RECDATE}
-PORTREVISION=	2
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.w3.org/TR/2007/WD-xhtml11-${RECDATE}/
-DISTNAME=	xhtml11
+MASTER_SITES=	http://www.w3.org/TR/2010/REC-xhtml11-${RECDATE}/
 PKGNAMESUFFIX=	-11
-EXTRACT_SUFX=	.tgz
+DISTNAME=	xhtml11
+DIST_SUBDIR=	${DISTNAME}-${RECDATE}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	W3C's XHTML 1.1 DTD
 
 RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr
 
-RECDATE=	20070216
+USES=		tar:tgz
+
+RECDATE=	20101123
 
 WRKSRC=		${WRKDIR}/xhtml11-${RECDATE}
 NO_BUILD=	yes
 PLIST_SUB+=	XMLCAT_ADD="${XMLCAT_ADD}" \
 		XMLCAT_RM="${XMLCAT_RM}" \
 		SGMLCAT_ADD="${SGMLCAT_ADD}" \
 		SGMLCAT_RM="${SGMLCAT_RM}"
 
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 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
 
 post-patch:
 	${REINPLACE_CMD} -i '' 's|SGMLDECL "xml1.dcl"|-- SGMLDECL "xml1.dcl" --|g' \
 		 ${WRKSRC}/DTD/xhtml11.cat
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}
 	${INSTALL_DATA} ${WRKSRC}/DTD/* ${STAGEDIR}${PREFIX}/${DTDDIR}
 	${INSTALL_DATA} ${FILESDIR}/catalog.xml ${STAGEDIR}${PREFIX}/${DTDDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${XSDDIR}
 	${INSTALL_DATA} ${WRKSRC}/SCHEMA/* ${STAGEDIR}${PREFIX}/${XSDDIR}
 
 .include <bsd.port.mk>
Index: head/textproc/xhtml-11/distinfo
===================================================================
--- head/textproc/xhtml-11/distinfo	(revision 413908)
+++ head/textproc/xhtml-11/distinfo	(revision 413909)
@@ -1,2 +1,2 @@
-SHA256 (xhtml11.tgz) = 9ff808fcb264ca2c13d540194cdd2286d1cdd7c346e622620d2e4c0e39265945
-SIZE (xhtml11.tgz) = 192036
+SHA256 (xhtml11-20101123/xhtml11.tgz) = 87893d097307cbf6b92fda5656ca3bc46536eeb389ab30b99ea95044d54d4d40
+SIZE (xhtml11-20101123/xhtml11.tgz) = 236494
Index: head/textproc/xhtml-11/pkg-plist
===================================================================
--- head/textproc/xhtml-11/pkg-plist	(revision 413908)
+++ head/textproc/xhtml-11/pkg-plist	(revision 413909)
@@ -1,15 +1,16 @@
-@unexec %%SGMLCAT_RM%%
-@unexec %%XMLCAT_RM%%
+@preunexec %%SGMLCAT_RM%%
+@preunexec %%XMLCAT_RM%%
 share/xml/xhtml/1.1/dtd/VERSION
 share/xml/xhtml/1.1/dtd/catalog.xml
 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/xhtml-ruby-1.xsd
 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
-@exec %%XMLCAT_ADD%%
-@exec %%SGMLCAT_ADD%%
+@postexec %%XMLCAT_ADD%%
+@postexec %%SGMLCAT_ADD%%