Merge remote-tracking branch 'origin/branches/2016Q3' into RELENG_2_3

13 files changed, 25 insertions, 29 deletions

diff --git a/lang/php55/Makefile b/lang/php55/Makefile
index 301a790..4000fee 100644
--- a/lang/php55/Makefile
+++ b/lang/php55/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PHP Scripting Language
 
 LICENSE=	PHP301
 
-USES=		tar:bzip2 cpe
+USES+=		tar:bzip2 cpe
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index b2de323..93c93c9 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PHP Scripting Language
 
 LICENSE=	PHP301
 
-USES=		tar:bzip2 cpe
+USES+=		tar:bzip2 cpe
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
diff --git a/lang/php70/Makefile b/lang/php70/Makefile
index 6434fb4..dd224ba 100644
--- a/lang/php70/Makefile
+++ b/lang/php70/Makefile
@@ -15,7 +15,7 @@ LICENSE=	PHP301
 
 BROKEN_powerpc64=	Does not build
 
-USES=		tar:bzip2 cpe
+USES+=		tar:bzip2 cpe
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
diff --git a/www/php55-opcache/Makefile b/www/php55-opcache/Makefile
index 1dc5c1f..753ea6e 100644
--- a/www/php55-opcache/Makefile
+++ b/www/php55-opcache/Makefile
@@ -1,6 +1,7 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	1
 CATEGORIES=	www
 
 MASTERDIR=	${.CURDIR}/../../lang/php55
diff --git a/www/php56-opcache/Makefile b/www/php56-opcache/Makefile
index 2c4265a..99b55c2 100644
--- a/www/php56-opcache/Makefile
+++ b/www/php56-opcache/Makefile
@@ -1,6 +1,7 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	1
 CATEGORIES=	www
 
 MASTERDIR=	${.CURDIR}/../../lang/php56
diff --git a/www/php70-opcache/Makefile b/www/php70-opcache/Makefile
index db9930b..f3b439b 100644
--- a/www/php70-opcache/Makefile
+++ b/www/php70-opcache/Makefile
@@ -1,6 +1,7 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	1
 CATEGORIES=	www
 
 MASTERDIR=	${.CURDIR}/../../lang/php70
diff --git a/www/redmine-knowledgebase/Makefile b/www/redmine-knowledgebase/Makefile
index 0e2a112..d3cda9b6 100644
--- a/www/redmine-knowledgebase/Makefile
+++ b/www/redmine-knowledgebase/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	knowledgebase
-PORTVERSION=	2.3.0
+PORTVERSION=	3.2.0
 DISTVERSIONPREFIX=v
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	www
 PKGNAMEPREFIX=	redmine-
 
@@ -21,7 +21,7 @@ GH_PROJECT=	redmine_knowledgebase
 
 REDMINE_PLUGIN_NAME=	redmine_${PORTNAME}
 
-RUN_DEPENDS+=	rubygem-redmine_acts_as_taggable_on>0:www/rubygem-redmine_acts_as_taggable_on \
+RUN_DEPENDS+=	rubygem-redmine_acts_as_taggable_on>=1.1.0:www/rubygem-redmine_acts_as_taggable_on \
 		rubygem-ya2yaml>0:textproc/rubygem-ya2yaml \
 		rubygem-awesome_nested_set>0:databases/rubygem-awesome_nested_set
 
