From 35c1d068c572025240c378de6bfce09bcf598ee7 Mon Sep 17 00:00:00 2001
From: Sam Tobin-Hochstadt <samth@racket-lang.org>
Date: Fri, 28 Jun 2013 11:52:53 -0400
Subject: [PATCH] Move most of the `net` collection out of the core.

- Most units and signatures from the `net` collection
  are now in `compatibility-lib`.
- Most of the actual libraries are in the `net-lib`
  package.

original commit: 2b1fb036c63639bc5dbb65348c4f4e5802c95b53
---
 pkgs/compatibility-pkgs/compatibility-lib/info.rkt              | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/base64-sig.rkt    | 0
 .../compatibility-pkgs/compatibility-lib}/net/base64-unit.rkt   | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/cgi-sig.rkt       | 0
 .../compatibility-pkgs/compatibility-lib}/net/cgi-unit.rkt      | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/cookie-sig.rkt    | 0
 .../compatibility-pkgs/compatibility-lib}/net/cookie-unit.rkt   | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/dns-sig.rkt       | 0
 .../compatibility-pkgs/compatibility-lib}/net/dns-unit.rkt      | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/ftp-sig.rkt       | 0
 .../compatibility-pkgs/compatibility-lib}/net/ftp-unit.rkt      | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/head-sig.rkt      | 0
 .../compatibility-pkgs/compatibility-lib}/net/head-unit.rkt     | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/imap-sig.rkt      | 0
 .../compatibility-pkgs/compatibility-lib}/net/imap-unit.rkt     | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/mime-sig.rkt      | 0
 .../compatibility-pkgs/compatibility-lib}/net/mime-unit.rkt     | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/nntp-sig.rkt      | 0
 .../compatibility-pkgs/compatibility-lib}/net/nntp-unit.rkt     | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/pop3-sig.rkt      | 0
 .../compatibility-pkgs/compatibility-lib}/net/pop3-unit.rkt     | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/qp-sig.rkt        | 0
 .../compatibility-pkgs/compatibility-lib}/net/qp-unit.rkt       | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/sendmail-sig.rkt  | 0
 .../compatibility-pkgs/compatibility-lib}/net/sendmail-unit.rkt | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/smtp-sig.rkt      | 0
 .../compatibility-pkgs/compatibility-lib}/net/smtp-unit.rkt     | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/uri-codec-sig.rkt | 0
 .../compatibility-lib}/net/uri-codec-unit.rkt                   | 2 +-
 .../compatibility-pkgs/compatibility-lib}/net/url-sig.rkt       | 0
 .../compatibility-pkgs/compatibility-lib}/net/url-unit.rkt      | 2 +-
 31 files changed, 16 insertions(+), 16 deletions(-)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/base64-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/base64-unit.rkt (72%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/cgi-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/cgi-unit.rkt (73%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/cookie-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/cookie-unit.rkt (84%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/dns-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/dns-unit.rkt (73%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/ftp-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/ftp-unit.rkt (82%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/head-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/head-unit.rkt (72%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/imap-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/imap-unit.rkt (72%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/mime-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/mime-unit.rkt (72%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/nntp-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/nntp-unit.rkt (72%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/pop3-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/pop3-unit.rkt (72%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/qp-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/qp-unit.rkt (73%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/sendmail-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/sendmail-unit.rkt (71%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/smtp-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/smtp-unit.rkt (72%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/uri-codec-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/uri-codec-unit.rkt (70%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/url-sig.rkt (100%)
 rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/net/url-unit.rkt (66%)

diff --git a/pkgs/compatibility-pkgs/compatibility-lib/info.rkt b/pkgs/compatibility-pkgs/compatibility-lib/info.rkt
index 5b9954a..b422d4f 100644
--- a/pkgs/compatibility-pkgs/compatibility-lib/info.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/info.rkt
@@ -1,3 +1,3 @@
 #lang setup/infotab
 (define collection 'multi)
-(define deps '("base"))
+(define deps '("base" "net-lib"))
diff --git a/racket/lib/collects/net/base64-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/base64-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/base64-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/base64-sig.rkt
diff --git a/racket/lib/collects/net/base64-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/base64-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/base64-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/base64-unit.rkt
index 6fa00d4..bac266a 100644
--- a/racket/lib/collects/net/base64-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/base64-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "base64-sig.rkt" "base64.rkt")
+         "base64-sig.rkt" net/base64)
 
 (define-unit-from-context base64@ base64^)
 
diff --git a/racket/lib/collects/net/cgi-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/cgi-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/cgi-sig.rkt
diff --git a/racket/lib/collects/net/cgi-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-unit.rkt
similarity index 73%
rename from racket/lib/collects/net/cgi-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/cgi-unit.rkt
index ac90c64..2a663b4 100644
--- a/racket/lib/collects/net/cgi-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "cgi-sig.rkt" "cgi.rkt")
+         "cgi-sig.rkt" net/cgi)
 
 (define-unit-from-context cgi@ cgi^)
 
diff --git a/racket/lib/collects/net/cookie-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/cookie-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/cookie-sig.rkt
diff --git a/racket/lib/collects/net/cookie-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-unit.rkt
similarity index 84%
rename from racket/lib/collects/net/cookie-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/cookie-unit.rkt
index c28553c..1dfc62d 100644
--- a/racket/lib/collects/net/cookie-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/unit
          "cookie-sig.rkt"
-         "cookie.rkt")
+         net/cookie)
 
 (define-unit-from-context cookie@ cookie^)
 
diff --git a/racket/lib/collects/net/dns-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/dns-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/dns-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/dns-sig.rkt
diff --git a/racket/lib/collects/net/dns-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/dns-unit.rkt
similarity index 73%
rename from racket/lib/collects/net/dns-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/dns-unit.rkt
index f5f99fb..cce9e82 100644
--- a/racket/lib/collects/net/dns-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/dns-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "dns-sig.rkt" "dns.rkt")
+         "dns-sig.rkt" net/dns)
 
 (define-unit-from-context dns@ dns^)
 
diff --git a/racket/lib/collects/net/ftp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/ftp-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/ftp-sig.rkt
diff --git a/racket/lib/collects/net/ftp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-unit.rkt
similarity index 82%
rename from racket/lib/collects/net/ftp-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/ftp-unit.rkt
index 42432a5..5609f1d 100644
--- a/racket/lib/collects/net/ftp-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-unit.rkt
@@ -5,7 +5,7 @@
 ;;   Micah Flatt
 ;;   06-06-2002
 (require racket/unit
-         "ftp-sig.rkt" "ftp.rkt")
+         "ftp-sig.rkt" net/ftp)
 
 (define-unit-from-context ftp@ ftp^)
 
diff --git a/racket/lib/collects/net/head-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/head-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/head-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/head-sig.rkt
diff --git a/racket/lib/collects/net/head-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/head-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/head-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/head-unit.rkt
index 1a1606b..ea5b6ae 100644
--- a/racket/lib/collects/net/head-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/head-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "head-sig.rkt" "head.rkt")
+         "head-sig.rkt" net/head)
 
 (define-unit-from-context head@ head^)
 
diff --git a/racket/lib/collects/net/imap-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/imap-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/imap-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/imap-sig.rkt
diff --git a/racket/lib/collects/net/imap-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/imap-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/imap-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/imap-unit.rkt
index 4b28b4f..2205f05 100644
--- a/racket/lib/collects/net/imap-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/imap-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "imap-sig.rkt" "imap.rkt")
+         "imap-sig.rkt" net/imap)
 
 (define-unit-from-context imap@ imap^)
 
diff --git a/racket/lib/collects/net/mime-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/mime-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/mime-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/mime-sig.rkt
diff --git a/racket/lib/collects/net/mime-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/mime-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/mime-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/mime-unit.rkt
index 538eab9..a620637 100644
--- a/racket/lib/collects/net/mime-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/mime-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "mime-sig.rkt" "mime.rkt")
+         "mime-sig.rkt" net/mime)
 
 (define-unit-from-context mime@ mime^)
 
diff --git a/racket/lib/collects/net/nntp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/nntp-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/nntp-sig.rkt
diff --git a/racket/lib/collects/net/nntp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/nntp-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/nntp-unit.rkt
index 0650418..6e81bac 100644
--- a/racket/lib/collects/net/nntp-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "nntp-sig.rkt" "nntp.rkt")
+         "nntp-sig.rkt" net/nntp)
 
 (define-unit-from-context nntp@ nntp^)
 
