From owner-svn-ports-head@freebsd.org Wed Jul 18 21:53:14 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6AEE0103550B; Wed, 18 Jul 2018 21:53:14 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 179838EC23; Wed, 18 Jul 2018 21:53:14 +0000 (UTC) (envelope-from mfechner@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 EAB55201A6; Wed, 18 Jul 2018 21:53:13 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6ILrDil049176; Wed, 18 Jul 2018 21:53:13 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6ILrD8U049174; Wed, 18 Jul 2018 21:53:13 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201807182153.w6ILrD8U049174@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Wed, 18 Jul 2018 21:53:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474905 - in head/devel/gitaly: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/devel/gitaly: . files X-SVN-Commit-Revision: 474905 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.27 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: Wed, 18 Jul 2018 21:53:14 -0000 Author: mfechner Date: Wed Jul 18 21:53:13 2018 New Revision: 474905 URL: https://svnweb.freebsd.org/changeset/ports/474905 Log: Made it possible to use another PREFIX for gitlab-ce. Reviewed by: swills (mentor) Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D16266 Modified: head/devel/gitaly/Makefile head/devel/gitaly/files/patch-config.toml.example Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Wed Jul 18 21:47:12 2018 (r474904) +++ head/devel/gitaly/Makefile Wed Jul 18 21:53:13 2018 (r474905) @@ -2,6 +2,7 @@ PORTNAME= gitaly DISTVERSION= 0.105.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -44,6 +45,7 @@ GL_ACCOUNT= gitlab-org GL_COMMIT= 90ec422b0e76840075010476898637a92f287245 post-patch: + ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample do-install: Modified: head/devel/gitaly/files/patch-config.toml.example ============================================================================== --- head/devel/gitaly/files/patch-config.toml.example Wed Jul 18 21:47:12 2018 (r474904) +++ head/devel/gitaly/files/patch-config.toml.example Wed Jul 18 21:53:13 2018 (r474905) @@ -4,11 +4,11 @@ # Example Gitaly configuration file -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" -+socket_path = "/usr/local/www/gitlab-ce/tmp/sockets/private/gitaly.socket" ++socket_path = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket" # The directory where Gitaly's executables are stored -bin_dir = "/home/git/gitaly" -+bin_dir = "/usr/local/share/gitaly/bin/" ++bin_dir = "%%PREFIX%%/share/gitaly/bin/" # # Optional: listen on a TCP socket. This is insecure (no authentication) # listen_addr = "localhost:9999" @@ -19,7 +19,7 @@ -# [git] -# bin_path = "/usr/bin/git" +[git] -+bin_path = "/usr/local/bin/git" ++bin_path = "%%PREFIX%%/bin/git" [[storage]] name = "default" @@ -33,7 +33,7 @@ [gitaly-ruby] # The directory where gitaly-ruby is installed -dir = "/home/git/gitaly/ruby" -+dir = "/usr/local/share/gitaly/ruby" ++dir = "%%PREFIX%%/share/gitaly/ruby" # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 300000000 @@ -42,7 +42,7 @@ [gitlab-shell] # The directory where gitlab-shell is installed -dir = "/home/git/gitlab-shell" -+dir = "/usr/local/share/gitlab-shell" ++dir = "%%PREFIX%%/share/gitlab-shell" # # You can adjust the concurrency of each RPC endpoint # [[concurrency]]