Use EVAL_PREFIX to work out the installed directory of the sam package.

4 files changed, 11 insertions, 10 deletions

diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 67447d39f1b..3cac4fac123 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/12/15 20:25:39 agc Exp $
+# $NetBSD: Makefile,v 1.9 2001/12/15 20:37:53 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
 #
 
@@ -19,7 +19,8 @@ USE_BUILDLINK_ONLY=	yes
 
 MANCOMPRESSED=		yes
 WRKSRC=			${WRKDIR}
-MAKE_ENV+=		WRKDIR=${WRKDIR} X11PREFIX=${X11PREFIX}
+EVAL_PREFIX+=		SAM_DIR=qt1
+MAKE_ENV+=		SAM_DIR=${SAM_DIR}
 
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/9term/distinfo b/x11/9term/distinfo
index 8942d0eef43..b580be014c6 100644
--- a/x11/9term/distinfo
+++ b/x11/9term/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.4 2001/05/05 01:56:20 hubertf Exp $
+$NetBSD: distinfo,v 1.5 2001/12/15 20:37:53 agc Exp $
 
 SHA1 (9term.1.6.3.tar.gz) = deb6248c9e441934ad8af522871034e24cb2bf5b
 Size (9term.1.6.3.tar.gz) = 135169 bytes
-SHA1 (patch-aa) = 0985fecfa694b99e67bcf91986944be89c44b6ae
+SHA1 (patch-aa) = 8e06b589d762d0fd349b66a0e20a51f1ac728fd5
 SHA1 (patch-ab) = c79dc4ef6bbc75112f8fe1e9ef3dafeb380a2d09
 SHA1 (patch-ac) = 500feea9198682d720314081d13a31e0e841940d
 SHA1 (patch-ad) = c9993356b66653c231be106e6f96d6e55a688f89
-SHA1 (patch-ae) = 654b27d31d61e0887e22a3a3fbc2bf5140d95dd3
+SHA1 (patch-ae) = 434af20bb9096e7a3580f00b415a94355d69fc88
 SHA1 (patch-af) = d8de61ee74a08a58842fda21c4db3a471083faf3
 SHA1 (patch-ag) = 2dcdadff6afa4307a54d4517599d7834d085eaf3
 SHA1 (patch-ah) = fc5340b1d11a9e70266180302e312d15acd05347
diff --git a/x11/9term/patches/patch-aa b/x11/9term/patches/patch-aa
index 8688e2acf5e..9d46d4d672b 100644
--- a/x11/9term/patches/patch-aa
+++ b/x11/9term/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/05/05 01:56:21 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2001/12/15 20:37:53 agc Exp $
 
 --- libtext/Makefile.orig	Thu Jun  2 04:01:19 1994
 +++ libtext/Makefile
@@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.3 2001/05/05 01:56:21 hubertf Exp $
  #	if your compiler supports posix-compatible compilation
 -OS=-DSOLARIS
 +OS=-DSUNOS -O2
-+SAMDIR=${X11PREFIX}/include/sam
++SAMDIR=${SAM_DIR}/include/sam
  
  #	add -Iincludedir for any include directories that need to be searched
  #	for posix header files
diff --git a/x11/9term/patches/patch-ae b/x11/9term/patches/patch-ae
index d31c89e08ab..58ff757e411 100644
--- a/x11/9term/patches/patch-ae
+++ b/x11/9term/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2001/05/05 01:56:21 hubertf Exp $
+$NetBSD: patch-ae,v 1.3 2001/12/15 20:37:54 agc Exp $
 
 --- 9term/Makefile.orig	Mon Mar 14 05:50:54 1994
 +++ 9term/Makefile
@@ -12,7 +12,7 @@ $NetBSD: patch-ae,v 1.2 2001/05/05 01:56:21 hubertf Exp $
 -BINDIR=/usr/pgrad/matty/bin/$(cputype)
 +OS= -D_LIBXG_EXTENSION -DSUNOS
 +
-+SAMPATH=${X11PREFIX}/include/sam
++SAMPATH=${SAM_DIR}/include/sam
 +
 +BINDIR=.			# where we'll install it
  
@@ -30,7 +30,7 @@ $NetBSD: patch-ae,v 1.2 2001/05/05 01:56:21 hubertf Exp $
  # or if you need extra libraries to load with X11 applications
 -LIBS=../libtext/libtext.a ../libframe/libframe.a ../libXg/libXg.a
 -XLIBS=-lXt -lX11
-+LIBS=../libtext/libtext.a $(X11PREFIX)/lib/libframe.a $(X11PREFIX)/lib/libXg.a
++LIBS=../libtext/libtext.a $(SAM_DIR)/lib/libframe.a $(SAM_DIR)/lib/libXg.a
 +XLIBS= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXt -lX11
  
  OBJECTS=9term.o command.o display.o pty.o