From owner-svn-ports-head@freebsd.org Tue Oct 30 16:17:43 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0DF3D10ECF61; Tue, 30 Oct 2018 16:17:43 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B75BB6D9BE; Tue, 30 Oct 2018 16:17:42 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 95D5F1FBB2; Tue, 30 Oct 2018 16:17:42 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9UGHg1e040250; Tue, 30 Oct 2018 16:17:42 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9UGHgij040247; Tue, 30 Oct 2018 16:17:42 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201810301617.w9UGHgij040247@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Tue, 30 Oct 2018 16:17:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483499 - in head/textproc/rubygem-gitlab-markup: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/textproc/rubygem-gitlab-markup: . files X-SVN-Commit-Revision: 483499 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2018 16:17:43 -0000 Author: mfechner Date: Tue Oct 30 16:17:41 2018 New Revision: 483499 URL: https://svnweb.freebsd.org/changeset/ports/483499 Log: 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) Added: head/textproc/rubygem-gitlab-markup/files/ head/textproc/rubygem-gitlab-markup/files/patch-gitlab-markup.gemspec (contents, props changed) Modified: head/textproc/rubygem-gitlab-markup/Makefile Modified: head/textproc/rubygem-gitlab-markup/Makefile ============================================================================== --- head/textproc/rubygem-gitlab-markup/Makefile Tue Oct 30 16:15:24 2018 (r483498) +++ head/textproc/rubygem-gitlab-markup/Makefile Tue Oct 30 16:17:41 2018 (r483499) @@ -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 Added: head/textproc/rubygem-gitlab-markup/files/patch-gitlab-markup.gemspec ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/rubygem-gitlab-markup/files/patch-gitlab-markup.gemspec Tue Oct 30 16:17:41 2018 (r483499) @@ -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".free ze, "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".free ze, "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