From nobody Wed Mar 30 22:27:04 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9CC351A44609; Wed, 30 Mar 2022 22:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KTLdj1Pvsz4qZd; Wed, 30 Mar 2022 22:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648679225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQLu2rTC1D8fplxn4R8Rm2dYibNjus/+FHjr0vlBMlE=; b=f9cpfSzm/TeSuJo2Cy5LmiuM848mcwAKAcuSpFRuxm6YSC+jRVV2w6HVU9IBiDNvHSTQBi IOYRriQlCzOIt47vOHlofs0RMalqC3A18SKYHESFsL2pYLQAdQvbaJIkrrDU9RqbcOImK/ SJuEAVZb2U17mXWZ+f7VQ/JnF1y+/IvdD3ixhGEBja6cFoBVN0Mqs8j0UxuH2FeFsZE0C5 hSaOMnBh0tapgM23waKtT0ut+zfhRMQdNsfj9qUZe7816vosAil9bpB60uFxQUcWzIMLsh PjEpZK6r8yFF1mRNrGJMBV26dGXfZOIUetwsRfv+dDI7WRkx3CmfSaub3lBZfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CC7F81BE1B; Wed, 30 Mar 2022 22:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22UMR4aC068851; Wed, 30 Mar 2022 22:27:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UMR4IA068850; Wed, 30 Mar 2022 22:27:04 GMT (envelope-from git) Date: Wed, 30 Mar 2022 22:27:04 GMT Message-Id: <202203302227.22UMR4IA068850@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 698765204587 - main - www/rubygem-gollum: Fix fef2fa5fd8a2a9e170be66133e9d535a9bc6fd4b List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6987652045875bd891ebc8710ac5b8163818f9b5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648679225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQLu2rTC1D8fplxn4R8Rm2dYibNjus/+FHjr0vlBMlE=; b=xdEbAj1F+Yt7olfWWCiWRky+WY/5mxzbFSg1KJyWvrWsd5Hk0iKqSwqYGzlPlGc/4MfDCH mWznOp3mbNQBCz7GYD/IZXgyaxC7uj4H/sze4nIITqISO8MJotgcOlBb4AeY2XDokMUXEh 6E3exNx/PrmjMFQFeeGK0ojIx4P7psIKPWjJrIWm8jXOGVgTBmUwqwdhO/RZMP/QsdUd13 ACJ2CBwccMhWC8J3pGsCWjYBVc1na7zflLvjoIGZI9htqAhfFYC0WyWcHJ2xKtjgwGRg8D 599CgLBkMf67a8MIKMjNCoCgJ5+miOHl3WM8lYPtftqWzsElHBYoQ0Hbs52YyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648679225; a=rsa-sha256; cv=none; b=puX5f+wpaN22MuDAAeUsN+weqUN4GqZ3yE4si00zCN1xh3R4lOzQrgTvAByJVUwZUl31i6 A6IZFAiOWxAm0Dn1Y62UfuoZzMMYNelhLU3kg16yZlAyl88zXoxAOTEoaYGmygH3H100gr roMiLtzXUzu+WnBIYBF1syuPIm00zYRWSckT2+2DN2TOzlHQJ9E5fGBTD2SSH9EiZhZwME sE02/loSxd2bXlxIcpygcthGqThA6w90F2iTLx7qnaS/nr1bA1RHAIF9B/QZvvsj+rKGSt oGUl80IwYsiAmfobQ7tYtpKgBwjmxqaj5hsFjfn6VLB31aSsmyikmi4ew4uTng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6987652045875bd891ebc8710ac5b8163818f9b5 commit 6987652045875bd891ebc8710ac5b8163818f9b5 Author: Po-Chuan Hsieh AuthorDate: 2022-03-30 22:18:10 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-30 22:21:53 +0000 www/rubygem-gollum: Fix fef2fa5fd8a2a9e170be66133e9d535a9bc6fd4b - Fix RUN_DEPENDS: - Change from rubygem-sprockets to rubygem-sprockets3 - Remove duplicate misc/rubygem-octicons - Remove superfluous devel/rubygem-mustache0 - Update version requirement of RUN_DEPENDS to match upstream - Sort RUN_DEPENDS - Update patch-gemspec: - Update octicons after rubygem-octicons 17.0.0 update - Remove uglifier after rubygem-uglifier 4.2.0 update - Avoid using %% in Makefile - Bump PORTREVISION for dependency and package change PR: 260207 With hat: ruby --- www/rubygem-gollum/Makefile | 35 +++++++++++++++++----------------- www/rubygem-gollum/files/patch-gemspec | 7 +++---- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/www/rubygem-gollum/Makefile b/www/rubygem-gollum/Makefile index dc8f0840a88b..4a902881beb1 100644 --- a/www/rubygem-gollum/Makefile +++ b/www/rubygem-gollum/Makefile @@ -2,7 +2,7 @@ PORTNAME= gollum PORTVERSION= 5.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www rubygems MASTER_SITES= RG @@ -13,22 +13,21 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git \ - rubygem-gemojione>=3.3.0:graphics/rubygem-gemojione \ - rubygem-gollum-lib>=5.1.3:www/rubygem-gollum-lib \ - rubygem-kramdown>=2.3.1:textproc/rubygem-kramdown \ - rubygem-kramdown-parser-gfm>=1.1.0:textproc/rubygem-kramdown-parser-gfm \ - rubygem-mustache0>=0.99.5:devel/rubygem-mustache0 \ - rubygem-sinatra>=2.1.0:www/rubygem-sinatra \ - rubygem-sinatra-contrib>=2.1.0:www/rubygem-sinatra-contrib \ - rubygem-mustache-sinatra>=1.0.1:devel/rubygem-mustache-sinatra \ - rubygem-useragent>=0.16.2:devel/rubygem-useragent \ - rubygem-octicons>=12.0.0:misc/rubygem-octicons \ - rubygem-sprockets>=3.7:devel/rubygem-sprockets \ - rubygem-sass>=3.5:textproc/rubygem-sass \ - rubygem-uglifier>=4.1:www/rubygem-uglifier \ - rubygem-sprockets-helpers>=1.2:devel/rubygem-sprockets-helpers \ - rubygem-rss>=0.2.9:www/rubygem-rss \ - rubygem-webrick>=1.7.0:www/rubygem-webrick \ + rubygem-gemojione>=4.1<5:graphics/rubygem-gemojione \ + rubygem-gollum-lib>=5.1<6:www/rubygem-gollum-lib \ + rubygem-kramdown>=2.3<3:textproc/rubygem-kramdown \ + rubygem-kramdown-parser-gfm>=1.1.0<1.2:textproc/rubygem-kramdown-parser-gfm \ + rubygem-mustache-sinatra>=1.0<2:devel/rubygem-mustache-sinatra \ + rubygem-octicons>=12.0:misc/rubygem-octicons \ + rubygem-rss>=0.2.9<0.3:www/rubygem-rss \ + rubygem-sass>=3.5<4:textproc/rubygem-sass \ + rubygem-sinatra>=2.0<3:www/rubygem-sinatra \ + rubygem-sinatra-contrib>=2.0<3:www/rubygem-sinatra-contrib \ + rubygem-sprockets3>=3.7<4:devel/rubygem-sprockets3 \ + rubygem-sprockets-helpers>=1.2<2:devel/rubygem-sprockets-helpers \ + rubygem-uglifier>=4.2<5:www/rubygem-uglifier \ + rubygem-useragent>=0.16.2<0.17:devel/rubygem-useragent \ + rubygem-webrick>=1.7<2:www/rubygem-webrick \ USES= cpe gem CPE_VENDOR= ${PORTNAME}_project @@ -39,7 +38,7 @@ NO_ARCH= yes PLIST_FILES= bin/gollum \ bin/gollum-migrate-tags -PLIST_DIRS= %%WWWDIR%% +PLIST_DIRS= ${WWWDIR} post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/www/gollum diff --git a/www/rubygem-gollum/files/patch-gemspec b/www/rubygem-gollum/files/patch-gemspec index 4d9db8799315..98283b8fbc55 100644 --- a/www/rubygem-gollum/files/patch-gemspec +++ b/www/rubygem-gollum/files/patch-gemspec @@ -1,15 +1,14 @@ ---- gollum.gemspec.orig 2022-02-19 10:25:43 UTC +--- gollum.gemspec.orig 2022-03-30 15:36:55 UTC +++ gollum.gemspec @@ -34,13 +34,12 @@ Gem::Specification.new do |s| s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) s.add_runtime_dependency(%q.freeze, ["~> 0.16.2"]) s.add_runtime_dependency(%q.freeze, ["~> 4.1"]) - s.add_runtime_dependency(%q.freeze, ["~> 12.0"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 16.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 12.0"]) s.add_runtime_dependency(%q.freeze, ["~> 3.7"]) s.add_runtime_dependency(%q.freeze, ["~> 3.5"]) -- s.add_runtime_dependency(%q.freeze, ["~> 4.2"]) -+ s.add_runtime_dependency(%q.freeze, [">= 4.1"]) + s.add_runtime_dependency(%q.freeze, ["~> 4.2"]) s.add_runtime_dependency(%q.freeze, ["~> 1.2"]) s.add_runtime_dependency(%q.freeze, ["~> 0.2.9"]) - s.add_runtime_dependency(%q.freeze, ["~> 2.1.0"])