From f1323b234ca20824755b76198612200030970f1a Mon Sep 17 00:00:00 2001
From: jlam <jlam>
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/geomview/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'graphics/geomview')

diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 1fb5b3cb7cc..61f2cbb01c2 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/07/04 03:08:57 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:17 jlam Exp $
 
 DISTNAME=		geomview-1.8.1
 CATEGORIES=		graphics math
@@ -12,12 +12,11 @@ CONFLICTS=		ImageMagick-*	# both have a program named 'animate'
 
 USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=		yes
-USE_X11=		yes
 
 CONFIGURE_ARGS+=	--without-xforms
 CONFIGURE_ARGS+=	--with-opengl=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--with-motif=${BUILDLINK_DIR}
-CPPFLAGS+=		-Dunix -Dalloca=__builtin_alloca -I${X11BASE}/include
+CPPFLAGS+=		-Dunix -Dalloca=__builtin_alloca
 
 INFO_FILES=		geomview
 
@@ -43,4 +42,5 @@ post-install:
 
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../x11/lesstif/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3