Upgrade, 2.2->3.0.

Submitted by:	Thomas Gellekum <thomas@ghpc8.ihf.rwth-aachen.de>

4 files changed, 95 insertions, 14 deletions

diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 19a17f87ea4c..1c7f5f4a4985 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,14 +1,16 @@
 # New ports collection makefile for:    elk
-# Version required:     2.2
+# Version required:     3.0
 # Date created:         08 March 1995
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id$
+# $Id: Makefile,v 1.6 1995/04/24 11:29:00 asami Exp $
 #
 
-DISTNAME=       elk-2.2
+DISTNAME=       elk-3.0
 CATEGORIES+=	languages
-MASTER_SITES=	ftp://ftp.x.org/contrib/devel_tools/
+KEYWORDS+=	languages scheme
+MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/devel_tools/ \
+		ftp://ftp.th-darmstadt.de/pub/X11/contrib/devel_tools/
 
 MAINTAINER=	thomas@ghpc8.ihf.rwth-aachen.de
 
@@ -23,14 +25,14 @@ ALL_TARGET=	default
 #
 
 pre-install:
-	@mkdir -p ${PREFIX}/lib/elk
+	@mkdir -p ${PREFIX}/share/elk
 
 post-install:
-	@(cd ${PREFIX}/lib/elk; \
-	  mv bin/scheme ${PREFIX}/bin/elk; \
+	@(cd ${PREFIX}/share/elk; \
+	  cp bin/scheme ${PREFIX}/bin/elk; \
 	  mkdir -p ${PREFIX}/include/elk; \
-	  mv include/*.h ${PREFIX}/include/elk; \
-	  rmdir bin include)
+	  cp -R include/* ${PREFIX}/include/elk; \
+	  rm -rf bin include)
 	@install -c -o bin -g bin -m 444 ${WRKSRC}/doc/man/elk.1 ${PREFIX}/man/man1
 	@gzip -9nf ${PREFIX}/man/man1/elk.1
 
diff --git a/lang/elk/distinfo b/lang/elk/distinfo
index 588a48a70b1c..40baccea032d 100644
--- a/lang/elk/distinfo
+++ b/lang/elk/distinfo
@@ -1 +1 @@
-MD5 (elk-2.2.tar.gz) = 0f62aacd2b5c43d0d1291a8078bbd125
+MD5 (elk-3.0.tar.gz) = dc123d0ee1360d11cb6e87ea1e33a410
diff --git a/lang/elk/pkg-comment b/lang/elk/pkg-comment
index 807441f12005..a51f09096995 100644
--- a/lang/elk/pkg-comment
+++ b/lang/elk/pkg-comment
@@ -1 +1 @@
-An embeddable Scheme interpreter.
+Elk -- an embeddable Scheme interpreter
diff --git a/lang/elk/pkg-plist b/lang/elk/pkg-plist
index c72ba351bf28..fc149cd8b94c 100644
--- a/lang/elk/pkg-plist
+++ b/lang/elk/pkg-plist
@@ -1,5 +1,84 @@
-@cwd /usr/local
 bin/elk
-lib/elk
-include/elk
+include/elk/compat.h
+include/elk/config.h
+include/elk/cstring.h
+include/elk/exception.h
+include/elk/extern.h
+include/elk/funcproto.h
+include/elk/gc.h
+include/elk/misc.h
+include/elk/object.h
+include/elk/param.h
+include/elk/scheme.h
+include/elk/stkmem.h
+include/elk/type.h
+include/elk/extensions/unix.h
+include/elk/extensions/xlib.h
+include/elk/extensions/xt.h
+share/elk/lib/ldflags
+share/elk/lib/linkscheme
+share/elk/lib/makedl
+share/elk/lib/module.o
+share/elk/lib/standalone.o
+share/elk/runtime/obj/bitstring.o
+share/elk/runtime/obj/debug.o
+share/elk/runtime/obj/elk-eval.o
+share/elk/runtime/obj/hack.o
+share/elk/runtime/obj/monitor.o
+share/elk/runtime/obj/newhandler.o
+share/elk/runtime/obj/record.o
+share/elk/runtime/obj/regexp.o
+share/elk/runtime/obj/struct.o
+share/elk/runtime/obj/unix.o
+share/elk/runtime/obj/xlib.o
+share/elk/runtime/obj/xt.o
+share/elk/runtime/obj/xaw/ALIASES
+share/elk/runtime/obj/xaw/ascii.o
+share/elk/runtime/obj/xaw/box.o
+share/elk/runtime/obj/xaw/command.o
+share/elk/runtime/obj/xaw/dialog.o
+share/elk/runtime/obj/xaw/form.o
+share/elk/runtime/obj/xaw/grip.o
+share/elk/runtime/obj/xaw/label.o
+share/elk/runtime/obj/xaw/list.o
+share/elk/runtime/obj/xaw/menubutton.o
+share/elk/runtime/obj/xaw/paned.o
+share/elk/runtime/obj/xaw/panner.o
+share/elk/runtime/obj/xaw/porthole.o
+share/elk/runtime/obj/xaw/repeater.o
+share/elk/runtime/obj/xaw/scrollbar.o
+share/elk/runtime/obj/xaw/shell.o
+share/elk/runtime/obj/xaw/simplemenu.o
+share/elk/runtime/obj/xaw/sme.o
+share/elk/runtime/obj/xaw/smebsb.o
+share/elk/runtime/obj/xaw/smeline.o
+share/elk/runtime/obj/xaw/stripchart.o
+share/elk/runtime/obj/xaw/toggle.o
+share/elk/runtime/obj/xaw/tree.o
+share/elk/runtime/obj/xaw/viewport.o
+share/elk/runtime/scm/apropos.scm
+share/elk/runtime/scm/bitstring.scm
+share/elk/runtime/scm/cscheme.scm
+share/elk/runtime/scm/debug.scm
+share/elk/runtime/scm/describe.scm
+share/elk/runtime/scm/gdbmtest.scm
+share/elk/runtime/scm/initscheme.scm
+share/elk/runtime/scm/motif.scm
+share/elk/runtime/scm/oops.scm
+share/elk/runtime/scm/parse.scm
+share/elk/runtime/scm/pp.scm
+share/elk/runtime/scm/qsort.scm
+share/elk/runtime/scm/record.scm
+share/elk/runtime/scm/recordutil.scm
+share/elk/runtime/scm/regexp.scm
+share/elk/runtime/scm/safe-env.scm
+share/elk/runtime/scm/setf.scm
+share/elk/runtime/scm/siteinfo.scm
+share/elk/runtime/scm/struct.scm
+share/elk/runtime/scm/toplevel.scm
+share/elk/runtime/scm/trace.scm
+share/elk/runtime/scm/unix.scm
+share/elk/runtime/scm/xlib.scm
+share/elk/runtime/scm/xt.scm
+share/elk/runtime/scm/xwidgets.scm
 man/man1/elk.1.gz