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.

---
 x11/rxvt/MESSAGE  |  4 ++--
 x11/rxvt/Makefile | 12 +++++-------
 x11/rxvt/PLIST    |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'x11/rxvt')

diff --git a/x11/rxvt/MESSAGE b/x11/rxvt/MESSAGE
index f901a7f1b45..0c81d861e81 100644
--- a/x11/rxvt/MESSAGE
+++ b/x11/rxvt/MESSAGE
@@ -1,5 +1,5 @@
 ======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 22:11:37 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2002/08/25 21:52:44 jlam Exp $
 
 The rxvt binary is able to use greek keyboard extensions and
 multibyte character encodings. Due to errors in the current
@@ -9,5 +9,5 @@ for users in other locales).
 
 The multibyte character encoding support is compiled in, but
 by default disabled. To enable it, please edit the file 
-${X11BASE}/lib/X11/app-defaults/Rxvt.
+${PREFIX}/lib/X11/app-defaults/Rxvt.
 ======================================================================
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 92ee22d6540..29c79624715 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/10/24 22:11:15 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2002/08/25 21:52:45 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
 #
 
@@ -13,10 +13,9 @@ MAINTAINER=		gcw@rxvt.org
 HOMEPAGE=		http://www.rxvt.org/
 COMMENT=		Low memory usage xterm replacement that supports color
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
-MESSAGE_SUBST+=		X11BASE="${X11PREFIX}"
 
 CONFIGURE_ARGS+=	--enable-utmp \
 			--enable-wtmp \
@@ -40,8 +39,8 @@ CONFIGURE_ARGS+=	--enable-utmp \
 # enabling it, please fix pkg/MESSAGE as well.
 #			--enable-greek
 
-CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_DIR}/include/X11
-CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include/X11
+CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib
 
 post-patch:
 	${MV} ${WRKSRC}/src/feature.h  ${WRKSRC}/src/feature.h.orig
@@ -53,6 +52,5 @@ pre-install:
 		${INSTALL_DATA} ${FILESDIR}/Rxvt ${X11PREFIX}/lib/X11/app-defaults; \
 	fi
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/rxvt/PLIST b/x11/rxvt/PLIST
index 9a315823c7c..cb71a886549 100644
--- a/x11/rxvt/PLIST
+++ b/x11/rxvt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/11 18:07:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:45 jlam Exp $
 bin/rxvt
 man/man1/rxvt.1
 lib/X11/app-defaults/Rxvt
-- 
cgit v1.2.3