diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2018-03-03 09:50:17 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2018-03-03 09:50:17 +0000 |
| commit | 54477e6f11ad6f7ece2ff49f6763b6be0b66189a (patch) | |
| tree | 36ff5751de8edbbf520de7557bf04251e1238c93 /net/traefik | |
| parent | 9d70bc85d166948ec5c07747535ec91e1fab58e7 (diff) | |
| download | ports-54477e6f11ad6f7ece2ff49f6763b6be0b66189a.tar.gz ports-54477e6f11ad6f7ece2ff49f6763b6be0b66189a.zip | |
Update to upstream version 1.5.3
Details:
- Upstream changelog, see https://github.com/containous/traefik/releases
- Use devel/go-bindata instead of temporary local copy
- Make "traefik version" report the build data correctly
- Use upstream build flags
MFH: 2018Q1
Notes
Notes:
svn path=/head/; revision=463476
Diffstat (limited to 'net/traefik')
| -rw-r--r-- | net/traefik/Makefile | 18 | ||||
| -rw-r--r-- | net/traefik/distinfo | 6 | ||||
| -rw-r--r-- | net/traefik/files/patch-generate.go | 14 |
3 files changed, 15 insertions, 23 deletions
diff --git a/net/traefik/Makefile b/net/traefik/Makefile index 01a96407b71b..d3ac0a205e4b 100644 --- a/net/traefik/Makefile +++ b/net/traefik/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= traefik -PORTVERSION= 1.5.2 +PORTVERSION= 1.5.3 DISTVERSIONPREFIX= v CATEGORIES= net @@ -11,12 +11,13 @@ COMMENT= High availability reverse proxy and load balancer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md +BUILD_DEPENDS= go-bindata:devel/go-bindata + USES= go USE_GITHUB= yes GH_ACCOUNT= containous GH_SUBDIR= src/github.com/containous/traefik -GH_TUPLE= jteeuwen:go-bindata:a0ff256:gobindata/src/github.com/jteeuwen/go-bindata USE_RC_SUBR= traefik @@ -26,12 +27,17 @@ GROUPS= traefik PLIST_FILES= bin/traefik \ "@sample etc/traefik.toml.sample" +TRAEFIK_BUILD_ENV= ${MAKE_ENV} \ + CGO_ENABLED=0 + +TRAEFIK_LDARGS= -ldflags "-s -w \ + -X github.com/containous/traefik/version.Version=${DISTVERSION} \ + -X github.com/containous/traefik/version.BuildDate=`date -u '+%Y-%m-%d_%I:%M:%S%p'`" + do-build: - @cd ${WRKSRC}/src/github.com/jteeuwen/go-bindata/go-bindata; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x @cd ${WRKSRC}/src/github.com/containous/traefik; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go generate && \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x ./cmd/traefik + ${SETENV} ${BUILD_ENV} ${TRAEFIK_BUILD_ENV} GOPATH=${WRKSRC} go generate && \ + ${SETENV} ${BUILD_ENV} ${TRAEFIK_BUILD_ENV} GOPATH=${WRKSRC} go build ${TRAEFIK_LDARGS} -v -x ./cmd/traefik do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/containous/traefik/traefik ${STAGEDIR}${PREFIX}/bin/traefik diff --git a/net/traefik/distinfo b/net/traefik/distinfo index 374c2710ff30..67f6a6fb5029 100644 --- a/net/traefik/distinfo +++ b/net/traefik/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1518525389 -SHA256 (containous-traefik-v1.5.2_GH0.tar.gz) = 9d4c65f5ed55d05e6727330fa095e8374f3e05a121f1f4395cbc15d0577da2d4 -SIZE (containous-traefik-v1.5.2_GH0.tar.gz) = 7828713 +TIMESTAMP = 1520063170 +SHA256 (containous-traefik-v1.5.3_GH0.tar.gz) = b6876834290dd3f916c78f6810597d40dbbd461e1d1d25fd30d31cd99b9c062b +SIZE (containous-traefik-v1.5.3_GH0.tar.gz) = 7828055 SHA256 (jteeuwen-go-bindata-a0ff256_GH0.tar.gz) = 06c7bb64ab428a28eb3633ae19fafb6b7b241d384ef45ac0728b1c5fbec64961 SIZE (jteeuwen-go-bindata-a0ff256_GH0.tar.gz) = 17868 diff --git a/net/traefik/files/patch-generate.go b/net/traefik/files/patch-generate.go deleted file mode 100644 index 1abe748966c5..000000000000 --- a/net/traefik/files/patch-generate.go +++ /dev/null @@ -1,14 +0,0 @@ ---- generate.go.orig 2018-01-23 16:34:04 UTC -+++ generate.go -@@ -1,9 +1,9 @@ - //go:generate rm -vf autogen/gentemplates/gen.go - //go:generate rm -vf autogen/genstatic/gen.go - //go:generate mkdir -p static --//go:generate go-bindata -pkg gentemplates -nometadata -nocompress -o autogen/gentemplates/gen.go ./templates/... -+//go:generate src/github.com/jteeuwen/go-bindata/go-bindata/go-bindata -pkg gentemplates -nometadata -nocompress -o autogen/gentemplates/gen.go ./templates/... - //go:generate gofmt -s -w autogen/gentemplates/gen.go --//go:generate go-bindata -pkg genstatic -nocompress -o autogen/genstatic/gen.go ./static/... -+//go:generate src/github.com/jteeuwen/go-bindata/go-bindata/go-bindata -pkg genstatic -nocompress -o autogen/genstatic/gen.go ./static/... - - package main - |