diff --git a/www/redmine-knowledgebase/distinfo b/www/redmine-knowledgebase/distinfo
index 534cd82..b6c74df 100644
--- a/www/redmine-knowledgebase/distinfo
+++ b/www/redmine-knowledgebase/distinfo
@@ -1,2 +1,3 @@
-SHA256 (alexbevi-redmine_knowledgebase-v2.3.0_GH0.tar.gz) = 9d7e050d9851b313a838ded47e8d1bf386741389497c55710a93bea0a85ed320
-SIZE (alexbevi-redmine_knowledgebase-v2.3.0_GH0.tar.gz) = 71659
+TIMESTAMP = 1467051812
+SHA256 (alexbevi-redmine_knowledgebase-v3.2.0_GH0.tar.gz) = 13439381fa60a579282466b99cf231e7563313ae433dc1439f9e37083a215bb9
+SIZE (alexbevi-redmine_knowledgebase-v3.2.0_GH0.tar.gz) = 94262
diff --git a/www/redmine-knowledgebase/files/patch-Gemfile b/www/redmine-knowledgebase/files/patch-Gemfile
new file mode 100644
index 0000000..e70a2c8
--- /dev/null
+++ b/www/redmine-knowledgebase/files/patch-Gemfile
@@ -0,0 +1,7 @@
+--- Gemfile.orig	2016-06-27 20:01:10 UTC
++++ Gemfile
+@@ -1,3 +1,3 @@
+-gem 'redmine_acts_as_taggable_on', github: "alexbevi/redmine_acts_as_taggable_on"
++gem 'redmine_acts_as_taggable_on'
+ gem 'ya2yaml'
+ gem 'awesome_nested_set'
diff --git a/www/redmine-knowledgebase/files/patch-app_helpers_knowledgebase__helper.rb b/www/redmine-knowledgebase/files/patch-app_helpers_knowledgebase__helper.rb
deleted file mode 100644
index 2c84869..0000000
--- a/www/redmine-knowledgebase/files/patch-app_helpers_knowledgebase__helper.rb
+++ /dev/null
@@ -1,15 +0,0 @@
---- app/helpers/knowledgebase_helper.rb.orig	2013-06-25 12:40:55 UTC
-+++ app/helpers/knowledgebase_helper.rb
-@@ -53,7 +53,11 @@ module KnowledgebaseHelper
-   def create_preview_link
-     v = Redmine::VERSION.to_a
-     if v[0] == 2 && v[1] <= 1
--      link_to_remote(l(:label_preview), { :url => { :controller => 'articles', :action => 'preview' }, :method => 'post', :update => 'preview', :with => "Form.serialize('articles-form')")
-+      link_to_remote l(:label_preview), 
-+                     { :url => { :controller => 'articles', :action => 'preview' }, 
-+                       :method => 'post', 
-+                       :update => 'preview', 
-+                       :with => "Form.serialize('articles-form')" }
-     else
-       preview_link({ :controller => 'articles', :action => 'preview' }, 'articles-form')
-     end
diff --git a/www/rubygem-redmine_acts_as_taggable_on/Makefile b/www/rubygem-redmine_acts_as_taggable_on/Makefile
index 08bb7ec..6021776 100644
--- a/www/rubygem-redmine_acts_as_taggable_on/Makefile
+++ b/www/rubygem-redmine_acts_as_taggable_on/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	redmine_acts_as_taggable_on
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	www rubygems
-MASTER_SITES=	RG
+MASTER_SITES=	LOCAL/feld/rubygems/
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Allows multiple Redmine plugins to use tags safely
diff --git a/www/rubygem-redmine_acts_as_taggable_on/distinfo b/www/rubygem-redmine_acts_as_taggable_on/distinfo
index 4aaad91..3166a87 100644
--- a/www/rubygem-redmine_acts_as_taggable_on/distinfo
+++ b/www/rubygem-redmine_acts_as_taggable_on/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/redmine_acts_as_taggable_on-1.0.0.gem) = 5a906eaf861f1dc4b51407a2f5dbbf83716d646af59575c6c4a1054e94eef024
-SIZE (rubygem/redmine_acts_as_taggable_on-1.0.0.gem) = 17920
+TIMESTAMP = 1467062550
+SHA256 (rubygem/redmine_acts_as_taggable_on-1.1.0.gem) = 39fc03de3e04812016cbd173e79bd5a89545e6bab450d3c7dc0584891448ca18
+SIZE (rubygem/redmine_acts_as_taggable_on-1.1.0.gem) = 17920
diff --git a/www/rubygem-redmine_acts_as_taggable_on/pkg-descr b/www/rubygem-redmine_acts_as_taggable_on/pkg-descr
index d9fde03..3fa1c1f 100644
--- a/www/rubygem-redmine_acts_as_taggable_on/pkg-descr
+++ b/www/rubygem-redmine_acts_as_taggable_on/pkg-descr
@@ -1,3 +1,3 @@
 Allows multiple Redmine plugins to use tags safely
 
-WWW: https://github.com/hdgarrood/redmine_acts_as_taggable_on
+WWW: https://github.com/alexbevi/redmine_acts_as_taggable_on