From owner-svn-ports-all@freebsd.org  Wed Sep 27 09:05:05 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
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 E9D9DE2EEB7;
 Wed, 27 Sep 2017 09:05:05 +0000 (UTC) (envelope-from tz@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 B0D0F6A1BC;
 Wed, 27 Sep 2017 09:05:05 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8R95460050546;
 Wed, 27 Sep 2017 09:05:04 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8R954V8050544;
 Wed, 27 Sep 2017 09:05:04 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201709270905.v8R954V8050544@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org
 using -f
From: Torsten Zuehlsdorff <tz@FreeBSD.org>
Date: Wed, 27 Sep 2017 09:05:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r450725 - in head/www/gitlab: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: tz
X-SVN-Commit-Paths: in head/www/gitlab: . files
X-SVN-Commit-Revision: 450725
X-SVN-Commit-Repository: ports
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Sep 2017 09:05:06 -0000

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'