svn commit: r344920 - in head/textproc: docbook sdocbook-xml sdocbook-xml/files

Mathieu Arnold mat at FreeBSD.org
Tue Feb 18 16:17:42 UTC 2014 

Author: mat
Date: Tue Feb 18 16:17:40 2014
New Revision: 344920
URL: http://svnweb.freebsd.org/changeset/ports/344920
QAT: https://qat.redports.org/buildarchive/r344920/

Log:
  Convert textproc/sdocbook to staging.
  
  Sponsored by:	Absolight

Added:
  head/textproc/sdocbook-xml/files/catalog.in
     - copied unchanged from r344867, head/textproc/sdocbook-xml/files/catalog
  head/textproc/sdocbook-xml/files/catalog.xml.in
     - copied, changed from r344867, head/textproc/sdocbook-xml/files/catalog.xml
Deleted:
  head/textproc/sdocbook-xml/files/catalog
  head/textproc/sdocbook-xml/files/catalog.xml
Modified:
  head/textproc/docbook/bsd.docbook.mk
  head/textproc/sdocbook-xml/Makefile
  head/textproc/sdocbook-xml/pkg-plist

Modified: head/textproc/docbook/bsd.docbook.mk
==============================================================================
--- head/textproc/docbook/bsd.docbook.mk	Tue Feb 18 16:14:02 2014	(r344919)
+++ head/textproc/docbook/bsd.docbook.mk	Tue Feb 18 16:17:40 2014	(r344920)
@@ -30,6 +30,7 @@ NO_BUILD=	yes
 EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
 .endif
 
+CATALOG_FILES?=	catalog
 XMLCATMGR=	bin/xmlcatmgr
 SGMLCAT=	share/sgml/catalog.ports
 ISOCAT=		share/sgml/iso8879/catalog
@@ -43,8 +44,10 @@ DTD_SUBDIR?=	/dtd
 DTDDIR?=	share/${XML_SGML}/${DTD_NAME}/${DTD_VERSION}${DTD_SUBDIR}
 PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} XMLCAT=${XMLCAT} \
 		DTDDIR=${DTDDIR}
+SUB_LIST+=	DTDDIR=${PREFIX}/${DTDDIR}
 
-.if !defined(PORTDOCS)
+
+.if !defined(PORTDOCS) && !defined(MANUAL_DOCS)
 PORTDOCS=	*.txt
 .endif
 
@@ -60,17 +63,19 @@ post-patch:
 	@${ECHO_CMD} 'CATALOG "${LOCALBASE}/${ISOCAT}"' >> ${WRKSRC}/catalog
 	@${RM} ${WRKSRC}/catalog.orig
 .elifndef HAS_MANUAL_CATALOG_FILE
-SUB_FILES=	catalog
+SUB_FILES=	${CATALOG_FILES}
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${DTDDIR}
 .if !defined(HAS_CATALOG_FILE) && !defined(HAS_MANUAL_CATALOG_FILE)
