5 files changed, 223 insertions, 227 deletions

diff --git a/lang/go/Makefile b/lang/go/Makefile
index 78a909df334b..fe50fd76f2d5 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -6,20 +6,21 @@
 #
 
 PORTNAME=	go
-PORTVERSION=	20110515
+PORTVERSION=	20110920
 CATEGORIES=	lang
-MASTER_SITES=	http://www.exit2shell.com/~skreuzer/distfiles/
-DISTNAME=	go-${PORTVERSION}
+MASTER_SITES=	LOCAL/jlaffaye
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	An experimental, concurrent, garbage-collected language
 
+LICENSE=	BSD
+
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash	\
 		bison:${PORTSDIR}/devel/bison
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_XZ=		yes
 USE_GMAKE=	yes
-GOMAKEDIR=	lib/go/src
 SUB_FILES=	pkg-message
 SUB_LIST+=	GOOBJ=${GOOBJ} \
 		ARCH=${GOARCH}
@@ -34,34 +35,15 @@ GOARCH=amd64
 GOOBJ=6
 .endif
 
-GOBIN=		${WRKDIR}/bin
-MAKE_ENV=	GOROOT=${WRKSRC}	\
-		GOARCH=${GOARCH}	\
-		GOBIN=${GOBIN}		\
-		GOOS=freebsd
 PLIST_SUB+=	ARCH=${GOARCH}		\
-		GOOBJ=${GOOBJ} \
-		GOMAKEDIR=${GOMAKEDIR}
-
-pre-build:
-	@${MKDIR} ${GOBIN}
+		GOOBJ=${GOOBJ}
 
-.if !defined(MAINTAINER_MODE)
 do-build:
 	(cd ${WRKSRC}/src &&		\
 		GOROOT=${WRKSRC}	\
 		GOARCH=${GOARCH}	\
-		GOBIN=${GOBIN}		\
 		GOOS=freebsd		\
 		bash make.bash)
