svn commit: r319677 - in head/lang/go: . files

Julien Laffaye jlaffaye at FreeBSD.org
Sun Jun 2 15:40:30 UTC 2013


Author: jlaffaye
Date: Sun Jun  2 15:40:29 2013
New Revision: 319677
URL: http://svnweb.freebsd.org/changeset/ports/319677

Log:
  - Do not hardcode GOOS, use OPSYS instead [1]
  - Add -f flag to LN [1]
  - Add a regression-test target
  
  Submitted by:	sbz (irc) [1]

Modified:
  head/lang/go/Makefile
  head/lang/go/files/bsd.go.mk
  head/lang/go/files/pkg-message.in

Modified: head/lang/go/Makefile
==============================================================================
--- head/lang/go/Makefile	Sun Jun  2 15:37:23 2013	(r319676)
+++ head/lang/go/Makefile	Sun Jun  2 15:40:29 2013	(r319677)
@@ -9,7 +9,7 @@ MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	go${PORTVERSION}.src
 
 MAINTAINER=	jlaffaye at FreeBSD.org
-COMMENT=	A concurrent, garbage-collected language
+COMMENT=	Go programming language
 
 LICENSE=	BSD
 
@@ -20,7 +20,8 @@ WRKSRC=		${WRKDIR}/go
 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,7 +45,7 @@ do-build:
 		GOROOT_FINAL=${PREFIX}/go	\
 		GOBIN=				\
 		GOARCH=${GOARCH}		\
-		GOOS=freebsd			\
+		GOOS=${OPSYS:L}			\
 		bash make.bash)
 
 post-install:
@@ -53,7 +54,10 @@ post-install:
 do-install:
 	@${CP} -a ${WRKSRC} ${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 && GOROOT=${WRKSRC} ./run.bash --no-rebuild --banner)
+
 .include <bsd.port.post.mk>

Modified: head/lang/go/files/bsd.go.mk
==============================================================================
--- head/lang/go/files/bsd.go.mk	Sun Jun  2 15:37:23 2013	(r319676)
+++ head/lang/go/files/bsd.go.mk	Sun Jun  2 15:40:29 2013	(r319677)
@@ -47,7 +47,7 @@ BUILD_DEPENDS+=	${GO_CMD}:${PORTSDIR}/la
 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 @@ PLIST_SUB+=	GO_LIBDIR=${GO_LIBDIR}	\
 .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)

Modified: head/lang/go/files/pkg-message.in
==============================================================================
--- head/lang/go/files/pkg-message.in	Sun Jun  2 15:37:23 2013	(r319676)
+++ head/lang/go/files/pkg-message.in	Sun Jun  2 15:40:29 2013	(r319677)
@@ -3,7 +3,7 @@
  environment properly. The following environment variables should
  be set:
 
- GOOS=freebsd
+ GOOS=%%GOOS%%
  GOARCH=%%ARCH%%
  GOROOT=%%PREFIX%%/go
 


More information about the svn-ports-all mailing list