[Midnightbsd-cvs] mports: textproc/xhtml-basic: fake fixes.

[ctriv at midnightbsd.org]

Log Message:
-----------
fake fixes.  use the SUB_FILES framework instead of rolling our own.

Modified Files:
--------------
    mports/textproc/xhtml-basic:
        Makefile (r1.2 -> r1.3)

Added Files:
-----------
    mports/textproc/xhtml-basic/files:
        catalog.xml.in (r1.1)

Removed Files:
-------------
    mports/textproc/xhtml-basic/files:
        catalog.xml

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/textproc/xhtml-basic/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L textproc/xhtml-basic/Makefile -L textproc/xhtml-basic/Makefile -u -r1.2 -r1.3
--- textproc/xhtml-basic/Makefile
+++ textproc/xhtml-basic/Makefile
@@ -15,7 +15,7 @@
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	W3C's XHTML Basic DTD
+COMMENT=	W3C's XHTML Basic DTD #'
 LICENSE=	unknown
 
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr \
@@ -23,10 +23,10 @@
 
 RECDATE=	20001219
 
-NO_MTREE=	YES
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/REC-${PORTNAME}-${RECDATE}
 
+
 PLIST=		${WRKDIR}/PLIST
 dir_DTD=	share/xml/dtd/xhtml-basic
 dir_DOC=	share/doc/xhtml-basic
@@ -47,11 +47,13 @@
 CATALOG_PORTS_SGML=	${LOCALBASE}/share/sgml/catalog.ports
 CATALOG_PORTS_XML=	${LOCALBASE}/share/xml/catalog.ports
 
+SUB_FILES= catalog.xml	
+
 .include "${.CURDIR}/contents.inc"
 
 # I'd much rather do this stuff in line with the actual installation
 # in do-install, but the PLIST must be generated in pre-install.
-pre-install:
+pre-fake:
 	${CAT} /dev/null > ${PLIST}
 .for f in ${contents_DTD}
 	${ECHO} ${dir_DTD}/${f} >> ${PLIST}
@@ -69,19 +71,17 @@
 	    ${PLIST}
 	${ECHO} "@dirrm ${dir_DOC}" >> ${PLIST}
 
+pre-fake:
+
 do-install:
-	@[ -d ${PREFIX}/${dir_DTD} ] || \
-	    ${MKDIR} ${PREFIX}/${dir_DTD}
-	@[ -d ${PREFIX}/${dir_DOC} ] || \
-	    ${MKDIR} ${PREFIX}/${dir_DOC}
+	@${MKDIR} ${PREFIX}/${dir_DTD}
+	@${MKDIR} ${PREFIX}/${dir_DOC}
 .for f in ${contents_DTD}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${dir_DTD}/${f}
 .endfor
 .for f in ${contents_DOC}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${dir_DOC}/${f}
 .endfor
-	${SED} -e "s;@@PREFIX@@;${PREFIX};g" ${FILESDIR}/catalog.xml > \
-	    ${WRKDIR}/catalog.xml
 	${INSTALL_DATA} ${WRKDIR}/catalog.xml ${PREFIX}/${dir_DTD}/catalog.xml
 	${MKDIR} ${PREFIX}/share/sgml
 	${MKDIR} ${PREFIX}/share/xml
--- /dev/null
+++ textproc/xhtml-basic/files/catalog.xml.in
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+  "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" >
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
+  prefer="public"
+  xml:base="file://%%PREFIX%%/share/xml/dtd/xhtml-basic/">
+
+  <rewriteSystem
+    systemIdStartString="http://www.w3.org/TR/xhtml-basic/"
+    rewritePrefix="./" />
+
+  <public
+    publicId="-//W3C//DTD XHTML Basic 1.0//EN"
+    uri="xhtml-basic10.dtd" />
+  <public
+    publicId="-//W3C//DTD XHTML Basic Document Model 1.0//EN"
+    uri="xhtml-basic10-model-1.mod" />
+
+</catalog>
--- textproc/xhtml-basic/files/catalog.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
-  "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" >
-
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
-  prefer="public"
-  xml:base="file://@@PREFIX@@/share/xml/dtd/xhtml-basic/">
-
-  <rewriteSystem
-    systemIdStartString="http://www.w3.org/TR/xhtml-basic/"
-    rewritePrefix="./" />
-
-  <public
-    publicId="-//W3C//DTD XHTML Basic 1.0//EN"
-    uri="xhtml-basic10.dtd" />
-  <public
-    publicId="-//W3C//DTD XHTML Basic Document Model 1.0//EN"
-    uri="xhtml-basic10-model-1.mod" />
-
-</catalog>