Update to 20100413

Submitted by:	devon.odell@gmail.com (maintainer, private mail)

3 files changed, 223 insertions, 191 deletions

diff --git a/lang/go/Makefile b/lang/go/Makefile
index 752ee09d29c1..eb0beeb49ae2 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	go
-PORTVERSION=	20100113
+PORTVERSION=	20100413
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.atarininja.org/~wxs/distfiles/
@@ -22,10 +22,6 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash	\
 ONLY_FOR_ARCHS=	i386 amd64
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKEFILE=	${WRKSRC}/src/Makefile
-.if !defined(MAINTAINER_MODE)
-ALL_TARGET=	build
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -48,6 +44,23 @@ PLIST_SUB+=	ARCH=${GOARCH}		\
 pre-build:
 	@${MKDIR} ${GOBIN}
 
+.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} | ${SED}		\
 		-e "s|%%PREFIX%%|${PREFIX}|g"	\
@@ -60,11 +73,11 @@ do-install:
 	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
 .endif
 	${INSTALL} -d -m 0755 ${DATADIR}
-	${INSTALL} -d -m 0755 ${PREFIX}/lib/go
+	${INSTALL} -d -m 0755 ${PREFIX}/lib/go/pkg
 	${INSTALL} -m 0644 ${WRKSRC}/src/Make.${GOARCH} ${DATADIR}
 	${INSTALL} -m 0644 ${WRKSRC}/src/Make.pkg ${DATADIR}
 	${INSTALL} -m 0644 ${WRKSRC}/src/Make.cmd ${DATADIR}
