kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/gitlab: Fix options which do the opposite

Browse source 
Currently we have MYSQL and PG option. Since the last change
the MYSQL option installs the PG configuration and vise versa.
This is now fixed.
This commit is contained in:
Torsten Zuehlsdorff 2017-09-27 09:05:04 +00:00
parent d41a65d657
commit 7d61bd218b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=450725
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
www/gitlab/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= gitlab
PORTVERSION= 9.3.11
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= www devel
@ -205,15 +206,19 @@ GROUPS= git
NO_ARCH= yes
NO_BUILD= yes
post-patch-MYSQL-on:
${CP} ${WRKSRC}/config/database.yml.mysql ${WRKSRC}/config/database.yml.sample
post-patch-MYSQL-off:
${REINPLACE_CMD} -e "/gem 'mysql2'/d" ${WRKSRC}/Gemfile
${REINPLACE_CMD} -e "/gem 'peek-mysql2'/d" ${WRKSRC}/Gemfile
${CP} ${WRKSRC}/config/database.yml.mysql ${WRKSRC}/config/database.yml.sample
post-patch-PGSQL-on:
${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
post-patch-PGSQL-off:
${REINPLACE_CMD} -e "/gem 'pg'/d" ${WRKSRC}/Gemfile
${REINPLACE_CMD} -e "/gem 'peek-pg'/d" ${WRKSRC}/Gemfile
${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
do-install:
${FIND} ${WRKSRC} -name '*.orig' -delete

9
www/gitlab/files/patch-Gemfile
View file

@ -1,6 +1,6 @@
--- Gemfile.orig 2017-09-06 21:34:31 UTC
+++ Gemfile
@@ -1,12 +1,12 @@
@@ -1,48 +1,47 @@
source 'https://rubygems.org'
-gem 'rails', '4.2.8'
@ -15,7 +15,12 @@
# Default values for AR models
gem 'default_value_for', '~> 3.0.0'
@@ -17,32 +17,31 @@ gem 'pg', '~> 0.18.2', group: :postgres
# Supported DBs
-gem 'mysql2', '~> 0.3.16', group: :mysql
-gem 'pg', '~> 0.18.2', group: :postgres
+gem 'mysql2', '>= 0.3.16', group: :mysql
+gem 'pg', '>= 0.18.2', group: :postgres
gem 'rugged', '~> 0.25.1.1'