diff --git a/racket/lib/collects/net/pop3-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/pop3-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/pop3-sig.rkt
diff --git a/racket/lib/collects/net/pop3-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/pop3-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/pop3-unit.rkt
index 5c5cc7c..3357b8a 100644
--- a/racket/lib/collects/net/pop3-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "pop3-sig.rkt" "pop3.rkt")
+         "pop3-sig.rkt" net/pop3)
 
 (define-unit-from-context pop3@ pop3^)
 
diff --git a/racket/lib/collects/net/qp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/qp-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/qp-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/qp-sig.rkt
diff --git a/racket/lib/collects/net/qp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/qp-unit.rkt
similarity index 73%
rename from racket/lib/collects/net/qp-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/qp-unit.rkt
index 1d7f2eb..8704dba 100644
--- a/racket/lib/collects/net/qp-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/qp-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "qp-sig.rkt" "qp.rkt")
+         "qp-sig.rkt" net/qp)
 
 (define-unit-from-context qp@ qp^)
 
diff --git a/racket/lib/collects/net/sendmail-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/sendmail-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-sig.rkt
diff --git a/racket/lib/collects/net/sendmail-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-unit.rkt
similarity index 71%
rename from racket/lib/collects/net/sendmail-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-unit.rkt
index 2fd9706..ad0876b 100644
--- a/racket/lib/collects/net/sendmail-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "sendmail-sig.rkt" "sendmail.rkt")
+         "sendmail-sig.rkt" net/sendmail)
 
 (define-unit-from-context sendmail@ sendmail^)
 
