From owner-svn-ports-all@freebsd.org Wed Mar 30 19:30:08 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 834D4AE375C; Wed, 30 Mar 2016 19:30:08 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id 5EC771B4A; Wed, 30 Mar 2016 19:30:08 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2UJU73E070355; Wed, 30 Mar 2016 19:30:07 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2UJU76S070352; Wed, 30 Mar 2016 19:30:07 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201603301930.u2UJU76S070352@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 30 Mar 2016 19:30:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412190 - in head/devel/gitlab-shell: . files X-SVN-Group: ports-head 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.21 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: Wed, 30 Mar 2016 19:30:08 -0000 Author: amdmi3 Date: Wed Mar 30 19:30:07 2016 New Revision: 412190 URL: https://svnweb.freebsd.org/changeset/ports/412190 Log: - Make hooks executable - Fix misused targets - Fix plist permissions and owners - Fix log file handling PR: 208135 Submitted by: xmj, amdmi3 Approved by: ports@toco-domains.de (maintainer) Modified: head/devel/gitlab-shell/Makefile head/devel/gitlab-shell/files/patch-config.yml.example head/devel/gitlab-shell/pkg-plist Modified: head/devel/gitlab-shell/Makefile ============================================================================== --- head/devel/gitlab-shell/Makefile Wed Mar 30 19:27:19 2016 (r412189) +++ head/devel/gitlab-shell/Makefile Wed Mar 30 19:30:07 2016 (r412190) @@ -3,6 +3,7 @@ PORTNAME= gitlab-shell PORTVERSION= 2.6.10 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://ports.toco-domains.de/ DISTNAME= ${PORTNAME}-v${PORTVERSION} @@ -19,13 +20,12 @@ GROUPS= git NO_BUILD= yes NO_ARCH= yes -do-install: +post-patch: ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample -post-install: - ${MKDIR} ${STAGEDIR}/var/log/ - ${TOUCH} ${STAGEDIR}/var/log/gitlab-shell.log - ${MKDIR} ${STAGEDIR}${DATADIR} +do-install: + @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) + @${MKDIR} ${STAGEDIR}/var/log/gitlab-shell .include Modified: head/devel/gitlab-shell/files/patch-config.yml.example ============================================================================== --- head/devel/gitlab-shell/files/patch-config.yml.example Wed Mar 30 19:27:19 2016 (r412189) +++ head/devel/gitlab-shell/files/patch-config.yml.example Wed Mar 30 19:30:07 2016 (r412190) @@ -5,7 +5,7 @@ # Log file. # Default is gitlab-shell.log in the root directory. -# log_file: "/home/git/gitlab-shell/gitlab-shell.log" -+log_file: "/var/log/gitlab-shell.log" ++log_file: "/var/log/gitlab-shell/gitlab-shell.log" # Log level. INFO by default log_level: INFO Modified: head/devel/gitlab-shell/pkg-plist ============================================================================== --- head/devel/gitlab-shell/pkg-plist Wed Mar 30 19:27:19 2016 (r412189) +++ head/devel/gitlab-shell/pkg-plist Wed Mar 30 19:30:07 2016 (r412190) @@ -10,16 +10,16 @@ %%DATADIR%%/LICENSE %%DATADIR%%/README.md %%DATADIR%%/VERSION -@(git,,555) %%DATADIR%%/bin/check -@(git,,555) %%DATADIR%%/bin/create-hooks -@(git,,555) %%DATADIR%%/bin/gitlab-keys -@(git,,555) %%DATADIR%%/bin/gitlab-projects -@(git,,555) %%DATADIR%%/bin/gitlab-shell -@(git,,555) %%DATADIR%%/bin/install +@(,,555) %%DATADIR%%/bin/check +@(,,555) %%DATADIR%%/bin/create-hooks +@(,,555) %%DATADIR%%/bin/gitlab-keys +@(,,555) %%DATADIR%%/bin/gitlab-projects +@(,,555) %%DATADIR%%/bin/gitlab-shell +@(,,555) %%DATADIR%%/bin/install @sample %%DATADIR%%/config.yml.sample -%%DATADIR%%/hooks/post-receive -%%DATADIR%%/hooks/pre-receive -%%DATADIR%%/hooks/update +@(,,555) %%DATADIR%%/hooks/post-receive +@(,,555) %%DATADIR%%/hooks/pre-receive +@(,,555) %%DATADIR%%/hooks/update %%DATADIR%%/lib/gitlab_access.rb %%DATADIR%%/lib/gitlab_access_status.rb %%DATADIR%%/lib/gitlab_config.rb @@ -55,11 +55,4 @@ %%DATADIR%%/spec/vcr_cassettes/discover-ok.yml %%DATADIR%%/support/rewrite-hooks.sh %%DATADIR%%/support/truncate_repositories.sh -@(git,,664) /var/log/gitlab-shell.log -@dir %%DATADIR%%/bin -@dir %%DATADIR%%/hooks -@dir %%DATADIR%%/lib -@dir %%DATADIR%%/spec/vcr_cassettes -@dir %%DATADIR%%/spec -@dir %%DATADIR%%/support -@dir %%DATADIR%% +@dir(git,,755) /var/log/gitlab-shell