-.else
-	(cd ${WRKSRC}/src &&		\
-		GOROOT=${WRKSRC}	\
-		GOARCH=${GOARCH}	\
-		GOBIN=${GOBIN}		\
-		GOOS=freebsd		\
-		bash all.bash)
-.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
@@ -71,15 +53,10 @@ do-install:
 	${INSTALL} -d -m 0755 ${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
 .endif
-	${INSTALL} -d -m 0755 ${PREFIX}/${GOMAKEDIR}
-	${INSTALL} -d -m 0755 ${PREFIX}/lib/go/pkg
-	${INSTALL} -m 0644 ${WRKSRC}/src/Make.common ${PREFIX}/${GOMAKEDIR}
-	${INSTALL} -m 0644 ${WRKSRC}/src/Make.pkg ${PREFIX}/${GOMAKEDIR}
-	${INSTALL} -m 0644 ${WRKSRC}/src/Make.cmd ${PREFIX}/${GOMAKEDIR}
-	${INSTALL} -m 0644 ${WRKSRC}/src/Make.ccmd ${PREFIX}/${GOMAKEDIR}
-	${INSTALL} -m 0644 ${WRKSRC}/src/Make.clib ${PREFIX}/${GOMAKEDIR}
-	${INSTALL} -m 0644 ${WRKSRC}/src/Make.inc ${PREFIX}/${GOMAKEDIR}
-	${CP} -R ${WRKSRC}/pkg/* ${PREFIX}/lib/go/pkg/
-	${CP} -R ${WRKDIR}/bin/* ${PREFIX}/bin/
+	${CP} ${WRKSRC}/bin/* ${PREFIX}/bin/
+	${INSTALL} -d -m 0755 ${PREFIX}/go/pkg
+	${CP} -R ${WRKSRC}/pkg/* ${PREFIX}/go/pkg/
+	${INSTALL} -d -m 0755 ${PREFIX}/go/src/
+	${INSTALL} -m 0644 ${WRKSRC}/src/Make.* ${PREFIX}/go/src/
 
 .include <bsd.port.post.mk>
diff --git a/lang/go/distinfo b/lang/go/distinfo
index 17d6c2585d8b..77ce5879e615 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,2 +1,2 @@
-SHA256 (go-20110515.tar.gz) = c8948d39c3a73935b62452eac4927f3eedc04f7a422f366336c8ed5ec1c3797f
-SIZE (go-20110515.tar.gz) = 35314592
+SHA256 (go-20110920.tar.xz) = a278ac75e0cf628fd4bb3e7b399d25f9df4668b8dc003038683fcb73f4f5168e
+SIZE (go-20110920.tar.xz) = 6809252
diff --git a/lang/go/files/bsd.go.mk b/lang/go/files/bsd.go.mk
index f0bbf7183458..5192c49d9940 100644
--- a/lang/go/files/bsd.go.mk
+++ b/lang/go/files/bsd.go.mk
@@ -13,13 +13,11 @@ GOOS=	freebsd
 .endif
 
 GO_CMD=		${LOCALBASE}/bin/${GOOBJ}g
-GOROOT_REL=	lib/go
-GOROOT=		${LOCALBASE}/${GOROOT_REL}
-GO_LIBDIR=	${GOROOT_REL}/pkg/${GOOS}_${GOARCH}
+GOROOT=		${LOCALBASE}/go
+GO_LIBDIR=	go/pkg/${GOOS}_${GOARCH}
 
 .if defined(USE_GO)
 BUILD_DEPENDS+=	${GO_CMD}:${PORTSDIR}/lang/go
-RUN_DEPENDS+=	${GO_CMD}:${PORTSDIR}/lang/go
 
 USE_GMAKE=	yes
 
@@ -27,9 +25,3 @@ MAKE_ENV+=	GOROOT=${GOROOT} GOARCH=${GOARCH} GOOS=${GOOS}
 
 PLIST_SUB+=	GO_LIBDIR=${GO_LIBDIR}
 .endif
-
-
-.if defined(USE_GO)
-do-install:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} install)
-.endif
diff --git a/lang/go/files/pkg-message.in b/lang/go/files/pkg-message.in
index d1973dde8d07..5c6cf01be0cc 100644
--- a/lang/go/files/pkg-message.in
+++ b/lang/go/files/pkg-message.in
@@ -5,7 +5,7 @@
 
  GOOS=freebsd
  GOARCH=%%ARCH%%
- GOROOT=%%PREFIX%%/lib/go
+ GOROOT=%%PREFIX%%/go
 
  Your compiler is %%GOOBJ%%g and your linker is %%GOOBJ%%l.
 
diff --git a/lang/go/pkg-plist b/lang/go/pkg-plist
index 8df916144d02..e241955ba536 100644
--- a/lang/go/pkg-plist
+++ b/lang/go/pkg-plist
@@ -22,150 +22,169 @@ bin/govet
 bin/goyacc
 bin/hgpatch
 bin/quietgcc
-lib/go/pkg/freebsd_%%ARCH%%/archive/tar.a
-lib/go/pkg/freebsd_%%ARCH%%/archive/zip.a
-lib/go/pkg/freebsd_%%ARCH%%/asn1.a
-lib/go/pkg/freebsd_%%ARCH%%/big.a
-lib/go/pkg/freebsd_%%ARCH%%/bufio.a
-lib/go/pkg/freebsd_%%ARCH%%/bytes.a
-lib/go/pkg/freebsd_%%ARCH%%/cgocall.h
-lib/go/pkg/freebsd_%%ARCH%%/cmath.a
-lib/go/pkg/freebsd_%%ARCH%%/compress/bzip2.a
-lib/go/pkg/freebsd_%%ARCH%%/compress/flate.a
-lib/go/pkg/freebsd_%%ARCH%%/compress/gzip.a
-lib/go/pkg/freebsd_%%ARCH%%/compress/lzw.a
-lib/go/pkg/freebsd_%%ARCH%%/compress/zlib.a
-lib/go/pkg/freebsd_%%ARCH%%/container/heap.a
-lib/go/pkg/freebsd_%%ARCH%%/container/list.a
-lib/go/pkg/freebsd_%%ARCH%%/container/ring.a
-lib/go/pkg/freebsd_%%ARCH%%/container/vector.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/aes.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/blowfish.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/cast5.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/cipher.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/des.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/dsa.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/ecdsa.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/elliptic.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/hmac.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/md4.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/md5.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/ocsp.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/openpgp.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/openpgp/armor.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/openpgp/error.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/openpgp/packet.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/openpgp/s2k.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/rand.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/rc4.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/ripemd160.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/rsa.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/sha1.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/sha256.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/sha512.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/subtle.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/tls.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/twofish.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/x509.a
-lib/go/pkg/freebsd_%%ARCH%%/crypto/xtea.a
-lib/go/pkg/freebsd_%%ARCH%%/debug/dwarf.a
-lib/go/pkg/freebsd_%%ARCH%%/debug/elf.a
-lib/go/pkg/freebsd_%%ARCH%%/debug/gosym.a
-lib/go/pkg/freebsd_%%ARCH%%/debug/macho.a
-lib/go/pkg/freebsd_%%ARCH%%/debug/pe.a
-lib/go/pkg/freebsd_%%ARCH%%/debug/proc.a
-lib/go/pkg/freebsd_%%ARCH%%/ebnf.a
-lib/go/pkg/freebsd_%%ARCH%%/encoding/ascii85.a
-lib/go/pkg/freebsd_%%ARCH%%/encoding/base32.a
-lib/go/pkg/freebsd_%%ARCH%%/encoding/base64.a
-lib/go/pkg/freebsd_%%ARCH%%/encoding/binary.a
-lib/go/pkg/freebsd_%%ARCH%%/encoding/git85.a
-lib/go/pkg/freebsd_%%ARCH%%/encoding/hex.a
-lib/go/pkg/freebsd_%%ARCH%%/encoding/line.a
-lib/go/pkg/freebsd_%%ARCH%%/encoding/pem.a
-lib/go/pkg/freebsd_%%ARCH%%/exec.a
-lib/go/pkg/freebsd_%%ARCH%%/exp/datafmt.a
-lib/go/pkg/freebsd_%%ARCH%%/exp/draw.a
-lib/go/pkg/freebsd_%%ARCH%%/exp/draw/x11.a
-lib/go/pkg/freebsd_%%ARCH%%/exp/eval.a
-lib/go/pkg/freebsd_%%ARCH%%/expvar.a
-lib/go/pkg/freebsd_%%ARCH%%/flag.a
-lib/go/pkg/freebsd_%%ARCH%%/fmt.a
-lib/go/pkg/freebsd_%%ARCH%%/go/ast.a
-lib/go/pkg/freebsd_%%ARCH%%/go/doc.a
-lib/go/pkg/freebsd_%%ARCH%%/go/parser.a
-lib/go/pkg/freebsd_%%ARCH%%/go/printer.a
-lib/go/pkg/freebsd_%%ARCH%%/go/scanner.a
-lib/go/pkg/freebsd_%%ARCH%%/go/token.a
-lib/go/pkg/freebsd_%%ARCH%%/go/typechecker.a
-lib/go/pkg/freebsd_%%ARCH%%/go/types.a
-lib/go/pkg/freebsd_%%ARCH%%/gob.a
-lib/go/pkg/freebsd_%%ARCH%%/hash.a
-lib/go/pkg/freebsd_%%ARCH%%/hash/adler32.a
-lib/go/pkg/freebsd_%%ARCH%%/hash/crc32.a
-lib/go/pkg/freebsd_%%ARCH%%/hash/crc64.a
-lib/go/pkg/freebsd_%%ARCH%%/hash/fnv.a
-lib/go/pkg/freebsd_%%ARCH%%/html.a
-lib/go/pkg/freebsd_%%ARCH%%/http.a
-lib/go/pkg/freebsd_%%ARCH%%/http/cgi.a
-lib/go/pkg/freebsd_%%ARCH%%/http/fcgi.a
-lib/go/pkg/freebsd_%%ARCH%%/http/httptest.a
-lib/go/pkg/freebsd_%%ARCH%%/http/pprof.a
-lib/go/pkg/freebsd_%%ARCH%%/image.a
-lib/go/pkg/freebsd_%%ARCH%%/image/jpeg.a
-lib/go/pkg/freebsd_%%ARCH%%/image/png.a
-lib/go/pkg/freebsd_%%ARCH%%/image/ycbcr.a
-lib/go/pkg/freebsd_%%ARCH%%/index/suffixarray.a
-lib/go/pkg/freebsd_%%ARCH%%/io.a
-lib/go/pkg/freebsd_%%ARCH%%/io/ioutil.a
-lib/go/pkg/freebsd_%%ARCH%%/json.a
-lib/go/pkg/freebsd_%%ARCH%%/log.a
-lib/go/pkg/freebsd_%%ARCH%%/math.a
-lib/go/pkg/freebsd_%%ARCH%%/mime.a
-lib/go/pkg/freebsd_%%ARCH%%/mime/multipart.a
-lib/go/pkg/freebsd_%%ARCH%%/net.a
-lib/go/pkg/freebsd_%%ARCH%%/net/dict.a
-lib/go/pkg/freebsd_%%ARCH%%/net/textproto.a
-lib/go/pkg/freebsd_%%ARCH%%/netchan.a
-lib/go/pkg/freebsd_%%ARCH%%/os.a
-lib/go/pkg/freebsd_%%ARCH%%/os/signal.a
-lib/go/pkg/freebsd_%%ARCH%%/os/user.a
-lib/go/pkg/freebsd_%%ARCH%%/patch.a
-lib/go/pkg/freebsd_%%ARCH%%/path.a
-lib/go/pkg/freebsd_%%ARCH%%/path/filepath.a
-lib/go/pkg/freebsd_%%ARCH%%/rand.a
-lib/go/pkg/freebsd_%%ARCH%%/reflect.a
-lib/go/pkg/freebsd_%%ARCH%%/regexp.a
-lib/go/pkg/freebsd_%%ARCH%%/rpc.a
-lib/go/pkg/freebsd_%%ARCH%%/rpc/jsonrpc.a
-lib/go/pkg/freebsd_%%ARCH%%/runtime.a
-lib/go/pkg/freebsd_%%ARCH%%/runtime.h
-lib/go/pkg/freebsd_%%ARCH%%/runtime/cgo.a
-lib/go/pkg/freebsd_%%ARCH%%/runtime/debug.a
-lib/go/pkg/freebsd_%%ARCH%%/runtime/pprof.a
-lib/go/pkg/freebsd_%%ARCH%%/scanner.a
-lib/go/pkg/freebsd_%%ARCH%%/smtp.a
-lib/go/pkg/freebsd_%%ARCH%%/sort.a
-lib/go/pkg/freebsd_%%ARCH%%/strconv.a
-lib/go/pkg/freebsd_%%ARCH%%/strings.a
-lib/go/pkg/freebsd_%%ARCH%%/sync.a
-lib/go/pkg/freebsd_%%ARCH%%/sync/atomic.a
-lib/go/pkg/freebsd_%%ARCH%%/syscall.a
-lib/go/pkg/freebsd_%%ARCH%%/syslog.a
-lib/go/pkg/freebsd_%%ARCH%%/tabwriter.a
-lib/go/pkg/freebsd_%%ARCH%%/template.a
-lib/go/pkg/freebsd_%%ARCH%%/testing.a
-lib/go/pkg/freebsd_%%ARCH%%/testing/iotest.a
-lib/go/pkg/freebsd_%%ARCH%%/testing/quick.a
-lib/go/pkg/freebsd_%%ARCH%%/testing/script.a
-lib/go/pkg/freebsd_%%ARCH%%/time.a
-lib/go/pkg/freebsd_%%ARCH%%/try.a
-lib/go/pkg/freebsd_%%ARCH%%/unicode.a
-lib/go/pkg/freebsd_%%ARCH%%/utf16.a
-lib/go/pkg/freebsd_%%ARCH%%/utf8.a
-lib/go/pkg/freebsd_%%ARCH%%/websocket.a
-lib/go/pkg/freebsd_%%ARCH%%/xml.a
+go/pkg/freebsd_%%ARCH%%/archive/tar.a
+go/pkg/freebsd_%%ARCH%%/archive/zip.a
+go/pkg/freebsd_%%ARCH%%/asn1.a
+go/pkg/freebsd_%%ARCH%%/big.a
+go/pkg/freebsd_%%ARCH%%/bufio.a
+go/pkg/freebsd_%%ARCH%%/bytes.a
+go/pkg/freebsd_%%ARCH%%/cgocall.h
+go/pkg/freebsd_%%ARCH%%/cmath.a
+go/pkg/freebsd_%%ARCH%%/compress/bzip2.a
+go/pkg/freebsd_%%ARCH%%/compress/flate.a
+go/pkg/freebsd_%%ARCH%%/compress/gzip.a
+go/pkg/freebsd_%%ARCH%%/compress/lzw.a
+go/pkg/freebsd_%%ARCH%%/compress/zlib.a
+go/pkg/freebsd_%%ARCH%%/container/heap.a
+go/pkg/freebsd_%%ARCH%%/container/list.a
+go/pkg/freebsd_%%ARCH%%/container/ring.a
+go/pkg/freebsd_%%ARCH%%/container/vector.a
+go/pkg/freebsd_%%ARCH%%/crypto.a
+go/pkg/freebsd_%%ARCH%%/crypto/aes.a
+go/pkg/freebsd_%%ARCH%%/crypto/blowfish.a
+go/pkg/freebsd_%%ARCH%%/crypto/cast5.a
+go/pkg/freebsd_%%ARCH%%/crypto/cipher.a
+go/pkg/freebsd_%%ARCH%%/crypto/des.a
+go/pkg/freebsd_%%ARCH%%/crypto/dsa.a
+go/pkg/freebsd_%%ARCH%%/crypto/ecdsa.a
+go/pkg/freebsd_%%ARCH%%/crypto/elliptic.a
+go/pkg/freebsd_%%ARCH%%/crypto/hmac.a
+go/pkg/freebsd_%%ARCH%%/crypto/md4.a
+go/pkg/freebsd_%%ARCH%%/crypto/md5.a
+go/pkg/freebsd_%%ARCH%%/crypto/ocsp.a
+go/pkg/freebsd_%%ARCH%%/crypto/openpgp.a
+go/pkg/freebsd_%%ARCH%%/crypto/openpgp/armor.a
+go/pkg/freebsd_%%ARCH%%/crypto/openpgp/elgamal.a
+go/pkg/freebsd_%%ARCH%%/crypto/openpgp/error.a
+go/pkg/freebsd_%%ARCH%%/crypto/openpgp/packet.a
+go/pkg/freebsd_%%ARCH%%/crypto/openpgp/s2k.a
+go/pkg/freebsd_%%ARCH%%/crypto/rand.a
+go/pkg/freebsd_%%ARCH%%/crypto/rc4.a
+go/pkg/freebsd_%%ARCH%%/crypto/ripemd160.a
+go/pkg/freebsd_%%ARCH%%/crypto/rsa.a
+go/pkg/freebsd_%%ARCH%%/crypto/sha1.a
+go/pkg/freebsd_%%ARCH%%/crypto/sha256.a
+go/pkg/freebsd_%%ARCH%%/crypto/sha512.a
+go/pkg/freebsd_%%ARCH%%/crypto/subtle.a
+go/pkg/freebsd_%%ARCH%%/crypto/tls.a
+go/pkg/freebsd_%%ARCH%%/crypto/twofish.a
+go/pkg/freebsd_%%ARCH%%/crypto/x509.a
+go/pkg/freebsd_%%ARCH%%/crypto/x509/pkix.a
+go/pkg/freebsd_%%ARCH%%/crypto/xtea.a
+go/pkg/freebsd_%%ARCH%%/csv.a
+go/pkg/freebsd_%%ARCH%%/debug/dwarf.a
+go/pkg/freebsd_%%ARCH%%/debug/elf.a
+go/pkg/freebsd_%%ARCH%%/debug/gosym.a
+go/pkg/freebsd_%%ARCH%%/debug/macho.a
+go/pkg/freebsd_%%ARCH%%/debug/pe.a
+go/pkg/freebsd_%%ARCH%%/ebnf.a
+go/pkg/freebsd_%%ARCH%%/encoding/ascii85.a
+go/pkg/freebsd_%%ARCH%%/encoding/base32.a
+go/pkg/freebsd_%%ARCH%%/encoding/base64.a
+go/pkg/freebsd_%%ARCH%%/encoding/binary.a
+go/pkg/freebsd_%%ARCH%%/encoding/git85.a
+go/pkg/freebsd_%%ARCH%%/encoding/hex.a
+go/pkg/freebsd_%%ARCH%%/encoding/pem.a
+go/pkg/freebsd_%%ARCH%%/exec.a
+go/pkg/freebsd_%%ARCH%%/exp/datafmt.a
+go/pkg/freebsd_%%ARCH%%/exp/gui.a
+go/pkg/freebsd_%%ARCH%%/exp/gui/x11.a
+go/pkg/freebsd_%%ARCH%%/exp/norm.a
+go/pkg/freebsd_%%ARCH%%/exp/regexp/syntax.a
+go/pkg/freebsd_%%ARCH%%/exp/template/html.a
+go/pkg/freebsd_%%ARCH%%/expvar.a
+go/pkg/freebsd_%%ARCH%%/flag.a
+go/pkg/freebsd_%%ARCH%%/fmt.a
+go/pkg/freebsd_%%ARCH%%/go/ast.a
+go/pkg/freebsd_%%ARCH%%/go/build.a
+go/pkg/freebsd_%%ARCH%%/go/doc.a
+go/pkg/freebsd_%%ARCH%%/go/parser.a
+go/pkg/freebsd_%%ARCH%%/go/printer.a
+go/pkg/freebsd_%%ARCH%%/go/scanner.a
+go/pkg/freebsd_%%ARCH%%/go/token.a
+go/pkg/freebsd_%%ARCH%%/go/typechecker.a
+go/pkg/freebsd_%%ARCH%%/go/types.a
+go/pkg/freebsd_%%ARCH%%/gob.a
+go/pkg/freebsd_%%ARCH%%/hash.a
+go/pkg/freebsd_%%ARCH%%/hash/adler32.a
+go/pkg/freebsd_%%ARCH%%/hash/crc32.a
+go/pkg/freebsd_%%ARCH%%/hash/crc64.a
+go/pkg/freebsd_%%ARCH%%/hash/fnv.a
+go/pkg/freebsd_%%ARCH%%/html.a
+go/pkg/freebsd_%%ARCH%%/http.a
+go/pkg/freebsd_%%ARCH%%/http/cgi.a
+go/pkg/freebsd_%%ARCH%%/http/fcgi.a
+go/pkg/freebsd_%%ARCH%%/http/httptest.a
+go/pkg/freebsd_%%ARCH%%/http/pprof.a
+go/pkg/freebsd_%%ARCH%%/http/spdy.a
+go/pkg/freebsd_%%ARCH%%/image.a
+go/pkg/freebsd_%%ARCH%%/image/bmp.a
+go/pkg/freebsd_%%ARCH%%/image/draw.a
+go/pkg/freebsd_%%ARCH%%/image/gif.a
+go/pkg/freebsd_%%ARCH%%/image/jpeg.a
+go/pkg/freebsd_%%ARCH%%/image/png.a
+go/pkg/freebsd_%%ARCH%%/image/tiff.a
+go/pkg/freebsd_%%ARCH%%/image/ycbcr.a
+go/pkg/freebsd_%%ARCH%%/index/suffixarray.a
+go/pkg/freebsd_%%ARCH%%/io.a
+go/pkg/freebsd_%%ARCH%%/io/ioutil.a
+go/pkg/freebsd_%%ARCH%%/json.a
+go/pkg/freebsd_%%ARCH%%/log.a
+go/pkg/freebsd_%%ARCH%%/mail.a
+go/pkg/freebsd_%%ARCH%%/math.a
+go/pkg/freebsd_%%ARCH%%/mime.a
+go/pkg/freebsd_%%ARCH%%/mime/multipart.a
+go/pkg/freebsd_%%ARCH%%/net.a
+go/pkg/freebsd_%%ARCH%%/net/dict.a
+go/pkg/freebsd_%%ARCH%%/net/textproto.a
+go/pkg/freebsd_%%ARCH%%/netchan.a
+go/pkg/freebsd_%%ARCH%%/old/template.a
+go/pkg/freebsd_%%ARCH%%/os.a
+go/pkg/freebsd_%%ARCH%%/os/signal.a
+go/pkg/freebsd_%%ARCH%%/os/user.a
+go/pkg/freebsd_%%ARCH%%/patch.a
+go/pkg/freebsd_%%ARCH%%/path.a
+go/pkg/freebsd_%%ARCH%%/path/filepath.a
+go/pkg/freebsd_%%ARCH%%/rand.a
+go/pkg/freebsd_%%ARCH%%/reflect.a
+go/pkg/freebsd_%%ARCH%%/regexp.a
+go/pkg/freebsd_%%ARCH%%/rpc.a
+go/pkg/freebsd_%%ARCH%%/rpc/jsonrpc.a
+go/pkg/freebsd_%%ARCH%%/runtime.a
+go/pkg/freebsd_%%ARCH%%/runtime.h
+go/pkg/freebsd_%%ARCH%%/runtime/cgo.a
+go/pkg/freebsd_%%ARCH%%/runtime/debug.a
+go/pkg/freebsd_%%ARCH%%/runtime/pprof.a
+go/pkg/freebsd_%%ARCH%%/scanner.a
+go/pkg/freebsd_%%ARCH%%/smtp.a
+go/pkg/freebsd_%%ARCH%%/sort.a
+go/pkg/freebsd_%%ARCH%%/strconv.a
+go/pkg/freebsd_%%ARCH%%/strings.a
+go/pkg/freebsd_%%ARCH%%/sync.a
+go/pkg/freebsd_%%ARCH%%/sync/atomic.a
+go/pkg/freebsd_%%ARCH%%/syscall.a
+go/pkg/freebsd_%%ARCH%%/syslog.a
+go/pkg/freebsd_%%ARCH%%/tabwriter.a
+go/pkg/freebsd_%%ARCH%%/template.a
+go/pkg/freebsd_%%ARCH%%/template/parse.a
+go/pkg/freebsd_%%ARCH%%/testing.a
+go/pkg/freebsd_%%ARCH%%/testing/iotest.a
+go/pkg/freebsd_%%ARCH%%/testing/quick.a
+go/pkg/freebsd_%%ARCH%%/testing/script.a
+go/pkg/freebsd_%%ARCH%%/time.a
+go/pkg/freebsd_%%ARCH%%/try.a
+go/pkg/freebsd_%%ARCH%%/unicode.a
+go/pkg/freebsd_%%ARCH%%/url.a
+go/pkg/freebsd_%%ARCH%%/utf16.a
+go/pkg/freebsd_%%ARCH%%/utf8.a
+go/pkg/freebsd_%%ARCH%%/websocket.a
+go/pkg/freebsd_%%ARCH%%/xml.a
+go/src/Make.ccmd
+go/src/Make.clib
+go/src/Make.cmd
+go/src/Make.common
+go/src/Make.inc
+go/src/Make.pkg
 %%PORTDOCS%%%%DOCSDIR%%/ExpressivenessOfGo.pdf
 %%PORTDOCS%%%%DOCSDIR%%/GoCourseDay1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/GoCourseDay2.pdf
@@ -201,6 +220,8 @@ lib/go/pkg/freebsd_%%ARCH%%/xml.a
 %%PORTDOCS%%%%DOCSDIR%%/codewalk/codewalk.js
 %%PORTDOCS%%%%DOCSDIR%%/codewalk/codewalk.xml
 %%PORTDOCS%%%%DOCSDIR%%/codewalk/functions.xml
+%%PORTDOCS%%%%DOCSDIR%%/codewalk/markov.go
+%%PORTDOCS%%%%DOCSDIR%%/codewalk/markov.xml
 %%PORTDOCS%%%%DOCSDIR%%/codewalk/pig.go
 %%PORTDOCS%%%%DOCSDIR%%/codewalk/popout.png
 %%PORTDOCS%%%%DOCSDIR%%/codewalk/sharemem.xml
@@ -225,8 +246,11 @@ lib/go/pkg/freebsd_%%ARCH%%/xml.a
 %%PORTDOCS%%%%DOCSDIR%%/go_mem.html
 %%PORTDOCS%%%%DOCSDIR%%/go_spec.html
 %%PORTDOCS%%%%DOCSDIR%%/go_tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/go_tutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/go_tutorial.tmpl
 %%PORTDOCS%%%%DOCSDIR%%/godocs.js
+%%PORTDOCS%%%%DOCSDIR%%/gopher/appenginegopher.jpg
+%%PORTDOCS%%%%DOCSDIR%%/gopher/appenginegophercolor.jpg
+%%PORTDOCS%%%%DOCSDIR%%/gopher/appenginelogo.gif
 %%PORTDOCS%%%%DOCSDIR%%/gopher/bumper.png
 %%PORTDOCS%%%%DOCSDIR%%/gopher/bumper192x108.png
 %%PORTDOCS%%%%DOCSDIR%%/gopher/bumper320x180.png
@@ -235,7 +259,6 @@ lib/go/pkg/freebsd_%%ARCH%%/xml.a
 %%PORTDOCS%%%%DOCSDIR%%/gopher/gopherbw.png
 %%PORTDOCS%%%%DOCSDIR%%/gopher/gophercolor.png
 %%PORTDOCS%%%%DOCSDIR%%/gopher/gophercolor16x16.png
-%%PORTDOCS%%%%DOCSDIR%%/htmlgen.go
 %%PORTDOCS%%%%DOCSDIR%%/ie.css
 %%PORTDOCS%%%%DOCSDIR%%/install.html
 %%PORTDOCS%%%%DOCSDIR%%/logo-153x55.png
@@ -244,11 +267,11 @@ lib/go/pkg/freebsd_%%ARCH%%/xml.a
 %%PORTDOCS%%%%DOCSDIR%%/play_overlay.png
 %%PORTDOCS%%%%DOCSDIR%%/playground.html
 %%PORTDOCS%%%%DOCSDIR%%/popups.js
-%%PORTDOCS%%%%DOCSDIR%%/prog.sh
 %%PORTDOCS%%%%DOCSDIR%%/progs/cat.go
 %%PORTDOCS%%%%DOCSDIR%%/progs/cat_rot13.go
 %%PORTDOCS%%%%DOCSDIR%%/progs/echo.go
 %%PORTDOCS%%%%DOCSDIR%%/progs/file.go
+%%PORTDOCS%%%%DOCSDIR%%/progs/file_windows.go
 %%PORTDOCS%%%%DOCSDIR%%/progs/helloworld.go
 %%PORTDOCS%%%%DOCSDIR%%/progs/helloworld3.go
 %%PORTDOCS%%%%DOCSDIR%%/progs/print.go
@@ -275,20 +298,18 @@ lib/go/pkg/freebsd_%%ARCH%%/xml.a
 %%PORTDOCS%%%%DOCSDIR%%/talks/io2010/eval1.go
 %%PORTDOCS%%%%DOCSDIR%%/talks/io2010/eval2.go
 %%PORTDOCS%%%%DOCSDIR%%/talks/io2010/talk.pdf
+%%PORTDOCS%%%%DOCSDIR%%/talks/io2011/Real_World_Go.pdf
+%%PORTDOCS%%%%DOCSDIR%%/talks/io2011/Writing_Web_Apps_in_Go.pdf
 %%PORTDOCS%%%%DOCSDIR%%/talks/java-typing.png
 %%PORTDOCS%%%%DOCSDIR%%/talks/slidy.css
 %%PORTDOCS%%%%DOCSDIR%%/talks/slidy.js
+%%PORTDOCS%%%%DOCSDIR%%/tmpltohtml.go
 %%PORTDOCS%%%%DOCSDIR%%/video-001.png
 %%PORTDOCS%%%%DOCSDIR%%/video-002.png
 %%PORTDOCS%%%%DOCSDIR%%/video-003.png
 %%PORTDOCS%%%%DOCSDIR%%/video-004.png
-%%GOMAKEDIR%%/Make.cmd
-%%GOMAKEDIR%%/Make.pkg
-%%GOMAKEDIR%%/Make.common
-%%GOMAKEDIR%%/Make.ccmd
-%%GOMAKEDIR%%/Make.clib
-%%GOMAKEDIR%%/Make.inc
-@dirrm %%GOMAKEDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/video-005.jpg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/talks/io2011
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/talks/io2010
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/talks
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/progs
@@ -298,29 +319,35 @@ lib/go/pkg/freebsd_%%ARCH%%/xml.a
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/codelab/wiki
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/codelab
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/testing
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/runtime
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/rpc
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/net
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/mime
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/os
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/io
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/index
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/image
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/http
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/hash
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/go
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/exp/draw
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/exp
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/encoding
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/debug
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/crypto/openpgp
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/crypto
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/container
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/compress
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/archive
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/sync
-@dirrm lib/go/pkg/freebsd_%%ARCH%%/path
-@dirrm lib/go/pkg/freebsd_%%ARCH%%
-@dirrm lib/go/pkg
-@dirrm lib/go
+@dirrm go/src
+@dirrm go/pkg/freebsd_%%ARCH%%/testing
+@dirrm go/pkg/freebsd_%%ARCH%%/template
+@dirrm go/pkg/freebsd_%%ARCH%%/sync
+@dirrm go/pkg/freebsd_%%ARCH%%/runtime
+@dirrm go/pkg/freebsd_%%ARCH%%/rpc
+@dirrm go/pkg/freebsd_%%ARCH%%/path
+@dirrm go/pkg/freebsd_%%ARCH%%/os
+@dirrm go/pkg/freebsd_%%ARCH%%/old
+@dirrm go/pkg/freebsd_%%ARCH%%/net
+@dirrm go/pkg/freebsd_%%ARCH%%/mime
+@dirrm go/pkg/freebsd_%%ARCH%%/io
+@dirrm go/pkg/freebsd_%%ARCH%%/index
+@dirrm go/pkg/freebsd_%%ARCH%%/image
+@dirrm go/pkg/freebsd_%%ARCH%%/http
+@dirrm go/pkg/freebsd_%%ARCH%%/hash
+@dirrm go/pkg/freebsd_%%ARCH%%/go
+@dirrm go/pkg/freebsd_%%ARCH%%/exp/template
+@dirrm go/pkg/freebsd_%%ARCH%%/exp/regexp
+@dirrm go/pkg/freebsd_%%ARCH%%/exp/gui
+@dirrm go/pkg/freebsd_%%ARCH%%/exp
+@dirrm go/pkg/freebsd_%%ARCH%%/encoding
+@dirrm go/pkg/freebsd_%%ARCH%%/debug
+@dirrm go/pkg/freebsd_%%ARCH%%/crypto/x509
+@dirrm go/pkg/freebsd_%%ARCH%%/crypto/openpgp
+@dirrm go/pkg/freebsd_%%ARCH%%/crypto
+@dirrm go/pkg/freebsd_%%ARCH%%/container
+@dirrm go/pkg/freebsd_%%ARCH%%/compress
+@dirrm go/pkg/freebsd_%%ARCH%%/archive
+@dirrm go/pkg/freebsd_%%ARCH%%
+@dirrm go/pkg
+@dirrm go