git: eaefe7d4ecf4 - main - x11/gnome: Move from x11/gnome3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 31 Jan 2022 21:57:23 UTC
The branch main has been updated by nc:
URL: https://cgit.FreeBSD.org/ports/commit/?id=eaefe7d4ecf41c002de61c21fb214ef390ab0476
commit eaefe7d4ecf41c002de61c21fb214ef390ab0476
Author: Neel Chauhan <nc@FreeBSD.org>
AuthorDate: 2022-01-31 21:56:04 +0000
Commit: Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2022-01-31 21:56:04 +0000
x11/gnome: Move from x11/gnome3
The reason for the move is because GNOME has moved beyond version 3,
bumping directly to 40 and iterating major release versions from there.
The Ports version of GNOME is currently at 41, making x11/gnome3
misnamed also.
Differential Revision: https://reviews.freebsd.org/D33959
---
MOVED | 1 +
x11/Makefile | 2 +-
x11/{gnome3 => gnome}/Makefile | 7 +++----
x11/{gnome3 => gnome}/pkg-descr | 2 --
x11/gnome/pkg-descr-lite | 5 +++++
x11/{gnome3 => gnome}/pkg-message | 2 +-
x11/{gnome3 => gnome}/pkg-message-lite | 16 ++++++++--------
x11/gnome3/pkg-descr-lite | 7 -------
8 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/MOVED b/MOVED
index 6e09b1354610..d7411952d84a 100644
--- a/MOVED
+++ b/MOVED
@@ -16882,3 +16882,4 @@ x11-fonts/sourcesanspro-ttf|x11-fonts/source-sans-ttf|2022-01-28|Rename to match
audio/nekobi-lv2|audio/dpf-plugins-lv2|2022-01-28|Nekobi is part of dpf-plugins
audio/kars-lv2|audio/dpf-plugins-lv2|2022-01-28|Kars is part of dpf-plugins
lang/scala-docs||2022-01-31|New 3.x versions dropped archived documentation
+x11/gnome3|x11/gnome|2022-01-32|GNOME has moved past version 3, including the Ports version
diff --git a/x11/Makefile b/x11/Makefile
index 94459952c2e9..eec0ec1a6428 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -79,6 +79,7 @@
SUBDIR += gdm
SUBDIR += glcapsviewer
SUBDIR += gmrun
+ SUBDIR += gnome
SUBDIR += gnome-clipboard-daemon
SUBDIR += gnome-desktop
SUBDIR += gnome-menus
@@ -87,7 +88,6 @@
SUBDIR += gnome-shell
SUBDIR += gnome-shell-extensions
SUBDIR += gnome-terminal
- SUBDIR += gnome3
SUBDIR += gnustep-app
SUBDIR += grabc
SUBDIR += grim
diff --git a/x11/gnome3/Makefile b/x11/gnome/Makefile
similarity index 96%
rename from x11/gnome3/Makefile
rename to x11/gnome/Makefile
index a0cf557815cd..e15e127dab4f 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome/Makefile
@@ -1,12 +1,11 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-PORTNAME= gnome3
-PORTVERSION= 3.36
-PORTREVISION= 4
+PORTNAME= gnome
+PORTVERSION= 41
CATEGORIES?= x11 gnome
MAINTAINER= gnome@FreeBSD.org
-COMMENT= "meta-port" for the GNOME 3 integrated X11 desktop
+COMMENT= Metaport for the GNOME integrated X11 desktop
FLAVORS= full lite
FLAVOR?= full
diff --git a/x11/gnome3/pkg-descr b/x11/gnome/pkg-descr
similarity index 78%
rename from x11/gnome3/pkg-descr
rename to x11/gnome/pkg-descr
index 33033379ff9d..36c88d60edc6 100644
--- a/x11/gnome3/pkg-descr
+++ b/x11/gnome/pkg-descr
@@ -1,5 +1,3 @@
-GNU Network Object Model Environment
-
This metaport installs the entire GNOME 3 desktop, including
the user applications released with it.
diff --git a/x11/gnome/pkg-descr-lite b/x11/gnome/pkg-descr-lite
new file mode 100644
index 000000000000..1bf12a7d1064
--- /dev/null
+++ b/x11/gnome/pkg-descr-lite
@@ -0,0 +1,5 @@
+This metaport installs the pieces of the GNOME desktop that are needed to
+provide a functional desktop. The x11/gnome metaport, contains the full
+version of the GNOME desktop environment.
+
+WWW: https://www.FreeBSD.org/gnome/
diff --git a/x11/gnome3/pkg-message b/x11/gnome/pkg-message
similarity index 75%
rename from x11/gnome3/pkg-message
rename to x11/gnome/pkg-message
index dc8acef35b33..895e224de582 100644
--- a/x11/gnome3/pkg-message
+++ b/x11/gnome/pkg-message
@@ -1,7 +1,7 @@
[
{ type: install
message: <<EOM
-Congratulations! GNOME 3 has been successfully installed on your system.
+Congratulations! GNOME has been successfully installed on your system.
For help on starting it up, as well as answers to common questions, and
some known issues, please see the FreeBSD GNOME homepage at:
diff --git a/x11/gnome3/pkg-message-lite b/x11/gnome/pkg-message-lite
similarity index 55%
rename from x11/gnome3/pkg-message-lite
rename to x11/gnome/pkg-message-lite
index a0b493deeb8d..05fadc44c124 100644
--- a/x11/gnome3/pkg-message-lite
+++ b/x11/gnome/pkg-message-lite
@@ -1,16 +1,16 @@
[
{ type: install
message: <<EOM
-The GNOME 3 desktop Lite edition has been successfully installed.
+The GNOME desktop Lite edition has been successfully installed.
-The Lite edition only includes the minimal components to get a working GNOME 3
-Desktop. The user then has to install prefered applications like editor,
-web browser or e-mail client. If you wish to install the full desktop, you can
-remove this port, and install the x11/gnome3 port or package. That can be best
-accomplished using the following commands:
+The Lite edition only includes the minimal components to get a working GNOME
+Desktop. The user then has to install prefered applications like editor, web
+browser or e-mail client. If you wish to install the full desktop, you can
+remove this port, and install the x11/gnome port or package. That can be
+best accomplished using the following commands:
-# pkg_delete gnome3-lite
-# cd /usr/ports/x11/gnome3
+# pkg_delete gnome-lite
+# cd /usr/ports/x11/gnome
# make install clean
Alternatively, you can install additional GNOME components individually
diff --git a/x11/gnome3/pkg-descr-lite b/x11/gnome3/pkg-descr-lite
deleted file mode 100644
index f756f3155736..000000000000
--- a/x11/gnome3/pkg-descr-lite
+++ /dev/null
@@ -1,7 +0,0 @@
-GNU Network Object Model Environment
-
-This metaport installs the pieces of the GNOME 3 desktop that
-are needed to provide a functional desktop. The x11/gnome3
-meta port, contains the full version of the GNOME 3 desktop environment.
-
-WWW: https://www.FreeBSD.org/gnome/