diff options
| author | jperkin <jperkin> | 2015-11-25 12:50:57 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-11-25 12:50:57 +0000 |
| commit | 1d5f7fe5cc80833e968d867383b9f2b06e19b0b5 (patch) | |
| tree | 6e0f6dcdcaaa8431cd523c7b1458cc679eeb048c /inputmethod/uim | |
| parent | 43680f8153e06ee0f2889fd8a929c68f80aa3bd6 (diff) | |
| download | pkgsrc-1d5f7fe5cc80833e968d867383b9f2b06e19b0b5.tar.gz | |
Remove mk/find-prefix.mk usage from the inputmethod category.
The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.
Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.
Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.
Diffstat (limited to 'inputmethod/uim')
| -rw-r--r-- | inputmethod/uim/modules.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/inputmethod/uim/modules.mk b/inputmethod/uim/modules.mk index 0e397ab2733..70ea0e4f2c4 100644 --- a/inputmethod/uim/modules.mk +++ b/inputmethod/uim/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.1 2014/05/31 14:22:38 obache Exp $ +# $NetBSD: modules.mk,v 1.2 2015/11/25 12:50:58 jperkin Exp $ # # This Makefile fragment is intended to be included by packages that install # UIM modules. It takes care of update the corresponding databases @@ -12,15 +12,12 @@ UIM_MODULES_MK= # defined .if (defined(UIM_MODULES) && !empty(UIM_MODULES)) || defined(_BUILDING_UIM) -. if defined(_BUILDING_UIM) -BUILDLINK_PREFIX.uim= ${PREFIX} -. else -EVAL_PREFIX+= BUILDLINK_PREFIX.uim=uim -DEPENDS+= uim-[0-9]*:../../inputmethod/uim +. if !defined(_BUILDING_UIM) +DEPENDS+= uim-[0-9]*:../../inputmethod/uim . endif -UIM_MODULE_MANAGER= ${BUILDLINK_PREFIX.uim}/bin/uim-module-manager -UIM_MODULE_LIST_DIR= ${BUILDLINK_PREFIX.uim}/share/uim/pkgsrc +UIM_MODULE_MANAGER= ${LOCALBASE}/bin/uim-module-manager +UIM_MODULE_LIST_DIR= ${LOCALBASE}/share/uim/pkgsrc FILES_SUBST+= UIM_MODULE_MANAGER=${UIM_MODULE_MANAGER:Q} FILES_SUBST+= UIM_MODULE_LIST_DIR=${UIM_MODULE_LIST_DIR:Q} @@ -29,7 +26,7 @@ INSTALL_TEMPLATES+= ../../inputmethod/uim/files/modules.tmpl DEINSTALL_TEMPLATES+= ../../inputmethod/uim/files/modules.tmpl GENERATE_PLIST+= for m in ${UIM_MODULES}; do \ - echo ${UIM_MODULE_LIST_DIR:S,^${BUILDLINK_PREFIX.uim}/,,}/$${m}; \ + echo ${UIM_MODULE_LIST_DIR:S,^${LOCALBASE}/,,}/$${m}; \ done post-install: uim-add-module-names |