- Add option to install XML character entities

- Ignore error if catalog is already registered
- Cleanup and consistency with similar ports
- Bump PORTREVISION

2 files changed, 54 insertions, 62 deletions

diff --git a/textproc/docbook-500/Makefile b/textproc/docbook-500/Makefile
index 1655caea639f..703db3982c3c 100644
--- a/textproc/docbook-500/Makefile
+++ b/textproc/docbook-500/Makefile
@@ -6,14 +6,14 @@
 
 PORTNAME=	docbook
 PORTVERSION=	5.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.docbook.org/xml/5.0/
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	DocBook 5.0, designed for technical documentation
 
-RUN_DEPENDS=	${LOCALBASE}/${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_ZIP=	yes
 NO_BUILD=	yes
@@ -22,39 +22,48 @@ LATEST_LINK=	${PORTNAME}-500
 DOCBOOKDIR=	share/xml/${PORTNAME}/${PORTVERSION}
 DOCSDIR=	${PREFIX}/${DOCBOOKDIR}/docs
 
+PLIST_SUB+=	XMLCAT_ADD="${XMLCAT_ADD}" \
+		XMLCAT_RM="${XMLCAT_RM}"
+
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
-REGIST_CAT_FLAGS_XML=	-c ${CATALOG_PORTS_XML} \
-			add nextCatalog ${DOCBOOKDIR}/catalog.xml
-UNREGIST_CAT_FLAGS_XML=	-c ${CATALOG_PORTS_XML} \
-			remove nextCatalog ${DOCBOOKDIR}/catalog.xml
+XMLCAT=		${PREFIX}/share/xml/catalog.ports
+
+XMLCAT_ADD=	${XMLCATMGR} -c ${XMLCAT} add nextCatalog \
+		    ${PREFIX}/${DOCBOOKDIR}/catalog.xml
+XMLCAT_RM=	${XMLCATMGR} -c ${XMLCAT} remove \
+		    ${PREFIX}/${DOCBOOKDIR}/catalog.xml
 
 OPTIONS=	DTD     	"XML DTD"   				on \
 		SCHEMA		"W3C XML Schema"			on \
 		RELAX_NG	"RELAX NG Schema"			on \
 		SCHEMATRON	"Schematron constraints"		on \
 		NVDL		"NVDL description"			on \
-		TOOLS		"Tools for working with DocBook"	on
+		TOOLS		"Tools for working with DocBook"	on \
+		XMLCHARENT	"Install ISO 8879 XML entites"		on
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DTD)
 PLIST_SUB+=	DTD=""
+MODULES+=	dtd
 .else
 PLIST_SUB+=	DTD="@comment "
 .endif
 .if defined(WITH_SCHEMA)
 PLIST_SUB+=	SCHEMA=""
+MODULES+=	xsd
 .else
 PLIST_SUB+=	SCHEMA="@comment "
 .endif
 .if defined(WITH_RELAX_NG)
 PLIST_SUB+=	RELAXNG=""
+MODULES+=	rng
 .else
 PLIST_SUB+=	RELAXNG="@comment "
 .endif
 .if defined(WITH_SCHEMATRON)
 PLIST_SUB+=	SCHEMATRON=""
+MODULES+=	sch
 .else
 PLIST_SUB+=	SCHEMATRON="@comment "
 .endif
@@ -65,62 +74,43 @@ PLIST_SUB+=	NVDL="@comment "
 .endif
 .if defined(WITH_TOOLS)
 PLIST_SUB+=	TOOLS=""
+MODULES+=	tools
 .else
 PLIST_SUB+=	TOOLS="@comment "
 .endif
