aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--databases/leo_center/Makefile2
-rw-r--r--net-mgmt/rubygem-oxidized-web/Makefile2
-rw-r--r--www/Makefile2
-rw-r--r--www/rubygem-dashing/Makefile2
-rw-r--r--www/rubygem-sinatra-contrib1/Makefile (renamed from www/rubygem-sinatra-contrib/Makefile)1
-rw-r--r--www/rubygem-sinatra-contrib1/distinfo (renamed from www/rubygem-sinatra-contrib/distinfo)0
-rw-r--r--www/rubygem-sinatra-contrib1/pkg-descr (renamed from www/rubygem-sinatra-contrib/pkg-descr)0
8 files changed, 6 insertions, 4 deletions
diff --git a/MOVED b/MOVED
index c6a689de76b..98b6de46b14 100644
--- a/MOVED
+++ b/MOVED
@@ -9844,3 +9844,4 @@ devel/p5-MooseX-Role-WithOverloading||2018-01-06|Has expired: deprecated by upst
devel/p5-Test-Block||2018-01-06|Has expired: Marked as deprecated upstream
sysutils/socket||2018-01-06|Has expired: Out of date
x11-toolkits/qt5-declarative-render2d/||2018-01-06|Merged into x11-toolkits/qt5-quick
+www/rubygem-sinatra-contrib|www/rubygem-sinatra-contrib1|2018-01-06|Renamed to coordinate with rubygem-sinatra1
diff --git a/databases/leo_center/Makefile b/databases/leo_center/Makefile
index ca94fb7b1a9..4b85f39c635 100644
--- a/databases/leo_center/Makefile
+++ b/databases/leo_center/Makefile
@@ -19,7 +19,7 @@ DIST_SUBDIR= leofs
RUN_DEPENDS= rubygem-haml>=0:www/rubygem-haml \
rubygem-leo_manager_client>=0.4.13:databases/rubygem-leo_manager_client \
- rubygem-sinatra-contrib>=0:www/rubygem-sinatra-contrib \
+ rubygem-sinatra-contrib1>=0:www/rubygem-sinatra-contrib1 \
rubygem-sinatra1>=1.4.3:www/rubygem-sinatra1 \
rubygem-thin>=0:www/rubygem-thin
diff --git a/net-mgmt/rubygem-oxidized-web/Makefile b/net-mgmt/rubygem-oxidized-web/Makefile
index 5da9c551236..6ee9afec7bc 100644
--- a/net-mgmt/rubygem-oxidized-web/Makefile
+++ b/net-mgmt/rubygem-oxidized-web/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= rubygem-emk-sinatra-url-for>=0.2:www/rubygem-emk-sinatra-url-for \
rubygem-puma>=3:www/rubygem-puma \
rubygem-sass>=3.3:textproc/rubygem-sass \
rubygem-sinatra1>=1.4.6:www/rubygem-sinatra1 \
- rubygem-sinatra-contrib>=1.4.6:www/rubygem-sinatra-contrib
+ rubygem-sinatra-contrib1>=1.4.6:www/rubygem-sinatra-contrib1
NO_ARCH= yes
USE_RUBY= yes
diff --git a/www/Makefile b/www/Makefile
index 984e96c1925..e7d816359bf 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2176,7 +2176,7 @@
SUBDIR += rubygem-semantic-ui-sass
SUBDIR += rubygem-simple-rss
SUBDIR += rubygem-sinatra
- SUBDIR += rubygem-sinatra-contrib
+ SUBDIR += rubygem-sinatra-contrib1
SUBDIR += rubygem-sinatra-r18n
SUBDIR += rubygem-sinatra-respond_to
SUBDIR += rubygem-sinatra1
diff --git a/www/rubygem-dashing/Makefile b/www/rubygem-dashing/Makefile
index 1202b64e712..ce052be9d1e 100644
--- a/www/rubygem-dashing/Makefile
+++ b/www/rubygem-dashing/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= rubygem-sass32>=3.2.12:textproc/rubygem-sass32 \
rubygem-coffee-script>=2.3.0:devel/rubygem-coffee-script \
rubygem-execjs>=2.2.2:devel/rubygem-execjs \
rubygem-sinatra1>=1.4.4:www/rubygem-sinatra1 \
- rubygem-sinatra-contrib>=1.4.2:www/rubygem-sinatra-contrib \
+ rubygem-sinatra-contrib1>=1.4.2:www/rubygem-sinatra-contrib1 \
rubygem-thin>=1.6.2:www/rubygem-thin \
rubygem-rufus-scheduler>=3.0.9:devel/rubygem-rufus-scheduler \
rubygem-thor>=0.19.1:devel/rubygem-thor \
diff --git a/www/rubygem-sinatra-contrib/Makefile b/www/rubygem-sinatra-contrib1/Makefile
index 72035ea83bf..70b2825fd01 100644
--- a/www/rubygem-sinatra-contrib/Makefile
+++ b/www/rubygem-sinatra-contrib1/Makefile
@@ -5,6 +5,7 @@ PORTVERSION= 1.4.7
PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= RG
+PKGNAMESUFFIX= 1
MAINTAINER= robak@FreeBSD.org
COMMENT= Collection of useful Sinatra extensions
diff --git a/www/rubygem-sinatra-contrib/distinfo b/www/rubygem-sinatra-contrib1/distinfo
index 2d815715ea5..2d815715ea5 100644
--- a/www/rubygem-sinatra-contrib/distinfo
+++ b/www/rubygem-sinatra-contrib1/distinfo
diff --git a/www/rubygem-sinatra-contrib/pkg-descr b/www/rubygem-sinatra-contrib1/pkg-descr
index 2966a19d33b..2966a19d33b 100644
--- a/www/rubygem-sinatra-contrib/pkg-descr
+++ b/www/rubygem-sinatra-contrib1/pkg-descr