-	${CP} -R ${WRKSRC}/pkg/ ${PREFIX}/lib/go
-	${CP} -R ${WRKDIR}/bin/ ${PREFIX}/bin
+	${CP} -R ${WRKSRC}/pkg/* ${PREFIX}/lib/go/pkg/
+	${CP} -R ${WRKDIR}/bin/* ${PREFIX}/bin/
 
 .include <bsd.port.post.mk>
diff --git a/lang/go/distinfo b/lang/go/distinfo
index bfc283d49ed8..c3c4b087d4ec 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,3 +1,3 @@
-MD5 (go-20100113.tar.bz2) = d0843e0be963ea44a33dceaa020c55a6
-SHA256 (go-20100113.tar.bz2) = e418f0d1a6ab2621fa31908a5fce401ddee69240a3b3efc69611d6d9de57f02e
-SIZE (go-20100113.tar.bz2) = 19885406
+MD5 (go-20100413.tar.bz2) = c8d7225d3a4fe0baaaaeb249dd04fd0c
+SHA256 (go-20100413.tar.bz2) = bb7b877a740e123119d09b247ecd8667f438e65546249d90fb69efc67c49a079
+SIZE (go-20100413.tar.bz2) = 23743317
diff --git a/lang/go/pkg-plist b/lang/go/pkg-plist
index c8a5b5d49bed..cefd78c6baac 100644
--- a/lang/go/pkg-plist
+++ b/lang/go/pkg-plist
@@ -1,203 +1,222 @@
-lib/go/freebsd_%%ARCH%%/runtime.a
-lib/go/freebsd_%%ARCH%%/sort.a
-lib/go/freebsd_%%ARCH%%/json.a
-lib/go/freebsd_%%ARCH%%/patch.a
-lib/go/freebsd_%%ARCH%%/rpc.a
-lib/go/freebsd_%%ARCH%%/ebnf.a
-lib/go/freebsd_%%ARCH%%/utf8.a
-lib/go/freebsd_%%ARCH%%/image/png.a
-lib/go/freebsd_%%ARCH%%/image/jpeg.a
-lib/go/freebsd_%%ARCH%%/encoding/base64.a
-lib/go/freebsd_%%ARCH%%/encoding/ascii85.a
-lib/go/freebsd_%%ARCH%%/encoding/hex.a
-lib/go/freebsd_%%ARCH%%/encoding/binary.a
-lib/go/freebsd_%%ARCH%%/encoding/git85.a
-lib/go/freebsd_%%ARCH%%/encoding/pem.a
-lib/go/freebsd_%%ARCH%%/bytes.a
-lib/go/freebsd_%%ARCH%%/debug/gosym.a
-lib/go/freebsd_%%ARCH%%/debug/proc.a
-lib/go/freebsd_%%ARCH%%/debug/macho.a
-lib/go/freebsd_%%ARCH%%/debug/dwarf.a
-lib/go/freebsd_%%ARCH%%/debug/elf.a
-lib/go/freebsd_%%ARCH%%/container/ring.a
-lib/go/freebsd_%%ARCH%%/container/heap.a
-lib/go/freebsd_%%ARCH%%/container/list.a
-lib/go/freebsd_%%ARCH%%/container/vector.a
-lib/go/freebsd_%%ARCH%%/strconv.a
-lib/go/freebsd_%%ARCH%%/io/ioutil.a
-lib/go/freebsd_%%ARCH%%/websocket.a
-lib/go/freebsd_%%ARCH%%/flag.a
-lib/go/freebsd_%%ARCH%%/crypto/sha256.a
-lib/go/freebsd_%%ARCH%%/crypto/sha1.a
-lib/go/freebsd_%%ARCH%%/crypto/md4.a
-lib/go/freebsd_%%ARCH%%/crypto/md5.a
-lib/go/freebsd_%%ARCH%%/crypto/xtea.a
-lib/go/freebsd_%%ARCH%%/crypto/x509.a
-lib/go/freebsd_%%ARCH%%/crypto/aes.a
-lib/go/freebsd_%%ARCH%%/crypto/block.a
-lib/go/freebsd_%%ARCH%%/crypto/rsa.a
-lib/go/freebsd_%%ARCH%%/crypto/tls.a
-lib/go/freebsd_%%ARCH%%/crypto/rc4.a
-lib/go/freebsd_%%ARCH%%/crypto/hmac.a
-lib/go/freebsd_%%ARCH%%/crypto/subtle.a
-lib/go/freebsd_%%ARCH%%/regexp.a
-lib/go/freebsd_%%ARCH%%/malloc.a
-lib/go/freebsd_%%ARCH%%/sync.a
-lib/go/freebsd_%%ARCH%%/os.a
-lib/go/freebsd_%%ARCH%%/os/signal.a
-lib/go/freebsd_%%ARCH%%/go/scanner.a
-lib/go/freebsd_%%ARCH%%/go/printer.a
-lib/go/freebsd_%%ARCH%%/go/parser.a
-lib/go/freebsd_%%ARCH%%/go/token.a
-lib/go/freebsd_%%ARCH%%/go/doc.a
-lib/go/freebsd_%%ARCH%%/go/ast.a
-lib/go/freebsd_%%ARCH%%/net.a
-lib/go/freebsd_%%ARCH%%/exec.a
-lib/go/freebsd_%%ARCH%%/io.a
-lib/go/freebsd_%%ARCH%%/compress/zlib.a
-lib/go/freebsd_%%ARCH%%/compress/flate.a
-lib/go/freebsd_%%ARCH%%/compress/gzip.a
-lib/go/freebsd_%%ARCH%%/libcgo.so
-lib/go/freebsd_%%ARCH%%/rand.a
-lib/go/freebsd_%%ARCH%%/http.a
-lib/go/freebsd_%%ARCH%%/expvar.a
-lib/go/freebsd_%%ARCH%%/once.a
-lib/go/freebsd_%%ARCH%%/testing.a
-lib/go/freebsd_%%ARCH%%/hash.a
-lib/go/freebsd_%%ARCH%%/tabwriter.a
-lib/go/freebsd_%%ARCH%%/template.a
-lib/go/freebsd_%%ARCH%%/log.a
-lib/go/freebsd_%%ARCH%%/path.a
-lib/go/freebsd_%%ARCH%%/strings.a
-lib/go/freebsd_%%ARCH%%/exp/parser.a
-lib/go/freebsd_%%ARCH%%/exp/datafmt.a
-lib/go/freebsd_%%ARCH%%/exp/exception.a
-lib/go/freebsd_%%ARCH%%/exp/eval.a
-lib/go/freebsd_%%ARCH%%/exp/draw.a
-lib/go/freebsd_%%ARCH%%/exp/iterable.a
-lib/go/freebsd_%%ARCH%%/bignum.a
-lib/go/freebsd_%%ARCH%%/reflect.a
-lib/go/freebsd_%%ARCH%%/math.a
-lib/go/freebsd_%%ARCH%%/testing/quick.a
-lib/go/freebsd_%%ARCH%%/testing/iotest.a
-lib/go/freebsd_%%ARCH%%/testing/script.a
-lib/go/freebsd_%%ARCH%%/image.a
-lib/go/freebsd_%%ARCH%%/unicode.a
-lib/go/freebsd_%%ARCH%%/xgb.a
-lib/go/freebsd_%%ARCH%%/hash/crc32.a
-lib/go/freebsd_%%ARCH%%/hash/adler32.a
-lib/go/freebsd_%%ARCH%%/gob.a
-lib/go/freebsd_%%ARCH%%/archive/tar.a
-lib/go/freebsd_%%ARCH%%/fmt.a
-lib/go/freebsd_%%ARCH%%/big.a
-lib/go/freebsd_%%ARCH%%/bufio.a
-lib/go/freebsd_%%ARCH%%/asn1.a
-lib/go/freebsd_%%ARCH%%/time.a
-lib/go/freebsd_%%ARCH%%/scanner.a
-lib/go/freebsd_%%ARCH%%/syscall.a
-lib/go/freebsd_%%ARCH%%/syslog.a
-lib/go/freebsd_%%ARCH%%/xml.a
-lib/go/~place-holder~
-bin/%%GOOBJ%%g
-bin/hgpatch
-bin/godefs
-bin/godoc
-bin/cgo
-bin/6cov
-bin/gomake
-bin/%%GOOBJ%%c
 bin/%%GOOBJ%%a
+bin/%%GOOBJ%%c
+bin/6cov
+bin/%%GOOBJ%%g
 bin/%%GOOBJ%%l
+bin/6nm
 bin/6prof
+bin/cgo
 bin/ebnflint
+bin/godefs
+bin/godoc
 bin/gofmt
-bin/gotest
+bin/goinstall
+bin/gomake
 bin/gopack
+bin/gopprof
+bin/gotest
 bin/goyacc
-bin/6nm
+bin/hgpatch
 bin/quietgcc
-%%DATADIR%%/Make.%%ARCH%%
-%%DATADIR%%/Make.pkg
-%%DATADIR%%/Make.cmd
-%%PORTDOCS%%%%DOCSDIR%%/gccgo_contribute.html
-%%PORTDOCS%%%%DOCSDIR%%/prog.sh
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/makehtml
+lib/go/pkg/freebsd_%%ARCH%%/archive/tar.a
+lib/go/pkg/freebsd_%%ARCH%%/asn1.a
+lib/go/pkg/freebsd_%%ARCH%%/big.a
+lib/go/pkg/freebsd_%%ARCH%%/bignum.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/flate.a
+lib/go/pkg/freebsd_%%ARCH%%/compress/gzip.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/aes.a
+lib/go/pkg/freebsd_%%ARCH%%/crypto/block.a
+lib/go/pkg/freebsd_%%ARCH%%/crypto/blowfish.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/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/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/proc.a
+lib/go/pkg/freebsd_%%ARCH%%/ebnf.a
+lib/go/pkg/freebsd_%%ARCH%%/encoding/ascii85.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/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/eval.a
+lib/go/pkg/freebsd_%%ARCH%%/exp/iterable.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%%/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%%/http.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%%/io.a
+lib/go/pkg/freebsd_%%ARCH%%/io/ioutil.a
+lib/go/pkg/freebsd_%%ARCH%%/json.a
+lib/go/pkg/freebsd_%%ARCH%%/libcgo.so
+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%%/net.a
+lib/go/pkg/freebsd_%%ARCH%%/nntp.a
+lib/go/pkg/freebsd_%%ARCH%%/once.a
+lib/go/pkg/freebsd_%%ARCH%%/os.a
+lib/go/pkg/freebsd_%%ARCH%%/os/signal.a
+lib/go/pkg/freebsd_%%ARCH%%/patch.a
+lib/go/pkg/freebsd_%%ARCH%%/path.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%%/runtime.a
+lib/go/pkg/freebsd_%%ARCH%%/runtime.h
+lib/go/pkg/freebsd_%%ARCH%%/runtime/pprof.a
+lib/go/pkg/freebsd_%%ARCH%%/scanner.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%%/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%%/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
+lib/go/pkg/~place-holder~
+%%PORTDOCS%%%%DOCSDIR%%/GoCourseDay1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/GoCourseDay2.pdf
+%%PORTDOCS%%%%DOCSDIR%%/GoCourseDay3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/go_mem.html
-%%PORTDOCS%%%%DOCSDIR%%/root.html
-%%PORTDOCS%%%%DOCSDIR%%/godocs.js
+%%PORTDOCS%%%%DOCSDIR%%/code.html
+%%PORTDOCS%%%%DOCSDIR%%/contribute.html
+%%PORTDOCS%%%%DOCSDIR%%/devel/index.html
+%%PORTDOCS%%%%DOCSDIR%%/devel/release.html
+%%PORTDOCS%%%%DOCSDIR%%/devel/roadmap.html
+%%PORTDOCS%%%%DOCSDIR%%/effective_go.html
+%%PORTDOCS%%%%DOCSDIR%%/gccgo_contribute.html
+%%PORTDOCS%%%%DOCSDIR%%/gccgo_install.html
+%%PORTDOCS%%%%DOCSDIR%%/go-logo-black.png
 %%PORTDOCS%%%%DOCSDIR%%/go-logo-blue.png
-%%PORTDOCS%%%%DOCSDIR%%/sieve.gif
+%%PORTDOCS%%%%DOCSDIR%%/go-logo-white.png
+%%PORTDOCS%%%%DOCSDIR%%/go_faq.html
+%%PORTDOCS%%%%DOCSDIR%%/go_for_cpp_programmers.html
+%%PORTDOCS%%%%DOCSDIR%%/go_lang_faq.html
+%%PORTDOCS%%%%DOCSDIR%%/go_mem.html
+%%PORTDOCS%%%%DOCSDIR%%/go_programming_faq.html
+%%PORTDOCS%%%%DOCSDIR%%/go_spec.html
 %%PORTDOCS%%%%DOCSDIR%%/go_tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/progs/helloworld3.go
-%%PORTDOCS%%%%DOCSDIR%%/progs/cat_rot13.go
+%%PORTDOCS%%%%DOCSDIR%%/go_tutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/godocs.js
+%%PORTDOCS%%%%DOCSDIR%%/gordon/bumper.png
+%%PORTDOCS%%%%DOCSDIR%%/gordon/bumper192x108.png
+%%PORTDOCS%%%%DOCSDIR%%/gordon/bumper320x180.png
+%%PORTDOCS%%%%DOCSDIR%%/gordon/bumper480x270.png
+%%PORTDOCS%%%%DOCSDIR%%/gordon/bumper640x360.png
+%%PORTDOCS%%%%DOCSDIR%%/gordon/gopherbw.png
+%%PORTDOCS%%%%DOCSDIR%%/gordon/gophercolor.png
+%%PORTDOCS%%%%DOCSDIR%%/gordon/gophercolor16x16.png
+%%PORTDOCS%%%%DOCSDIR%%/htmlgen.go
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/logo-153x55.png
+%%PORTDOCS%%%%DOCSDIR%%/makehtml
+%%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/sortmain.go
-%%PORTDOCS%%%%DOCSDIR%%/progs/server1.go
 %%PORTDOCS%%%%DOCSDIR%%/progs/file.go
-%%PORTDOCS%%%%DOCSDIR%%/progs/server.go
-%%PORTDOCS%%%%DOCSDIR%%/progs/sum.go
-%%PORTDOCS%%%%DOCSDIR%%/progs/sort.go
-%%PORTDOCS%%%%DOCSDIR%%/progs/sieve1.go
 %%PORTDOCS%%%%DOCSDIR%%/progs/helloworld.go
+%%PORTDOCS%%%%DOCSDIR%%/progs/helloworld3.go
 %%PORTDOCS%%%%DOCSDIR%%/progs/print.go
-%%PORTDOCS%%%%DOCSDIR%%/progs/sieve.go
 %%PORTDOCS%%%%DOCSDIR%%/progs/print_string.go
-%%PORTDOCS%%%%DOCSDIR%%/progs/strings.go
 %%PORTDOCS%%%%DOCSDIR%%/progs/run
-%%PORTDOCS%%%%DOCSDIR%%/video-snap.jpg
-%%PORTDOCS%%%%DOCSDIR%%/GoCourseDay1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/code.html
-%%PORTDOCS%%%%DOCSDIR%%/gordon/bumper640x360.png
-%%PORTDOCS%%%%DOCSDIR%%/gordon/gophercolor.png
-%%PORTDOCS%%%%DOCSDIR%%/gordon/bumper320x180.png
-%%PORTDOCS%%%%DOCSDIR%%/gordon/gophercolor16x16.png
-%%PORTDOCS%%%%DOCSDIR%%/gordon/gopherbw.png
-%%PORTDOCS%%%%DOCSDIR%%/gordon/bumper480x270.png
-%%PORTDOCS%%%%DOCSDIR%%/gordon/bumper.png
-%%PORTDOCS%%%%DOCSDIR%%/gordon/bumper192x108.png
-%%PORTDOCS%%%%DOCSDIR%%/GoCourseDay2.pdf
-%%PORTDOCS%%%%DOCSDIR%%/effective_go.html
-%%PORTDOCS%%%%DOCSDIR%%/go_faq.html
-%%PORTDOCS%%%%DOCSDIR%%/gccgo_install.html
-%%PORTDOCS%%%%DOCSDIR%%/go_spec.html
-%%PORTDOCS%%%%DOCSDIR%%/GoCourseDay3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/logo-153x55.png
-%%PORTDOCS%%%%DOCSDIR%%/go_tutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/htmlgen.go
-%%PORTDOCS%%%%DOCSDIR%%/go_for_cpp_programmers.html
-%%PORTDOCS%%%%DOCSDIR%%/contribute.html
-%%PORTDOCS%%%%DOCSDIR%%/go-logo-black.png
-%%PORTDOCS%%%%DOCSDIR%%/go_lang_faq.html
-%%PORTDOCS%%%%DOCSDIR%%/talks/slidy.js
-%%PORTDOCS%%%%DOCSDIR%%/talks/slidy.css
+%%PORTDOCS%%%%DOCSDIR%%/progs/server.go
+%%PORTDOCS%%%%DOCSDIR%%/progs/server1.go
+%%PORTDOCS%%%%DOCSDIR%%/progs/sieve.go
+%%PORTDOCS%%%%DOCSDIR%%/progs/sieve1.go
+%%PORTDOCS%%%%DOCSDIR%%/progs/sort.go
+%%PORTDOCS%%%%DOCSDIR%%/progs/sortmain.go
+%%PORTDOCS%%%%DOCSDIR%%/progs/strings.go
+%%PORTDOCS%%%%DOCSDIR%%/progs/sum.go
+%%PORTDOCS%%%%DOCSDIR%%/root.html
+%%PORTDOCS%%%%DOCSDIR%%/sieve.gif
+%%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/talks/go_talk-20091030.pdf
 %%PORTDOCS%%%%DOCSDIR%%/talks/go_talk-20100112.html
-%%PORTDOCS%%%%DOCSDIR%%/go-logo-white.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/release.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/roadmap.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/index.html
-@dirrm lib/go/freebsd_%%ARCH%%/os
-@dirrm lib/go/freebsd_%%ARCH%%/exp
-@dirrm lib/go/freebsd_%%ARCH%%/testing
-@dirrm lib/go/freebsd_%%ARCH%%/hash
-@dirrm lib/go/freebsd_%%ARCH%%/debug
-@dirrm lib/go/freebsd_%%ARCH%%/archive
-@dirrm lib/go/freebsd_%%ARCH%%/image
-@dirrm lib/go/freebsd_%%ARCH%%/crypto
-@dirrm lib/go/freebsd_%%ARCH%%/io
-@dirrm lib/go/freebsd_%%ARCH%%/encoding
-@dirrm lib/go/freebsd_%%ARCH%%/compress
-@dirrm lib/go/freebsd_%%ARCH%%/go
-@dirrm lib/go/freebsd_%%ARCH%%/container
-@dirrm lib/go/freebsd_%%ARCH%%
-@dirrm lib/go/
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/devel
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/progs
+%%PORTDOCS%%%%DOCSDIR%%/talks/go_talk-20100121.html
+%%PORTDOCS%%%%DOCSDIR%%/talks/go_talk-20100323.html
+%%PORTDOCS%%%%DOCSDIR%%/talks/java-typing.png
+%%PORTDOCS%%%%DOCSDIR%%/talks/slidy.css
+%%PORTDOCS%%%%DOCSDIR%%/talks/slidy.js
+%%PORTDOCS%%%%DOCSDIR%%/video-snap.jpg
+%%DATADIR%%/Make.%%ARCH%%
+%%DATADIR%%/Make.cmd
+%%DATADIR%%/Make.pkg
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/talks
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/progs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/gordon
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/devel
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
+@dirrm lib/go/pkg/freebsd_%%ARCH%%/testing
+@dirrm lib/go/pkg/freebsd_%%ARCH%%/runtime
+@dirrm lib/go/pkg/freebsd_%%ARCH%%/os
+@dirrm lib/go/pkg/freebsd_%%ARCH%%/io
+@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
+@dirrm lib/go/pkg/freebsd_%%ARCH%%/encoding
+@dirrm lib/go/pkg/freebsd_%%ARCH%%/debug
+@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%%
+@dirrm lib/go/pkg
+@dirrm lib/go