-.if defined(NOPORTDOCS)
-PLIST_SUB+=	NOPORTDOCS="@comment "
-.else
-PLIST_SUB+=	NOPORTDOCS=""
+.if defined(WITH_XMLCHARENT)
+RUN_DEPENDS+=	${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent
 .endif
 
 do-install:
 	${MKDIR} ${PREFIX}/${DOCBOOKDIR}
 	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${PREFIX}/${DOCBOOKDIR}
-.if defined(WITH_DTD)
-	${MKDIR} ${PREFIX}/${DOCBOOKDIR}/dtd
-	${INSTALL_DATA} ${WRKSRC}/dtd/docbook.dtd ${PREFIX}/${DOCBOOKDIR}/dtd
-.endif
-.if defined(WITH_SCHEMA)
-	${MKDIR} ${PREFIX}/${DOCBOOKDIR}/xsd
-.for i in docbook.xsd xlink.xsd xml.xsd
-	${INSTALL_DATA} ${WRKSRC}/xsd/${i} ${PREFIX}/${DOCBOOKDIR}/xsd
-.endfor
-.endif
-.if defined(WITH_RELAX_NG)
-	${MKDIR} ${PREFIX}/${DOCBOOKDIR}/rng
-.for i in docbook.rnc docbook.rng docbookxi.rnc docbookxi.rng
-	${INSTALL_DATA} ${WRKSRC}/rng/${i} ${PREFIX}/${DOCBOOKDIR}/rng
+.for m in ${MODULES}
+		${MKDIR} ${PREFIX}/${DOCBOOKDIR}/${m}
+		files=$$(${FIND} ${WRKSRC}/${m} -type f); \
+		for i in $${files}; do \
+			${INSTALL_DATA} $${i} ${PREFIX}/${DOCBOOKDIR}/${m}; \
+		done
 .endfor
-.endif
-.if defined(WITH_SCHEMATRON)
-	${MKDIR} ${PREFIX}/${DOCBOOKDIR}/sch
-	${INSTALL_DATA} ${WRKSRC}/sch/docbook.sch ${PREFIX}/${DOCBOOKDIR}/sch
-.endif
 .if defined(WITH_NVDL)
 	${MKDIR} ${PREFIX}/${DOCBOOKDIR}/nvdl
 	${INSTALL_DATA} ${WRKSRC}/docbook.nvdl ${PREFIX}/${DOCBOOKDIR}/nvdl
 .endif
-.if defined(WITH_TOOLS)
-	${MKDIR} ${PREFIX}/${DOCBOOKDIR}/tools
-.for i in db4-entities.pl db4-upgrade.xsl
-	${INSTALL_DATA} ${WRKSRC}/tools/${i} ${PREFIX}/${DOCBOOKDIR}/tools
-.endfor
-.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in ChangeLog README VERSION docs/docbook-5.0-spec-cd-01.html \
-	docs/docbook-5.0-spec-cd-01.pdf docs/docbook-5.0-spec-cd-01.xml \
-	docs/howto.html docs/howto.pdf docs/howto.xml
-		${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	files1=$$(${FIND} ${WRKSRC} -type f -depth 1| ${GREP} -v -e "$.xml" -e "$.nvdl"); \
+	files2=$$(${FIND} ${WRKSRC}/docs -type f -depth 1); \
+	for i in $${files1} $${files2}; do \
+		${INSTALL_DATA} $${i} ${DOCSDIR}; \
+	done
 	${MKDIR} ${DOCSDIR}/images
-.for i in emacs.png oxygen1.png oxygen2.png oxygen3.png xxe.png
-	${INSTALL_DATA} ${WRKSRC}/docs/images/${i} ${DOCSDIR}/images
-.endfor
+	files=$$(${FIND} ${WRKSRC}/docs/images -type f); \
+	for i in $${files}; do \
+		${INSTALL_DATA} $${i} ${DOCSDIR}/images; \
+	done
 .endif
 
 post-install:
-	-${XMLCATMGR} ${REGIST_CAT_FLAGS_XML}
+	-${XMLCAT_ADD}
 
 .include <bsd.port.post.mk>
diff --git a/textproc/docbook-500/pkg-plist b/textproc/docbook-500/pkg-plist
index 119d1c19148d..3abfe03f101b 100644
--- a/textproc/docbook-500/pkg-plist
+++ b/textproc/docbook-500/pkg-plist
@@ -1,20 +1,21 @@
+@unexec %%XMLCAT_RM%%
 share/xml/docbook/5.0/catalog.xml
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/ChangeLog
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/README
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/VERSION
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/docbook-5.0-spec-cd-01.html
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/docbook-5.0-spec-cd-01.pdf
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/docbook-5.0-spec-cd-01.xml
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/howto.html
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/howto.pdf
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/howto.xml
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/images/emacs.png
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/images/oxygen1.png
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/images/oxygen2.png
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/images/oxygen3.png
-%%NOPORTDOCS%%share/xml/docbook/5.0/docs/images/xxe.png
-%%NOPORTDOCS%%@dirrm share/xml/docbook/5.0/docs/images
-%%NOPORTDOCS%%@dirrm share/xml/docbook/5.0/docs
+%%PORTDOCS%%share/xml/docbook/5.0/docs/ChangeLog
+%%PORTDOCS%%share/xml/docbook/5.0/docs/README
+%%PORTDOCS%%share/xml/docbook/5.0/docs/VERSION
+%%PORTDOCS%%share/xml/docbook/5.0/docs/docbook-5.0-spec-cd-01.html
+%%PORTDOCS%%share/xml/docbook/5.0/docs/docbook-5.0-spec-cd-01.pdf
+%%PORTDOCS%%share/xml/docbook/5.0/docs/docbook-5.0-spec-cd-01.xml
+%%PORTDOCS%%share/xml/docbook/5.0/docs/howto.html
+%%PORTDOCS%%share/xml/docbook/5.0/docs/howto.pdf
+%%PORTDOCS%%share/xml/docbook/5.0/docs/howto.xml
+%%PORTDOCS%%share/xml/docbook/5.0/docs/images/emacs.png
+%%PORTDOCS%%share/xml/docbook/5.0/docs/images/oxygen1.png
+%%PORTDOCS%%share/xml/docbook/5.0/docs/images/oxygen2.png
+%%PORTDOCS%%share/xml/docbook/5.0/docs/images/oxygen3.png
+%%PORTDOCS%%share/xml/docbook/5.0/docs/images/xxe.png
+%%PORTDOCS%%@dirrm share/xml/docbook/5.0/docs/images
+%%PORTDOCS%%@dirrm share/xml/docbook/5.0/docs
 %%DTD%%share/xml/docbook/5.0/dtd/docbook.dtd
 %%DTD%%@dirrm share/xml/docbook/5.0/dtd
 %%NVDL%%share/xml/docbook/5.0/nvdl/docbook.nvdl
@@ -36,3 +37,4 @@ share/xml/docbook/5.0/catalog.xml
 @dirrm share/xml/docbook/5.0
 @dirrmtry share/xml/docbook
 @dirrmtry share/xml
+@exec %%XMLCAT_ADD%%