svn commit: r450725 - in head/www/gitlab: . files

[Torsten Zuehlsdorff]

Author: tz
Date: Wed Sep 27 09:05:04 2017
New Revision: 450725
URL: https://svnweb.freebsd.org/changeset/ports/450725

Log:
  www/gitlab: Fix options which do the opposite
  
  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.

Modified:
  head/www/gitlab/Makefile
  head/www/gitlab/files/patch-Gemfile

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Wed Sep 27 09:01:59 2017	(r450724)
+++ head/www/gitlab/Makefile	Wed Sep 27 09:05:04 2017	(r450725)
@@ -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

Modified: head/www/gitlab/files/patch-Gemfile
==============================================================================
--- head/www/gitlab/files/patch-Gemfile	Wed Sep 27 09:01:59 2017	(r450724)
+++ head/www/gitlab/files/patch-Gemfile	Wed Sep 27 09:05:04 2017	(r450725)
@@ -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'