svn commit: r550536 - in head: . x11 x11/gnome3 x11/gnome3-lite
Baptiste Daroussin
bapt at FreeBSD.org
Tue Sep 29 17:05:31 UTC 2020
Author: bapt
Date: Tue Sep 29 17:05:29 2020
New Revision: 550536
URL: https://svnweb.freebsd.org/changeset/ports/550536
Log:
Mark the fact that now gnome is mosly 3.36.
Actually more 3.38 but because some things like gnome-shell and mutter are
sill 3.36 let's not claim yet we are at 3.38
Some pieces are still 3.38 but will be updated very soon
While here turn the gnome3-lite meta port into a flavor of gnome3
Added:
head/x11/gnome3/pkg-descr-lite
- copied unchanged from r550535, head/x11/gnome3-lite/pkg-descr
head/x11/gnome3/pkg-message-lite
- copied unchanged from r550535, head/x11/gnome3-lite/pkg-message
Deleted:
head/x11/gnome3-lite/
Modified:
head/MOVED
head/x11/Makefile
head/x11/gnome3/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Tue Sep 29 17:04:57 2020 (r550535)
+++ head/MOVED Tue Sep 29 17:05:29 2020 (r550536)
@@ -15627,3 +15627,4 @@ net-im/corebird||2020-09-25|Stopped working in august
devel/py-pyqi||2020-09-25|No longer developed, use devel/py-click instead
net-im/libnice-gst010|net-im/libnice-gst1|2020-09-25|Not depended on, gstream0.10 support has been removed in newer versions
graphics/evince-lite|graphics/evince at lite|2020-09-26|Has been replaced by a flavor
+x11/gnome3-lite|x11/gnome3 at lite|2020-09-29|HAs been replaced by a flavor
Modified: head/x11/Makefile
==============================================================================
--- head/x11/Makefile Tue Sep 29 17:04:57 2020 (r550535)
+++ head/x11/Makefile Tue Sep 29 17:05:29 2020 (r550536)
@@ -82,7 +82,6 @@
SUBDIR += gnome-shell-extensions
SUBDIR += gnome-terminal
SUBDIR += gnome3
- SUBDIR += gnome3-lite
SUBDIR += gnustep-app
SUBDIR += grabc
SUBDIR += grim
Modified: head/x11/gnome3/Makefile
==============================================================================
--- head/x11/gnome3/Makefile Tue Sep 29 17:04:57 2020 (r550535)
+++ head/x11/gnome3/Makefile Tue Sep 29 17:05:29 2020 (r550536)
@@ -2,13 +2,15 @@
# $FreeBSD$
PORTNAME= gnome3
-PORTVERSION= 3.28
-PORTREVISION= 2
+PORTVERSION= 3.36
CATEGORIES?= x11 gnome
MAINTAINER= gnome at FreeBSD.org
-COMMENT?= "meta-port" for the GNOME 3 integrated X11 desktop
+COMMENT= "meta-port" for the GNOME 3 integrated X11 desktop
+FLAVORS= full lite
+FLAVOR?= full
+
RUN_DEPENDS?= dconf-editor:devel/dconf-editor \
gnome-session>=3.0.0:x11/gnome-session \
gnome-themes-extra>=3.28:x11-themes/gnome-themes-extra \
@@ -33,20 +35,19 @@ RUN_DEPENDS?= dconf-editor:devel/dconf-editor \
caribou>=0:accessibility/caribou \
${LOCALBASE}/share/sounds/freedesktop/index.theme:audio/freedesktop-sound-theme
-CONFLICTS?= gnome3-lite-[0-9]*
+OPTIONS_DEFINE= DOCS
USES= metaport
-.if ${.CURDIR:T}!="gnome3-lite"
-OPTIONS_DEFINE+=DOCS
-
-DOCS_RUN_DEPENDS= gnome-user-docs>=0:misc/gnome-user-docs \
- gnome-getting-started-docs>=0:misc/gnome-getting-started-docs
+.if ${FLAVOR} ==lite
+OPTIONS_EXCLUDE= DOCS
+PKGNAMESUFFIX= -lite
+COMMENT= The "meta-port" of the GNOME desktop slimmed down for only the basics
+PKGMESSAGE= ${.CURDIR}/pkg-message-lite
+DESCR= ${.CURDIR}/pkg-descr-lite
.endif
-.include <bsd.port.options.mk>
-
-.if ${.CURDIR:T}!="gnome3-lite"
+.if ${FLAVOR} == "full"
RUN_DEPENDS+= epiphany>=3.0.0:www/epiphany \
gucharmap>=3.0.0:deskutils/gucharmap \
gnome-characters>=3.0.0:deskutils/gnome-characters \
@@ -74,5 +75,9 @@ RUN_DEPENDS+= epiphany>=3.0.0:www/epiphany \
ekiga:net-im/ekiga
.endif # !gnome3-lite section
+
+DOCS_RUN_DEPENDS= gnome-user-docs>=0:misc/gnome-user-docs \
+ gnome-getting-started-docs>=0:misc/gnome-getting-started-docs
+
.include <bsd.port.mk>
Copied: head/x11/gnome3/pkg-descr-lite (from r550535, head/x11/gnome3-lite/pkg-descr)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/gnome3/pkg-descr-lite Tue Sep 29 17:05:29 2020 (r550536, copy of r550535, head/x11/gnome3-lite/pkg-descr)
@@ -0,0 +1,7 @@
+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/
Copied: head/x11/gnome3/pkg-message-lite (from r550535, head/x11/gnome3-lite/pkg-message)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/gnome3/pkg-message-lite Tue Sep 29 17:05:29 2020 (r550536, copy of r550535, head/x11/gnome3-lite/pkg-message)
@@ -0,0 +1,23 @@
+[
+{ type: install
+ message: <<EOM
+The GNOME 3 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:
+
+# pkg_delete gnome3-lite
+# cd /usr/ports/x11/gnome3
+# make install clean
+
+Alternatively, you can install additional GNOME components individually
+using either their ports or packages.
+
+For more help on using GNOME on FreeBSD, please see the FreeBSD GNOME project
+site at http://www.FreeBSD.org/gnome.
+EOM
+}
+]
More information about the svn-ports-head
mailing list