From owner-svn-ports-head@freebsd.org Thu Aug 15 18:28:18 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 98412B27D6; Thu, 15 Aug 2019 18:28:18 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 468ZhL3SPgz4GRh; Thu, 15 Aug 2019 18:28:18 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 539521CA6F; Thu, 15 Aug 2019 18:28:18 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7FISII8080297; Thu, 15 Aug 2019 18:28:18 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7FISIGv080296; Thu, 15 Aug 2019 18:28:18 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201908151828.x7FISIGv080296@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 15 Aug 2019 18:28:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509040 - head/textproc/fzf X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/textproc/fzf X-SVN-Commit-Revision: 509040 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Aug 2019 18:28:18 -0000 Author: yuri Date: Thu Aug 15 18:28:17 2019 New Revision: 509040 URL: https://svnweb.freebsd.org/changeset/ports/509040 Log: textproc/fzf: Switch to USES=go:modules, fix build with go1.13 PR: 239881 Submitted by: Dmitri Goutnik Approved by: sascha@root-login.org (maintainer) Modified: head/textproc/fzf/Makefile Modified: head/textproc/fzf/Makefile ============================================================================== --- head/textproc/fzf/Makefile Thu Aug 15 18:23:23 2019 (r509039) +++ head/textproc/fzf/Makefile Thu Aug 15 18:28:17 2019 (r509040) @@ -11,12 +11,10 @@ COMMENT= Blazing fast command-line fuzzy finder LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= compiler go +USES= compiler go:modules USE_GITHUB= yes GH_ACCOUNT= junegunn -GH_SUBDIR:= src/github.com/${GH_ACCOUNT}/${PORTNAME} - GH_TUPLE= \ gdamore:encoding:b23993cbb635:gdamore_encoding/vendor/github.com/gdamore/encoding \ gdamore:tcell:0a0db94084df:gdamore_tcell/vendor/github.com/gdamore/tcell \ @@ -33,6 +31,8 @@ GH_TUPLE= \ smartystreets:assertions:b2de0cb4f26d:smartystreets_assertions/vendor/github.com/smartystreets/assertions \ smartystreets:goconvey:044398e4856c:smartystreets_goconvey/vendor/github.com/smartystreets/goconvey +GO_BUILDFLAGS= -ldflags="-X main.revision=0b33dc6 -w" + SUB_FILES= pkg-message PLIST_FILES= bin/fzf man/man1/fzf.1.gz PORTEXAMPLES= shell/completion.bash shell/completion.zsh \ @@ -47,34 +47,14 @@ TMUX_DESC= Install fzf-tmux (depends on BASH) TMUX_RUN_DEPENDS= bash:shells/bash TMUX_PLIST_FILES= bin/fzf-tmux man/man1/fzf-tmux.1.gz -GOENV= GOPATH=${WRKSRC} CGO_CFLAGS="${CGO_CFLAGS}" \ - CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN="" - -do-build: - cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} && \ - ${SETENV} ${MAKE_ENV} ${GOENV} ${GO_CMD} build -a \ - -ldflags "-X main.revision=0b33dc6 -w" -o bin/${PORTNAME} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/bin/${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +post-install: + ${INSTALL_MAN} ${WRKSRC}/man/man1/fzf.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC} && \ ${COPYTREE_SHARE} shell ${STAGEDIR}${EXAMPLESDIR}) -post-install: - ${INSTALL_MAN} ${WRKSRC}/man/man1/fzf.1 ${STAGEDIR}${MANPREFIX}/man/man1 - post-install-TMUX-on: ${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}-tmux ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/man1/fzf-tmux.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.include - -# If cc is clang, change it to clang to help Go identify the compiler, -# else we get -pthread warnings -.if ${COMPILER_TYPE} == "clang" && ${CC} == "cc" -CC=clang -.endif - -.include +.include