Make smalleiffel wrapper script display a usage statement when called

with no arguments.  Also move HTML documentation into
${PREFIX}/share/doc/html.

5 files changed, 61 insertions, 34 deletions

diff --git a/lang/smalleiffel/Makefile b/lang/smalleiffel/Makefile
index 734c1b8dca8..ea20457d145 100644
--- a/lang/smalleiffel/Makefile
+++ b/lang/smalleiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/02/25 06:18:08 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2000/09/06 14:31:38 jlam Exp $
 #
 
 DISTNAME=	se
@@ -18,7 +18,7 @@ MAKE_ENV+=	SmallEiffel=${WRKSRC}/sys/system.se
 ALL_TARGET=	./bin/compile_to_c
 
 DIST_SUBDIR=	${PKGNAME}
-DOCDIR=		${PREFIX}/share/doc/smalleiffel
+DOCDIR=		${PREFIX}/share/doc/html/smalleiffel
 EGDIR=		${PREFIX}/share/examples/smalleiffel
 LIBDIR=		${PREFIX}/share/smalleiffel
 LIBEXECDIR=	${PREFIX}/libexec/smalleiffel
@@ -30,7 +30,8 @@ post-patch:
 	${CHMOD} +x ${WRKSRC}/misc/GC.SH
 
 post-build:
-	${SED}	-e "s,@@SE_LIB@@,${LIBDIR},g" \
+	${SED}	-e "s,@@SE_DOC@@,${DOCDIR},g" \
+		-e "s,@@SE_LIB@@,${LIBDIR},g" \
 		-e "s,@@SE_LIBEXEC@@,${LIBEXECDIR},g" \
 		${FILESDIR}/smalleiffel.sh > ${WRKDIR}/smalleiffel.sh
 	${SED}	-e "s,@@SE_LIB@@,${LIBDIR},g" \
diff --git a/lang/smalleiffel/files/patch-sum b/lang/smalleiffel/files/patch-sum
index d0bc9a1a28f..c590a39af4d 100644
--- a/lang/smalleiffel/files/patch-sum
+++ b/lang/smalleiffel/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/02/21 21:23:34 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/09/06 14:31:38 jlam Exp $
 
-MD5 (patch-aa) = bdf9783bdcb2f1d8d547f57b16f92894
+MD5 (patch-aa) = 9e0c7bb22c83186875b948aba6b3fef5
 MD5 (patch-ab) = b344f645dc4bca959e4a0cdb630dba5a
 MD5 (patch-ac) = 71043e3a025084402246b02e1bfbb897
 MD5 (patch-ad) = 291add8ee7fbc0edaf0053405e9e465f
diff --git a/lang/smalleiffel/files/smalleiffel.sh b/lang/smalleiffel/files/smalleiffel.sh
index 7fce43f85e7..7a4b646b569 100644
--- a/lang/smalleiffel/files/smalleiffel.sh
+++ b/lang/smalleiffel/files/smalleiffel.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: smalleiffel.sh,v 1.4 1999/10/13 19:03:39 jlam Exp $
+# $NetBSD: smalleiffel.sh,v 1.5 2000/09/06 14:31:38 jlam Exp $
 #
 # This script is invoked as:
 #
@@ -9,6 +9,32 @@
 # where <cmd> is one of the programs in @@SE_LIBEXEC@@.
 #
 SmallEiffel=@@SE_LIB@@/sys/system.se; export SmallEiffel
+
+if [ -z $1 ]
+then
+	cat << EOF
+Usage:
+	smalleiffel <cmd> [<arg> ...]
+
+where <cmd> can be:
+
+	clean
+	compile
+	compile_to_c
+	compile_to_jvm
+	finder
+	pretty
+	print_jvm_class
+	short
+
+For more documentation on these commands, point a Web browser at:
+
+	@SE_DOC@/index.html
+
+EOF
+exit 0
+fi
+
 se_cmd=@@SE_LIBEXEC@@/$1
 shift
 
diff --git a/lang/smalleiffel/patches/patch-aa b/lang/smalleiffel/patches/patch-aa
index 6c23d243ada..f684a79cca2 100644
--- a/lang/smalleiffel/patches/patch-aa
+++ b/lang/smalleiffel/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2000/02/21 21:23:34 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2000/09/06 14:31:39 jlam Exp $
 
 --- lib_se/frozen_string_list.e.orig	Sat Feb 12 04:14:31 2000
 +++ lib_se/frozen_string_list.e	Mon Feb 21 13:36:10 2000
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.3 2000/02/21 21:23:34 jlam Exp $
     fz_java_util_bitset:        STRING is "java/util/BitSet";
     fz_jvm_root:                STRING is "_any"
     fz_main:                    STRING is "main";
