Fix installation problems. Patches worked out by alistair Crooks.

5 files changed, 13 insertions, 12 deletions

diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 24cad5782ff..454f7ad4485 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/05/15 12:15:17 agc Exp $
+# $NetBSD: Makefile,v 1.14 2000/09/13 10:41:59 tron Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
 #
 
@@ -15,6 +15,7 @@ EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
 
 MANCOMPRESSED=		yes
 USE_X11=		yes
+MAKE_ENV+=		X11PREFIX=${X11PREFIX}
 
 DEPENDS+=		libXgFonts-1.0:../../fonts/Xg
 
diff --git a/editors/sam/files/patch-sum b/editors/sam/files/patch-sum
index e28b105527a..c079cfd94e8 100644
--- a/editors/sam/files/patch-sum
+++ b/editors/sam/files/patch-sum
@@ -1,11 +1,11 @@
-$NetBSD: patch-sum,v 1.2 1999/08/24 19:01:44 agc Exp $
+$NetBSD: patch-sum,v 1.3 2000/09/13 10:42:00 tron Exp $
 
-MD5 (patch-aa) = 5ad819a7a41439fb8d89c31998960bb8
+MD5 (patch-aa) = d4298a2883be8645dffffbb9f5b5f3c2
 MD5 (patch-ab) = f59c393133169ca3255fb1c84753e3b8
-MD5 (patch-ac) = 4e808218ab49a0bb6815ab636f8a33c5
+MD5 (patch-ac) = a5a29cfd5a5841cc4dd50d04efddef1b
 MD5 (patch-ad) = 6ddab3327906dc6643c707f2f93b8588
 MD5 (patch-ae) = e6a7a172f05b376a452ea9185584d54e
-MD5 (patch-af) = 9a1e46868477cccc90601bcef7a5cdbd
+MD5 (patch-af) = 9ec5572bbf7a51407aac0100b4c5fae2
 MD5 (patch-ag) = 70c2343930a221bc8f83f8d68b8a92d1
 MD5 (patch-ah) = 7bcc9175893571c500c88f0c9475e690
 MD5 (patch-ai) = 0b761769dd60c4f0b4e1eec6fb4c0b9d
diff --git a/editors/sam/patches/patch-aa b/editors/sam/patches/patch-aa
index b770f0cfa4b..6d66315dcb4 100644
--- a/editors/sam/patches/patch-aa
+++ b/editors/sam/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:11:17 agc Exp $
+$NetBSD: patch-aa,v 1.3 2000/09/13 10:42:00 tron Exp $
 
 *** libXg/Makefile.orig	Fri Jul 28 14:02:17 1995
 --- libXg/Makefile	Fri Jul 21 15:03:43 1995
@@ -41,11 +41,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:11:17 agc Exp $
 ! OS=-O2 -DBSDi
   
   #	add -Iincludedir for any include directories that need to be searched
-! INCS=-I../include -I/usr/X11R6/include
+! INCS=-I../include -I${X11BASE}/include
   
   #	set this if your X libraries are in different locations
   #	or if you need extra libraries to load with X11 applications
-! XLIBS=/usr/X11/lib/libXt.a /usr/X11/lib/libX11.a
+! XLIBS=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lX11
   
   #	add name of library orderer - use ":" if none
 ! RANLIB=ranlib
diff --git a/editors/sam/patches/patch-ac b/editors/sam/patches/patch-ac
index 69da3584efc..810c10dfccd 100644
--- a/editors/sam/patches/patch-ac
+++ b/editors/sam/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:11:18 agc Exp $
+$NetBSD: patch-ac,v 1.3 2000/09/13 10:42:00 tron Exp $
 
 *** samterm/Makefile.orig	Fri Jul 28 14:09:32 1995
 --- samterm/Makefile	Fri Jul 21 15:30:09 1995
@@ -63,7 +63,7 @@ $NetBSD: patch-ac,v 1.2 1998/08/07 11:11:18 agc Exp $
 ! #      /usr/X11R6/lib/libICE.a \
 ! #      /usr/X11R6/lib/libX11.a
 ! 
-! XLIBS=-L/usr/X11R6/lib -lXt -lSM -lICE -lX11
+! XLIBS=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lSM -lICE -lX11
   
   CFLAGS=$(OS) $(INCS) -D_LIBXG_EXTENSION
   
diff --git a/editors/sam/patches/patch-af b/editors/sam/patches/patch-af
index acbc4d6978c..ad052d09a59 100644
--- a/editors/sam/patches/patch-af
+++ b/editors/sam/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:11:19 agc Exp $
+$NetBSD: patch-af,v 1.3 2000/09/13 10:42:00 tron Exp $
 
 *** Makefile.orig	Fri Aug 11 15:55:41 1995
 --- Makefile	Fri Aug 11 16:08:35 1995
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.2 1998/08/07 11:11:19 agc Exp $
 + MAN3=add balloc bitblt cachechars event frame graphics rgbpix rune
 + MAN4=font keyboard utf
 + MAN6=bitmap regexp
-+ APP_DEFAULT_DIR=/usr/X11R6/lib/X11/app-defaults
++ APP_DEFAULT_DIR=${X11PREFIX}/lib/X11/app-defaults
 + AD=Sam
 + 
   all:	lXg lframe samdir samtermdir