diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-24 22:32:49 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-24 22:32:49 +0000 |
| commit | 963854440c8d5cb49ac23779c965d0f6fb408744 (patch) | |
| tree | 097b956f7e23b0db264fe1d3cdeee8eafc050cd9 /textproc/sdocbook-xml | |
| parent | ddf8b3e6be1c5e8bd6c6415891ec22c20f432245 (diff) | |
| download | ports-963854440c8d5cb49ac23779c965d0f6fb408744.tar.gz ports-963854440c8d5cb49ac23779c965d0f6fb408744.zip | |
Add a new keywork xmlcatmgr
It simplifies the handling of the XML and SMGL catalog
It brings a big of consistency by always specifying the catalog path absolute
instead of mixing absolute and relative path.
The keyword is also written a PKG_ROOTDIR friendly to simplify cross installing
Reviewed by: hrs
Differential Revision: https://reviews.freebsd.org/D6539
Notes
Notes:
svn path=/head/; revision=415814
Diffstat (limited to 'textproc/sdocbook-xml')
| -rw-r--r-- | textproc/sdocbook-xml/Makefile | 11 | ||||
| -rw-r--r-- | textproc/sdocbook-xml/pkg-plist | 8 |
2 files changed, 5 insertions, 14 deletions
diff --git a/textproc/sdocbook-xml/Makefile b/textproc/sdocbook-xml/Makefile index 542708071120..901e9f0406bb 100644 --- a/textproc/sdocbook-xml/Makefile +++ b/textproc/sdocbook-xml/Makefile @@ -3,7 +3,7 @@ PORTNAME= sdocbook-xml PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= textproc MASTER_SITES= http://www.oasis-open.org/docbook/xml/simple/${PORTVERSION}/ @@ -12,24 +12,20 @@ DISTNAME= docbook-simple-${PORTVERSION} MAINTAINER= gabor@FreeBSD.org COMMENT= "Simplified" DocBook XML DTD -RUN_DEPENDS+= ${LOCALBASE}/${XMLCATMGR}:textproc/xmlcatmgr +RUN_DEPENDS+= xmlcatmgr:textproc/xmlcatmgr USES= zip NO_MTREE= yes NO_BUILD= yes NO_WRKSUBDIR= yes -XMLCATMGR= bin/xmlcatmgr -XMLCAT= share/xml/catalog.ports -SGMLCAT= share/sgml/catalog.ports CATALOG_FILES= catalog catalog.xml DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} DTD_NAME= sdocbook DTD_VERSION= ${PORTVERSION} DTD_SUBDIR= /dtd DTDDIR= share/xml/${DTD_NAME}/${DTD_VERSION}${DTD_SUBDIR} -PLIST_SUB+= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} XMLCAT=${XMLCAT} \ - DTDDIR=${DTDDIR} +PLIST_SUB+= DTDDIR=${DTDDIR} SUB_FILES= ${CATALOG_FILES} SUB_LIST+= DTDDIR=${PREFIX}/${DTDDIR} @@ -39,6 +35,5 @@ do-install: .for f in ${CATALOG_FILES} ${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/${DTDDIR} .endfor - @${ECHO_CMD} "@unexec rmdir %D/share/xml/${DTD_NAME} 2>/dev/null || :" >> ${TMPPLIST} .include <bsd.port.mk> diff --git a/textproc/sdocbook-xml/pkg-plist b/textproc/sdocbook-xml/pkg-plist index 4889c60dc24a..6abfc9c37860 100644 --- a/textproc/sdocbook-xml/pkg-plist +++ b/textproc/sdocbook-xml/pkg-plist @@ -1,9 +1,5 @@ -%%DTDDIR%%/catalog -@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F -@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F -%%DTDDIR%%/catalog.xml -@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F -@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F +@xmlcatmgr %%DTDDIR%%/catalog +@xmlcatmgr %%DTDDIR%%/catalog.xml %%DTDDIR%%/sdbcent.mod %%DTDDIR%%/sdbhier.mod %%DTDDIR%%/sdbpool.mod |