Index: devel/gitaly/Makefile
===================================================================
--- devel/gitaly/Makefile
+++ devel/gitaly/Makefile
@@ -44,6 +44,7 @@
 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:
Index: devel/gitaly/files/patch-config.toml.example
===================================================================
--- devel/gitaly/files/patch-config.toml.example
+++ devel/gitaly/files/patch-config.toml.example
@@ -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]]
Index: www/gitlab-ce/Makefile
===================================================================
--- www/gitlab-ce/Makefile
+++ www/gitlab-ce/Makefile
@@ -222,6 +222,12 @@
 NO_ARCH=	yes
 NO_BUILD=	yes
 
+post-patch:
+	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example
+	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/unicorn.rb.example
+	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/lib/support/nginx/gitlab
+	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/lib/support/nginx/gitlab-ssl
+
 post-patch-MYSQL-on:
 	${CP} ${WRKSRC}/config/database.yml.mysql ${WRKSRC}/config/database.yml.sample
 
Index: www/gitlab-ce/files/patch-config_gitlab.yml.example
===================================================================
--- www/gitlab-ce/files/patch-config_gitlab.yml.example
+++ www/gitlab-ce/files/patch-config_gitlab.yml.example
@@ -5,7 +5,7 @@
      # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
      admin:
 -      address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
-+      address: unix:/usr/local/www/gitlab-ce/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
++      address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
  
    ## Mattermost
    ## For enabling Add to Mattermost button
@@ -14,7 +14,7 @@
    gitaly:
      # Path to the directory containing Gitaly client executables.
 -    client_path: /home/git/gitaly/bin
-+    client_path: /usr/local/share/gitaly/bin
++    client_path: %%PREFIX%%/share/gitaly/bin
      # Default Gitaly authentication token. Can be overriden per storage. Can
      # be left blank when Gitaly is running locally on a Unix socket, which
      # is the normal way to deploy Gitaly.
@@ -25,7 +25,7 @@
 -        path: /home/git/repositories/
 -        gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
 +        path: /usr/home/git/repositories/
-+        gitaly_address: unix:/usr/local/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
++        gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
          # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
@@ -35,8 +35,8 @@
    gitlab_shell:
 -    path: /home/git/gitlab-shell/
 -    hooks_path: /home/git/gitlab-shell/hooks/
-+    path: /usr/local/share/gitlab-shell/
-+    hooks_path: /usr/local/share/gitlab-shell/hooks/
++    path: %%PREFIX%%/share/gitlab-shell/
++    hooks_path: %%PREFIX/share/gitlab-shell/hooks/
  
      # File that contains the secret key for verifying access for gitlab-shell.
      # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -50,7 +50,7 @@
    # Use the default values unless you really know what you are doing
    git:
 -    bin_path: /usr/bin/git
-+    bin_path: /usr/local/bin/git
++    bin_path: %%PREFIX%%/bin/git
  
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
Index: www/gitlab-ce/files/patch-config_unicorn.rb.example
===================================================================
--- www/gitlab-ce/files/patch-config_unicorn.rb.example
+++ www/gitlab-ce/files/patch-config_unicorn.rb.example
@@ -5,13 +5,13 @@
  # Help ensure your application will always spawn in the symlinked
  # "current" directory that Capistrano sets up.
 -working_directory "/home/git/gitlab" # available in 0.94.0+
-+working_directory "/usr/local/www/gitlab-ce" # available in 0.94.0+
++working_directory "%%PREFIX%%/www/gitlab-ce" # available in 0.94.0+
  
  # Listen on both a Unix domain socket and a TCP port.
  # If you are load-balancing multiple Unicorn masters, lower the backlog
  # setting to e.g. 64 for faster failover.
 -listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024
-+listen "/usr/local/www/gitlab-ce/tmp/sockets/gitlab.socket", :backlog => 1024
++listen "%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab.socket", :backlog => 1024
  listen "127.0.0.1:8080", :tcp_nopush => true
  
  # nuke workers after 30 seconds instead of 60 seconds (the default)
@@ -20,15 +20,15 @@
  
  # feel free to point this anywhere accessible on the filesystem
 -pid "/home/git/gitlab/tmp/pids/unicorn.pid"
-+pid "/usr/local/www/gitlab-ce/tmp/pids/unicorn.pid"
++pid "%%PREFIX%%/www/gitlab-ce/tmp/pids/unicorn.pid"
  
  # By default, the Unicorn logger will write to stderr.
  # Additionally, some applications/frameworks log to stderr or stdout,
  # so prevent them from going to /dev/null when daemonized here:
 -stderr_path "/home/git/gitlab/log/unicorn.stderr.log"
 -stdout_path "/home/git/gitlab/log/unicorn.stdout.log"
-+stderr_path "/usr/local/www/gitlab-ce/log/unicorn.stderr.log"
-+stdout_path "/usr/local/www/gitlab-ce/log/unicorn.stdout.log"
++stderr_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stderr.log"
++stdout_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stdout.log"
  
  # combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
  # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
Index: www/gitlab-ce/files/patch-lib_support_nginx_gitlab
===================================================================
--- www/gitlab-ce/files/patch-lib_support_nginx_gitlab
+++ www/gitlab-ce/files/patch-lib_support_nginx_gitlab
@@ -5,7 +5,7 @@
    # Gitlab socket file,
    # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
 -  server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
-+  server unix:/usr/local/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
++  server unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
  }
  
  map $http_upgrade $connection_upgrade_gitlab {
@@ -14,7 +14,7 @@
      # Location to the Gitlab's public directory,
      # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public.
 -    root /home/git/gitlab/public;
-+    root /usr/local/www/gitlab-ce/public;
++    root %%PREFIX%%/www/gitlab-ce/public;
      internal;
    }
  
Index: www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl
===================================================================
--- www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl
+++ www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl
@@ -5,7 +5,7 @@
    # Gitlab socket file,
    # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
 -  server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
-+  server unix:/usr/local/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
++  server unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
  }
  
  map $http_upgrade $connection_upgrade_gitlab_ssl {
@@ -14,7 +14,7 @@
      # Location to the Gitlab's public directory,
      # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public
 -    root /home/git/gitlab/public;
-+    root /usr/local/www/gitlab-ce/public;
++    root %%PREFIX%%/www/gitlab-ce/public;
      internal;
    }
  }