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 | daad0f3d6ce8b344ce91e35e98ea05abf8e03f2d (patch) | |
| tree | 2d76c0a00d07e0939789aa971b834f332c4820c3 /databases/shared-mime-info | |
| parent | b1472309671a67b16cab03410ae83bb9d6007baa (diff) | |
| download | pkgsrc-daad0f3d6ce8b344ce91e35e98ea05abf8e03f2d.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 'databases/shared-mime-info')
| -rw-r--r-- | databases/shared-mime-info/Makefile | 5 | ||||
| -rw-r--r-- | databases/shared-mime-info/mimedb.mk | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile index e78f8083a56..1223f44dbd3 100644 --- a/databases/shared-mime-info/Makefile +++ b/databases/shared-mime-info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:37 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:27 jlam Exp $ # DISTNAME= shared-mime-info-0.16 @@ -23,8 +23,7 @@ CONFIGURE_ARGS+= --disable-update-mimedb CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL FILES_SUBST+= MIMEDB_PATH="${PREFIX}/share/mime" FILES_SUBST+= UPDATE_MIMEDB="${PREFIX}/bin/update-mime-database" diff --git a/databases/shared-mime-info/mimedb.mk b/databases/shared-mime-info/mimedb.mk index c30b32fbf9c..5fb9f1bb1d4 100644 --- a/databases/shared-mime-info/mimedb.mk +++ b/databases/shared-mime-info/mimedb.mk @@ -1,4 +1,4 @@ -# $NetBSD: mimedb.mk,v 1.3 2005/12/29 06:21:36 jlam Exp $ +# $NetBSD: mimedb.mk,v 1.4 2006/03/14 01:14:27 jlam Exp $ # # This Makefile fragment is intended to be included by packages that install # mime customization files. It takes care of registering them in the global @@ -10,8 +10,8 @@ SHARED_MIME_INFO_MIMEDB_MK= # defined .include "../../mk/bsd.prefs.mk" -INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl +INSTALL_TEMPLATE+= ${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl +DEINSTALL_TEMPLATE+= ${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl FILES_SUBST+= MIMEDB_PATH="${BUILDLINK_PREFIX.shared-mime-info}/share/mime" FILES_SUBST+= UPDATE_MIMEDB="${BUILDLINK_PREFIX.shared-mime-info}/bin/update-mime-database" |