The sam libs and headers are in X11PREFIX - search them there!

4 files changed, 15 insertions, 14 deletions

diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index da6477da5d3..786e8b5b5d2 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/01 09:35:40 agc Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/05 01:56:20 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
 #
 
@@ -19,6 +19,7 @@ NOT_FOR_PLATFORM=	*-*-alpha	#LP64 Problems
 
 MANCOMPRESSED=		yes
 NO_WRKSUBDIR=		yes
-MAKE_ENV+=		WRKDIR=${WRKDIR} PKGSRCDIR=${PKGSRCDIR}
+MAKE_ENV+=		WRKDIR=${WRKDIR} PKGSRCDIR=${PKGSRCDIR} \
+			X11PREFIX=${X11PREFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/9term/distinfo b/x11/9term/distinfo
index d10641baa35..8942d0eef43 100644
--- a/x11/9term/distinfo
+++ b/x11/9term/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.3 2001/05/01 09:35:40 agc Exp $
+$NetBSD: distinfo,v 1.4 2001/05/05 01:56:20 hubertf Exp $
 
 SHA1 (9term.1.6.3.tar.gz) = deb6248c9e441934ad8af522871034e24cb2bf5b
 Size (9term.1.6.3.tar.gz) = 135169 bytes
-SHA1 (patch-aa) = ec6ef2bec9b34407f46e4d7d4483272fd6e8a68e
+SHA1 (patch-aa) = 0985fecfa694b99e67bcf91986944be89c44b6ae
 SHA1 (patch-ab) = c79dc4ef6bbc75112f8fe1e9ef3dafeb380a2d09
 SHA1 (patch-ac) = 500feea9198682d720314081d13a31e0e841940d
 SHA1 (patch-ad) = c9993356b66653c231be106e6f96d6e55a688f89
-SHA1 (patch-ae) = 4d6ae599a53a9fbc8b97fc83e3d57950e881854e
+SHA1 (patch-ae) = 654b27d31d61e0887e22a3a3fbc2bf5140d95dd3
 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 597bc3f5f3c..8688e2acf5e 100644
--- a/x11/9term/patches/patch-aa
+++ b/x11/9term/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.2 2001/05/01 09:35:41 agc Exp $
+$NetBSD: patch-aa,v 1.3 2001/05/05 01:56:21 hubertf Exp $
 
---- libtext/Makefile.orig	Thu Jun  2 03:01:19 1994
-+++ libtext/Makefile	Fri Sep 26 16:44:27 1997
+--- libtext/Makefile.orig	Thu Jun  2 04:01:19 1994
++++ libtext/Makefile
 @@ -5,14 +5,15 @@
  #	
  #	Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
  #	if your compiler supports posix-compatible compilation
 -OS=-DSOLARIS
 +OS=-DSUNOS -O2
-+SAMDIR=${PREFIX}/include/sam
++SAMDIR=${X11PREFIX}/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 c03427d5a32..d31c89e08ab 100644
--- a/x11/9term/patches/patch-ae
+++ b/x11/9term/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2001/05/01 09:35:41 agc Exp $
+$NetBSD: patch-ae,v 1.2 2001/05/05 01:56:21 hubertf Exp $
 
---- 9term/Makefile.orig	Mon Mar 14 04:50:54 1994
-+++ 9term/Makefile	Tue May  1 09:59:01 2001
+--- 9term/Makefile.orig	Mon Mar 14 05:50:54 1994
++++ 9term/Makefile
 @@ -11,27 +11,29 @@
  #	Define RISCOS for Mips RISC/os
  #	Define BSDPTYS for BSD-style pty support
@@ -12,7 +12,7 @@ $NetBSD: patch-ae,v 1.1 2001/05/01 09:35:41 agc Exp $
 -BINDIR=/usr/pgrad/matty/bin/$(cputype)
 +OS= -D_LIBXG_EXTENSION -DSUNOS
 +
-+SAMPATH=${PREFIX}/include/sam
++SAMPATH=${X11PREFIX}/include/sam
 +
 +BINDIR=.			# where we'll install it
  
@@ -30,7 +30,7 @@ $NetBSD: patch-ae,v 1.1 2001/05/01 09:35:41 agc 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 $(PREFIX)/lib/libframe.a $(PREFIX)/lib/libXg.a
++LIBS=../libtext/libtext.a $(X11PREFIX)/lib/libframe.a $(X11PREFIX)/lib/libXg.a
 +XLIBS= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXt -lX11
  
  OBJECTS=9term.o command.o display.o pty.o