From 3526a61be10ca078c3dcd4b3bff11bab9df41d85 Mon Sep 17 00:00:00 2001
From: Matt Heffron <heffron@alumni.caltech.edu>
Date: Thu, 5 Sep 2024 22:40:32 -0700
Subject: [PATCH] Import XCL:DEFPACKAGE into LISP package, and then export it.

---
 sources/DEFPACKAGE-IMPORT      | 33 ++++++++++++++++++++-------------
 sources/DEFPACKAGE-IMPORT.LCOM | 18 +++++++++++++++++-
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/sources/DEFPACKAGE-IMPORT b/sources/DEFPACKAGE-IMPORT
index 7b94f577..4fb7f938 100644
--- a/sources/DEFPACKAGE-IMPORT
+++ b/sources/DEFPACKAGE-IMPORT
@@ -1,28 +1,35 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-
(FILECREATED "16-May-90 15:31:19" {DSK}<usr>local>lde>lispcore>sources>DEFPACKAGE-IMPORT.;2
 1000   
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (VARS DEFPACKAGE-IMPORTCOMS)
+
(FILECREATED " 5-Sep-2024 22:33:36" {DSK}<home>matt>Interlisp>medley>sources>DEFPACKAGE-IMPORT.;2
 1161   
 
-      previous date%: "12-Dec-86 13:26:35" {DSK}<usr>local>lde>lispcore>sources>DEFPACKAGE-IMPORT.;1
-)
+      :EDIT-BY "mth"
 
+      :CHANGES-TO (VARS DEFPACKAGE-IMPORTCOMS)
+
+      :PREVIOUS-DATE "16-May-90 15:31:19" 
+{DSK}<home>matt>Interlisp>medley>sources>DEFPACKAGE-IMPORT.;1)
 
-(* ; "
-Copyright (c) 1986, 1990 by Venue & Xerox Corporation.  All rights reserved.
-")
 
 (PRETTYCOMPRINT DEFPACKAGE-IMPORTCOMS)
 
 (RPAQQ DEFPACKAGE-IMPORTCOMS
 ((P (IMPORT (CL:INTERN "DEFPACKAGE" "XCL")
-                                            "INTERLISP"))
-                                  (PROP MAKEFILE-ENVIRONMENT DEFPACKAGE-IMPORT)))
+                                        "INTERLISP")
+                                 (IMPORT (CL:INTERN "DEFPACKAGE" "XCL")
+                                        "LISP")
+                                 (EXPORT (CL:FIND-SYMBOL "DEFPACKAGE" "LISP")
+                                        "LISP"))
+                              (PROP MAKEFILE-ENVIRONMENT DEFPACKAGE-IMPORT)))
 
 (IMPORT (CL:INTERN "DEFPACKAGE" "XCL")
        "INTERLISP")
 
-(PUTPROPS DEFPACKAGE-IMPORT
 MAKEFILE-ENVIRONMENT
 (:READTABLE "INTERLISP" :PACKAGE "INTERLISP"
-                                                                ))
-(PUTPROPS DEFPACKAGE-IMPORT COPYRIGHT ("Venue & Xerox Corporation" 1986 1990))
+(IMPORT (CL:INTERN "DEFPACKAGE" "XCL")
+       "LISP")
+
+(EXPORT (CL:FIND-SYMBOL "DEFPACKAGE" "LISP")
+       "LISP")
+
+(PUTPROPS DEFPACKAGE-IMPORT
 MAKEFILE-ENVIRONMENT
 (:READTABLE "INTERLISP" :PACKAGE "INTERLISP"))
 (DECLARE%: DONTCOPY
   (FILEMAP (NIL)))
 STOP
diff --git a/sources/DEFPACKAGE-IMPORT.LCOM b/sources/DEFPACKAGE-IMPORT.LCOM
index 6c398e3d..8bec2676 100644
--- a/sources/DEFPACKAGE-IMPORT.LCOM
+++ b/sources/DEFPACKAGE-IMPORT.LCOM
@@ -1 +1,17 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
(FILECREATED "25-Jan-98 12:25:04" ("compiled on " {DSK}<lispcore>sources>DEFPACKAGE-IMPORT.;1) 
"30-Mar-95 20:33:04" bcompl'd in "Medley 14-Aug-95 ..." dated "14-Aug-95 15:27:48")
(FILECREATED "16-May-90 15:31:19" {DSK}<usr>local>lde>lispcore>sources>DEFPACKAGE-IMPORT.;2 1000 
changes to%: (VARS DEFPACKAGE-IMPORTCOMS) previous date%: "12-Dec-86 13:26:35" 
{DSK}<usr>local>lde>lispcore>sources>DEFPACKAGE-IMPORT.;1)
(PRETTYCOMPRINT DEFPACKAGE-IMPORTCOMS)
(RPAQQ DEFPACKAGE-IMPORTCOMS ((P (IMPORT (CL:INTERN "DEFPACKAGE" "XCL") "INTERLISP")) (PROP 
MAKEFILE-ENVIRONMENT DEFPACKAGE-IMPORT)))
(IMPORT (CL:INTERN "DEFPACKAGE" "XCL") "INTERLISP")
(PUTPROPS DEFPACKAGE-IMPORT MAKEFILE-ENVIRONMENT (:READTABLE "INTERLISP" :PACKAGE "INTERLISP"))
(PUTPROPS DEFPACKAGE-IMPORT COPYRIGHT ("Venue & Xerox Corporation" 1986 1990))
NIL
\ No newline at end of file
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+
+(FILECREATED " 5-Sep-2024 22:35:06" ("compiled on " 
+{DSK}<home>matt>Interlisp>medley>sources>DEFPACKAGE-IMPORT.;2) "31-Jul-2024 02:24:35" tcompl'd in 
+"FULL 31-Jul-2024 ..." dated "31-Jul-2024 02:24:38")
+(FILECREATED " 5-Sep-2024 22:33:36" {DSK}<home>matt>Interlisp>medley>sources>DEFPACKAGE-IMPORT.;2 1161
+ :EDIT-BY "mth" :CHANGES-TO (VARS DEFPACKAGE-IMPORTCOMS) :PREVIOUS-DATE "16-May-90 15:31:19" 
+{DSK}<home>matt>Interlisp>medley>sources>DEFPACKAGE-IMPORT.;1)
+(PRETTYCOMPRINT DEFPACKAGE-IMPORTCOMS)
+(RPAQQ DEFPACKAGE-IMPORTCOMS ((P (IMPORT (CL:INTERN "DEFPACKAGE" "XCL") "INTERLISP") (IMPORT (CL:INTERN
+ "DEFPACKAGE" "XCL") "LISP") (EXPORT (CL:FIND-SYMBOL "DEFPACKAGE" "LISP") "LISP")) (PROP 
+MAKEFILE-ENVIRONMENT DEFPACKAGE-IMPORT)))
+(IMPORT (CL:INTERN "DEFPACKAGE" "XCL") "INTERLISP")
+(IMPORT (CL:INTERN "DEFPACKAGE" "XCL") "LISP")
+(EXPORT (CL:FIND-SYMBOL "DEFPACKAGE" "LISP") "LISP")
+(PUTPROPS DEFPACKAGE-IMPORT MAKEFILE-ENVIRONMENT (:READTABLE "INTERLISP" :PACKAGE "INTERLISP"))
+NIL