1 files changed, 145 insertions, 76 deletions

diff --git a/lang/elk/pkg-plist b/lang/elk/pkg-plist
index d73b2d442f0c..b9d3964587a2 100644
--- a/lang/elk/pkg-plist
+++ b/lang/elk/pkg-plist
@@ -1,91 +1,160 @@
 bin/elk
 include/elk/compat.h
-include/elk/config.h
 include/elk/cstring.h
 include/elk/exception.h
+include/elk/extensions/unix.h
+include/elk/extensions/xlib.h
+include/elk/extensions/xt.h
 include/elk/extern.h
 include/elk/funcproto.h
 include/elk/gc.h
+include/elk/intern.h
+include/elk/kernel.h
 include/elk/misc.h
 include/elk/object.h
 include/elk/param.h
 include/elk/scheme.h
+include/elk/site.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
+lib/elk/bitstring.la
+lib/elk/bitstring.so
+lib/elk/debug.la
+lib/elk/debug.so
+lib/elk/elk-eval.la
+lib/elk/elk-eval.so
+lib/elk/gdbm.la
+lib/elk/gdbm.so
+lib/elk/hack.la
+lib/elk/hack.so
+lib/elk/motif-widgets.la
+lib/elk/motif-widgets.so
+lib/elk/motif-xt.la
+lib/elk/motif-xt.so
+lib/elk/newhandler.la
+lib/elk/newhandler.so
+lib/elk/record.la
+lib/elk/record.so
+lib/elk/regexp.la
+lib/elk/regexp.so
+lib/elk/struct.la
+lib/elk/struct.so
+lib/elk/unix.la
+lib/elk/unix.so
+lib/elk/xaw-widgets.la
+lib/elk/xaw-widgets.so
+lib/elk/xaw-xt.la
+lib/elk/xaw-xt.so
+lib/elk/xlib.la
+lib/elk/xlib.so
+lib/libelk.a
+lib/libelk.la
+lib/libelk.so
+lib/libelk.so.0
+share/elk/apropos.scm
+share/elk/bitstring.scm
+share/elk/cscheme.scm
+share/elk/debug.scm
+share/elk/describe.scm
+share/elk/gdbmtest.scm
+share/elk/initscheme.scm
+share/elk/motif.scm
+share/elk/oops.scm
+share/elk/parse.scm
+share/elk/pp.scm
+share/elk/qsort.scm
+share/elk/record.scm
+share/elk/recordutil.scm
+share/elk/regexp.scm
+share/elk/safe-env.scm
+share/elk/setf.scm
+share/elk/slib.scm
+share/elk/struct.scm
+share/elk/toplevel.scm
+share/elk/trace.scm
+share/elk/unix.scm
+share/elk/xaw.scm
+share/elk/xlib.scm
+share/elk/xwidgets.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/c++/class.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/c++/constructor.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/drawing-area.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/list.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/main-window.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/menu-stuff.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/message-dialog.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/option-menu.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/popup-menu.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/pulldown-menu.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/radio-stuff.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/radio.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/scroll-bar.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/selection-box.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/motif/vcr.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/regexp/match.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/Y.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/acker.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/billiard.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/cc.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/cell.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/co.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/compile.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/cps.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/dynamic.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/fib.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/fix.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/flame.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/hanoi.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/kons.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/meissel.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/mondo.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/perm.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/prim.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/ramanujan.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/rungekutta.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/sqrt.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/unify.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scheme/work.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/unix/calc.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/unix/copy.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/unix/lock.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/unix/ls.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/unix/pipsiz.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/unix/timeout.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/accel.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/clickcount.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/dialog.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/grip.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/list.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/paned.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/panner.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/popup.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/porthole.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/pulldown.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/scrollbar.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/scrollbox.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/stripchart.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/text.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/tree.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xaw/viewport.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xlib/hello.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xlib/lines.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xlib/map-all.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xlib/picture.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xlib/poly.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xlib/properties.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xlib/track.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xlib/useful.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/xlib/wm-delete.scm
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/xlib
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/xaw
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/unix
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/scheme
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/regexp
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/motif
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/c++
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm share/elk
+@dirrm lib/elk
 @dirrm include/elk/extensions
 @dirrm include/elk
-@dirrm share/elk/lib
-@dirrm share/elk/runtime/obj/xaw
-@dirrm share/elk/runtime/obj
-@dirrm share/elk/runtime/scm
-@dirrm share/elk/runtime
-@dirrm share/elk