Fold -obsolete.scm files into packages.scm.

scheme/lib/ftp-obsolete.scm

@@ -1,24 +0,0 @@
-; maps obsolete ftp-procedure names to new ftp procedure names
-; by Andreas Bernauer (2002)
-
-(define ftp:connect ftp-connect)
-(define ftp:login ftp-login)
-(define ftp:type ftp-type)
-(define ftp:rename ftp-rename)
-(define ftp:delete ftp-delete)
-(define ftp:cd ftp-cd)
-(define ftp:cdup ftp-cdup)
-(define ftp:pwd ftp-pwd)
-(define ftp:rmdir ftp-rmdir)
-(define ftp:mkdir ftp-mkdir)
-(define ftp:modification-time ftp-modification-time)
-(define ftp:size ftp-size)
-(define ftp:abort ftp-abort)
-(define ftp:quit ftp-quit)
-(define ftp:ls ftp-ls)
-(define ftp:dir ftp-dir)
-(define ftp:get ftp-get)
-(define ftp:put ftp-put)
-(define ftp:append ftp-append)
-(define ftp:quot ftp-quot)
-

scheme/lib/nettime-obsolete.scm

@@ -1,6 +0,0 @@
-; maps obsolete nettime-procedure names to new nettime procedure names
-; by Andreas Bernauer (2002)
-
-(define net:time net-time)
-(define net:daytime net-daytime)
-

scheme/lib/pop3-obsolete.scm

@@ -1,12 +0,0 @@
-; maps obsolete pop3-procedure names to new pop3 procedure names
-; by Andreas Bernauer (2002)
-
-(define pop3:connect pop3-connect)
-(define pop3:login pop3-login)
-(define pop3:stat pop3-stat)
-(define pop3:get pop3-get)
-(define pop3:headers pop3-headers)
-(define pop3:last pop3-last)
-(define pop3:delete pop3-delete)
-(define pop3:reset pop3-reset)
-(define pop3:quit pop3-quit)

scheme/packages.scm

@@ -491,7 +491,29 @@
   (open scsh
 	scheme
 	ftp)
-  (files (lib ftp-obsolete)))
+  (begin
+    (define ftp:connect ftp-connect)
+    (define ftp:login ftp-login)
+    (define ftp:type ftp-type)
+    (define ftp:rename ftp-rename)
+    (define ftp:delete ftp-delete)
+    (define ftp:cd ftp-cd)
+    (define ftp:cdup ftp-cdup)
+    (define ftp:pwd ftp-pwd)
+    (define ftp:rmdir ftp-rmdir)
+    (define ftp:mkdir ftp-mkdir)
+    (define ftp:modification-time ftp-modification-time)
+    (define ftp:size ftp-size)
+    (define ftp:abort ftp-abort)
+    (define ftp:quit ftp-quit)
+    (define ftp:ls ftp-ls)
+    (define ftp:dir ftp-dir)
+    (define ftp:get ftp-get)
+    (define ftp:put ftp-put)
+    (define ftp:append ftp-append)
+    (define ftp:quot ftp-quot)))
+
+
 
 (define-structure netrc netrc-interface
   (open defrec-package
@@ -521,7 +543,16 @@
   (open scsh
 	scheme
 	pop3)
-  (files (lib pop3-obsolete)))
+  (begin
+    (define pop3:connect pop3-connect)
+    (define pop3:login pop3-login)
+    (define pop3:stat pop3-stat)
+    (define pop3:get pop3-get)
+    (define pop3:headers pop3-headers)
+    (define pop3:last pop3-last)
+    (define pop3:delete pop3-delete)
+    (define pop3:reset pop3-reset)
+    (define pop3:quit pop3-quit)))
 
 (define-structure nettime nettime-interface
   (open scsh
@@ -532,7 +563,9 @@
   (open scsh
 	scheme
 	nettime)
-  (files (lib nettime-obsolete)))
+  (begin
+    (define net:time net-time)
+    (define net:daytime net-daytime)))
 
 (define-structure dns dns-interface
   (open scheme