aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--comms/conserver-com/Makefile2
-rw-r--r--comms/conserver/Makefile2
-rw-r--r--www/rubygem-gitlab-grack/Makefile6
-rw-r--r--www/rubygem-gitlab-grack/files/patch-gemspec12
4 files changed, 15 insertions, 7 deletions
diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index 9145bc95b9de..ae83176bf30d 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX= -com
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Application that allows multiple users to watch serial consoles
-CONFLICTS_INSTALL= conserver-[0-9]* rubygem-gitlab-grack-[0-9]*
+CONFLICTS_INSTALL= conserver-[0-9]*
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-master=${DEFAULTHOST} --with-port=${DEFAULTPORT} \
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 13a442b8e452..1a2b1b9d7e44 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -16,7 +16,7 @@ COMMENT= Manage remote serial consoles via TCP/IP
BUILD_DEPENDS= makeme:${PORTSDIR}/devel/msrc0 \
mkcmd:${PORTSDIR}/devel/mkcmd
-CONFLICTS_INSTALL= conserver-com-[0-9]* rubygem-gitlab-grack-[0-9]*
+CONFLICTS_INSTALL= conserver-com-[0-9]*
# Set this to where you want console(8) to connect to by default
# or use something like ``make DEFAULTHOST=myserver.mydomain.net''
diff --git a/www/rubygem-gitlab-grack/Makefile b/www/rubygem-gitlab-grack/Makefile
index fe19716fc80a..6d22e6432738 100644
--- a/www/rubygem-gitlab-grack/Makefile
+++ b/www/rubygem-gitlab-grack/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gitlab-grack
PORTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= RG
@@ -12,13 +13,8 @@ LICENSE= MIT
RUN_DEPENDS= rubygem-rack15>=1.5.1:${PORTSDIR}/www/rubygem-rack15
-CONFLICTS_INSTALL= conserver-[0-9]* conserver-com-[0-9]*
-
USE_RUBY= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes
-PLIST_FILES= bin/console \
- bin/testserver
-
.include <bsd.port.mk>
diff --git a/www/rubygem-gitlab-grack/files/patch-gemspec b/www/rubygem-gitlab-grack/files/patch-gemspec
new file mode 100644
index 000000000000..2061920af360
--- /dev/null
+++ b/www/rubygem-gitlab-grack/files/patch-gemspec
@@ -0,0 +1,12 @@
+--- gitlab-grack.gemspec.orig 2015-05-23 23:58:53 UTC
++++ gitlab-grack.gemspec
+@@ -11,8 +11,7 @@ Gem::Specification.new do |s|
+ s.date = "2015-04-22"
+ s.description = "Ruby/Rack Git Smart-HTTP Server Handler"
+ s.email = ["schacon@gmail.com"]
+- s.executables = ["console", "testserver"]
+- s.files = [".gitignore", ".gitmodules", ".travis.yml", "CHANGELOG", "Gemfile", "Gemfile.lock", "README.md", "Rakefile", "bin/console", "bin/testserver", "examples/dispatch.fcgi", "grack.gemspec", "install.txt", "lib/grack.rb", "lib/grack/auth.rb", "lib/grack/bundle.rb", "lib/grack/git.rb", "lib/grack/server.rb", "lib/grack/version.rb", "tests/main_test.rb"]
++ s.files = [".gitignore", ".gitmodules", ".travis.yml", "CHANGELOG", "Gemfile", "Gemfile.lock", "README.md", "Rakefile", "examples/dispatch.fcgi", "grack.gemspec", "install.txt", "lib/grack.rb", "lib/grack/auth.rb", "lib/grack/bundle.rb", "lib/grack/git.rb", "lib/grack/server.rb", "lib/grack/version.rb", "tests/main_test.rb"]
+ s.homepage = "https://github.com/gitlabhq/grack"
+ s.rubygems_version = "2.4.7"
+ s.summary = "Ruby/Rack Git Smart-HTTP Server Handler"