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/tk-Tix/Makefile         | 19 ++++++++++---------
 x11/tk-Tix/distinfo         |  4 ++--
 x11/tk-Tix/patches/patch-aa | 12 ++++++------
 3 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'x11/tk-Tix')

diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile
index 42e6ac09389..d0a2692db43 100644
--- a/x11/tk-Tix/Makefile
+++ b/x11/tk-Tix/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/04/16 14:06:53 seb Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 21:52:46 jlam Exp $
 #
 
 DISTNAME=	tix8.2.0b1
 PKGNAME=	tk-Tix-8.2.0b1
+WRKSRC=		${WRKDIR}/tix8.2.0/unix
 CATEGORIES=	x11 tcl tk
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tixlibrary/}
 
@@ -10,17 +11,17 @@ MAINTAINER=	he@netbsd.org
 HOMEPAGE=	http://tixlibrary.sourceforge.net/
 COMMENT=	Powerful widget library for Tcl/Tk
 
+USE_BUILDLINK2=		yes
+USE_X11=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-shared --with-tcl=${BUILDLINK_DIR}/lib \
-			--with-tk=${BUILDLINK_DIR}/lib \
+CONFIGURE_ARGS+=	--enable-shared --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
+			--with-tk=${BUILDLINK_PREFIX.tk}/lib \
 			--disable-stubs
-USE_BUILDLINK_ONLY=	YES
-
-WRKSRC=			${WRKDIR}/tix8.2.0/unix
+MAKE_ENV+=		TCL_DIR=${BUILDLINK_PREFIX.tcl}
+MAKE_ENV+=		TK_DIR=${BUILDLINK_PREFIX.tk}
 
 test:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} test)
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} test
 
-.include "../../mk/x11.buildlink.mk"
-.include "../../x11/tk/buildlink.mk"
+.include "../../x11/tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk-Tix/distinfo b/x11/tk-Tix/distinfo
index 73556615dcb..9e22882c684 100644
--- a/x11/tk-Tix/distinfo
+++ b/x11/tk-Tix/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
+$NetBSD: distinfo,v 1.2 2002/08/25 21:52:47 jlam Exp $
 
 SHA1 (tix8.2.0b1.tar.gz) = c9114e56c41fc492532639127439d6f267c51402
 Size (tix8.2.0b1.tar.gz) = 1374621 bytes
-SHA1 (patch-aa) = c77a20a692b3ef79e9092c15e506d5af7961919e
+SHA1 (patch-aa) = b9c15d3435d289a3469e4c1bc261df99e1a2bf2e
 SHA1 (patch-ab) = 2a46093df4d19c481d58b2a9b8945430d547a12c
 SHA1 (patch-ac) = 9702cf3635c04ce066f5d910d5a5b6ad1d87d96b
diff --git a/x11/tk-Tix/patches/patch-aa b/x11/tk-Tix/patches/patch-aa
index 8dcd5201186..0f4f452dd6b 100644
--- a/x11/tk-Tix/patches/patch-aa
+++ b/x11/tk-Tix/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 21:52:47 jlam Exp $
 
---- Makefile.in.orig	Thu Jan 11 08:43:46 2001
+--- Makefile.in.orig	Thu Jan 11 02:43:46 2001
 +++ Makefile.in
 @@ -217,6 +217,7 @@
  STLIB_LD = @STLIB_LD@
@@ -24,10 +24,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/15 08:19:02 he Exp $
 -	   -I$(TCL_SRC_DIR)/unix \
 -	   -I$(TK_SRC_DIR)/generic \
 -	   -I$(TK_SRC_DIR)/unix \
-+INCLUDES = -I$(BUILDLINK_DIR)/include/tcl/generic \
-+	   -I$(BUILDLINK_DIR)/include/tcl/unix \
-+	   -I$(BUILDLINK_DIR)/include/tk/generic \
-+	   -I$(BUILDLINK_DIR)/include/tk/unix \
++INCLUDES = -I$(TCL_DIR)/include/tcl/generic \
++	   -I$(TCL_DIR)/include/tcl/unix \
++	   -I$(TK_DIR)/include/tk/generic \
++	   -I$(TK_DIR)/include/tk/unix \
  	   -I$(GENERIC_DIR) \
  	   -I$(UNIX_DIR) \
 -	   -I$(WIN_DIR)
-- 
cgit v1.2.3