From b6b94f0c669b1ef2a824c69854900b68ec821681 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 25 Aug 2002 21:50:52 +0000
Subject: Merge packages from the buildlink2 branch back into the main trunk
 that have been converted to USE_BUILDLINK2.

---
 sysutils/asapm/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sysutils/asapm')

diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 6f86c8e7c06..8bcfd1e540c 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/11/26 19:55:40 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2002/08/25 21:50:54 jlam Exp $
 #
 
 DISTNAME=		asapm-2.11
@@ -15,13 +15,13 @@ COMMENT=		Laptop battery status display for X11
 IGNORE+=		"APM is not available for ${MACHINE_PLATFORM}"
 .endif
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-jpeg	# there actually is no JPEG support
 CONFIGURE_ARGS+=	--with-xpm
-CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_DIR}/include
-CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include
+CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3