Index: head/net/syncthing-cli/Makefile =================================================================== --- head/net/syncthing-cli/Makefile (revision 395628) +++ head/net/syncthing-cli/Makefile (revision 395629) @@ -1,53 +1,54 @@ # Created by: Steve Wills # $FreeBSD$ PORTNAME= syncthing-cli PORTVERSION= 0.1.0.2015070301 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= swills@FreeBSD.org COMMENT= Syncthing CLI -BUILD_DEPENDS= ${LOCALBASE}/bin/go:${PORTSDIR}/lang/go +BUILD_DEPENDS= go14>=1.4:${PORTSDIR}/lang/go14 USE_GITHUB= yes GH_ACCOUNT= syncthing AudriusButkevicius:audrius GH_PROJECT= syncthing:st cli:audrius GH_TAGNAME= 2707f77 v${SYNCTHING_VER}:st 7f561c7:audrius SYNCTHING_VER= 0.11.18 PLIST_FILES= bin/syncthing-cli STRIP= # stripping can break go binaries post-patch: @${MKDIR} ${WRKSRC}/src/github.com/syncthing @${MKDIR} ${WRKSRC}/src/github.com/AudriusButkevicius @${MKDIR} ${WRKSRC}/src/code.google.com/p @${MKDIR} ${WRKSRC}/src/golang.org/x @${MKDIR} ${WRKSRC}/src/github.com/bkaradzic @${MV} ${WRKSRC_audrius} \ ${WRKSRC}/src/github.com/AudriusButkevicius/cli @${MV} ${WRKSRC_st}/Godeps/_workspace/src/golang.org/x/crypto \ ${WRKSRC}/src/golang.org/x @${MV} ${WRKSRC_st}/Godeps/_workspace/src/golang.org/x/text \ ${WRKSRC}/src/golang.org/x @${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/bkaradzic/go-lz4 \ ${WRKSRC}/src/github.com/bkaradzic @${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/calmh \ ${WRKSRC}/src/github.com/calmh @${MV} ${WRKSRC_st} \ ${WRKSRC}/src/github.com/syncthing/syncthing @${MV} ${WRKSRC}/src/github.com/syncthing/syncthing/Godeps/_workspace/src/github.com/syncthing/protocol \ ${WRKSRC}/src/github.com/syncthing/protocol do-build: - @cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build + @cd ${WRKSRC} ; ${SETENV} PATH=${PATH}:${LOCALBASE}/go14/bin \ + GOPATH=${WRKSRC} go build @${MV} ${WRKSRC}/syncthing-cli-${GH_TAGNAME} ${WRKSRC}/syncthing-cli do-install: ${INSTALL_PROGRAM} ${WRKSRC}/syncthing-cli ${STAGEDIR}${PREFIX}/bin/ .include Index: head/net/syncthing-cli/files/patch-utils.go =================================================================== --- head/net/syncthing-cli/files/patch-utils.go (nonexistent) +++ head/net/syncthing-cli/files/patch-utils.go (revision 395629) @@ -0,0 +1,11 @@ +--- utils.go ++++ utils.go +@@ -146,7 +146,7 @@ func validAddress(input string) { + if len(tokens) != 2 { + die(input + " is not a valid value for an address\nExpected format :") + } +- matched, err := regexp.MatchString("^[a-zA-Z0-9]+([a-zA-Z0-9.]+[a-zA-Z0-9]+)?$", tokens[0]) ++ matched, err := regexp.MatchString("^[a-zA-Z0-9]+([-a-zA-Z0-9.]+[-a-zA-Z0-9]+)?$", tokens[0]) + die(err) + if !matched { + die(input + " is not a valid value for an address\nExpected format :") Property changes on: head/net/syncthing-cli/files/patch-utils.go ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property