diff options
| -rw-r--r-- | editors/xvile/Makefile | 4 | ||||
| -rw-r--r-- | graphics/libwmf/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/asapm/Makefile | 6 | ||||
| -rw-r--r-- | x11/fvwm2/Makefile | 4 | ||||
| -rw-r--r-- | x11/rxvt/Makefile | 6 | ||||
| -rw-r--r-- | x11/xfce/Makefile | 8 |
6 files changed, 17 insertions, 15 deletions
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index 117d3a789ef..759820390ae 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2000/02/05 18:32:02 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2000/07/11 09:31:32 agc Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp # @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_PERL5= yes USE_XAW= yes MAKEFILE= makefile -CONFIGURE_ARGS+= --with-screen=Xaw --with-xpm --with-perl --with-lib-dir=${X11BASE}/libexec +CONFIGURE_ARGS+= --with-screen=Xaw --with-xpm --with-perl --with-lib-dir=${X11PREFIX}/libexec INSTALL_TARGET= install install-perl post-install: diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index a692169553f..1d1cf949753 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/05/01 06:07:45 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/11 09:31:33 agc Exp $ # DISTNAME= libwmf-0.1.17 @@ -22,7 +22,7 @@ USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-png="${LOCALBASE}" CONFIGURE_ARGS+= --with-ttf="${LOCALBASE}" -CONFIGURE_ARGS+= --with-xpm="${X11BASE}" +CONFIGURE_ARGS+= --with-xpm="`${PKG_INFO} -qp xpm | ${AWK} '{ print $$2 }'`" CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index 2372ed3d152..d0c30243100 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/07/06 21:09:38 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.10 2000/07/11 09:31:33 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp # @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_X11= yes CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support CONFIGURE_ARGS+= --with-xpm \ - --with-xpm-includes="${X11BASE}/include" \ - --with-xpm-library="${X11BASE}/lib" + --with-xpm-includes="`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include" \ + --with-xpm-library="`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/lib" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile index 526179db4f8..728419b612f 100644 --- a/x11/fvwm2/Makefile +++ b/x11/fvwm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 1999/12/02 12:04:18 kleink Exp $ +# $NetBSD: Makefile,v 1.23 2000/07/11 09:31:33 agc Exp $ # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-extras CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2 CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11 -CONFIGURE_ARGS+= --with-xpm-includes=${PREFIX}/include +CONFIGURE_ARGS+= --with-xpm-includes=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include CONFIGURE_ARGS+= --with-readline-includes=${LOCALBASE}/include CONFIGURE_ARGS+= --with-rplay-includes=${LOCALBASE}/include CONFIGURE_ARGS+= --with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11ROOT}/include/bitmaps:${X11ROOT}/include/pixmaps diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 8704fc3a96f..eddb999c514 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/05/08 03:25:20 hubertf Exp $ +# $NetBSD: Makefile,v 1.14 2000/07/11 09:31:33 agc Exp $ # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp # @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --enable-utmp \ --enable-frills \ --enable-keepscrolling \ --enable-mousewheel \ - --with-xpm-includes=${X11BASE}/include/X11 \ - --with-xpm-library=${X11BASE}/lib + --with-xpm-includes=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include/X11 \ + --with-xpm-library=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/lib .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index bf291ed6d61..590dc3c1ff2 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/03/03 17:50:25 jwise Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 09:31:33 agc Exp $ DISTNAME= xfce-3.3.1 CATEGORIES= x11 @@ -16,8 +16,10 @@ USE_X11= yes USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= XFCE_LOCALE_DIR=${PREFIX}/share/locale -CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share \ - --with-imlib=${X11BASE} --with-xpm=${X11BASE} +CONFIGURE_ARGS+=--without-included-gettext \ + --datadir=${PREFIX}/share \ + --with-imlib=${X11BASE} \ + --with-xpm=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'` USE_GMAKE= yes .include "../../mk/bsd.pkg.mk" |