diff options
| author | jlam <jlam> | 2006-03-14 01:14:26 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-03-14 01:14:26 +0000 |
| commit | 6bd0765af7e172f63338e1591991ae18424e7d39 (patch) | |
| tree | 2d76c0a00d07e0939789aa971b834f332c4820c3 /sysutils/desktop-file-utils | |
| parent | f80cc541cc91416239ab2c78422558283deb2b3f (diff) | |
| download | pkgsrc-6bd0765af7e172f63338e1591991ae18424e7d39.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 'sysutils/desktop-file-utils')
| -rw-r--r-- | sysutils/desktop-file-utils/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/desktop-file-utils/desktopdb.mk | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sysutils/desktop-file-utils/Makefile b/sysutils/desktop-file-utils/Makefile index 6a31e1c49d9..6e1804f5a5f 100644 --- a/sysutils/desktop-file-utils/Makefile +++ b/sysutils/desktop-file-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:49 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:34 jlam Exp $ # DISTNAME= desktop-file-utils-0.10 @@ -19,8 +19,7 @@ USE_PKGLOCALEDIR= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= EMACS=no -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL FILES_SUBST+= APPLICATIONS_PATH="${PREFIX}/share/applications" FILES_SUBST+= UPDATE_DESKTOPDB="${PREFIX}/bin/update-desktop-database" diff --git a/sysutils/desktop-file-utils/desktopdb.mk b/sysutils/desktop-file-utils/desktopdb.mk index 0d9c85801c3..0e72ae949c2 100644 --- a/sysutils/desktop-file-utils/desktopdb.mk +++ b/sysutils/desktop-file-utils/desktopdb.mk @@ -1,4 +1,4 @@ -# $NetBSD: desktopdb.mk,v 1.3 2005/12/29 06:22:17 jlam Exp $ +# $NetBSD: desktopdb.mk,v 1.4 2006/03/14 01:14:34 jlam Exp $ # # This Makefile fragment is intended to be included by packages that install # desktop entries. It takes care of registering them in the global database. @@ -9,8 +9,8 @@ DESKTOP_FILE_UTILS_MIMEDB_MK= # defined .include "../../mk/bsd.prefs.mk" -INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl +INSTALL_TEMPLATE+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl +DEINSTALL_TEMPLATE+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl FILES_SUBST+= APPLICATIONS_PATH="${BUILDLINK_PREFIX.desktop-file-utils}/share/applications" FILES_SUBST+= UPDATE_DESKTOPDB="${BUILDLINK_PREFIX.desktop-file-utils}/bin/update-desktop-database" |