From owner-svn-ports-all@freebsd.org Mon Sep 23 22:57:28 2019 Return-Path: Delivered-To: svn-ports-all@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 D821E123199; Mon, 23 Sep 2019 22:57:28 +0000 (UTC) (envelope-from dmgk@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 46cfpw5Q7Tz4dtS; Mon, 23 Sep 2019 22:57:28 +0000 (UTC) (envelope-from dmgk@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 9D2551DF1F; Mon, 23 Sep 2019 22:57:28 +0000 (UTC) (envelope-from dmgk@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8NMvSZE055470; Mon, 23 Sep 2019 22:57:28 GMT (envelope-from dmgk@FreeBSD.org) Received: (from dmgk@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8NMvS82055469; Mon, 23 Sep 2019 22:57:28 GMT (envelope-from dmgk@FreeBSD.org) Message-Id: <201909232257.x8NMvS82055469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dmgk set sender to dmgk@FreeBSD.org using -f From: Dmitri Goutnik Date: Mon, 23 Sep 2019 22:57:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512686 - head/www/gitea X-SVN-Group: ports-head X-SVN-Commit-Author: dmgk X-SVN-Commit-Paths: head/www/gitea X-SVN-Commit-Revision: 512686 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Sep 2019 22:57:28 -0000 Author: dmgk Date: Mon Sep 23 22:57:28 2019 New Revision: 512686 URL: https://svnweb.freebsd.org/changeset/ports/512686 Log: www/gitea: Use linker flags to set version instead of patching the source. PR: 240744 Submitted by: stb@lassitu.de (maintainer) Reported by: Ivan Approved by: araujo (mentor) Differential Revision: https://reviews.freebsd.org/D21771 Modified: head/www/gitea/Makefile Modified: head/www/gitea/Makefile ============================================================================== --- head/www/gitea/Makefile Mon Sep 23 22:56:21 2019 (r512685) +++ head/www/gitea/Makefile Mon Sep 23 22:57:28 2019 (r512686) @@ -4,6 +4,7 @@ PORTNAME= gitea DISTVERSIONPREFIX= v DISTVERSION= 1.9.3 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= stb@lassitu.de @@ -19,7 +20,7 @@ USE_GITHUB= yes GH_ACCOUNT= go-gitea USE_RC_SUBR= gitea -GO_BUILDFLAGS= -tags "${GO_TAGS}" +GO_BUILDFLAGS= -tags "${GO_TAGS}" -ldflags '-X "main.Version=${PORTVERSION}"' SUB_FILES+= app.ini.sample SUB_LIST+= GITUSER=${USERS} @@ -46,15 +47,6 @@ DAEMONARGS= -f .endif SUB_LIST+= DAEMONARGS="${DAEMONARGS}" - -post-patch: - # Gitea releases don't supply the release version number; the - # automatic method to obtain the version number in the Gitea build - # system only works when sources are checked out from git. - # See https://github.com/go-gitea/gitea/issues/1136#issuecomment-311622745 - @${SED} -Ei .orig \ - -e 's#^(var Version = )"[^"]+"#\1"${PORTVERSION}"#' \ - ${GO_WRKSRC}/main.go do-install: ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin