diff options
| author | jlam <jlam> | 2006-03-14 01:14:26 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-03-14 01:14:26 +0000 |
| commit | 16bf253b1b8893b5c99da550141b8aff3f02e074 (patch) | |
| tree | 2d76c0a00d07e0939789aa971b834f332c4820c3 /textproc/xmlcatmgr/catalogs.mk | |
| parent | 9cc802b6466cf4c6418f08cf067a4d91f1000a98 (diff) | |
| download | pkgsrc-16bf253b1b8893b5c99da550141b8aff3f02e074.tar.gz | |
Modify the pkginstall framework so that it manages all aspects of
INSTALL/DEINSTALL script creation within pkgsrc.
If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts. If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:
INSTALL_SRC= ${PKGDIR}/INSTALL
DEINSTALL_SRC= # emtpy
As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts. By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).
In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework. The only public variables relating to the templates are:
INSTALL_SRC INSTALL_TEMPLATE
DEINSTALL_SRC DEINSTALL_TEMPLATE
HEADER_TEMPLATE
The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.
Diffstat (limited to 'textproc/xmlcatmgr/catalogs.mk')
| -rw-r--r-- | textproc/xmlcatmgr/catalogs.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk index ee9b5c7ae42..f6b72cb8ca6 100644 --- a/textproc/xmlcatmgr/catalogs.mk +++ b/textproc/xmlcatmgr/catalogs.mk @@ -1,4 +1,4 @@ -# $NetBSD: catalogs.mk,v 1.14 2005/12/29 06:22:20 jlam Exp $ +# $NetBSD: catalogs.mk,v 1.15 2006/03/14 01:14:34 jlam 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 @@ -52,8 +52,8 @@ FILES_SUBST+= SGML_CATALOG="${XMLCATMGR_PREFIX}/share/sgml/catalog" FILES_SUBST+= XML_CATALOG="${XMLCATMGR_PREFIX}/share/xml/catalog" 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 +INSTALL_TEMPLATE+= ../../textproc/xmlcatmgr/files/install.tmpl +DEINSTALL_TEMPLATE+= ../../textproc/xmlcatmgr/files/deinstall.tmpl .endif # !empty(SGML_ENTRIES) || !empty(XML_ENTRIES) PRINT_PLIST_AWK+= /^share\/(sgml|xml)\/catalog$$/ \ |