Modify installation directory and install catalog.

Submitted by:	kiri

8 files changed, 144 insertions, 86 deletions

diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index 83ffc1b0b13f..d24011852869 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -19,22 +19,23 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
 
 INSTDIR=	${PREFIX}/share/xml
-DTDDIR=		${INSTDIR}/dtd/docbook
-ENTDIR=		${INSTDIR}/entity
-MISCDIR=	${INSTDIR}/misc/docbook
+DTDDIR=		${INSTDIR}/docbook
+ENTDIR=		${INSTDIR}/docbook/ent
 DTDFILES=	calstblx.dtd dbcentx.mod dbgenent.mod dbhierx.mod \
 		dbnotnx.mod dbpoolx.mod docbookx.dtd soextblx.dtd
-MISCFILES=	40chg.txt readme.txt
+MISCFILES=	40chg.txt 41chg.txt readme.txt
+
+post-extract:
+	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/catalog.tmpl > ${WRKSRC}/catalog
 
 pre-install:
-	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
-	@[ -d ${DTDDIR}	 ] || ${MKDIR} ${DTDDIR}
-	@[ -d ${ENTDIR}	 ] || ${MKDIR} ${ENTDIR}
-	@[ -d ${MISCDIR} ] || ${MKDIR} ${MISCDIR}
+	${MKDIR} ${ENTDIR}
 
 do-install:
 	@(cd ${WRKSRC};     ${INSTALL_DATA} ${DTDFILES} ${DTDDIR})
 	@(cd ${WRKSRC}/ent; ${INSTALL_DATA} *.ent ${ENTDIR})
-	@(cd ${WRKSRC};     ${INSTALL_DATA} ${MISCFILES} ${MISCDIR})
+	@(cd ${WRKSRC};     ${INSTALL_DATA} ${MISCFILES} ${DTDDIR})
+	${INSTALL_DATA} ${WRKSRC}/catalog ${INSTDIR}
+	${INSTALL_DATA} ${FILESDIR}/catalog.docbook ${DTDDIR}/catalog
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook-sk/files/catalog.docbook b/textproc/docbook-sk/files/catalog.docbook
new file mode 100644
index 000000000000..118fcd9085ad
--- /dev/null
+++ b/textproc/docbook-sk/files/catalog.docbook
@@ -0,0 +1,27 @@
+PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
+PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" "calstblx.dtd"
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
+PUBLIC "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" "dbpoolx.mod"
+PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" "dbhierx.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" "dbgenent.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" "dbnotnx.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" "dbcentx.mod"
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
diff --git a/textproc/docbook-sk/files/catalog.tmpl b/textproc/docbook-sk/files/catalog.tmpl
new file mode 100644
index 000000000000..4165882fd08a
--- /dev/null
+++ b/textproc/docbook-sk/files/catalog.tmpl
@@ -0,0 +1 @@
+CATALOG "%%PREFIX%%/share/xml/docbook/catalog"
diff --git a/textproc/docbook-sk/pkg-plist b/textproc/docbook-sk/pkg-plist
index 30a45b805f37..91d329405f3f 100644
--- a/textproc/docbook-sk/pkg-plist
+++ b/textproc/docbook-sk/pkg-plist
@@ -1,35 +1,35 @@
-share/xml/dtd/docbook/calstblx.dtd
-share/xml/dtd/docbook/dbcentx.mod
-share/xml/dtd/docbook/dbgenent.mod
-share/xml/dtd/docbook/dbhierx.mod
-share/xml/dtd/docbook/dbnotnx.mod
-share/xml/dtd/docbook/dbpoolx.mod
-share/xml/dtd/docbook/docbookx.dtd
-share/xml/dtd/docbook/soextblx.dtd
-share/xml/entity/iso-amsa.ent
-share/xml/entity/iso-amsb.ent
-share/xml/entity/iso-amsc.ent
-share/xml/entity/iso-amsn.ent
-share/xml/entity/iso-amso.ent
-share/xml/entity/iso-amsr.ent
-share/xml/entity/iso-box.ent
-share/xml/entity/iso-cyr1.ent
-share/xml/entity/iso-cyr2.ent
-share/xml/entity/iso-dia.ent
-share/xml/entity/iso-grk1.ent
-share/xml/entity/iso-grk2.ent
-share/xml/entity/iso-grk3.ent
-share/xml/entity/iso-grk4.ent
-share/xml/entity/iso-lat1.ent
-share/xml/entity/iso-lat2.ent
-share/xml/entity/iso-num.ent
-share/xml/entity/iso-pub.ent
-share/xml/entity/iso-tech.ent
-share/xml/misc/docbook/40chg.txt
-share/xml/misc/docbook/readme.txt
-@dirrm share/xml/dtd/docbook
-@dirrm share/xml/misc/docbook
-@unexec rmdir %D/share/xml/dtd 2>/dev/null || true
-@unexec rmdir %D/share/xml/misc 2>/dev/null || true
-@unexec rmdir %D/share/xml/entity 2>/dev/null || true
+share/xml/catalog
+share/xml/docbook/40chg.txt
+share/xml/docbook/41chg.txt
+share/xml/docbook/calstblx.dtd
+share/xml/docbook/catalog
+share/xml/docbook/dbcentx.mod
+share/xml/docbook/dbgenent.mod
+share/xml/docbook/dbhierx.mod
+share/xml/docbook/dbnotnx.mod
+share/xml/docbook/dbpoolx.mod
+share/xml/docbook/docbookx.dtd
+share/xml/docbook/ent/iso-amsa.ent
+share/xml/docbook/ent/iso-amsb.ent
+share/xml/docbook/ent/iso-amsc.ent
+share/xml/docbook/ent/iso-amsn.ent
+share/xml/docbook/ent/iso-amso.ent
+share/xml/docbook/ent/iso-amsr.ent
+share/xml/docbook/ent/iso-box.ent
+share/xml/docbook/ent/iso-cyr1.ent
+share/xml/docbook/ent/iso-cyr2.ent
+share/xml/docbook/ent/iso-dia.ent
+share/xml/docbook/ent/iso-grk1.ent
+share/xml/docbook/ent/iso-grk2.ent
+share/xml/docbook/ent/iso-grk3.ent
+share/xml/docbook/ent/iso-grk4.ent
+share/xml/docbook/ent/iso-lat1.ent
+share/xml/docbook/ent/iso-lat2.ent
+share/xml/docbook/ent/iso-num.ent
+share/xml/docbook/ent/iso-pub.ent
+share/xml/docbook/ent/iso-tech.ent
+share/xml/docbook/readme.txt
+share/xml/docbook/soextblx.dtd
+@dirrm share/xml/docbook/ent
+@unexec rmdir %D/share/xml/docbook 2>/dev/null || true
 @unexec rmdir %D/share/xml 2>/dev/null || true
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index 83ffc1b0b13f..d24011852869 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -19,22 +19,23 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
 
 INSTDIR=	${PREFIX}/share/xml
