Make this package work on Solaris.

Also, don't assume that X11BASE is /usr/openwin on Solaris.

4 files changed, 53 insertions, 6 deletions

diff --git a/plan9/sam/Makefile b/plan9/sam/Makefile
index 127a5a6f00e..9a4203b7667 100644
--- a/plan9/sam/Makefile
+++ b/plan9/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/07/02 08:37:28 agc Exp $
+# $NetBSD: Makefile,v 1.11 1999/08/24 19:01:43 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
 #
 
@@ -13,12 +13,20 @@ MAINTAINER=		packages@netbsd.org
 NO_WRKSUBDIR=		yes
 EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
 
+MANCOMPRESSED=		yes
+USE_X11=		yes
+
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
-MANCOMPRESSED=		yes
+.if ${OPSYS} == "SunOS"
+.if ${X11BASE} != "/usr/openwin"
+OTHER_X_LIBS=	-lSM -lICE
+.endif
+do-build:
+	for d in libXg libframe sam samterm; do				\
+		(cd ${WRKSRC}/$$d; make -f Make.solaris 		\
+				OTHER_X_LIBS="${OTHER_X_LIBS}");	\
+	done
 .endif
-
-USE_X11=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/plan9/sam/files/patch-sum b/plan9/sam/files/patch-sum
index 3b8e6a12a17..e28b105527a 100644
--- a/plan9/sam/files/patch-sum
+++ b/plan9/sam/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:17:03 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/24 19:01:44 agc Exp $
 
 MD5 (patch-aa) = 5ad819a7a41439fb8d89c31998960bb8
 MD5 (patch-ab) = f59c393133169ca3255fb1c84753e3b8
@@ -7,3 +7,5 @@ MD5 (patch-ad) = 6ddab3327906dc6643c707f2f93b8588
 MD5 (patch-ae) = e6a7a172f05b376a452ea9185584d54e
 MD5 (patch-af) = 9a1e46868477cccc90601bcef7a5cdbd
 MD5 (patch-ag) = 70c2343930a221bc8f83f8d68b8a92d1
+MD5 (patch-ah) = 7bcc9175893571c500c88f0c9475e690
+MD5 (patch-ai) = 0b761769dd60c4f0b4e1eec6fb4c0b9d
diff --git a/plan9/sam/patches/patch-ah b/plan9/sam/patches/patch-ah
new file mode 100644
index 00000000000..11d8df12097
--- /dev/null
+++ b/plan9/sam/patches/patch-ah
@@ -0,0 +1,20 @@
+$NetBSD: patch-ah,v 1.1 1999/08/24 19:01:44 agc Exp $
+
+Generalise Solaris makefile
+
+--- samterm/Make.solaris	1999/08/24 18:39:40	1.1
++++ samterm/Make.solaris	1999/08/24 18:40:08
+@@ -16,11 +16,11 @@
+ #	SAMTERM contains the name of the file containing the samterm
+ #	executable.  SAMTERMDIR is the directory where it is installed.
+ SAMTERM=samterm
+-SAMTERMDIR=/usr/local/bin
++SAMTERMDIR=${PREFIX}/bin
+ 
+ #	set this if your X libraries are in different locations
+ #	or if you need extra libraries to load with X11 applications
+-XLIBS=-L/usr/openwin/lib -lXt -lX11 -lsocket -lnsl
++XLIBS=-L${X11BASE}/lib -lXt -lX11 ${OTHER_X_LIBS} -lsocket -lnsl
+ 
+ CFLAGS=$(OS) $(INCS) -D_LIBXG_EXTENSION
+ 
diff --git a/plan9/sam/patches/patch-ai b/plan9/sam/patches/patch-ai
new file mode 100644
index 00000000000..c0d1da81df2
--- /dev/null
+++ b/plan9/sam/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.1 1999/08/24 19:01:45 agc Exp $
+
+--- sam/Make.solaris	1999/08/24 18:41:20	1.1
++++ sam/Make.solaris	1999/08/24 18:41:44
+@@ -21,9 +21,9 @@
+ #	where sam is to be installed.  SAMSAVEDIR is the name of the directory
+ #	where the samsave file restoration script is stored.
+ RSAMNAME=sam
+-TERMNAME=/usr/local/bin/samterm
+-SAMDIR=/usr/local/bin
+-SAMSAVEDIR=/usr/local/bin
++TERMNAME=${PREFIX}/bin/samterm
++SAMDIR=${PREFIX}/bin
++SAMSAVEDIR=${PREFIX}/bin
+ 
+ #	Set TMP to a good place for tmp files (with lots of room)
+ TMP=/tmp