rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

go-module.mk: much improved distfile handling. 

Module distfiles are now renamed so that their filenames contain
the subpath. Thus, they do not need to be in a DIST_SUBDIR and can
be shared among more than one Go package.

Also update the lf port with the new distfile names and add
CHECK_RELRO_SKIP.
This commit is contained in:
Benny Siegert 2020-04-09 20:53:58 +02:00
parent 080e895f81
commit 0f3bb22cef
3 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
go/go-module.mk
View File

@ -63,7 +63,6 @@ do-install:
${RUN} cd ${WRKDIR}/.gopath && [ ! -d bin ] || ${PAX} -rw bin ${DESTDIR}${PREFIX}
.endif
# FIXME This needs to depend on extract
.PHONY: show-go-modules
show-go-modules: ${WRKDIR}/.extract_done
${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} get -d
@ -72,14 +71,14 @@ show-go-modules: ${WRKDIR}/.extract_done
DISTFILES?= ${DEFAULT_DISTFILES}
.for i in ${GO_MODULE_FILES}
DISTFILES+= ${${i}:!basename ${i}!}
SITES.${${i}:!basename ${i}!}= https://proxy.golang.org/${${i}:!dirname ${i}!}/
DISTFILES+= ${i:S/\//_/g}
SITES.${i:S/\//_/g}= -https://proxy.golang.org/${i}
.endfor
post-extract:
.for i in ${GO_MODULE_FILES}
${MKDIR} ${WRKDIR}/.goproxy/${${i}:!dirname ${i}!}
cp ${DISTDIR}/${DIST_SUBDIR}/${${i}:!basename ${i}!} ${WRKDIR}/.goproxy/${i}
${MKDIR} ${WRKDIR}/.goproxy/${i:H}
cp ${DISTDIR}/${DIST_SUBDIR}/${i:S/\//_/g} ${WRKDIR}/.goproxy/${i}
.endfor
_VARGROUPS+= go

3
lf/Makefile
View File

@ -10,13 +10,12 @@ HOMEPAGE= https://${GO_SRCPATH}
COMMENT= Terminal file manager
LICENSE= 2-clause-bsd
DIST_SUBDIR= ${PKGNAME_NOREV}
GO_MODULE_FILES+= github.com/mattn/go-runewidth/@v/v0.0.4.mod
GO_MODULE_FILES+= github.com/mattn/go-runewidth/@v/v0.0.4.zip
GO_MODULE_FILES+= github.com/nsf/termbox-go/@v/v0.0.0-20190325093121-288510b9734e.zip
GO_MODULE_FILES+= github.com/nsf/termbox-go/@v/v0.0.0-20190325093121-288510b9734e.mod
CHECK_RELRO_SKIP+= bin/lf
.include "../../wip/go/go-module.mk"
.include "../../mk/bsd.pkg.mk"

40
lf/distinfo
View File

@ -1,22 +1,22 @@
$NetBSD: distinfo,v 1.2 2018/03/14 08:46:23 bsiegert Exp $
SHA1 (lf-13/lf-13.tar.gz) = 0ac58823fbaef505c98f32d478a64100e5191cd1
RMD160 (lf-13/lf-13.tar.gz) = d542305b5a26090262304d5f330145b4926ba319
SHA512 (lf-13/lf-13.tar.gz) = 67c0fdbf7dc86a3856a0dce9fb8ed38f1a4c8a66a8ae051887b4aa6ddcbd086a748124cae804f4a051e20efcffb1cd847611b400c54143a79587ce4561a938c0
Size (lf-13/lf-13.tar.gz) = 67064 bytes
SHA1 (lf-13/v0.0.0-20190325093121-288510b9734e.mod) = d48d2f3ba9f25e16d2896c365a2a546c13f0645b
RMD160 (lf-13/v0.0.0-20190325093121-288510b9734e.mod) = 91a64464b5c3108f10e1f9a74996b464c40d6cfa
SHA512 (lf-13/v0.0.0-20190325093121-288510b9734e.mod) = d96b326f421417a67e9db79350043b29f2b2c9b7ca00f696955303f0ba090c8fd82f018f312ebef4d443ef87732af99d807dcb6f6e16187d00ba0c0502d78876
Size (lf-13/v0.0.0-20190325093121-288510b9734e.mod) = 33 bytes
SHA1 (lf-13/v0.0.0-20190325093121-288510b9734e.zip) = d5c8e5954e888c17df553d43ab77cd3d002c9660
RMD160 (lf-13/v0.0.0-20190325093121-288510b9734e.zip) = 67589548e73ca56daab2c52adc8ea214139bd3e2
SHA512 (lf-13/v0.0.0-20190325093121-288510b9734e.zip) = 1fdba1fd9660dac4b61534346127703c3a7fc49bc8ea5f2a9348aed2a32182dbbfbb196105d247d0ddbae44116be1effed29546ce0bea41969f179badf68cdce
Size (lf-13/v0.0.0-20190325093121-288510b9734e.zip) = 46179 bytes
SHA1 (lf-13/v0.0.4.mod) = 4ea1d8179b52949e0536e3744d69410414540dd7
RMD160 (lf-13/v0.0.4.mod) = 7b055d0690c748e3832a9ecb6db2a8d49f9aeb8c
SHA512 (lf-13/v0.0.4.mod) = b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
Size (lf-13/v0.0.4.mod) = 37 bytes
SHA1 (lf-13/v0.0.4.zip) = 9a8a2430a3c128189b5b97a737a4d155cd2a36e2
RMD160 (lf-13/v0.0.4.zip) = b86ebf1499cb4f234839e3061dda815e9d1a011e
SHA512 (lf-13/v0.0.4.zip) = fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
Size (lf-13/v0.0.4.zip) = 22344 bytes
SHA1 (github.com_mattn_go-runewidth_@v_v0.0.4.mod) = 4ea1d8179b52949e0536e3744d69410414540dd7
RMD160 (github.com_mattn_go-runewidth_@v_v0.0.4.mod) = 7b055d0690c748e3832a9ecb6db2a8d49f9aeb8c
SHA512 (github.com_mattn_go-runewidth_@v_v0.0.4.mod) = b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
Size (github.com_mattn_go-runewidth_@v_v0.0.4.mod) = 37 bytes
SHA1 (github.com_mattn_go-runewidth_@v_v0.0.4.zip) = 9a8a2430a3c128189b5b97a737a4d155cd2a36e2
RMD160 (github.com_mattn_go-runewidth_@v_v0.0.4.zip) = b86ebf1499cb4f234839e3061dda815e9d1a011e
SHA512 (github.com_mattn_go-runewidth_@v_v0.0.4.zip) = fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
Size (github.com_mattn_go-runewidth_@v_v0.0.4.zip) = 22344 bytes
SHA1 (github.com_nsf_termbox-go_@v_v0.0.0-20190325093121-288510b9734e.mod) = d48d2f3ba9f25e16d2896c365a2a546c13f0645b
RMD160 (github.com_nsf_termbox-go_@v_v0.0.0-20190325093121-288510b9734e.mod) = 91a64464b5c3108f10e1f9a74996b464c40d6cfa
SHA512 (github.com_nsf_termbox-go_@v_v0.0.0-20190325093121-288510b9734e.mod) = d96b326f421417a67e9db79350043b29f2b2c9b7ca00f696955303f0ba090c8fd82f018f312ebef4d443ef87732af99d807dcb6f6e16187d00ba0c0502d78876
Size (github.com_nsf_termbox-go_@v_v0.0.0-20190325093121-288510b9734e.mod) = 33 bytes
SHA1 (github.com_nsf_termbox-go_@v_v0.0.0-20190325093121-288510b9734e.zip) = d5c8e5954e888c17df553d43ab77cd3d002c9660
RMD160 (github.com_nsf_termbox-go_@v_v0.0.0-20190325093121-288510b9734e.zip) = 67589548e73ca56daab2c52adc8ea214139bd3e2
SHA512 (github.com_nsf_termbox-go_@v_v0.0.0-20190325093121-288510b9734e.zip) = 1fdba1fd9660dac4b61534346127703c3a7fc49bc8ea5f2a9348aed2a32182dbbfbb196105d247d0ddbae44116be1effed29546ce0bea41969f179badf68cdce
Size (github.com_nsf_termbox-go_@v_v0.0.0-20190325093121-288510b9734e.zip) = 46179 bytes
SHA1 (lf-13.tar.gz) = 0ac58823fbaef505c98f32d478a64100e5191cd1
RMD160 (lf-13.tar.gz) = d542305b5a26090262304d5f330145b4926ba319
SHA512 (lf-13.tar.gz) = 67c0fdbf7dc86a3856a0dce9fb8ed38f1a4c8a66a8ae051887b4aa6ddcbd086a748124cae804f4a051e20efcffb1cd847611b400c54143a79587ce4561a938c0
Size (lf-13.tar.gz) = 67064 bytes