sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix catalog file name in pkg-install.in, fixing polkit build.

Browse source 
Add a safety check so we don't add non-existent catalogs there.
Convert to staging.
This commit is contained in:
Matthias Andree 2014-02-11 23:50:01 +00:00
parent 55f028e46e
commit ece255e47a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=343833
4 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
textproc/docbook-xsl/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= docbook-xsl PORTNAME= docbook-xsl
PORTVERSION= 1.76.1 PORTVERSION= 1.76.1
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= textproc CATEGORIES= textproc
MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION}:src \ MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION}:src \
SF/docbook/${PORTNAME}-doc/${PORTVERSION}:doc SF/docbook/${PORTNAME}-doc/${PORTVERSION}:doc
@ -62,7 +62,6 @@ DXVERSIONS= 1.36 1.37 1.38 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 \
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.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 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> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS} .if ${PORT_OPTIONS:MDOCS}
@ -161,41 +160,28 @@ post-extract:
do-install: do-install:
.if ${PORT_OPTIONS:MDOCS} .if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC}/doc && ${TAR} -cf - . |\ (cd ${WRKSRC}/doc && ${TAR} -cf - . |\
${TAR} -xf - -C${DOCSDIR}) ${TAR} -xf - -C${STAGEDIR}${DOCSDIR})
.endif .endif
.for m in ${MODULES} .for m in ${MODULES}
${MKDIR} ${PREFIX}/${INSTDIR}/${m} ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTDIR}/${m}
dirs=$$(${FIND} ${WRKSRC}/${m} -type d | ${SED} 's|^${WRKSRC}/${m}||g'); \ dirs=$$(${FIND} ${WRKSRC}/${m} -type d | ${SED} 's|^${WRKSRC}/${m}||g'); \
for d in $${dirs}; do \ for d in $${dirs}; do \
files=$$(${FIND} ${WRKSRC}/${m}/$${d} -type f); \ files=$$(${FIND} ${WRKSRC}/${m}/$${d} -type f); \
${MKDIR} ${PREFIX}/${INSTDIR}/${m}/$${d}; \ ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTDIR}/${m}/$${d}; \
for i in $${files}; do \ for i in $${files}; do \
${INSTALL_DATA} $${i} ${PREFIX}/${INSTDIR}/${m}/$${d}; \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/${INSTDIR}/${m}/$${d}; \
done; \ done; \
done; \ done; \
files=$$(${FIND} ${WRKSRC}/${m} -type f -depth 1); \ files=$$(${FIND} ${WRKSRC}/${m} -type f -depth 1); \
for i in $${files}; do \ for i in $${files}; do \
${INSTALL_DATA} $${i} ${PREFIX}/${INSTDIR}/${m}; \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/${INSTDIR}/${m}; \
done 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 .endfor
files=$$(${FIND} ${WRKSRC} -type f -depth 1); \ files=$$(${FIND} ${WRKSRC} -type f -depth 1); \
for i in $${files}; do \ for i in $${files}; do \
${INSTALL_DATA} $${i} ${PREFIX}/${INSTDIR}; \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/${INSTDIR}; \
done done
post-install:
@${SETENV} PKG_PREFIX=${PREFIX} \
${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk> .include <bsd.port.mk>

2
textproc/docbook-xsl/files/pkg-deinstall.in
View file

@ -2,7 +2,7 @@
# This script will remove the docbook-xsl entries added to xml catalog. # This script will remove the docbook-xsl entries added to xml catalog.
# -- Rui Lopes <rui@ruilopes.com> # -- Rui Lopes <rui@ruilopes.com>
if [ "$2" != "POST-DEINSTALL" ]; then if [ "$2" != "DEINSTALL" ]; then
exit 0 exit 0
fi fi

6
textproc/docbook-xsl/files/pkg-install.in
View file

@ -11,12 +11,16 @@
# -- Rui Lopes <rui@ruilopes.com> # -- Rui Lopes <rui@ruilopes.com>
XSL_DIR=${PKG_PREFIX}/%%INSTDIR%% XSL_DIR=${PKG_PREFIX}/%%INSTDIR%%
CATALOG_XSL=${XSL_DIR}/catalog CATALOG_XSL=${XSL_DIR}/catalog.xml
if [ "$2" != "POST-INSTALL" ]; then if [ "$2" != "POST-INSTALL" ]; then
exit 0 exit 0
fi fi
test -r "${CATALOG_XSL}" || {
echo >&2 "Cannot register non-existent catalog ${CATALOG_XSL}"
exit 1
}
%%XMLCATMGR%% -c %%CATALOG_PORTS%% add delegateSystem \ %%XMLCATMGR%% -c %%CATALOG_PORTS%% add delegateSystem \
http://docbook.sourceforge.net/release/xsl/ \ http://docbook.sourceforge.net/release/xsl/ \
"file://${CATALOG_XSL}" "file://${CATALOG_XSL}"

1
textproc/docbook-xsl/pkg-plist
View file

@ -13,7 +13,6 @@ share/xsl/docbook/RELEASE-NOTES.txt
share/xsl/docbook/RELEASE-NOTES.xml share/xsl/docbook/RELEASE-NOTES.xml
share/xsl/docbook/TODO share/xsl/docbook/TODO
share/xsl/docbook/VERSION share/xsl/docbook/VERSION
share/xsl/docbook/catalog
share/xsl/docbook/catalog.xml share/xsl/docbook/catalog.xml
share/xsl/docbook/common/af.xml share/xsl/docbook/common/af.xml
share/xsl/docbook/common/am.xml share/xsl/docbook/common/am.xml