net: renamings

This is Go 1 package renaming CL #3.
This one merely moves the source; the import strings will be
changed after the next weekly release.
This one moves pieces into net.

http -> net/http
http/cgi -> net/http/cgi
http/fcgi -> net/http/fcgi
http/pprof -> net/http/pprof
http/httptest -> net/http/httptest
mail -> net/mail
rpc -> net/rpc
rpc/jsonrpc -> net/rpc/jsonrpc
smtp -> net/smtp
url -> net/url

Also remove rand (now math/rand) from NOTEST - it has a test.

The only edits are in Makefiles and deps.bash.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5335048

src/pkg/Makefile

@@ -105,11 +105,6 @@ DIRS=\
 	hash/fnv\
 	html\
 	html/template\
-	http\
-	http/cgi\
-	http/fcgi\
-	http/pprof\
-	http/httptest\
 	image\
 	image/bmp\
 	image/color\
@@ -124,7 +119,6 @@ DIRS=\
 	io/ioutil\
 	log\
 	log/syslog\
-	mail\
 	math\
 	math/big\
 	math/cmplx\
@@ -133,7 +127,17 @@ DIRS=\
 	mime/multipart\
 	net\
 	net/dict\
+	net/http\
+	net/http/cgi\
+	net/http/fcgi\
+	net/mail\
+	net/http/pprof\
+	net/http/httptest\
+	net/rpc\
+	net/rpc/jsonrpc\
+	net/smtp\
 	net/textproto\
+	net/url\
 	old/netchan\
 	old/regexp\
 	old/template\
@@ -146,14 +150,11 @@ DIRS=\
 	reflect\
 	regexp\
 	regexp/syntax\
-	rpc\
-	rpc/jsonrpc\
 	runtime\
 	runtime/cgo\
 	runtime/debug\
 	runtime/pprof\
 	scanner\
-	smtp\
 	sort\
 	strconv\
 	strings\
@@ -169,7 +170,6 @@ DIRS=\
 	testing/script\
 	time\
 	unicode\
-	url\
 	utf16\
 	utf8\
 	websocket\
@@ -205,13 +205,12 @@ NOTEST+=\
 	exp/gui/x11\
 	go/doc\
 	hash\
-	http/pprof\
-	http/httptest\
 	image/bmp\
 	image/color\
 	image/gif\
 	net/dict\
-	rand\
+	net/http/pprof\
+	net/http/httptest\
 	runtime/cgo\
 	syscall\
 	testing\

src/pkg/deps.bash

@@ -31,9 +31,18 @@ dirpat="$dirpat
 /^(csv)$/
 /^(exp\/template\/html)$/
 /^(gob)$/
+/^(http)/
+/^(http\/cgi)$/
+/^(http\/fcgi)$/
+/^(http\/httptest)$/
+/^(http\/pprof)$/
 /^(json)$/
+/^(mail)$/
 /^(rand)$/
+/^(rpc)$/
+/^(smtp)$/
 /^(syslog)$/
+/^(url)$/
 /^(xml)$/
 "
 
@@ -60,9 +69,19 @@ for dir in $dirs; do (
 		s;^csv.install$;encoding/csv.install;
 		s;^exp/template/html.install$;html/template.install;
 		s;^gob.install$;encoding/gob.install;
+		s;^http.install$;net/http.install;
+		s;^http/cgi.install$;net/http/cgi.install;
+		s;^http/fcgi.install$;net/http/fcgi.install;
+		s;^http/httptest.install$;net/http/httptest.install;
+		s;^http/pprof.install$;net/http/pprof.install;
 		s;^json.install$;encoding/json.install;
+		s;^mail.install$;net/mail.install;
+		s;^rpc.install$;net/rpc.install;
+		s;^rpc/jsonrpc.install$;net/rpc/jsonrpc.install;
+		s;^smtp.install$;net/smtp.install;
 		s;^syslog.install$;log/syslog.install;
 		s;^rand.install$;math/rand.install;
+		s;^url.install$;net/url.install;
 		s;^xml.install$;encoding/xml.install;' |
 		# TODO: end of renamings.
 		sed 's;^C\.install;runtime/cgo.install;' |

src/pkg/net/http/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=http
 GOFILES=\
@@ -29,4 +29,4 @@ GOFILES_windows=\
 	
 GOFILES+=$(GOFILES_$(GOOS))
 
-include ../../Make.pkg
+include ../../../Make.pkg

src/pkg/net/http/cgi/Makefile

@@ -2,10 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../../Make.inc
 
-TARG=mail
+TARG=http/cgi
 GOFILES=\
-	message.go\
+	child.go\
+	host.go\
 
-include ../../Make.pkg
+include ../../../../Make.pkg

src/pkg/net/http/fcgi/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.inc
+include ../../../../Make.inc
 
 TARG=http/fcgi
 GOFILES=\
 	child.go\
 	fcgi.go\
 
-include ../../../Make.pkg
+include ../../../../Make.pkg

src/pkg/net/http/httptest/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.inc
+include ../../../../Make.inc
 
 TARG=http/httptest
 GOFILES=\
 	recorder.go\
 	server.go\
 
-include ../../../Make.pkg
+include ../../../../Make.pkg

src/pkg/net/http/pprof/Makefile

@@ -2,11 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../../Make.inc
 
-TARG=smtp
+TARG=http/pprof
 GOFILES=\
-	auth.go\
-	smtp.go\
+	pprof.go\
 
-include ../../Make.pkg
+include ../../../../Make.pkg

src/pkg/net/mail/Makefile

@@ -4,9 +4,8 @@
 
 include ../../../Make.inc
 
-TARG=http/cgi
+TARG=mail
 GOFILES=\
-	child.go\
-	host.go\
+	message.go\
 
 include ../../../Make.pkg

src/pkg/net/rpc/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=rpc
 GOFILES=\
@@ -10,4 +10,4 @@ GOFILES=\
 	debug.go\
 	server.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg

src/pkg/net/rpc/jsonrpc/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.inc
+include ../../../../Make.inc
 
 TARG=rpc/jsonrpc
 GOFILES=\
 	client.go\
 	server.go\
 
-include ../../../Make.pkg
+include ../../../../Make.pkg

src/pkg/net/smtp/Makefile

@@ -4,8 +4,9 @@
 
 include ../../../Make.inc
 
-TARG=http/pprof
+TARG=smtp
 GOFILES=\
-	pprof.go\
+	auth.go\
+	smtp.go\
 
 include ../../../Make.pkg

src/pkg/net/url/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=url
 GOFILES=\
 	url.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg