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

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Thu Oct  5 09:50:24 2017
New Revision: 451300
URL: https://svnweb.freebsd.org/changeset/ports/451300

Log:
  Fix Gemfile for rubygem-gon 6.2.0 update
  
  - While I'm here, silence patch messages
  - Bump PORTREVISION for package change

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

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Thu Oct  5 09:50:18 2017	(r451299)
+++ head/www/gitlab/Makefile	Thu Oct  5 09:50:24 2017	(r451300)
@@ -5,6 +5,7 @@ PORTNAME=	gitlab
 PORTVERSION=	9.3.11
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www devel
 
 MAINTAINER=	tz at FreeBSD.org
@@ -207,18 +208,18 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 
 post-patch-MYSQL-on:
-	${CP} ${WRKSRC}/config/database.yml.mysql ${WRKSRC}/config/database.yml.sample
+	@${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
+	@${REINPLACE_CMD} -e "/gem 'mysql2'/d" ${WRKSRC}/Gemfile
+	@${REINPLACE_CMD} -e "/gem 'peek-mysql2'/d" ${WRKSRC}/Gemfile
 
 post-patch-PGSQL-on:
-	${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
+	@${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
+	@${REINPLACE_CMD} -e "/gem 'pg'/d" ${WRKSRC}/Gemfile
+	@${REINPLACE_CMD} -e "/gem 'peek-pg'/d" ${WRKSRC}/Gemfile
 
 do-install:
 	${FIND} ${WRKSRC} -name '*.orig' -delete

Modified: head/www/gitlab/files/patch-Gemfile
==============================================================================
--- head/www/gitlab/files/patch-Gemfile	Thu Oct  5 09:50:18 2017	(r451299)
+++ head/www/gitlab/files/patch-Gemfile	Thu Oct  5 09:50:24 2017	(r451300)
@@ -216,7 +216,8 @@
  gem 'bootstrap-sass', '~> 3.3.0'
  gem 'font-awesome-rails', '~> 4.7'
  gem 'gemojione', '~> 3.3'
- gem 'gon', '~> 6.1.0'
+-gem 'gon', '~> 6.1.0'
++gem 'gon', '~> 6.1'
  gem 'jquery-atwho-rails', '~> 1.3.2'
 -gem 'jquery-rails', '~> 4.1.0'
 -gem 'request_store', '~> 1.3'