From owner-svn-ports-head@freebsd.org Fri Aug 16 23:57:39 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 F0644B3A90; Fri, 16 Aug 2019 23:57:39 +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 469Kxv64vHz3CLh; Fri, 16 Aug 2019 23:57:39 +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 AF681916A; Fri, 16 Aug 2019 23:57:39 +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 x7GNvdhc037546; Fri, 16 Aug 2019 23:57:39 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7GNvdjc037545; Fri, 16 Aug 2019 23:57:39 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201908162357.x7GNvdjc037545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Fri, 16 Aug 2019 23:57:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509125 - head/www/mattermost-server X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/www/mattermost-server X-SVN-Commit-Revision: 509125 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: Fri, 16 Aug 2019 23:57:40 -0000 Author: yuri Date: Fri Aug 16 23:57:39 2019 New Revision: 509125 URL: https://svnweb.freebsd.org/changeset/ports/509125 Log: www/mattermost-server: Switch to USES=go:modules, fix build with go1.13 PR: 239884 Submitted by: Dmitri Goutnik Approved by: loic.blot@unix-experience.fr (maintainer) Modified: head/www/mattermost-server/Makefile Modified: head/www/mattermost-server/Makefile ============================================================================== --- head/www/mattermost-server/Makefile Fri Aug 16 23:48:50 2019 (r509124) +++ head/www/mattermost-server/Makefile Fri Aug 16 23:57:39 2019 (r509125) @@ -16,9 +16,10 @@ ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \ mattermost-webapp>=${PORTVERSION}:www/mattermost-webapp -USES= go +USES= go:modules -GO_LDFLAGS= -X github.com/mattermost/mattermost-server/model.BuildNumber=${PORTVERSION} +GO_TARGET= ./cmd/mattermost +GO_BUILDFLAGS= -ldflags="-X github.com/mattermost/mattermost-server/model.BuildNumber=${PORTVERSION}" USE_RC_SUBR= mattermostd @@ -33,22 +34,11 @@ MATTERMOSTD_GROUP= mattermost USERS= ${MATTERMOSTD_USER} GROUPS= ${MATTERMOSTD_GROUP} -pre-build: - @${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} - @cd ${WRKSRC} && \ - ${MV} api4 app cmd config doc einterfaces imports jobs manualtesting \ - mlog migrations model plugin services store testlib utils web wsapi vendor \ - ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} - -do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT} && \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags="${GO_LDFLAGS}" ./... - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/mattermost ${STAGEDIR}${PREFIX}/bin/mattermostd +post-install: + ${MV} ${STAGEDIR}${PREFIX}/bin/mattermost ${STAGEDIR}${PREFIX}/bin/mattermostd ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mattermost - ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/config/default.json ${STAGEDIR}${PREFIX}/etc/mattermost/config.json.sample + ${INSTALL_DATA} ${GO_WRKSRC}/config/default.json ${STAGEDIR}${PREFIX}/etc/mattermost/config.json.sample ${MKDIR} ${STAGEDIR}${WWWDIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} 'fonts i18n templates' ${STAGEDIR}${WWWDIR} + cd ${GO_WRKSRC} && ${COPYTREE_SHARE} 'fonts i18n templates' ${STAGEDIR}${WWWDIR} .include