-+   fz_man:                     STRING is "doc/smalleiffel";
++   fz_man:                     STRING is "doc/html/smalleiffel";
     fz_max_value:               STRING is "MAX_VALUE";
     fz_new:                     STRING is "new";
     fz_new_chunk:               STRING is "new_chunk";
diff --git a/lang/smalleiffel/pkg/PLIST b/lang/smalleiffel/pkg/PLIST
index a9ceb9e2f7a..6ecd8e4b590 100644
--- a/lang/smalleiffel/pkg/PLIST
+++ b/lang/smalleiffel/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2000/02/25 05:11:59 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/09/06 14:31:39 jlam Exp $
 bin/smalleiffel
 libexec/smalleiffel/clean
 libexec/smalleiffel/compile
@@ -8,30 +8,30 @@ libexec/smalleiffel/finder
 libexec/smalleiffel/pretty
 libexec/smalleiffel/print_jvm_class
 libexec/smalleiffel/short
-share/doc/smalleiffel/COPYING
-share/doc/smalleiffel/Eiffel.FAQ
-share/doc/smalleiffel/HISTORY.html
-share/doc/smalleiffel/NOT_YET_IMPLEMENTED.html
-share/doc/smalleiffel/SmallEiffelFAQ.html
-share/doc/smalleiffel/THANKS.html
-share/doc/smalleiffel/WeNeedFeedBack.txt
-share/doc/smalleiffel/c_code.html
-share/doc/smalleiffel/cecil.html
-share/doc/smalleiffel/clean.html
-share/doc/smalleiffel/compile.html
-share/doc/smalleiffel/compile_to_c.html
-share/doc/smalleiffel/compile_to_jvm.html
-share/doc/smalleiffel/external.html
-share/doc/smalleiffel/finder.html
-share/doc/smalleiffel/index.html
-share/doc/smalleiffel/install.html
-share/doc/smalleiffel/people.html
-share/doc/smalleiffel/pretty.html
-share/doc/smalleiffel/print_jvm_class.html
-share/doc/smalleiffel/se-line.gif
-share/doc/smalleiffel/short.html
-share/doc/smalleiffel/support.html
-share/doc/smalleiffel/system.html
+share/doc/html/smalleiffel/COPYING
+share/doc/html/smalleiffel/Eiffel.FAQ
+share/doc/html/smalleiffel/HISTORY.html
+share/doc/html/smalleiffel/NOT_YET_IMPLEMENTED.html
+share/doc/html/smalleiffel/SmallEiffelFAQ.html
+share/doc/html/smalleiffel/THANKS.html
+share/doc/html/smalleiffel/WeNeedFeedBack.txt
+share/doc/html/smalleiffel/c_code.html
+share/doc/html/smalleiffel/cecil.html
+share/doc/html/smalleiffel/clean.html
+share/doc/html/smalleiffel/compile.html
+share/doc/html/smalleiffel/compile_to_c.html
+share/doc/html/smalleiffel/compile_to_jvm.html
+share/doc/html/smalleiffel/external.html
+share/doc/html/smalleiffel/finder.html
+share/doc/html/smalleiffel/index.html
+share/doc/html/smalleiffel/install.html
+share/doc/html/smalleiffel/people.html
+share/doc/html/smalleiffel/pretty.html
+share/doc/html/smalleiffel/print_jvm_class.html
+share/doc/html/smalleiffel/se-line.gif
+share/doc/html/smalleiffel/short.html
+share/doc/html/smalleiffel/support.html
+share/doc/html/smalleiffel/system.html
 share/examples/smalleiffel/contrib/READ_ME
 share/examples/smalleiffel/contrib/edb/READ_ME
 share/examples/smalleiffel/contrib/edb/add-line-directive
@@ -773,5 +773,5 @@ share/smalleiffel/sys/system.se
 @dirrm share/examples/smalleiffel/contrib/edb
 @dirrm share/examples/smalleiffel/contrib
 @dirrm share/examples/smalleiffel
-@dirrm share/doc/smalleiffel
+@dirrm share/doc/html/smalleiffel
 @dirrm libexec/smalleiffel