From eec881fd373492023b3161b5d4f87eed8bc434ea Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@pkgsrc.org>
Date: Fri, 16 Jan 1998 08:42:22 +0000
Subject: Don't use hardcoded "work" dirname, but use ${WRKDIR:T} instead (and
 pass in via MAKE_ENV).

---
 plan9/9term/Makefile         | 5 +++--
 plan9/9term/patches/patch-aa | 2 +-
 plan9/9term/patches/patch-ab | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'plan9')

diff --git a/plan9/9term/Makefile b/plan9/9term/Makefile
index ad39cde7c59..6404a63f3eb 100644
--- a/plan9/9term/Makefile
+++ b/plan9/9term/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1997/10/17 13:03:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/01/16 08:42:22 hubertf Exp $
 # New ports collection makefile for:    9term
 # Version required:     1.6.3
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
@@ -15,7 +15,7 @@ MASTER_SITES=   ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 MAINTAINER=	erich@FreeBSD.org
 
 # needs library and private header, but not during runtime
-BUILD_DEPENDS=	${PORTSDIR}/plan9/sam/work/libframe/libframe.a:${PORTSDIR}/plan9/sam
+BUILD_DEPENDS=	${PORTSDIR}/plan9/sam/${WRKDIR:T}/libframe/libframe.a:${PORTSDIR}/plan9/sam
 
 OPSYS!= 	uname -s
 .if (${OPSYS} == "NetBSD")
@@ -25,5 +25,6 @@ MANCOMPRESSED=	yes
 MAN1=		9term.1
 
 NO_WRKSUBDIR=	yes
+MAKE_ENV+=	WRKDIR=${WRKDIR}
 
 .include <bsd.port.mk>
diff --git a/plan9/9term/patches/patch-aa b/plan9/9term/patches/patch-aa
index 8c712c55977..b8ca9a80055 100644
--- a/plan9/9term/patches/patch-aa
+++ b/plan9/9term/patches/patch-aa
@@ -6,7 +6,7 @@
  #	if your compiler supports posix-compatible compilation
 -OS=-DSOLARIS
 +OS=-DSUNOS -O2
-+SAMDIR=../../../sam/work
++SAMDIR=../../../sam/${WRKDIR:T}
  
  #	add -Iincludedir for any include directories that need to be searched
  #	for posix header files
diff --git a/plan9/9term/patches/patch-ab b/plan9/9term/patches/patch-ab
index e0e00578e59..a0c1cc7e61b 100644
--- a/plan9/9term/patches/patch-ab
+++ b/plan9/9term/patches/patch-ab
@@ -92,7 +92,7 @@
 -BINDIR=/usr/pgrad/matty/bin/$(cputype)
 +OS= -D_LIBXG_EXTENSION -DSUNOS
 +
-+SAMPATH=../../../sam/work
++SAMPATH=../../../sam/${WRKDIR:T}
 +
 +BINDIR=.			# where we'll install it
  
-- 
cgit v1.2.3