diff options
author | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:54:23 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:54:23 +0000 |
commit | dd9b059aed8be7b6979127439c2494c374a4f149 (patch) | |
tree | 7c8a49ec5fb0f6949ddf37f991e7e0fee4f4948c /x11 | |
parent | f194077636b67baa483a627587f94283342d40fa (diff) | |
download | pkgsrc-dd9b059aed8be7b6979127439c2494c374a4f149.tar.gz |
Remove mk/find-prefix.mk usage from the x11 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 'x11')
-rw-r--r-- | x11/fast-user-switch-applet/Makefile | 6 | ||||
-rw-r--r-- | x11/gtk2/Makefile | 5 | ||||
-rw-r--r-- | x11/tk/buildlink3.mk | 6 | ||||
-rw-r--r-- | x11/tk85/buildlink3.mk | 6 |
4 files changed, 8 insertions, 15 deletions
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile index 4a1291b6d93..bec363e34d3 100644 --- a/x11/fast-user-switch-applet/Makefile +++ b/x11/fast-user-switch-applet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2015/10/10 01:58:22 ryoon Exp $ +# $NetBSD: Makefile,v 1.70 2015/11/25 12:54:23 jperkin Exp $ # DISTNAME= fast-user-switch-applet-2.24.0 @@ -21,9 +21,7 @@ USE_X11= yes .include "../../mk/bsd.prefs.mk" -EVAL_PREFIX= PREFIX.gdm -PREFIX.gdm_DEFAULT= ${PREFIX} -CONFIGURE_ARGS+= --with-gdm-setup=${PREFIX.gdm}/sbin/gdmsetup +CONFIGURE_ARGS+= --with-gdm-setup=${LOCALBASE}/sbin/gdmsetup .if defined(PKG_SYSCONFDIR.gdm) CONFIGURE_ARGS+= --with-gdm-config=${PKG_SYSCONFDIR.gdm}/custom.conf diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 6781997e724..25244fb035a 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.270 2015/06/14 21:46:34 prlw1 Exp $ +# $NetBSD: Makefile,v 1.271 2015/11/25 12:54:23 jperkin Exp $ DISTNAME= gtk+-2.24.28 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -90,9 +90,8 @@ REPLACE_PYTHON= gtk/gtk-builder-convert post-install: ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB} -EVAL_PREFIX+= PREFIX.hicolor=hicolor-icon-theme FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk2-update-icon-cache" -FILES_SUBST+= ICON_THEME_DIR="${PREFIX.hicolor}/share/icons/hicolor" +FILES_SUBST+= ICON_THEME_DIR="${LOCALBASE}/share/icons/hicolor" INSTALL_TEMPLATES+= ../../x11/gtk2/files/icon-cache.tmpl PRINT_PLIST_AWK+= /^share\/icons\/hicolor\/icon-theme.cache$$/ { next; } diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index 4636860c5f1..cf8e978a73a 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.34 2014/01/11 14:41:05 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.35 2015/11/25 12:54:23 jperkin Exp $ BUILDLINK_TREE+= tk @@ -21,9 +21,7 @@ TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh _TOOLS_USE_PKGSRC.wish= yes -FIND_PREFIX:= TOOLS_PREFIX.wish=tk -.include "../../mk/find-prefix.mk" -WISH= ${TOOLS_PREFIX.wish}/bin/wish +WISH= ${LOCALBASE}/bin/wish pkgbase := tk .include "../../mk/pkg-build-options.mk" diff --git a/x11/tk85/buildlink3.mk b/x11/tk85/buildlink3.mk index 3f221e32e3a..62b0cfdbe46 100644 --- a/x11/tk85/buildlink3.mk +++ b/x11/tk85/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2014/04/17 20:26:51 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2015/11/25 12:54:23 jperkin Exp $ BUILDLINK_TREE+= tk @@ -21,9 +21,7 @@ TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh _TOOLS_USE_PKGSRC.wish= yes -FIND_PREFIX:= TOOLS_PREFIX.wish=tk -.include "../../mk/find-prefix.mk" -WISH= ${TOOLS_PREFIX.wish}/bin/wish +WISH= ${LOCALBASE}/bin/wish pkgbase := tk .include "../../mk/pkg-build-options.mk" |