Renamed the binary installed from github-markup to gitlab-markup to fix a file collision caused by package rubygem-github-markup.

Approved by:	mentors (implicit)

2 files changed, 18 insertions, 1 deletions

diff --git a/textproc/rubygem-gitlab-markup/Makefile b/textproc/rubygem-gitlab-markup/Makefile
index 9768331c5286..55f93dbcc85d 100644
--- a/textproc/rubygem-gitlab-markup/Makefile
+++ b/textproc/rubygem-gitlab-markup/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gitlab-markup
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
@@ -16,10 +17,13 @@ USE_RUBY=	yes
 
 NO_ARCH=	yes
 
-PLIST_FILES=	bin/github-markup
+PLIST_FILES=	bin/gitlab-markup
 
 SHEBANG_FILES=	lib/github/commands/rest2html \
 		script/bootstrap \
 		script/cibuild
 
+post-patch:
+	${MV} ${WRKSRC}/bin/github-markup ${WRKSRC}/bin/gitlab-markup
+
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-gitlab-markup/files/patch-gitlab-markup.gemspec b/textproc/rubygem-gitlab-markup/files/patch-gitlab-markup.gemspec
new file mode 100644
index 000000000000..bafc779b09fb
--- /dev/null
+++ b/textproc/rubygem-gitlab-markup/files/patch-gitlab-markup.gemspec
@@ -0,0 +1,13 @@
+--- gitlab-markup.gemspec.orig	2018-10-30 12:09:22 UTC
++++ gitlab-markup.gemspec
+@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
+   s.date = "2018-06-08"
+   s.description = "This gem is used by GitLab to render any non Markdown markup".freeze
+   s.email = "chris@ozmm.org".freeze
+-  s.executables = ["github-markup".freeze]
+-  s.files = [".gitignore".freeze, ".gitlab-ci.yml".freeze, ".kick".freeze, ".travis.yml".freeze, "CONTRIBUTING.md".freeze, "Gemfile".freeze, "HISTORY.md".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/github-markup".freeze, "gitlab-markup.gemspec".freeze, "lib/github-markup.rb".freeze, "lib/github/commands/rest2html".freeze, "lib/github/markup.rb".freeze, "lib/github/markup/command_implementation.rb".freeze, "lib/github/markup/gem_implementation.rb".freeze, "lib/github/markup/implementation.rb".freeze, "lib/github/markup/markdown.rb".freeze, "lib/github/markup/rdoc.rb".freeze, "lib/github/markups.rb".freeze, "script/bootstrap".freeze, "script/cibuild".freeze, "test/fixtures/fail.sh".freeze, "test/markup_test.rb".freeze, "test/markups/README.asciidoc".freeze, "test/markups/README.asciidoc.html".freeze, "test/markups/README.creole".freeze, "test/markups/README.creole.html".freeze, "test/markups/README.litcoffee".freeze, "test/markups/README.litcoffee.html".freeze, "test/markups/README.markdown".freeze, "test/markups/README.markdown.html".freeze, "test/markups/README.mediawiki".freeze, "test/markups/README.mediawiki.html".freeze, "test/markups/README.noformat".freeze, "test/markups/README.noformat.html".freeze, "test/markups/README.org".freeze, "test/markups/README.org.html".freeze, "test/markups/README.pod".freeze, "test/markups/README.pod.html".freeze, "test/markups/README.rdoc".freeze, "test/markups/README.rdoc.html".freeze, "test/markups/README.rmd".freeze, "test/markups/README.rmd.html".freeze, "test/markups/README.rst".freeze, "test/markups/README.rst.html".freeze, "test/markups/README.rst.txt".freeze, "test/markups/README.rst.txt.html".freeze, "test/markups/README.textile".freeze, "test/markups/README.textile.html".freeze, "test/markups/README.toc.rst".freeze, "test/markups/README.toc.rst.html".freeze, "test/markups/README.txt".freeze, "test/markups/README.txt.html".freeze]
++  s.executables = ["gitlab-markup".freeze]
++  s.files = [".gitignore".freeze, ".gitlab-ci.yml".freeze, ".kick".freeze, ".travis.yml".freeze, "CONTRIBUTING.md".freeze, "Gemfile".freeze, "HISTORY.md".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/gitlab-markup".freeze, "gitlab-markup.gemspec".freeze, "lib/github-markup.rb".freeze, "lib/github/commands/rest2html".freeze, "lib/github/markup.rb".freeze, "lib/github/markup/command_implementation.rb".freeze, "lib/github/markup/gem_implementation.rb".freeze, "lib/github/markup/implementation.rb".freeze, "lib/github/markup/markdown.rb".freeze, "lib/github/markup/rdoc.rb".freeze, "lib/github/markups.rb".freeze, "script/bootstrap".freeze, "script/cibuild".freeze, "test/fixtures/fail.sh".freeze, "test/markup_test.rb".freeze, "test/markups/README.asciidoc".freeze, "test/markups/README.asciidoc.html".freeze, "test/markups/README.creole".freeze, "test/markups/README.creole.html".freeze, "test/markups/README.litcoffee".freeze, "test/markups/README.litcoffee.html".freeze, "test/markups/README.markdown".freeze, "test/markups/README.markdown.html".freeze, "test/markups/README.mediawiki".freeze, "test/markups/README.mediawiki.html".freeze, "test/markups/README.noformat".freeze, "test/markups/README.noformat.html".freeze, "test/markups/README.org".freeze, "test/markups/README.org.html".freeze, "test/markups/README.pod".freeze, "test/markups/README.pod.html".freeze, "test/markups/README.rdoc".freeze, "test/markups/README.rdoc.html".freeze, "test/markups/README.rmd".freeze, "test/markups/README.rmd.html".freeze, "test/markups/README.rst".freeze, "test/markups/README.rst.html".freeze, "test/markups/README.rst.txt".freeze, "test/markups/README.rst.txt.html".freeze, "test/markups/README.textile".freeze, "test/markups/README.textile.html".freeze, "test/markups/README.toc.rst".freeze, "test/markups/README.toc.rst.html".freeze, "test/markups/README.txt".freeze, "test/markups/README.txt.html".freeze]
+   s.homepage = "https://gitlab.com/gitlab-org/gitlab-markup".freeze
+   s.licenses = ["MIT".freeze]
+   s.rubygems_version = "2.7.7".freeze