diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2022-09-17 11:54:43 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2022-09-17 11:54:43 +0000 |
| commit | 47dfc12f6c6cdcf6be50009ab00f1bf0ef9fe4d1 (patch) | |
| tree | dc92e09472de0b506e1d95bc4cdc560b424e6d4d /net/syncthing/Makefile | |
| parent | 1ef11ca070e3006ce1d67ddf94a6026842b57309 (diff) | |
| download | pkgsrc-47dfc12f6c6cdcf6be50009ab00f1bf0ef9fe4d1.tar.gz | |
syncthing: fix build with Go 1.19 as default, bump revision
- remove vendor directory and switch to separately downloaded modules
(NOTE: this part should probably be reverted after the next release!)
- patch go.mod and go.sum for quic-go update (the result of running
go get github.com/lucas-clemente/quic-go@v0.28.1, implies updating other
dependencies
- one source code patch for quic-go to fix API breakage
Diffstat (limited to 'net/syncthing/Makefile')
| -rw-r--r-- | net/syncthing/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile index 6fb8d51510a..b6304ac9846 100644 --- a/net/syncthing/Makefile +++ b/net/syncthing/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.157 2022/09/07 09:32:14 bsiegert Exp $ +# $NetBSD: Makefile,v 1.158 2022/09/17 11:54:43 bsiegert Exp $ # Protocol breaks require tech-pkg@ discussion and MAINTAINER approval. DISTNAME= syncthing-source-v1.20.4 PKGNAME= ${DISTNAME:S,source-v,,} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=syncthing/} GITHUB_RELEASE= v${PKGVERSION_NOREV} @@ -15,9 +15,8 @@ LICENSE= mpl-2.0 # The 'zillode' dependency calls the compiler on certain archs. USE_LANGUAGES= c +WRKSRC= ${WRKDIR}/syncthing NO_CONFIGURE= yes -GO_SRCPATH= github.com/syncthing/syncthing -GO_DIST_BASE= syncthing INSTALLATION_DIRS= bin share/applications CHECK_RELRO_SKIP+= bin/syncthing @@ -66,6 +65,9 @@ FILES_SUBST+= SYNCTHING_GROUP=${SYNCTHING_GROUP} RCD_SCRIPTS+= syncthing +post-extract: + ${RM} -rf ${WRKSRC}/vendor + do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO} run build.go -no-upgrade build syncthing @@ -79,7 +81,9 @@ do-install: ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/syncthing.png .endfor -.include "../../lang/go/go-package.mk" +.include "go-modules.mk" + +.include "../../lang/go/go-module.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" |