svn commit: r343833 - in head/textproc/docbook-xsl: . files
Matthias Andree
mandree at FreeBSD.org
Tue Feb 11 23:50:03 UTC 2014
Author: mandree
Date: Tue Feb 11 23:50:01 2014
New Revision: 343833
URL: http://svnweb.freebsd.org/changeset/ports/343833
QAT: https://qat.redports.org/buildarchive/r343833/
Log:
Fix catalog file name in pkg-install.in, fixing polkit build.
Add a safety check so we don't add non-existent catalogs there.
Convert to staging.
Modified:
head/textproc/docbook-xsl/Makefile
head/textproc/docbook-xsl/files/pkg-deinstall.in
head/textproc/docbook-xsl/files/pkg-install.in
head/textproc/docbook-xsl/pkg-plist
Modified: head/textproc/docbook-xsl/Makefile
==============================================================================
--- head/textproc/docbook-xsl/Makefile Tue Feb 11 23:08:02 2014 (r343832)
+++ head/textproc/docbook-xsl/Makefile Tue Feb 11 23:50:01 2014 (r343833)
@@ -2,7 +2,7 @@
PORTNAME= docbook-xsl
PORTVERSION= 1.76.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION}:src \
SF/docbook/${PORTNAME}-doc/${PORTVERSION}:doc
@@ -62,7 +62,6 @@ DXVERSIONS= 1.36 1.37 1.38 1.39 1.40 1.4
1.64.1 1.65.0 1.65.1 1.66.0 1.66.1 1.67.0 1.67.2 1.68.0 \
1.68.1 1.69.0 1.69.1 1.70.0 1.70.1 1.71.0 1.71.1 current
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
@@ -161,41 +160,28 @@ post-extract:
do-install:
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC}/doc && ${TAR} -cf - . |\
- ${TAR} -xf - -C${DOCSDIR})
+ ${TAR} -xf - -C${STAGEDIR}${DOCSDIR})
.endif
.for m in ${MODULES}
- ${MKDIR} ${PREFIX}/${INSTDIR}/${m}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTDIR}/${m}
dirs=$$(${FIND} ${WRKSRC}/${m} -type d | ${SED} 's|^${WRKSRC}/${m}||g'); \
for d in $${dirs}; do \
files=$$(${FIND} ${WRKSRC}/${m}/$${d} -type f); \
- ${MKDIR} ${PREFIX}/${INSTDIR}/${m}/$${d}; \
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTDIR}/${m}/$${d}; \
for i in $${files}; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${INSTDIR}/${m}/$${d}; \
+ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/${INSTDIR}/${m}/$${d}; \
done; \
done; \
files=$$(${FIND} ${WRKSRC}/${m} -type f -depth 1); \
for i in $${files}; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${INSTDIR}/${m}; \
+ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/${INSTDIR}/${m}; \
done
.endfor
- ${XMLCATMGR} -c ${CATALOG_XSL} create
-.for dxversion in ${DXVERSIONS}
- ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \
- http://docbook.sourceforge.net/release/xsl/${dxversion} \
- "file://${PREFIX}/${INSTDIR}"
- ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \
- http://docbook.sourceforge.net/release/xsl/${dxversion} \
- "file://${PREFIX}/${INSTDIR}"
-.endfor
files=$$(${FIND} ${WRKSRC} -type f -depth 1); \
for i in $${files}; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${INSTDIR}; \
+ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/${INSTDIR}; \
done
-post-install:
- @${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
.include <bsd.port.mk>
Modified: head/textproc/docbook-xsl/files/pkg-deinstall.in
==============================================================================
--- head/textproc/docbook-xsl/files/pkg-deinstall.in Tue Feb 11 23:08:02 2014 (r343832)
+++ head/textproc/docbook-xsl/files/pkg-deinstall.in Tue Feb 11 23:50:01 2014 (r343833)
@@ -2,10 +2,10 @@
# This script will remove the docbook-xsl entries added to xml catalog.
# -- Rui Lopes <rui at ruilopes.com>
-if [ "$2" != "POST-DEINSTALL" ]; then
+if [ "$2" != "DEINSTALL" ]; then
exit 0
fi
%%XMLCATMGR%% -c %%CATALOG_PORTS%% remove \
- http://docbook.sourceforge.net/release/xsl/
+ http://docbook.sourceforge.net/release/xsl/
exit 0
Modified: head/textproc/docbook-xsl/files/pkg-install.in
==============================================================================
--- head/textproc/docbook-xsl/files/pkg-install.in Tue Feb 11 23:08:02 2014 (r343832)
+++ head/textproc/docbook-xsl/files/pkg-install.in Tue Feb 11 23:50:01 2014 (r343833)
@@ -11,12 +11,16 @@
# -- Rui Lopes <rui at ruilopes.com>
XSL_DIR=${PKG_PREFIX}/%%INSTDIR%%
-CATALOG_XSL=${XSL_DIR}/catalog
+CATALOG_XSL=${XSL_DIR}/catalog.xml
if [ "$2" != "POST-INSTALL" ]; then
exit 0
fi
+test -r "${CATALOG_XSL}" || {
+ echo >&2 "Cannot register non-existent catalog ${CATALOG_XSL}"
+ exit 1
+}
%%XMLCATMGR%% -c %%CATALOG_PORTS%% add delegateSystem \
http://docbook.sourceforge.net/release/xsl/ \
"file://${CATALOG_XSL}"
Modified: head/textproc/docbook-xsl/pkg-plist
==============================================================================
--- head/textproc/docbook-xsl/pkg-plist Tue Feb 11 23:08:02 2014 (r343832)
+++ head/textproc/docbook-xsl/pkg-plist Tue Feb 11 23:50:01 2014 (r343833)
@@ -13,7 +13,6 @@ share/xsl/docbook/RELEASE-NOTES.txt
share/xsl/docbook/RELEASE-NOTES.xml
share/xsl/docbook/TODO
share/xsl/docbook/VERSION
-share/xsl/docbook/catalog
share/xsl/docbook/catalog.xml
share/xsl/docbook/common/af.xml
share/xsl/docbook/common/am.xml
More information about the svn-ports-all
mailing list