CVS commit: pkgsrc/lang/go111

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Sat Sep 22 12:15:28 UTC 2018

Modified Files:
        pkgsrc/lang/go111: ALTERNATIVES Makefile PLIST

Log Message:
lang/go111: Fix ALTERNATIVES

- Install versioned commands in bin/
- Use ALTERNATIVES to create commands without version suffix


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/go111/ALTERNATIVES \
    pkgsrc/lang/go111/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/go111/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/go111/ALTERNATIVES
diff -u pkgsrc/lang/go111/ALTERNATIVES:1.1 pkgsrc/lang/go111/ALTERNATIVES:1.2
--- pkgsrc/lang/go111/ALTERNATIVES:1.1  Tue Sep 18 16:22:14 2018
+++ pkgsrc/lang/go111/ALTERNATIVES      Sat Sep 22 12:15:28 2018
@@ -1,2 +1,2 @@
-bin/go111 @PREFIX@/go111/bin/go
-bin/gofmt111 @PREFIX@/go111/bin/gofmt
+bin/go @PREFIX@/go111/bin/go
+bin/gofmt @PREFIX@/go111/bin/gofmt
Index: pkgsrc/lang/go111/Makefile
diff -u pkgsrc/lang/go111/Makefile:1.1 pkgsrc/lang/go111/Makefile:1.2
--- pkgsrc/lang/go111/Makefile:1.1      Tue Sep 18 16:22:14 2018
+++ pkgsrc/lang/go111/Makefile  Sat Sep 22 12:15:28 2018
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2018/09/18 16:22:14 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2018/09/22 12:15:28 minskim Exp $
 
 .include "../../lang/go/version.mk"
 
 DISTNAME=      go${GO111_VERSION}.src
 PKGNAME=       go111-${GO111_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  https://storage.googleapis.com/golang/
 EXTRACT_USING= bsdtar
@@ -87,6 +88,8 @@ CHECK_INTERPRETER_SKIP+=      go${GOVERSSUFFI
 BUILD_DEPENDS+=                go14-1.4*:../../lang/go14
 GOROOT_BOOTSTRAP=      ${PREFIX}/go14
 
+PLIST_SUBST+=  GOVERSSUFFIX=${GOVERSSUFFIX}
+
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS+=   pty route
@@ -108,6 +111,9 @@ do-install:
        cd ${WRKSRC} && rm -rf .hgignore .hgtags pkg/obj
        cd ${WRKSRC} && pax -rw . ${DESTDIR}${PREFIX}/go${GOVERSSUFFIX}
        find ${DESTDIR}${PREFIX}/go${GOVERSSUFFIX} -name \*.orig -exec rm {} \;
+.for cmd in go gofmt
+       ${LN} -s ${PREFIX}/go111/bin/${cmd} ${DESTDIR}${PREFIX}/bin/${cmd}${GOVERSSUFFIX}
+.endfor
 
 do-test:
        cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${GOOPT} ${BASH} run.bash --no-rebuild --banner ""

Index: pkgsrc/lang/go111/PLIST
diff -u pkgsrc/lang/go111/PLIST:1.2 pkgsrc/lang/go111/PLIST:1.3
--- pkgsrc/lang/go111/PLIST:1.2 Wed Sep 19 17:59:35 2018
+++ pkgsrc/lang/go111/PLIST     Sat Sep 22 12:15:28 2018
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2018/09/19 17:59:35 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/09/22 12:15:28 minskim Exp $
+bin/go${GOVERSSUFFIX}
+bin/gofmt${GOVERSSUFFIX}
 go111/AUTHORS
 go111/CONTRIBUTING.md
 go111/CONTRIBUTORS