-DTDDIR=		${INSTDIR}/dtd/docbook
-ENTDIR=		${INSTDIR}/entity
-MISCDIR=	${INSTDIR}/misc/docbook
+DTDDIR=		${INSTDIR}/docbook
+ENTDIR=		${INSTDIR}/docbook/ent
 DTDFILES=	calstblx.dtd dbcentx.mod dbgenent.mod dbhierx.mod \
 		dbnotnx.mod dbpoolx.mod docbookx.dtd soextblx.dtd
-MISCFILES=	40chg.txt readme.txt
+MISCFILES=	40chg.txt 41chg.txt readme.txt
+
+post-extract:
+	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/catalog.tmpl > ${WRKSRC}/catalog
 
 pre-install:
-	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
-	@[ -d ${DTDDIR}	 ] || ${MKDIR} ${DTDDIR}
-	@[ -d ${ENTDIR}	 ] || ${MKDIR} ${ENTDIR}
-	@[ -d ${MISCDIR} ] || ${MKDIR} ${MISCDIR}
+	${MKDIR} ${ENTDIR}
 
 do-install:
 	@(cd ${WRKSRC};     ${INSTALL_DATA} ${DTDFILES} ${DTDDIR})
 	@(cd ${WRKSRC}/ent; ${INSTALL_DATA} *.ent ${ENTDIR})
