diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-14 01:14:26 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-14 01:14:26 +0000 |
| commit | 9112c47201d0e89217f980ba46c1421d911dc5de (patch) | |
| tree | 2d76c0a00d07e0939789aa971b834f332c4820c3 /x11/gtk2 | |
| parent | 737ec08d7adeb53dccfc390d9d048eab7b498d10 (diff) | |
| download | pkgsrc-9112c47201d0e89217f980ba46c1421d911dc5de.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 'x11/gtk2')
| -rw-r--r-- | x11/gtk2/modules.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/x11/gtk2/modules.mk b/x11/gtk2/modules.mk index 61d6ed46c5a..2f0a75088ef 100644 --- a/x11/gtk2/modules.mk +++ b/x11/gtk2/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.11 2005/12/29 06:22:25 jlam Exp $ +# $NetBSD: modules.mk,v 1.12 2006/03/14 01:14:35 jlam Exp $ # # This Makefile fragment is intended to be included by packages that install # GTK2 modules. It takes care of rebuilding the corresponding databases at @@ -25,8 +25,8 @@ GTK2_LOADERS= YES FILES_SUBST+= GTK_IMMODULES_DB=${GTK_IMMODULES_DB:Q} FILES_SUBST+= GTK_QUERY_IMMODULES=${GTK_QUERY_IMMODULES:Q} GTK_IMMODULES_DB= ${BUILDLINK_PREFIX.gtk2}/libdata/gtk-2.0/gtk.immodules -INSTALL_EXTRA_TMPL+= ../../x11/gtk2/files/immodules.tmpl -DEINSTALL_EXTRA_TMPL+= ../../x11/gtk2/files/immodules.tmpl +INSTALL_TEMPLATE+= ../../x11/gtk2/files/immodules.tmpl +DEINSTALL_TEMPLATE+= ../../x11/gtk2/files/immodules.tmpl .endif .if defined(GTK2_LOADERS) && !empty(GTK2_LOADERS:M[Yy][Ee][Ss]) |