diff --git a/racket/lib/collects/net/smtp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/smtp-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/smtp-sig.rkt
diff --git a/racket/lib/collects/net/smtp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-unit.rkt
similarity index 72%
rename from racket/lib/collects/net/smtp-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/smtp-unit.rkt
index 98adc51..029ccaf 100644
--- a/racket/lib/collects/net/smtp-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "smtp-sig.rkt" "smtp.rkt")
+         "smtp-sig.rkt" net/smtp)
 
 (define-unit-from-context smtp@ smtp^)
 
diff --git a/racket/lib/collects/net/uri-codec-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/uri-codec-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-sig.rkt
diff --git a/racket/lib/collects/net/uri-codec-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-unit.rkt
similarity index 70%
rename from racket/lib/collects/net/uri-codec-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-unit.rkt
index f680d8a..477b849 100644
--- a/racket/lib/collects/net/uri-codec-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "uri-codec-sig.rkt" "uri-codec.rkt")
+         "uri-codec-sig.rkt" net/uri-codec)
 
 (define-unit-from-context uri-codec@ uri-codec^)
 
diff --git a/racket/lib/collects/net/url-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/url-sig.rkt
similarity index 100%
rename from racket/lib/collects/net/url-sig.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/url-sig.rkt
diff --git a/racket/lib/collects/net/url-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/url-unit.rkt
similarity index 66%
rename from racket/lib/collects/net/url-unit.rkt
rename to pkgs/compatibility-pkgs/compatibility-lib/net/url-unit.rkt
index 98fe4d3..8623748 100644
--- a/racket/lib/collects/net/url-unit.rkt
+++ b/pkgs/compatibility-pkgs/compatibility-lib/net/url-unit.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/unit
-         "url-sig.rkt" "url.rkt" "url-connect.rkt")
+         "url-sig.rkt" net/url net/url-connect)
 
 (define-unit-from-context url@ url+scheme^)