gnome-extra -> gnome-extras

There was a reason to do this in the past but now this just bothers me.
This commit is contained in:
ajacoutot 2014-04-01 18:02:58 +00:00
parent 8c4de29aa8
commit 738f443680
5 changed files with 12 additions and 12 deletions

View File

@ -1,21 +1,21 @@
# $OpenBSD: Makefile,v 1.93 2014/03/30 16:50:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.94 2014/04/01 18:02:58 ajacoutot Exp $
COMMENT-main= GNOME desktop meta-package (base installation)
COMMENT-extra= GNOME desktop meta-package (full installation)
COMMENT-extras= GNOME desktop meta-package (full installation)
V= 3.12.0
PKGNAME= gnome-${V}
PKGNAME-main= gnome-${V}
PKGNAME-extra= gnome-extra-${V}
PKGNAME-extras= gnome-extras-${V}
REVISION-main= 1
REVISION-extra= 0
REVISION-main= 2
REVISION-extras= 1
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
Antoine Jacoutot <ajacoutot@openbsd.org>
MULTI_PACKAGES= -main -extra
MULTI_PACKAGES= -main -extras
# remove when we don't use gtk+2 apps in GNOME
# Gtk-Message: Failed to load module "canberra-gtk-module"
@ -84,7 +84,7 @@ RUN_DEPENDS-main += x11/gnome/alacarte \
x11/gnome/vino \
x11/gnome/weather
RUN_DEPENDS-extra += STEM-=${V}:${BASE_PKGPATH},-main \
RUN_DEPENDS-extras += STEM-=${V}:${BASE_PKGPATH},-main \
audio/rhythmbox \
graphics/simple-scan \
mail/evolution \

View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PLIST-extra,v 1.1 2012/02/23 09:22:06 ajacoutot Exp $
@conflict gnome-extras-*
@pkgpath ${BASE_PKGPATH},-extras

View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PLIST-extras,v 1.3 2014/04/01 18:02:58 ajacoutot Exp $
@conflict gnome-extra-*
@pkgpath ${BASE_PKGPATH},-extra

View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.27 2014/03/30 16:50:44 ajacoutot Exp $
$OpenBSD: README-main,v 1.28 2014/04/01 18:02:58 ajacoutot Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -8,7 +8,7 @@ $OpenBSD: README-main,v 1.27 2014/03/30 16:50:44 ajacoutot Exp $
The GNOME desktop is composed of 2 meta-packages:
* gnome, for a standard GNOME installation
* gnome-extra, for a full GNOME installation
* gnome-extras, for a full GNOME installation
The "gnome" package is focused on generic usage to give the user the
choice to install his favorite applications for daily usage (i.e. PIM,