From nobody Mon May 15 18:38:39 2023 X-Original-To: dev-commits-ports-all@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 4QKp6S1CbVz49wVV; Mon, 15 May 2023 18:38:40 +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 4QKp6S0f5Jz3xGR; Mon, 15 May 2023 18:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684175920; 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=fsd2tEw9C3zNsE8nmVJy+b0Pzzr8JBLyBxDEUGS1LdA=; b=D0M0j1uETRE6Ecr5pWhPLbo0IW/D70Gqw7yd7wwmxOPYrLD429/Cz2ioilk2QC+A+q4AhG llCoVNimtHM5AVTtbkkbcP8yam/O4v4XzLQolxXL7GFW2jAuU1GkXy4OMdL1YyjU81qMd7 3fjcvEweeV5Jn2JN6rjGcH4sl2dGXxWXPIZTR7eOkzgsaKNdqETnyiK76gZmeqzLe1RPd0 Cl9RAbKfivILe8X5m7nn01VW3SgansPldYAlEBJOXjnzklUybREvdG0prk0r+hACO1tz39 uCPmfq69SSd7nWij7xMpAryoUNpNaNKubARyP4flIpkXm6ZvE6iolxZohrQnyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684175920; 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=fsd2tEw9C3zNsE8nmVJy+b0Pzzr8JBLyBxDEUGS1LdA=; b=XY654Ast42Uim43Syg9juUc59amF+BVW50fe9IYkPd0ac5nEdZFAMkBOuvMh8rUWkpnSSR O1NTNbpzMwdNoCocDrDUCYhylBRAH9VDBR747cmpFjLmOgscOJAaPWuEVnwjOzaP5ZnSeU vtT7nSRYW6GOQeDujPEh454E6adPs4H5SpYNuClIwM9cdyu8AZ5IcTnP/AVKLX7HLZgukW G75lmrJdJb24YGJa831EQf9PFjvnQw9NT5a3TLEFrz8c+knOVzx/qrmaVIJ9JHx0gaQA/b vPdEpwQsKiAEuMomPCSEQnZaqfmAGXrwR2uNcr5P+ilXua6mXMlpSo4LhtJ3hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684175920; a=rsa-sha256; cv=none; b=Q9LrM5waewLv9IgcopKu1d1iNOo9FKk+cxB6OEQmtRXezvwqrFCIjkX90vQI6P7Tcnr6QC EPSXdnOdjs0eIekjOOIqmNA29vpBU3fGbyZBv1AZYc9bs8FdKlEfdhgWWd8598Mr9We+MD 7ly0y6qaPmNFeavjFSttYxILVrLI0gHLyVwoqRx+8mOidq4G4kyk+sIiviwbU2JE/RWIY0 NxSE3HErZ/th2rHvKXvdxfkTUT0NWvXZAiTHgg02PccwFC92vQNqDwq11WzqqflK+wErOh xNNSZ3XSVnetSqT+Z56HrbAqNiY4r/a4hOlO4ch9Qbaj26I1UX2ASo8VFUlKYw== 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 4QKp6R6pBCzrjQ; Mon, 15 May 2023 18:38:39 +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 34FIcdAI053997; Mon, 15 May 2023 18:38:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34FIcdqI053996; Mon, 15 May 2023 18:38:39 GMT (envelope-from git) Date: Mon, 15 May 2023 18:38:39 GMT Message-Id: <202305151838.34FIcdqI053996@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 95cba3ff0c70 - main - textproc/rubygem-semver_dialects: Remove duplicate List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95cba3ff0c709b460e27a898662d128eef604ad6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=95cba3ff0c709b460e27a898662d128eef604ad6 commit 95cba3ff0c709b460e27a898662d128eef604ad6 Author: Muhammad Moinur Rahman AuthorDate: 2023-05-15 18:30:22 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-05-15 18:38:27 +0000 textproc/rubygem-semver_dialects: Remove duplicate Same port existed in the tree under devel/rubygem-semver_dialects. - Update www/gitlab-ce to reflect to the older port in the tree - Add enttry into MOVED Approved by: portmgr (just-fix-it) --- MOVED | 1 + textproc/Makefile | 1 - textproc/rubygem-semver_dialects/Makefile | 19 ------------------- textproc/rubygem-semver_dialects/distinfo | 3 --- textproc/rubygem-semver_dialects/pkg-descr | 2 -- www/gitlab-ce/Makefile | 3 ++- 6 files changed, 3 insertions(+), 26 deletions(-) diff --git a/MOVED b/MOVED index a2523e57907b..2519dcf23681 100644 --- a/MOVED +++ b/MOVED @@ -7537,3 +7537,4 @@ news/py-sabyenc3|news/py-sabctools|2023-05-08|Renamed upstream news/sabnzbdplus|news/sabnzbd|2023-05-08|Update to proper upstream name graphics/camera||2023-05-08|Has expired: abandoned upstream, does not fetch, website disappeared, unmaintained emulators/mess||2023-05-08|Merged into emulators/mame in upstream +textproc/rubygem-semver_dialects|devel/rubygem-semver_dialects|2023-05-15|Duplicate ports diff --git a/textproc/Makefile b/textproc/Makefile index 750dab54d02a..ddfe5822bc07 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1849,7 +1849,6 @@ SUBDIR += rubygem-sassc22 SUBDIR += rubygem-sax-machine SUBDIR += rubygem-scss_lint - SUBDIR += rubygem-semver_dialects SUBDIR += rubygem-shell2html SUBDIR += rubygem-simplecov-html SUBDIR += rubygem-sixarm_ruby_unaccent diff --git a/textproc/rubygem-semver_dialects/Makefile b/textproc/rubygem-semver_dialects/Makefile deleted file mode 100644 index 73864bf1ab08..000000000000 --- a/textproc/rubygem-semver_dialects/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -PORTNAME= semver_dialects -PORTVERSION= 1.2.1 -CATEGORIES= textproc rubygems -MASTER_SITES= RG - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= Parse, process and compare semantic versions -WWW= https://rubygems.org/gems/semver_dialects \ - https://gitlab.com/gitlab-org/vulnerability-research/foss/semver_dialects - -LICENSE= MIT - -RUN_DEPENDS= rubygem-pastel>=0.8.0<0.9:devel/rubygem-pastel \ - rubygem-thor>=1.2.0<1.3:devel/rubygem-thor \ - rubygem-tty-command>=0.10.1<0.11:devel/rubygem-tty-command - -USES= gem - -.include diff --git a/textproc/rubygem-semver_dialects/distinfo b/textproc/rubygem-semver_dialects/distinfo deleted file mode 100644 index e269ed98c233..000000000000 --- a/textproc/rubygem-semver_dialects/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1682147698 -SHA256 (rubygem/semver_dialects-1.2.1.gem) = 60a1f67659f79c51a667e8858ec9b089c1e4ce4f6d2a0f0b4ac101916946eb23 -SIZE (rubygem/semver_dialects-1.2.1.gem) = 13312 diff --git a/textproc/rubygem-semver_dialects/pkg-descr b/textproc/rubygem-semver_dialects/pkg-descr deleted file mode 100644 index d6ca520ab4ac..000000000000 --- a/textproc/rubygem-semver_dialects/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -This gem helps to parse, process and compare semantic versions -for Maven, NPM, PHP, RubyGems and python packages. diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index acd7d6d9c4ad..bc487873704f 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 15.11.3 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -160,7 +161,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \ rubygem-re2>=1.6.0<1.7.0:devel/rubygem-re2 \ - rubygem-semver_dialects>=1.2.1<1.3:textproc/rubygem-semver_dialects \ + rubygem-semver_dialects>=1.2.1<1.3:devel/rubygem-semver_dialects \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \