From 43680f8153e06ee0f2889fd8a929c68f80aa3bd6 Mon Sep 17 00:00:00 2001 From: jperkin Date: Wed, 25 Nov 2015 12:50:43 +0000 Subject: Remove mk/find-prefix.mk usage from the graphics 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. --- graphics/gnome-icon-theme/Makefile | 20 ++++++++------------ graphics/gnome-icon-theme/buildlink3.mk | 5 ++--- 2 files changed, 10 insertions(+), 15 deletions(-) (limited to 'graphics/gnome-icon-theme') diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile index bad9ba0abf3..3cbab879736 100644 --- a/graphics/gnome-icon-theme/Makefile +++ b/graphics/gnome-icon-theme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2015/02/27 14:35:01 tnn Exp $ +# $NetBSD: Makefile,v 1.99 2015/11/25 12:50:43 jperkin Exp $ DISTNAME= gnome-icon-theme-3.12.0 CATEGORIES= graphics gnome @@ -26,23 +26,19 @@ PKGCONFIG_OVERRIDE= gnome-icon-theme.pc.in # the current pkgsrc version. BUILDLINK_API_DEPENDS.icon-naming-utils+= icon-naming-utils>=0.8.90 -EVAL_PREFIX+= PREFIX.gtk2=gtk2+ -FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache" +FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${LOCALBASE}/bin/gtk-update-icon-cache" FILES_SUBST+= ICON_THEME_DIR="${PREFIX}/share/icons/gnome" INSTALL_TEMPLATES+= ../../graphics/gnome-icon-theme/files/icon-cache.tmpl DEINSTALL_TEMPLATES+= ../../graphics/gnome-icon-theme/files/icon-cache.tmpl PRINT_PLIST_AWK+= /^share\/icons\/gnome\/icon-theme.cache$$/ { next; } -FIND_PREFIX:= LIBRSVGDIR=librsvg -.include "../../mk/find-prefix.mk" - post-install: - ${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 16 -h 16 -o ${DESTDIR}${PREFIX}/share/icons/gnome/16x16/places/start-here.png - ${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 22 -h 22 -o ${DESTDIR}${PREFIX}/share/icons/gnome/22x22/places/start-here.png - ${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 24 -h 24 -o ${DESTDIR}${PREFIX}/share/icons/gnome/24x24/places/start-here.png - ${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 32 -h 32 -o ${DESTDIR}${PREFIX}/share/icons/gnome/32x32/places/start-here.png - ${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 48 -h 48 -o ${DESTDIR}${PREFIX}/share/icons/gnome/48x48/places/start-here.png - ${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 256 -h 256 -o ${DESTDIR}${PREFIX}/share/icons/gnome/256x256/places/start-here.png + ${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 16 -h 16 -o ${DESTDIR}${PREFIX}/share/icons/gnome/16x16/places/start-here.png + ${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 22 -h 22 -o ${DESTDIR}${PREFIX}/share/icons/gnome/22x22/places/start-here.png + ${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 24 -h 24 -o ${DESTDIR}${PREFIX}/share/icons/gnome/24x24/places/start-here.png + ${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 32 -h 32 -o ${DESTDIR}${PREFIX}/share/icons/gnome/32x32/places/start-here.png + ${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 48 -h 48 -o ${DESTDIR}${PREFIX}/share/icons/gnome/48x48/places/start-here.png + ${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 256 -h 256 -o ${DESTDIR}${PREFIX}/share/icons/gnome/256x256/places/start-here.png BUILDLINK_DEPMETHOD.gettext-lib= build .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk index 254082271f6..215a40e420d 100644 --- a/graphics/gnome-icon-theme/buildlink3.mk +++ b/graphics/gnome-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2012/05/07 01:53:34 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2015/11/25 12:50:43 jperkin Exp $ BUILDLINK_TREE+= gnome-icon-theme @@ -17,8 +17,7 @@ USE_TOOLS+= perl .include "../../mk/bsd.fast.prefs.mk" .if !defined(GNOME_ICON_THEME_DEPEND_ONLY) -EVAL_PREFIX+= PREFIX.gtk2=gtk2+ -FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache" +FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${LOCALBASE}/bin/gtk-update-icon-cache" FILES_SUBST+= ICON_THEME_DIR="${BUILDLINK_PREFIX.gnome-icon-theme}/share/icons/gnome" INSTALL_TEMPLATES+= ../../graphics/gnome-icon-theme/files/icon-cache.tmpl DEINSTALL_TEMPLATES+= ../../graphics/gnome-icon-theme/files/icon-cache.tmpl -- cgit v1.2.3