aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-05-15 18:30:22 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-05-15 18:38:27 +0000
commit95cba3ff0c709b460e27a898662d128eef604ad6 (patch)
tree8a0f50cfb9632a5eecbe6c3c62604ba386f3c09e
parent1d37fcd8316a078e512852b7c565b5b2cf2dcbcd (diff)
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)
-rw-r--r--MOVED1
-rw-r--r--textproc/Makefile1
-rw-r--r--textproc/rubygem-semver_dialects/Makefile19
-rw-r--r--textproc/rubygem-semver_dialects/distinfo3
-rw-r--r--textproc/rubygem-semver_dialects/pkg-descr2
-rw-r--r--www/gitlab-ce/Makefile3
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 <bsd.port.mk>
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 \