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/GraphicsMagick/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'graphics/GraphicsMagick') diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 2448c2921e9..d85aac752e2 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2015/10/06 16:50:31 adam Exp $ +# $NetBSD: Makefile,v 1.72 2015/11/25 12:50:43 jperkin Exp $ .include "Makefile.common" @@ -16,7 +16,7 @@ USE_FEATURES= vsnprintf # optional but recommended for security GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --with-modules=yes -CONFIGURE_ARGS+= --with-gs-font-dir=${URW_FONTS_DIR}/share/fonts/urw +CONFIGURE_ARGS+= --with-gs-font-dir=${LOCALBASE}/share/fonts/urw CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib CONFIGURE_ARGS+= --without-perl @@ -27,9 +27,6 @@ PKGCONFIG_OVERRIDE+= Magick++/lib/GraphicsMagick++.pc.in TEST_TARGET= check -FIND_PREFIX:= URW_FONTS_DIR=urw-fonts -.include "../../mk/find-prefix.mk" - .include "options.mk" .include "../../devel/libltdl/buildlink3.mk" -- cgit v1.2.3