-	${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${PREFIX}/${DTDDIR}
+.  for f in ${CATALOG_FILES}
+	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/${DTDDIR}
+.  endfor
 .endif
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .if defined(PORTDOCS) && !defined(MANUAL_DOCS)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .  for f in ${PORTDOCS}
 	${MV} ${STAGEDIR}${PREFIX}/${DTDDIR}/${f} ${STAGEDIR}${DOCSDIR}
 .  endfor

Modified: head/textproc/sdocbook-xml/Makefile
==============================================================================
--- head/textproc/sdocbook-xml/Makefile	Tue Feb 18 16:14:02 2014	(r344919)
+++ head/textproc/sdocbook-xml/Makefile	Tue Feb 18 16:17:40 2014	(r344920)
@@ -2,53 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	sdocbook-xml
-PORTVERSION= 	1.1
-PORTEPOCH=	1
-CATEGORIES=	textproc
+PORTVERSION=	1.1
+PORTEPOCH=	2
 MASTER_SITES=	http://www.oasis-open.org/docbook/xml/simple/${PORTVERSION}/
 DISTNAME=	docbook-simple-${PORTVERSION}
 
 MAINTAINER=	gabor at FreeBSD.org
 COMMENT=	"Simplified" DocBook XML DTD
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+NO_ISOCAT=	yes
+XML_DTD=	yes
+MANUAL_DOCS=	yes
+CATALOG_FILES=	catalog catalog.xml
 
-USE_ZIP=	yes
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
-PLIST_SUB=	XMLCATMGR=${XMLCATMGR}\
-		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}\
-		CATALOG_PORTS_XML=${CATALOG_PORTS_XML}\
-		XMLDIR=${SDOCBOOKDIR}\
-		VERSION=${PORTVERSION}
-
-SDOCBOOKDIR=	${PREFIX}/share/xml/${PORTNAME:S/-xml//}/${PORTVERSION}
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
-CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
-
-FILES=		sdbcent.mod sdbhier.mod sdbpool.mod sdocbook-custom.dtd \
-		sdocbook.css sdocbook.dtd sdocbookref-custom.dtd \
-		sdocbookref.dtd sinclist.mod
-
-NO_STAGE=	yes
-do-extract:
-	${MKDIR} ${WRKDIR}; \
-	(cd ${WRKDIR} && ${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES})
-
-post-patch:
-	${SED} -e 's#@@DTDDIR@@#${SDOCBOOKDIR}#' < ${FILESDIR}/catalog.xml > ${WRKSRC}/catalog.xml
-
-do-install:
-	${MKDIR} ${SDOCBOOKDIR}
-.for i in ${FILES}
-	${INSTALL_DATA} $(WRKDIR)/${i} ${SDOCBOOKDIR}
-.endfor
-	${INSTALL_DATA} ${FILESDIR}/catalog ${SDOCBOOKDIR}
-	${INSTALL_DATA} ${WRKDIR}/catalog.xml ${SDOCBOOKDIR}
-
-post-install:
-	${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${SDOCBOOKDIR}/catalog
-	${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${SDOCBOOKDIR}/catalog.xml
+DTD_NAME=	${PORTNAME:S/-xml//}
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>

Copied: head/textproc/sdocbook-xml/files/catalog.in (from r344867, head/textproc/sdocbook-xml/files/catalog)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/sdocbook-xml/files/catalog.in	Tue Feb 18 16:17:40 2014	(r344920, copy of r344867, head/textproc/sdocbook-xml/files/catalog)
@@ -0,0 +1,3 @@
+OVERRIDE YES
+PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN" "sdocbook.dtd"
+PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" "sdocbookref.dtd"

Copied and modified: head/textproc/sdocbook-xml/files/catalog.xml.in (from r344867, head/textproc/sdocbook-xml/files/catalog.xml)
==============================================================================
--- head/textproc/sdocbook-xml/files/catalog.xml	Tue Feb 18 11:43:42 2014	(r344867, copy source)
+++ head/textproc/sdocbook-xml/files/catalog.xml.in	Tue Feb 18 16:17:40 2014	(r344920)
@@ -2,6 +2,6 @@
 <!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">
-  <public publicId="-//OASIS//DTD Simplified DocBook XML V1.1//EN" uri="file://@@DTDDIR@@/sdocbook.dtd" />
-  <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" uri="file://@@DTDDIR@@/sdocbookref.dtd" />
+  <public publicId="-//OASIS//DTD Simplified DocBook XML V1.1//EN" uri="file://%%DTDDIR%%/sdocbook.dtd" />
+  <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" uri="file://%%DTDDIR%%/sdocbookref.dtd" />
 </catalog>

Modified: head/textproc/sdocbook-xml/pkg-plist
==============================================================================
--- head/textproc/sdocbook-xml/pkg-plist	Tue Feb 18 16:14:02 2014	(r344919)
+++ head/textproc/sdocbook-xml/pkg-plist	Tue Feb 18 16:17:40 2014	(r344920)
@@ -1,17 +1,16 @@
- at unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%XMLDIR%%/catalog
-share/xml/sdocbook/%%VERSION%%/catalog
- at exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%XMLDIR%%/catalog
- at unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%XMLDIR%%/catalog.xml
-share/xml/sdocbook/%%VERSION%%/catalog.xml
- at exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%XMLDIR%%/catalog.xml
-share/xml/sdocbook/%%VERSION%%/sdbcent.mod
-share/xml/sdocbook/%%VERSION%%/sdbhier.mod
-share/xml/sdocbook/%%VERSION%%/sdbpool.mod
-share/xml/sdocbook/%%VERSION%%/sdocbook-custom.dtd
-share/xml/sdocbook/%%VERSION%%/sdocbook.css
-share/xml/sdocbook/%%VERSION%%/sdocbook.dtd
-share/xml/sdocbook/%%VERSION%%/sdocbookref-custom.dtd
-share/xml/sdocbook/%%VERSION%%/sdocbookref.dtd
-share/xml/sdocbook/%%VERSION%%/sinclist.mod
- at dirrm share/xml/sdocbook/%%VERSION%%
- at dirrm share/xml/sdocbook
+%%DTDDIR%%/catalog
+ at unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
+ at exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
+%%DTDDIR%%/catalog.xml
+ at unexec %D/%%XMLCATMGR%% -sc %D/%%XMLCAT%% remove %D/%F
+ at exec %D/%%XMLCATMGR%% -sc %D/%%XMLCAT%% add nextCatalog %D/%F
+%%DTDDIR%%/sdbcent.mod
+%%DTDDIR%%/sdbhier.mod
+%%DTDDIR%%/sdbpool.mod
+%%DTDDIR%%/sdocbook-custom.dtd
+%%DTDDIR%%/sdocbook.css
+%%DTDDIR%%/sdocbook.dtd
+%%DTDDIR%%/sdocbookref-custom.dtd
+%%DTDDIR%%/sdocbookref.dtd
+%%DTDDIR%%/sinclist.mod
+ at dirrm %%DTDDIR%%

More information about the svn-ports-all mailing list