-	@(cd ${WRKSRC};     ${INSTALL_DATA} ${MISCFILES} ${MISCDIR})
+	@(cd ${WRKSRC};     ${INSTALL_DATA} ${MISCFILES} ${DTDDIR})
+	${INSTALL_DATA} ${WRKSRC}/catalog ${INSTDIR}
+	${INSTALL_DATA} ${FILESDIR}/catalog.docbook ${DTDDIR}/catalog
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook-xml/files/catalog.docbook b/textproc/docbook-xml/files/catalog.docbook
new file mode 100644
index 000000000000..118fcd9085ad
--- /dev/null
+++ b/textproc/docbook-xml/files/catalog.docbook
@@ -0,0 +1,27 @@
+PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
+PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" "calstblx.dtd"
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
+PUBLIC "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" "dbpoolx.mod"
+PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" "dbhierx.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" "dbgenent.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" "dbnotnx.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" "dbcentx.mod"
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
diff --git a/textproc/docbook-xml/files/catalog.tmpl b/textproc/docbook-xml/files/catalog.tmpl
new file mode 100644
index 000000000000..4165882fd08a
--- /dev/null
+++ b/textproc/docbook-xml/files/catalog.tmpl
@@ -0,0 +1 @@
+CATALOG "%%PREFIX%%/share/xml/docbook/catalog"
diff --git a/textproc/docbook-xml/pkg-plist b/textproc/docbook-xml/pkg-plist
index 30a45b805f37..91d329405f3f 100644
--- a/textproc/docbook-xml/pkg-plist
+++ b/textproc/docbook-xml/pkg-plist
@@ -1,35 +1,35 @@
-share/xml/dtd/docbook/calstblx.dtd
-share/xml/dtd/docbook/dbcentx.mod
-share/xml/dtd/docbook/dbgenent.mod
-share/xml/dtd/docbook/dbhierx.mod
-share/xml/dtd/docbook/dbnotnx.mod
-share/xml/dtd/docbook/dbpoolx.mod
-share/xml/dtd/docbook/docbookx.dtd
-share/xml/dtd/docbook/soextblx.dtd
-share/xml/entity/iso-amsa.ent
-share/xml/entity/iso-amsb.ent
-share/xml/entity/iso-amsc.ent
-share/xml/entity/iso-amsn.ent
-share/xml/entity/iso-amso.ent
-share/xml/entity/iso-amsr.ent
-share/xml/entity/iso-box.ent
-share/xml/entity/iso-cyr1.ent
-share/xml/entity/iso-cyr2.ent
-share/xml/entity/iso-dia.ent
-share/xml/entity/iso-grk1.ent
-share/xml/entity/iso-grk2.ent
-share/xml/entity/iso-grk3.ent
-share/xml/entity/iso-grk4.ent
-share/xml/entity/iso-lat1.ent
-share/xml/entity/iso-lat2.ent
-share/xml/entity/iso-num.ent
-share/xml/entity/iso-pub.ent
-share/xml/entity/iso-tech.ent
-share/xml/misc/docbook/40chg.txt
-share/xml/misc/docbook/readme.txt
-@dirrm share/xml/dtd/docbook
-@dirrm share/xml/misc/docbook
-@unexec rmdir %D/share/xml/dtd 2>/dev/null || true
-@unexec rmdir %D/share/xml/misc 2>/dev/null || true
-@unexec rmdir %D/share/xml/entity 2>/dev/null || true
+share/xml/catalog
+share/xml/docbook/40chg.txt
+share/xml/docbook/41chg.txt
+share/xml/docbook/calstblx.dtd
+share/xml/docbook/catalog
+share/xml/docbook/dbcentx.mod
+share/xml/docbook/dbgenent.mod
+share/xml/docbook/dbhierx.mod
+share/xml/docbook/dbnotnx.mod
+share/xml/docbook/dbpoolx.mod
+share/xml/docbook/docbookx.dtd
+share/xml/docbook/ent/iso-amsa.ent
+share/xml/docbook/ent/iso-amsb.ent
+share/xml/docbook/ent/iso-amsc.ent
+share/xml/docbook/ent/iso-amsn.ent
+share/xml/docbook/ent/iso-amso.ent
+share/xml/docbook/ent/iso-amsr.ent
+share/xml/docbook/ent/iso-box.ent
+share/xml/docbook/ent/iso-cyr1.ent
+share/xml/docbook/ent/iso-cyr2.ent
+share/xml/docbook/ent/iso-dia.ent
+share/xml/docbook/ent/iso-grk1.ent
+share/xml/docbook/ent/iso-grk2.ent
+share/xml/docbook/ent/iso-grk3.ent
+share/xml/docbook/ent/iso-grk4.ent
+share/xml/docbook/ent/iso-lat1.ent
+share/xml/docbook/ent/iso-lat2.ent
+share/xml/docbook/ent/iso-num.ent
+share/xml/docbook/ent/iso-pub.ent
+share/xml/docbook/ent/iso-tech.ent
+share/xml/docbook/readme.txt
+share/xml/docbook/soextblx.dtd
+@dirrm share/xml/docbook/ent
+@unexec rmdir %D/share/xml/docbook 2>/dev/null || true
 @unexec rmdir %D/share/xml 2>/dev/null || true