pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/xmlcatmgr Quote arguments properly for xmlcat...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/41fe96977577
branches:  trunk
changeset: 474861:41fe96977577
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Thu May 06 14:39:05 2004 +0000

description:
Quote arguments properly for xmlcatmgr.  OK'ed by jmmv@.

diffstat:

 textproc/xmlcatmgr/catalogs.mk          |  6 +++---
 textproc/xmlcatmgr/files/deinstall.tmpl |  6 +++---
 textproc/xmlcatmgr/files/install.tmpl   |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (72 lines):

diff -r ede3a0167c3d -r 41fe96977577 textproc/xmlcatmgr/catalogs.mk
--- a/textproc/xmlcatmgr/catalogs.mk    Thu May 06 14:25:02 2004 +0000
+++ b/textproc/xmlcatmgr/catalogs.mk    Thu May 06 14:39:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: catalogs.mk,v 1.7 2004/04/28 07:11:44 wiz Exp $
+# $NetBSD: catalogs.mk,v 1.8 2004/05/06 14:39:05 minskim Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # catalog files or DTDs.  It takes care of registering them into the right
@@ -49,8 +49,8 @@
 FILES_SUBST+=  XMLCATMGR="${XMLCATMGR}"
 FILES_SUBST+=  SGML_CATALOG="${BUILDLINK_PREFIX.xmlcatmgr}/share/sgml/catalog"
 FILES_SUBST+=  XML_CATALOG="${BUILDLINK_PREFIX.xmlcatmgr}/share/xml/catalog"
-FILES_SUBST+=  SGML_ENTRIES="${SGML_ENTRIES}"
-FILES_SUBST+=  XML_ENTRIES="${XML_ENTRIES}"
+FILES_SUBST+=  SGML_ENTRIES=${SGML_ENTRIES:Q}
+FILES_SUBST+=  XML_ENTRIES=${XML_ENTRIES:Q}
 INSTALL_EXTRA_TMPL+=   ../../textproc/xmlcatmgr/files/install.tmpl
 DEINSTALL_EXTRA_TMPL+= ../../textproc/xmlcatmgr/files/deinstall.tmpl
 USE_PKGINSTALL=        YES
diff -r ede3a0167c3d -r 41fe96977577 textproc/xmlcatmgr/files/deinstall.tmpl
--- a/textproc/xmlcatmgr/files/deinstall.tmpl   Thu May 06 14:25:02 2004 +0000
+++ b/textproc/xmlcatmgr/files/deinstall.tmpl   Thu May 06 14:39:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: deinstall.tmpl,v 1.4 2004/01/17 16:00:20 jmmv Exp $
+# $NetBSD: deinstall.tmpl,v 1.5 2004/05/06 14:39:05 minskim Exp $
 #
 # Unregister SGML/XML catalog entries.
 #
@@ -12,14 +12,14 @@
 case ${STAGE} in
 DEINSTALL)
        if [ -n "${SGML_ENTRIES}" ]; then
-               set -- ${SGML_ENTRIES}
+               set -- @SGML_ENTRIES@
                while [ $# -gt 0 ]; do
                        ${XMLCATMGR} -sc ${SGML_CATALOG} remove "$1" "$2"
                        shift; shift; shift
                done
        fi
        if [ -n "${XML_ENTRIES}" ]; then
-               set -- ${XML_ENTRIES}
+               set -- @XML_ENTRIES@
                while [ $# -gt 0 ]; do
                        ${XMLCATMGR} -c ${XML_CATALOG} remove "$1" "$2"
                        shift; shift; shift
diff -r ede3a0167c3d -r 41fe96977577 textproc/xmlcatmgr/files/install.tmpl
--- a/textproc/xmlcatmgr/files/install.tmpl     Thu May 06 14:25:02 2004 +0000
+++ b/textproc/xmlcatmgr/files/install.tmpl     Thu May 06 14:39:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.tmpl,v 1.3 2003/09/08 12:26:22 jmmv Exp $
+# $NetBSD: install.tmpl,v 1.4 2004/05/06 14:39:05 minskim Exp $
 #
 # Register SGML/XML catalog entries.
 #
@@ -12,14 +12,14 @@
 case ${STAGE} in
 POST-INSTALL)
        if [ -n "${SGML_ENTRIES}" ]; then
-               set -- ${SGML_ENTRIES}
+               set -- @SGML_ENTRIES@
                while [ $# -gt 0 ]; do
                        ${XMLCATMGR} -sc ${SGML_CATALOG} add "$1" "$2" "$3"
                        shift; shift; shift
                done
        fi
        if [ -n "${XML_ENTRIES}" ]; then
-               set -- ${XML_ENTRIES}
+               set -- @XML_ENTRIES@
                while [ $# -gt 0 ]; do
                        ${XMLCATMGR} -c ${XML_CATALOG} add "$1" "$2" "$3"
                        shift; shift; shift



Home | Main Index | Thread Index | Old Index