From nobody Tue Jan 11 19:05:42 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 2B6CF1957882; Tue, 11 Jan 2022 19:05:49 +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 4JYKsQ2Z1zz4nkQ; Tue, 11 Jan 2022 19:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 145431EBE9; Tue, 11 Jan 2022 19:05:43 +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 20BJ5gJC091023; Tue, 11 Jan 2022 19:05:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BJ5g5n091022; Tue, 11 Jan 2022 19:05:42 GMT (envelope-from git) Date: Tue, 11 Jan 2022 19:05:42 GMT Message-Id: <202201111905.20BJ5g5n091022@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: 56467e81552e - main - www/rubygem-gollum-lib: Clean up 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: 56467e81552e249465603661c5c510a388926daf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641927947; 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=wisHPg59Qp+HS6k3cYIaU2DU8nyb8oLDWwmeJVLOdUE=; b=vfi44TVo9fKbTtdz9sGMeMCAj/Q0Fhs8ic3xOHrR+UkOtGGn4Z3UoekFcc1FMNKiyBnh09 OoFRtv1K1VXyhk9JIE4jn2UiZL+zOqkThux+cKCChblvCDfhqA5wlFQ4ZxucByBP2Suzn1 koCJ/9iJYdbkGGE/dKa9/+xE0nUr4US2FTzuH/JiW3QCsLfKN3JGaABpe2G3wZdVpnKqzg knCG5JD1mAd50IHcQIlR3L4Lfi/B151Dj0MZ1fX/njBnxO+GvxjA8tDjznCEH9y49SjzIC Y50tilZ5NvgHXBuYt+ekrnd90BQj/542cqk7SYD2Ix86EQu9AbrQXmmllY8rQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641927947; a=rsa-sha256; cv=none; b=NSLlEp0bV7vpgX7IGr5dQNsL5KTk8+4yVlEeFSdTOh3uIpQ5o/UZXe2vo1bquzuBgNWEzh ohrZghfdV+FrDSMuUjnMcajihR4TjNoRYNvAkRHqn9LvyeHVdL02rAPuGqsqQweYNwtD0v ipj28j2yCaOiM2x+2KtgYlDcObWKRUeSiCyGaOyu2p81XX1iHDbrgM3oZ/8zZExDZn3UmM R0RfQjlpw847FV8nAdnfqfG9kt+O2SPi1Yp6E6HXEXbPs6ampVIGmsVeX6tqzawKd0EaUU PQG2I1UTIV5TVNGk4I0vOfH1ydNZatvD+XCCMdFHKRuKjym1c7x+e2l9W5oHlw== 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=56467e81552e249465603661c5c510a388926daf commit 56467e81552e249465603661c5c510a388926daf Author: Po-Chuan Hsieh AuthorDate: 2022-01-11 17:40:48 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-01-11 18:47:42 +0000 www/rubygem-gollum-lib: Clean up Remove the options since gitlab uses textproc/rubygem-gitlab-markup directly now. --- www/rubygem-gollum-lib/Makefile | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/www/rubygem-gollum-lib/Makefile b/www/rubygem-gollum-lib/Makefile index 640702ff5f95..afd8ab1152e5 100644 --- a/www/rubygem-gollum-lib/Makefile +++ b/www/rubygem-gollum-lib/Makefile @@ -12,6 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-gemojione>=3.2<4:graphics/rubygem-gemojione \ + rubygem-github-markup>=1.6:textproc/rubygem-github-markup \ rubygem-gollum-grit_adapter10>=1.0<2:www/rubygem-gollum-grit_adapter10 \ rubygem-nokogiri>=1.6.1<2.0:textproc/rubygem-nokogiri \ rubygem-rouge2>=2.1<3:textproc/rubygem-rouge2 \ @@ -20,24 +21,8 @@ RUN_DEPENDS= rubygem-gemojione>=3.2<4:graphics/rubygem-gemojione \ rubygem-twitter-text1=1.14.7:textproc/rubygem-twitter-text1 USES= gem - -OPTIONS_RADIO= MARKUP -OPTIONS_RADIO_MARKUP= GITHUB GITLAB -OPTIONS_DEFAULT?= GITHUB - -MARKUP_DESC= Markup Selection -GITHUB_DESC= Use rubygem-github-markup (default) -GITLAB_DESC= Use rubygem-gitlab-markup instead - -GITHUB_RUN_DEPENDS= rubygem-github-markup>=1.6:textproc/rubygem-github-markup -GITLAB_RUN_DEPENDS= rubygem-gitlab-markup>=1.5:textproc/rubygem-gitlab-markup - USE_RUBY= yes NO_ARCH= yes -post-patch-GITLAB-on: -# change runtime dependency from "github-markup >= 1.6" to "gitlab-markup >= 1.5" - @${REINPLACE_CMD} -e '/s.add_runtime_dependency/ s|github-markup\(.*\)1.6|gitlab-markup\11.5|' ${WRKSRC}/${GEMSPEC} - .include