From 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 29 Aug 2001 22:41:00 +0000
Subject: Use x11.buildlink.mk instead of USE_X11.  Also convert hard-coded
 references to ${X11BASE} in the header and library search paths into
 references to ${LOCALBASE}/share/x11-links.  These packages should now be
 strongly- buildlinked regardless of whether xpkgwedge is installed.

Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
---
 graphics/imlib/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'graphics/imlib')

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 82629f703de..efe43e321e7 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2001/08/27 14:35:09 tron Exp $
+# $NetBSD: Makefile,v 1.57 2001/08/29 22:41:18 jlam Exp $
 #
 
 DISTNAME=		imlib-1.9.11
@@ -20,6 +20,7 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 USE_GMAKE=		yes
 
 USE_BUILDLINK_ONLY=	yes
+REPLACE_BUILDLINK=	imlib-config
 
 CPPFLAGS+=		-DENABLE_NLS
 CONFIGURE_ENV+=		ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
@@ -28,7 +29,7 @@ CONFIGURE_ENV+=		X_LDFLAGS="${X_LDFLAGS}"
 # The following ensures that `imlib-config --libs' includes the correct
 # linker flags for linking the X11 libs.
 #
-X_LDFLAGS=		-Wl,-R${X11BASE}/lib -L${X11BASE}/lib
+X_LDFLAGS=		-Wl,-R${X11BASE}/lib -L${BUILDLINK_X11_DIR}/lib
 
 pre-configure:
 	${TOUCH} ${WRKSRC}/ltconfig
@@ -49,4 +50,5 @@ post-install:
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3