Bump websocketd to 0.3.1

- Switch to MODGO_MOD*.
- Remove patch in favor of MODGO_LDFLAGS.

OK kspillner@
This commit is contained in:
abieber 2020-08-23 02:59:00 +00:00
parent f71bd93199
commit 27b47d6d24
3 changed files with 17 additions and 26 deletions

View File

@ -1,11 +1,12 @@
# $OpenBSD: Makefile,v 1.10 2019/07/12 20:48:51 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2020/08/23 02:59:00 abieber Exp $
COMMENT = access any command-line tool via a WebSocket
GH_ACCOUNT = joewalnes
GH_PROJECT = websocketd
GH_TAGNAME = v0.2.12
REVISION= 1
MODGO_MODNAME = github.com/joewalnes/websocketd
MODGO_VERSION = v0.3.1
DISTNAME = websocketd-${MODGO_VERSION}
PKGNAME = websocketd-0.3.1
CATEGORIES = net www
@ -19,14 +20,11 @@ PERMIT_PACKAGE = Yes
WANTLIB = c pthread
MODULES += lang/go
BUILD_DEPENDS = net/go-net
MODGO_LDFLAGS += -X main.version=${MODGO_VERSION}
NO_TEST = Yes
SUBST_VARS = VERSION
pre-build:
@${SUBST_CMD} ${WRKSRC}/version.go
WRKDIST = ${WRKDIR}/${MODGO_MODNAME}@${MODGO_VERSION}
post-install:
${INSTALL_MAN} ${WRKSRC}/release/websocketd.man \
@ -44,4 +42,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/examples/html/count.html \
${PREFIX}/share/examples/websocketd/html/count.html
MODGO_MODULES = \
github.com/gorilla/websocket v1.4.0
.include <bsd.port.mk>

View File

@ -1,2 +1,6 @@
SHA256 (websocketd-0.2.12.tar.gz) = iUQPKLWvmF1DVQve7j4ExK0Msrw3OvjgVj8XaVkgJVA=
SIZE (websocketd-0.2.12.tar.gz) = 40784
SHA256 (go_modules/github.com/gorilla/websocket/@v/v1.4.0.mod) = Imq1Kug+4WMB8VUuOEw0husCQ7NFHLTJsHqpwBVQ5VY=
SHA256 (go_modules/github.com/gorilla/websocket/@v/v1.4.0.zip) = k32sOZvKL4g0TDHuKVzVcxAkS8GjpY6LyxSrJqYAnQ4=
SHA256 (websocketd-v0.3.1.zip) = YzDRWrESHy6UI93EwDmzOY5QZvtjkf3meCCPMaY1B9w=
SIZE (go_modules/github.com/gorilla/websocket/@v/v1.4.0.mod) = 36
SIZE (go_modules/github.com/gorilla/websocket/@v/v1.4.0.zip) = 73861
SIZE (websocketd-v0.3.1.zip) = 86320

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-version_go,v 1.1 2015/07/20 20:53:59 kspillner Exp $
Patch version string so websocketd --version works as expected.
--- version.go.orig Wed Jul 15 14:01:22 2015
+++ version.go Wed Jul 15 14:01:54 2015
@@ -13,7 +13,7 @@ import (
// This value can be set for releases at build time using:
// go {build|run} -ldflags "-X main.version 1.2.3 -X main.buildinfo timestamp-@githubuser-platform".
// If unset, Version() shall return "DEVBUILD".
-var version string = "DEVBUILD"
+var version string = "${VERSION}"
var buildinfo string = "--"
func Version() string {