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 /inputmethod | |
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 'inputmethod')
-rw-r--r-- | inputmethod/canna-server/Makefile | 4 | ||||
-rw-r--r-- | inputmethod/sj3-dict/Makefile | 4 | ||||
-rw-r--r-- | inputmethod/skkinput/Makefile | 4 | ||||
-rw-r--r-- | inputmethod/skkserv/Makefile | 3 |
4 files changed, 6 insertions, 9 deletions
diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile index d24eee32c74..da381c0c0e4 100644 --- a/inputmethod/canna-server/Makefile +++ b/inputmethod/canna-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/12/29 06:21:45 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:29 jlam Exp $ # .include "../../inputmethod/canna/Makefile.common" @@ -8,8 +8,6 @@ CANNA_MODULE= server INSTALL_TARGET= instserver -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - .include "../../mk/bsd.prefs.mk" BUILD_DEFS+= CANNA_USER CANNA_GROUP diff --git a/inputmethod/sj3-dict/Makefile b/inputmethod/sj3-dict/Makefile index cfef222c451..8fb70ab7633 100644 --- a/inputmethod/sj3-dict/Makefile +++ b/inputmethod/sj3-dict/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/10 22:29:44 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:29 jlam Exp $ # DISTNAME= sj3-2.0.1.20 @@ -28,8 +28,8 @@ SJ3GROUP?= daemon MAKE_ENV+= SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \ IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q} FILES_SUBST+= SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} IMDICTDIR=${IMDICTDIR} -INSTALL_SRC= ${PKGDIR}/INSTALL DEINSTALL_SRC= # empty +INSTALL_SRC= ${PKGDIR}/INSTALL EVAL_PREFIX+= SJ3SERVERBINDIR=sj3-server-bin diff --git a/inputmethod/skkinput/Makefile b/inputmethod/skkinput/Makefile index 2b79e8fd582..f7152cacdaf 100644 --- a/inputmethod/skkinput/Makefile +++ b/inputmethod/skkinput/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/10 22:30:29 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:29 jlam Exp $ DISTNAME= skkinput-2.06.3 PKGREVISION= 1 @@ -14,8 +14,8 @@ BUILD_DEFS+= USE_INET6 USE_IMAKE= YES PLIST_SUBST+= PKGBASE=${LOCALBASE:Q} -INSTALL_SRC= ${PKGDIR}/INSTALL DEINSTALL_SRC= # empty +INSTALL_SRC= ${PKGDIR}/INSTALL post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/skkinput diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile index 9d35d226063..db549faefa2 100644 --- a/inputmethod/skkserv/Makefile +++ b/inputmethod/skkserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:53 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:29 jlam Exp $ DISTNAME= skk9.6 PKGNAME= skkserv-3.9.4 @@ -15,7 +15,6 @@ HOMEPAGE= http://skk.kuis.kyoto-u.ac.jp/ COMMENT= Dictionary server for Simple Kana-Kanji conversion programs WRKSRC= ${WRKDIR}/skk-9.6 -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL BUILD_DEFS+= USE_INET6 |