From b3489846cdcd8599e3b3c7365abab022dde2d298 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 29 Sep 2002 09:47:20 +0000 Subject: buildlink1 -> buildlink2 and use gcc/buildlink2.mk instead of Makefile.gcc --- x11/xfce/Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'x11/xfce') diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index 8308eb3069c..391e1325dd3 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2002/04/23 17:46:17 martti Exp $ +# $NetBSD: Makefile,v 1.28 2002/09/29 09:47:20 jlam Exp $ DISTNAME= xfce-3.8.16 CATEGORIES= x11 @@ -9,35 +9,35 @@ HOMEPAGE= http://www.xfce.org/ COMMENT= Lightweight desktop environment with CDE look and feel BUILD_USES_MSGFMT= yes -DEPENDS+= gtk+-1.2.*:../../x11/gtk -DEPENDS+= imlib>=1.9.11nb1:../../graphics/imlib -USE_X11= # defined -USE_XPM= # defined +USE_BUILDLINK2= # defined USE_X11BASE= # defined -USE_LIBINTL= # defined USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_GMAKE= # defined GNU_CONFIGURE= # defined -GCC_VERSION!= gcc --version -.if (${GCC_VERSION:C/-.*$$//} == egcs) && (${MACHINE_ARCH} == alpha) -.include "../../lang/gcc/Makefile.gcc" +.if ${MACHINE_ARCH} == "alpha" +. include "../../lang/gcc/buildlink2.mk" .endif -EVAL_PREFIX+= IMLIBDIR=imlib CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ARGS+= --datadir=${PREFIX}/share CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc -CONFIGURE_ARGS+= --enable-imlib=${IMLIBDIR} +CONFIGURE_ARGS+= --enable-imlib=${BUILDLINK_PREFIX.imlib} CONFIGURE_ARGS+= --disable-libiconv +CONFIGURE_ARGS+= --disable-audiofile # work around bug in configure script CONFIGURE_ENV+= gt_cv_func_gettext_libintl="yes" CPPFLAGS+= -I${X11BASE}/include # dependent includes for xpm.h +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3