summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-10-31 07:50:29 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-10-31 07:50:29 +0800
commitab767edb2c12ecf3ae8064dfef68193ce4a10ebb (patch)
treeb5442b7beda6bff28e7317e413f13c06f3bb5b5c
parent330b092c66ef97784828e4e41c2569793789fae2 (diff)
downloadmarcuscom-ports-ab767edb2c12ecf3ae8064dfef68193ce4a10ebb.tar
marcuscom-ports-ab767edb2c12ecf3ae8064dfef68193ce4a10ebb.tar.gz
marcuscom-ports-ab767edb2c12ecf3ae8064dfef68193ce4a10ebb.tar.bz2
marcuscom-ports-ab767edb2c12ecf3ae8064dfef68193ce4a10ebb.tar.lz
marcuscom-ports-ab767edb2c12ecf3ae8064dfef68193ce4a10ebb.tar.xz
marcuscom-ports-ab767edb2c12ecf3ae8064dfef68193ce4a10ebb.tar.zst
marcuscom-ports-ab767edb2c12ecf3ae8064dfef68193ce4a10ebb.zip
Fix gnome-games location and pull in the gnome-utils meta port instead of
all the loose util ports. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18840 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/gnome3/Makefile12
1 files changed, 3 insertions, 9 deletions
diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 98e7c20e8..2eea3ebcf 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY= # empty
MAINTAINER= gnome@FreeBSD.org
COMMENT?= The "meta-port" for the GNOME 3 integrated X11 desktop
-CONFLICTS?= gnome2-[0-9]* gnome2-lite-[0-9]* gnome3-lite-[0-9]*
+CONFLICTS?= gnome3-lite-[0-9]*
RUN_DEPENDS?= gnome-panel>=3.0.0:${PORTSDIR}/x11/gnome-panel \
dconf-editor:${PORTSDIR}/devel/dconf-editor \
@@ -66,18 +66,12 @@ RUN_DEPENDS+= empathy>=3.0.0:${PORTSDIR}/net-im/empathy \
brasero>=3.0.0:${PORTSDIR}/sysutils/brasero \
accerciser>=3.0.0:${PORTSDIR}/accessibility/accerciser \
gcalctool>=3.0.0:${PORTSDIR}/math/gcalctool \
- baobab>=3.4.0:${PORTSDIR}/deskutils/baobab \
- gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary \
- gnome-font-viewer>=3.4.0:${PORTSDIR}/deskutils/gnome-font-viewer \
- gnome-screenshot>=3.4.0:${PORTSDIR}/deskutils/gnome-screenshot \
- gnome-search-tool>=3.4.0:${PORTSDIR}/deskutils/gnome-search-tool \
- gnome-system-log>=3.4.0:${PORTSDIR}/deskutils/gnome-system-log \
- gnome-system-monitor>=3.0.0:${PORTSDIR}/sysutils/gnome-system-monitor \
+ gnome-utils>=3.6.0:${PORTSDIR}/deskutils/gnome-utils \
file-roller>=3.0.0:${PORTSDIR}/archivers/file-roller \
evince>=3.0.0:${PORTSDIR}/graphics/evince \
vino>=3.0.0:${PORTSDIR}/net/vino \
vinagre>=3.0.0:${PORTSDIR}/net/vinagre \
- gnome-games>=3.0.0:${PORTSDIR}/games/gnome-games3 \
+ gnome-games>=3.0.0:${PORTSDIR}/games/gnome-games \
totem>=3.0.0:${PORTSDIR}/multimedia/totem \
gconf-editor>=3.0.0:${PORTSDIR}/sysutils/gconf-editor \
gdm>=3.0.0:${PORTSDIR}/x11/gdm \