Index: head/devel/gitlab-shell/Makefile =================================================================== --- head/devel/gitlab-shell/Makefile (revision 412189) +++ head/devel/gitlab-shell/Makefile (revision 412190) @@ -1,31 +1,31 @@ # Created by: Torsten Zuehlsdorff =2.1.5:${PORTSDIR}/lang/ruby21 \ gem:${PORTSDIR}/devel/ruby-gems USERS= git 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 Index: head/devel/gitlab-shell/files/patch-config.yml.example =================================================================== --- head/devel/gitlab-shell/files/patch-config.yml.example (revision 412189) +++ head/devel/gitlab-shell/files/patch-config.yml.example (revision 412190) @@ -1,11 +1,11 @@ --- config.yml.example.orig 2016-02-24 09:49:01 UTC +++ config.yml.example @@ -48,7 +48,7 @@ redis: # 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 Index: head/devel/gitlab-shell/pkg-plist =================================================================== --- head/devel/gitlab-shell/pkg-plist (revision 412189) +++ head/devel/gitlab-shell/pkg-plist (revision 412190) @@ -1,65 +1,58 @@ %%DATADIR%%/.gitignore %%DATADIR%%/.gitlab-ci.yml %%DATADIR%%/.hound.yml %%DATADIR%%/.rspec %%DATADIR%%/.rubocop.yml %%DATADIR%%/CHANGELOG %%DATADIR%%/Gemfile %%DATADIR%%/Gemfile.lock %%DATADIR%%/Guardfile %%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 %%DATADIR%%/lib/gitlab_custom_hook.rb %%DATADIR%%/lib/gitlab_init.rb %%DATADIR%%/lib/gitlab_keys.rb %%DATADIR%%/lib/gitlab_logger.rb %%DATADIR%%/lib/gitlab_net.rb %%DATADIR%%/lib/gitlab_post_receive.rb %%DATADIR%%/lib/gitlab_projects.rb %%DATADIR%%/lib/gitlab_shell.rb %%DATADIR%%/lib/httpunix.rb %%DATADIR%%/lib/names_helper.rb %%DATADIR%%/spec/gitlab_access_spec.rb %%DATADIR%%/spec/gitlab_config_spec.rb %%DATADIR%%/spec/gitlab_keys_spec.rb %%DATADIR%%/spec/gitlab_logger_spec.rb %%DATADIR%%/spec/gitlab_net_spec.rb %%DATADIR%%/spec/gitlab_post_receive_spec.rb %%DATADIR%%/spec/gitlab_projects_spec.rb %%DATADIR%%/spec/gitlab_shell_spec.rb %%DATADIR%%/spec/httpunix_spec.rb %%DATADIR%%/spec/names_helper_spec.rb %%DATADIR%%/spec/spec_helper.rb %%DATADIR%%/spec/vcr_cassettes/allowed-pull.yml %%DATADIR%%/spec/vcr_cassettes/allowed-push.yml %%DATADIR%%/spec/vcr_cassettes/broadcast_message-none.yml %%DATADIR%%/spec/vcr_cassettes/broadcast_message-ok.yml %%DATADIR%%/spec/vcr_cassettes/check-ok.yml %%DATADIR%%/spec/vcr_cassettes/denied-pull.yml %%DATADIR%%/spec/vcr_cassettes/denied-push-with-user.yml %%DATADIR%%/spec/vcr_cassettes/denied-push.yml %%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