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.
---
 wm/afterstep/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'wm/afterstep')

diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index a42b7a7b482..2a5aa472a8c 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/08/27 14:35:15 tron Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/29 22:41:21 jlam Exp $
 
 DISTNAME=	AfterStep-1.8.9
 PKGNAME=	afterstep-1.8.9
@@ -22,10 +22,10 @@ USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_PERL5=		YES
-USE_X11=		YES
 
 CONFIGURE_ARGS+=	--disable-staticlibs
 CONFIGURE_ARGS+=	--with-helpcommand="xpman"
+CFLAGS+=		-I${BUILDLINK_DIR}/include/X11		# xpm.h
 
 post-patch:
 	for i in `${FIND} ${WRKSRC} -name "*.man" -print` \
@@ -44,4 +44,5 @@ pre-configure:
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3