From e9e26df1fc161cd494bbd28081a6280400ecfcc2 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 23 Sep 2002 21:55:11 +0000
Subject: buildlink1 -> buildlink2

---
 sysutils/xosview/Makefile | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'sysutils/xosview')

diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index cfcc317e1ee..3dfea87ca85 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2002/06/04 06:50:13 tron Exp $
+# $NetBSD: Makefile,v 1.40 2002/09/23 22:01:31 jlam Exp $
 
 DISTNAME=       xosview-1.7.0.b
 PKGNAME=	xosview-1.7.0b
@@ -10,31 +10,29 @@ MAINTAINER=	bgrayson@netbsd.org
 HOMEPAGE=	http://lore.ece.utexas.edu/~bgrayson/xosview.html
 COMMENT=	X11 graphical display of OS statistics
 
+USE_BUILDLINK2=		YES
+USE_X11BASE=		YES
+
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--x-includes=${BUILDLINK_X11_DIR}/include
-CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_X11_DIR}/lib
-
-USE_X11BASE=		YES
-USE_BUILDLINK_ONLY=	YES
+CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-BUILD_DEFS=	UVM
-
-.if !defined(UVM) && exists(/usr/include/uvm/uvm.h)
-UVM=		# defined
+.  if !defined(UVM) && exists(/usr/include/uvm/uvm.h)
 CFLAGS+=	-DUVM
-.endif
+UVM=		# defined
+BUILD_DEFS=	UVM
+.  endif
 .elif ${OPSYS} == "SunOS"
+USE_GMAKE=	YES
 BUILD_DEPENDS+=	egcs-1.1.2:../../lang/egcs
-CONFIGURE_ENV+=	CXX=${LOCALBASE}/egcs/bin/g++
-CPPFLAGS+=	-I${BUILDLINK_X11_DIR}/include
+CXX=		${LOCALBASE}/egcs/bin/g++
+CPPFLAGS+=	-I${X11BASE}/include
 LIBS+=		-lsocket -lnsl
-USE_GMAKE=	YES
 .endif
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3