aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorWesley Shields <wxs@FreeBSD.org>2010-11-24 14:45:50 +0000
committerWesley Shields <wxs@FreeBSD.org>2010-11-24 14:45:50 +0000
commit0c5bb189882aa2f516187e81275fef194169da68 (patch)
tree6bca24166440060a8dc0ae46eefcc6c8b33aee18 /lang
parent6a6e6266e84666afb4c8f92bb31f5e85af483fe4 (diff)
Notes
Diffstat (limited to 'lang')
-rw-r--r--lang/go/Makefile27
-rw-r--r--lang/go/files/pkg-message.in (renamed from lang/go/pkg-message)4
-rw-r--r--lang/go/pkg-plist14
3 files changed, 22 insertions, 23 deletions
diff --git a/lang/go/Makefile b/lang/go/Makefile
index 54a938edd9ad..836864fd03fe 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -7,6 +7,7 @@
PORTNAME= go
PORTVERSION= 20101027
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= LOCAL/wen
DISTNAME= go-${PORTVERSION}
@@ -19,6 +20,10 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
ONLY_FOR_ARCHS= i386 amd64
USE_GMAKE= yes
+GOMAKEDIR= lib/go/src
+SUB_FILES= pkg-message
+SUB_LIST+= GOOBJ=${GOOBJ} \
+ ARCH=${GOARCH}
.include <bsd.port.pre.mk>
@@ -36,7 +41,8 @@ MAKE_ENV= GOROOT=${WRKSRC} \
GOBIN=${GOBIN} \
GOOS=freebsd
PLIST_SUB+= ARCH=${GOARCH} \
- GOOBJ=${GOOBJ}
+ GOOBJ=${GOOBJ} \
+ GOMAKEDIR=${GOMAKEDIR}
pre-build:
@${MKDIR} ${GOBIN}
@@ -59,24 +65,21 @@ do-build:
.endif
post-install:
- @${CAT} ${PKGMESSAGE} | ${SED} \
- -e "s|%%PREFIX%%|${PREFIX}|g" \
- -e "s|%%ARCH%%|${GOARCH}|g" \
- -e "s|%%GOOBJ%%|${GOOBJ}|g"
+ @${CAT} ${PKGMESSAGE}
do-install:
.if !defined(NOPORTDOCS)
${INSTALL} -d -m 0755 ${DOCSDIR}
${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
.endif
- ${INSTALL} -d -m 0755 ${DATADIR}
+ ${INSTALL} -d -m 0755 ${PREFIX}/${GOMAKEDIR}
${INSTALL} -d -m 0755 ${PREFIX}/lib/go/pkg
- ${INSTALL} -m 0644 ${WRKSRC}/src/Make.common ${DATADIR}
- ${INSTALL} -m 0644 ${WRKSRC}/src/Make.pkg ${DATADIR}
- ${INSTALL} -m 0644 ${WRKSRC}/src/Make.cmd ${DATADIR}
- ${INSTALL} -m 0644 ${WRKSRC}/src/Make.ccmd ${DATADIR}
- ${INSTALL} -m 0644 ${WRKSRC}/src/Make.clib ${DATADIR}
- ${INSTALL} -m 0644 ${WRKSRC}/src/Make.inc ${DATADIR}
+ ${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/
diff --git a/lang/go/pkg-message b/lang/go/files/pkg-message.in
index 8f11e10b1444..d1973dde8d07 100644
--- a/lang/go/pkg-message
+++ b/lang/go/files/pkg-message.in
@@ -7,10 +7,6 @@
GOARCH=%%ARCH%%
GOROOT=%%PREFIX%%/lib/go
- To build Go programs, you may include %%PREFIX%%/share/go/Make.pkg
- or %%PREFIX%%/share/go/Make.cmd in your build infrastructure
- (note: this requires gmake).
-
Your compiler is %%GOOBJ%%g and your linker is %%GOOBJ%%l.
For more information on programming in Go and for more
diff --git a/lang/go/pkg-plist b/lang/go/pkg-plist
index ec3e4af9e7dc..bde26d003625 100644
--- a/lang/go/pkg-plist
+++ b/lang/go/pkg-plist
@@ -246,13 +246,13 @@ lib/go/pkg/freebsd_%%ARCH%%/xml.a
%%PORTDOCS%%%%DOCSDIR%%/video-001.png
%%PORTDOCS%%%%DOCSDIR%%/video-002.png
%%PORTDOCS%%%%DOCSDIR%%/video-003.png
-%%DATADIR%%/Make.cmd
-%%DATADIR%%/Make.pkg
-%%DATADIR%%/Make.common
-%%DATADIR%%/Make.ccmd
-%%DATADIR%%/Make.clib
-%%DATADIR%%/Make.inc
-@dirrm %%DATADIR%%
+%%GOMAKEDIR%%/Make.cmd
+%%GOMAKEDIR%%/Make.pkg
+%%GOMAKEDIR%%/Make.common
+%%GOMAKEDIR%%/Make.ccmd
+%%GOMAKEDIR%%/Make.clib
+%%GOMAKEDIR%%/Make.inc
+@dirrm %%GOMAKEDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/talks/io2010
%%PORTDOCS%%@dirrm %%DOCSDIR%%/talks
%%PORTDOCS%%@dirrm %%DOCSDIR%%/progs