Index: Makefile
===================================================================
--- Makefile	(revision 319352)
+++ Makefile	(working copy)
@@ -9,7 +9,7 @@
 DISTNAME=	go${PORTVERSION}.src
 
 MAINTAINER=	jlaffaye@FreeBSD.org
-COMMENT=	A concurrent, garbage-collected language
+COMMENT=	Go programming language
 
 LICENSE=	BSD
 
@@ -20,7 +20,8 @@
 ONLY_FOR_ARCHS=	i386 amd64
 SUB_FILES=	pkg-message
 SUB_LIST+=	GOOBJ=${GOOBJ} \
-		ARCH=${GOARCH}
+		ARCH=${GOARCH} \
+		GOOS=${OPSYS:L}
 
 .include <bsd.port.pre.mk>
 
@@ -44,16 +45,19 @@
 		GOROOT_FINAL=${PREFIX}/go	\
 		GOBIN=				\
 		GOARCH=${GOARCH}		\
-		GOOS=freebsd			\
+		GOOS=${OPSYS:L}			\
 		bash make.bash)
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 do-install:
-	@${CP} -a ${WRKSRC} ${PREFIX}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${PREFIX})
 .for f in go godoc gofmt
-	@${LN} -s ${PREFIX}/go/bin/${f} ${PREFIX}/bin/${f}
+	@${LN} -sf ${PREFIX}/go/bin/${f} ${PREFIX}/bin/${f}
 .endfor
 
+regression-test: build
+	@(cd ${WRKSRC}/src; run.bash --no-rebuild --banner)
+
 .include <bsd.port.post.mk>
Index: files/bsd.go.mk
===================================================================
--- files/bsd.go.mk	(revision 319352)
+++ files/bsd.go.mk	(working copy)
@@ -47,7 +47,7 @@
 GO_ENV+=	GOROOT=${GOROOT}	\
 		GOPATH=${WRKDIR}	\
 		GOARCH=${GOARCH}	\
-		GOOS=freebsd		\
+		GOOS=${OPSYS:L}		\
 		CGO_CFLAGS="${CGO_CFLAGS}" \
 		CGO_LDFLAGS="${CGO_LDFLAGS}"
 PLIST_SUB+=	GO_LIBDIR=${GO_LIBDIR}	\
@@ -57,7 +57,7 @@
 .if !target(post-extract)
 post-extract:
 	@${MKDIR} ${GO_WRKSRC:H}
-	@${LN} -s ${WRKSRC} ${GO_WRKSRC}
+	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
 .endif
 
 .if !target(do-build)
Index: files/pkg-message.in
===================================================================
--- files/pkg-message.in	(revision 319352)
+++ files/pkg-message.in	(working copy)
@@ -3,7 +3,7 @@
  environment properly. The following environment variables should
  be set:
 
- GOOS=freebsd
+ GOOS=%%GOOS%%
  GOARCH=%%ARCH%%
  GOROOT=%%PREFIX%%/go