diff options
| author | jperkin <jperkin> | 2015-11-25 12:53:55 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-11-25 12:53:55 +0000 |
| commit | e33c78e9836daf378dcedca5517ee8ad40850284 (patch) | |
| tree | 1dc73422da1d0ff998b6ac88078733ddfe325efd /wm/fvwm | |
| parent | 093e9003c17ee8a64f8d4fcc02b0855e3bdcbb1d (diff) | |
| download | pkgsrc-e33c78e9836daf378dcedca5517ee8ad40850284.tar.gz | |
Remove mk/find-prefix.mk usage from the wm 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 'wm/fvwm')
| -rw-r--r-- | wm/fvwm/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile index d45cf0b725b..aa593cedb14 100644 --- a/wm/fvwm/Makefile +++ b/wm/fvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2015/07/04 16:18:41 joerg Exp $ +# $NetBSD: Makefile,v 1.33 2015/11/25 12:53:55 jperkin Exp $ DISTNAME= fvwm-${FVWM_VER} PKGREVISION= 6 @@ -27,11 +27,10 @@ INSTALLATION_DIRS+= lib/X11/fvwm2 INSTALLATION_DIRS+= lib/X11/fvwm2/pixmaps INSTALLATION_DIRS+= ${PKGMANDIR}/man1 -EVAL_PREFIX+= XPMDIR=xpm CONFIGURE_ARGS+= --without-gnome CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/lib/X11/fvwm2 CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/lib/X11 -CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR:Q}/include +CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_PREFIX.libXpm:Q}/include CONFIGURE_ARGS+= --with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}/include/X11/bitmaps:${X11BASE:Q}/include/X11/pixmaps # We don't want to have CPP from the buildlink directory |