4 files changed, 56 insertions, 28 deletions
diff --git a/lang/elk/files/patch-sum b/lang/elk/files/patch-sum
index 4d968a4e34c..53a0d3f74a4 100644
--- a/lang/elk/files/patch-sum
+++ b/lang/elk/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/08/17 11:18:40 agc Exp $
+$NetBSD: patch-sum,v 1.3 1999/08/19 10:50:06 agc Exp $
 
-MD5 (patch-aa) = 2a64f01369ec305ca06ec20b2c7929db
+MD5 (patch-aa) = b7b322faf24c8adf06e082e9cec05361
 MD5 (patch-ab) = 606196dcb073174399e2ea016ce45da7
 MD5 (patch-ac) = 7b17ca93610a97ea42931e80014a06a2
 MD5 (patch-ad) = bcfe220754da600d611a0989f48e534b
@@ -10,3 +10,4 @@ MD5 (patch-ag) = 1b7ce3525985ea670f6d042dc0a6a283
 MD5 (patch-ah) = 6e370db1f6de0862aad57c7330867803
 MD5 (patch-ai) = 7515b0cba7a747baf7379f0778bfbf68
 MD5 (patch-aj) = d7ce903897077223da1addeb610c3219
+MD5 (patch-ak) = e95592985fa8d07fc93f0e2b521e116e
diff --git a/lang/elk/patches/patch-aa b/lang/elk/patches/patch-aa
index d79ebd12aba..7fa4f61aa22 100644
--- a/lang/elk/patches/patch-aa
+++ b/lang/elk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 1999/08/17 11:18:40 agc Exp $
+$NetBSD: patch-aa,v 1.2 1999/08/19 10:50:07 agc Exp $
 
 *** doc/man/elk.1.orig	Thu Apr  6 14:40:07 1995
 --- doc/man/elk.1	Thu Apr  6 14:41:02 1995
@@ -51,27 +51,3 @@ $NetBSD: patch-aa,v 1.1 1999/08/17 11:18:40 agc Exp $
   This interpreter, together with the standard Scheme toplevel,
   .I Elk
   can be used as an ordinary, stand-alone implementation of the
---- Makefile.orig	Mon Jul 31 13:56:26 1995
-+++ Makefile	Tue Mar 31 11:44:51 1998
-@@ -16,9 +16,9 @@
- 	 lib/unix\
- 	 lib/xlib\
- 	 lib/xt\
--	 lib/xaw\
--	 lib/xm\
--	 lib/xm/xt
-+	 lib/xaw
-+#	 lib/xm\
-+#	 lib/xm/xt
- 
- # ----------------------------------------------------------------------
- 
-@@ -37,7 +37,7 @@
- 	done
- 
- install:
--	@for i in $(SUBDIRS) ;\
-+	@for i in $(SUBDIRS) doc/man;\
- 	do \
- 	    echo Installing $$i...; \
- 	    ( cd $$i ; $(MAKE) install ) || exit $$?; \
diff --git a/lang/elk/patches/patch-ak b/lang/elk/patches/patch-ak
new file mode 100644
index 00000000000..b01cd0d13f7
--- /dev/null
+++ b/lang/elk/patches/patch-ak
@@ -0,0 +1,40 @@
+$NetBSD: patch-ak,v 1.1 1999/08/19 10:51:23 agc Exp $
+
++ Don't mess with Motif, as there's a trong possibility it won't be
+installed.
+
++ install postscript documentation whilst we're here.
+
+--- Makefile.orig	Mon Jul 31 13:56:26 1995
++++ Makefile	Thu Aug 19 11:35:35 1999
+@@ -16,9 +16,9 @@
+ 	 lib/unix\
+ 	 lib/xlib\
+ 	 lib/xt\
+-	 lib/xaw\
+-	 lib/xm\
+-	 lib/xm/xt
++	 lib/xaw
++#	 lib/xm\
++#	 lib/xm/xt
+ 
+ # ----------------------------------------------------------------------
+ 
+@@ -37,10 +37,16 @@
+ 	done
+ 
+ install:
+-	@for i in $(SUBDIRS) ;\
++	@for i in $(SUBDIRS) doc/man;\
+ 	do \
+ 	    echo Installing $$i...; \
+ 	    ( cd $$i ; $(MAKE) install ) || exit $$?; \
++	done
++	mkdir -p ${PREFIX}/share/doc/elk
++	@for i in bitstring cprog kernel oops record regexp unix usenix \
++							xlib xt; do	\
++		echo "Installing postscript docs for $$i";		\
++		${BSD_INSTALL_DATA} doc/$$i/*.ps ${PREFIX}/share/doc/elk; \
+ 	done
+ 
+ localize:
diff --git a/lang/elk/pkg/PLIST b/lang/elk/pkg/PLIST
index 9da1a06d333..3457a7f1801 100644
--- a/lang/elk/pkg/PLIST
+++ b/lang/elk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1998/03/31 11:59:55 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/08/19 10:50:07 agc Exp $
 bin/elk
 include/elk/compat.h
 include/elk/config.h
@@ -83,6 +83,17 @@ lib/elk/runtime/scm/xlib.scm
 lib/elk/runtime/scm/xt.scm
 lib/elk/runtime/scm/xwidgets.scm
 man/man1/elk.1.gz
+share/doc/elk/bitstring.ps
+share/doc/elk/cprog.ps
+share/doc/elk/kernel.ps
+share/doc/elk/oops.ps
+share/doc/elk/record.ps
+share/doc/elk/regexp.ps
+share/doc/elk/unix.ps
+share/doc/elk/usenix.ps
+share/doc/elk/xlib.ps
+share/doc/elk/xt.ps
+@dirrm share/doc/elk
 @dirrm lib/elk/runtime/scm
 @dirrm lib/elk/runtime/obj/xaw
 @dirrm lib/elk/runtime/obj