* Add support for building empathy with protocol plug-ins [1]

* Lighten up gnome2-lite considerably.  If anyone disagrees with my choices,
  please make an argument for which ports should really be part of gnome2-lite.

Discussed with:	marcuscom-devel (adamw and Pawel Worach)


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11358 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 12 insertions, 12 deletions

diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 1e3d96bda..559819842 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2/Makefile,v 1.250 2008/08/06 20:19:50 marcus Exp $
+#   $MCom: ports/x11/gnome2/Makefile,v 1.251 2008/08/15 17:45:37 marcus Exp $
 #
 
 PORTNAME=	gnome2
 PORTVERSION=	2.23.6
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -38,15 +38,12 @@ RUN_DEPENDS?=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
 		gok:${PORTSDIR}/accessibility/gok \
 		nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \
 		gcalctool:${PORTSDIR}/math/gcalctool \
-		gucharmap:${PORTSDIR}/deskutils/gucharmap \
-		zenity:${PORTSDIR}/x11/zenity \
 		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
 		${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \
 		dasher:${PORTSDIR}/accessibility/dasher \
 		evolution:${PORTSDIR}/mail/evolution \
 		${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
 		network-admin:${PORTSDIR}/sysutils/gnome-system-tools \
-		gnome-nettool:${PORTSDIR}/net/gnome-nettool \
 		vino-session:${PORTSDIR}/net/vino \
 		exchange-connector-setup-2.24:${PORTSDIR}/mail/evolution-exchange \
 		${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
@@ -54,10 +51,8 @@ RUN_DEPENDS?=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
 		totem:${PORTSDIR}/multimedia/totem \
 		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
 		${LOCALBASE}/share/gnome-background-properties/gnome-nature.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
-		sound-juicer:${PORTSDIR}/audio/sound-juicer \
 		${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \
 		evince:${PORTSDIR}/graphics/evince \
-		${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
 		alacarte:${PORTSDIR}/deskutils/alacarte \
 		gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager \
 		${LOCALBASE}/libexec/gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \
@@ -65,13 +60,8 @@ RUN_DEPENDS?=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
 		gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
 		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \
 		seahorse:${PORTSDIR}/security/seahorse \
-		swfdec-player:${PORTSDIR}/multimedia/swfdec-gnome \
 		mousetweaks:${PORTSDIR}/accessibility/mousetweaks \
-		vinagre:${PORTSDIR}/net/vinagre \
-		cheese:${PORTSDIR}/multimedia/cheese \
 		${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
-		${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet \
-		empathy:${PORTSDIR}/net-im/empathy \
 		${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme
 
 NO_BUILD=	yes
@@ -94,6 +84,16 @@ RUN_DEPENDS+=	yelp:${PORTSDIR}/x11/yelp \
 		epiphany:${PORTSDIR}/www/epiphany
 .endif
 .if ${.CURDIR:T}!="gnome2-lite"
+RUN_DEPENDS+=	empathy:${PORTSDIR}/net-im/empathy \
+		cheese:${PORTSDIR}/multimedia/cheese \
+		gucharmap:${PORTSDIR}/deskutils/gucharmap \
+		sound-juicer:${PORTSDIR}/audio/sound-juicer \
+		zenity:${PORTSDIR}/x11/zenity \
+		gnome-nettool:${PORTSDIR}/net/gnome-nettool \
+		swfdec-player:${PORTSDIR}/multimedia/swfdec-gnome \
+		vinagre:${PORTSDIR}/net/vinagre \
+		${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
+		${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet
 .if ${ARCH} == "i386"
 #RUN_DEPENDS+=	tomboy:${PORTSDIR}/deskutils/tomboy
 .endif