Add CONFLICTS with the each others.

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

9 files changed, 221 insertions, 4 deletions

diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
new file mode 100644
index 000000000..64bca8c5c
--- /dev/null
+++ b/x11/gnome2-lite/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:	gnome2-lite
+# Date created:		30 November 2003
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/x11/gnome2-lite/Makefile,v 1.54 2010/05/10 21:18:55 kwm Exp $
+#   $MCom: ports/x11/gnome2-lite/Makefile,v 1.62 2009/11/26 20:39:06 marcus Exp $
+#
+
+PORTREVISION=	0
+CATEGORIES=	x11 gnome
+PKGNAMESUFFIX=	-lite
+
+COMMENT=	The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases
+
+RUN_DEPENDS=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \
+    		gnome-audio-profiles-properties:${PORTSDIR}/audio/gnome-media \
+	 	gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \
+		eog:${PORTSDIR}/graphics/eog \
+		gedit:${PORTSDIR}/editors/gedit \
+		gnome-terminal:${PORTSDIR}/x11/gnome-terminal \
+		gnome-session:${PORTSDIR}/x11/gnome-session \
+		gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
+		nautilus:${PORTSDIR}/x11-fm/nautilus \
+		${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
+		${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
+		${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
+		evince:${PORTSDIR}/graphics/evince \
+		gcalctool:${PORTSDIR}/math/gcalctool \
+		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
+		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
+    		gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+
+MASTERDIR=	${.CURDIR}/../gnome2
+CONFLICTS=	gnome2-[0-9]* gnome3-[0-9]* gnome3-lite-[0-9]*
+
+DESCR=		${.CURDIR}/pkg-descr
+PKGMESSAGE=	${.CURDIR}/pkg-message
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11/gnome2-lite/pkg-descr b/x11/gnome2-lite/pkg-descr
new file mode 100644
index 000000000..1c85098c1
--- /dev/null
+++ b/x11/gnome2-lite/pkg-descr
@@ -0,0 +1,15 @@
+GNU Network Object Model Environment
+
+This metaport installs the pieces of the GNOME 2 desktop that
+are needed to provide a functional desktop.  x11/gnome2
+contains the full version of the GNOME 2 desktop environment.
+
+Other popular GNOME applications can be installed from the other
+GNOME 2 metaports:
+
+    * x11/gnome2-fifth-toe
+    * x11/gnome2-power-tools
+    * editors/gnome2-office
+    * devel/gnome2-hacker-tools
+
+WWW: http://www.FreeBSD.org/gnome/
diff --git a/x11/gnome2-lite/pkg-message b/x11/gnome2-lite/pkg-message
new file mode 100644
index 000000000..0b0e5564e
--- /dev/null
+++ b/x11/gnome2-lite/pkg-message
@@ -0,0 +1,21 @@
+************************************************************
+
+The GNOME 2 desktop Lite edition has been successfully installed.
+
+The Lite edition does not include all the components of the standard
+GNOME 2 desktop as detailed at http://www.gnome.org.  If you wish to
+install the full desktop, you can remove this port, and install the
+x11/gnome2 port or package.  That can be best accomplished using
+the following commands:
+
+# pkg_delete gnome2-lite
+# cd /usr/ports/x11/gnome2
+# 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.
+
+************************************************************
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
new file mode 100644
index 000000000..15e264c22
--- /dev/null
+++ b/x11/gnome2/Makefile
@@ -0,0 +1,120 @@
+# New ports collection makefile for:	gnome2
+# Date created:		21 May 2002
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/x11/gnome2/Makefile,v 1.170 2011/02/25 01:32:12 delphij Exp $
+#   $MCom: ports/x11/gnome2/Makefile,v 1.300 2010/11/18 01:37:46 kwm Exp $
+#
+
+PORTNAME=	gnome2
+PORTVERSION=	2.32.1
+PORTREVISION?=	2
+CATEGORIES?=	x11 gnome
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT?=	The "meta-port" for the GNOME 2 integrated X11 desktop
+
+RUN_DEPENDS?=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \
+		gnome-audio-profiles-properties:${PORTSDIR}/audio/gnome-media \
+	 	gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \
+		eog:${PORTSDIR}/graphics/eog \
+		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
+		gnect:${PORTSDIR}/games/gnome-games \
+		gedit:${PORTSDIR}/editors/gedit \
+		gnome-terminal:${PORTSDIR}/x11/gnome-terminal \
+		gnome-session:${PORTSDIR}/x11/gnome-session \
+		bug-buddy:${PORTSDIR}/devel/bug-buddy \
+		gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
+		nautilus:${PORTSDIR}/x11-fm/nautilus \
+		${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm \
+		${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
+		${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
+		file-roller:${PORTSDIR}/archivers/file-roller \
+		${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
+		gok:${PORTSDIR}/accessibility/gok \
+		gcalctool:${PORTSDIR}/math/gcalctool \
+		${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 \
+		vino-passwd:${PORTSDIR}/net/vino \
+		exchange-connector-setup-2.32:${PORTSDIR}/mail/evolution-exchange \
+		${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
+		${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
+		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 \
+		evince:${PORTSDIR}/graphics/evince \
+		alacarte:${PORTSDIR}/deskutils/alacarte \
+		gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager \
+		orca:${PORTSDIR}/accessibility/orca \
+		gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
+		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \
+		seahorse-agent:${PORTSDIR}/security/seahorse-plugins \
+		mousetweaks:${PORTSDIR}/accessibility/mousetweaks \
+		${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
+		${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme
+
+CONFLICTS=	gnome2-lite-[0-9]* gnome3-[0-9]* gnome3-lite-[0-9]*
+
+NO_BUILD=	yes
+
+.if !defined(GNOME_SLAVE)
+USE_PYTHON=	yes
+.endif
+
+.if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite"
+OPTIONS=	XSCREENSAVER "Use xscreensaver as screen saver app" off \
+		MAPI "Depend on evolution-mapi (pulls in samba4)" on
+.endif
+
+do-install:	# empty
+
+.include <bsd.port.pre.mk>
+
+.if !defined(GNOME_SLAVE)
+.if ${ARCH}!="sparc64" && ${ARCH}!="ia64"
+RUN_DEPENDS+=	yelp:${PORTSDIR}/x11/yelp \
+		epiphany:${PORTSDIR}/www/epiphany
+.endif
+.if ${.CURDIR:T}!="gnome2-lite"
+RUN_DEPENDS+=	empathy:${PORTSDIR}/net-im/empathy \
+		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 \
+		brasero:${PORTSDIR}/sysutils/brasero \
+		gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \
+		${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
+		${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet \
+		${LOCALBASE}/lib/gtk-2.0/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi \
+		gpk-application:${PORTSDIR}/ports-mgmt/gnome-packagekit \
+		ekiga:${PORTSDIR}/net/ekiga3
+.if ${OSVERSION}>=800000
+RUN_DEPENDS+=	cheese:${PORTSDIR}/multimedia/cheese
+.endif
+.if ${ARCH} == "i386"
+#RUN_DEPENDS+=	tomboy:${PORTSDIR}/deskutils/tomboy
+.endif
+.if defined(WITH_MAPI)
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi
+.endif
+.endif
+.endif
+
+.if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite"
+.if defined(WITH_XSCREENSAVER)
+RUN_DEPENDS+=	${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+.else
+RUN_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
+.endif
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/gnome2/pkg-descr b/x11/gnome2/pkg-descr
new file mode 100644
index 000000000..a7051fc7b
--- /dev/null
+++ b/x11/gnome2/pkg-descr
@@ -0,0 +1,12 @@
+GNU Network Object Model Environment
+
+This metaport installs the entire GNOME 2 desktop, including
+the the most common user applications.  Other popular GNOME
+applications can be installed from the other GNOME 2 metaports:
+
+    * x11/gnome2-fifth-toe
+    * x11/gnome2-power-tools
+    * editors/gnome2-office
+    * devel/gnome2-hacker-tools
+
+WWW: http://www.FreeBSD.org/gnome/
diff --git a/x11/gnome2/pkg-message b/x11/gnome2/pkg-message
new file mode 100644
index 000000000..d8f296a70
--- /dev/null
+++ b/x11/gnome2/pkg-message
@@ -0,0 +1,8 @@
+**************************************************************************
+Congratulations!  GNOME 2 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:
+
+                       http://www.FreeBSD.org/gnome/
+
+**************************************************************************
diff --git a/x11/gnome2/pkg-plist b/x11/gnome2/pkg-plist
new file mode 100644
index 000000000..549a621fe
--- /dev/null
+++ b/x11/gnome2/pkg-plist
@@ -0,0 +1 @@
+@comment this plist intentionally left empty
diff --git a/x11/gnome3-lite/Makefile b/x11/gnome3-lite/Makefile
index 4f407b673..c8b0c4aa4 100644
--- a/x11/gnome3-lite/Makefile
+++ b/x11/gnome3-lite/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2-lite/Makefile,v 1.62 2009/11/26 20:39:06 marcus Exp $
+#   $MCom: ports/x11/gnome3-lite/Makefile,v 1.1 2011/04/01 10:59:09 kwm Exp $
 #
 
 PORTREVISION=	0
@@ -13,7 +13,7 @@ PKGNAMESUFFIX=	-lite
 COMMENT=	The "meta-port" of the GNOME desktop slimmed down for only the basics
 
 MASTERDIR=	${.CURDIR}/../gnome3
-CONFLICTS=	gnome3-[0-9]*
+CONFLICTS=	gnome2-[0-9]* gnome2-lite-[0-9]* gnome3-[0-9]*
 
 DESCR=		${.CURDIR}/pkg-descr
 PKGMESSAGE=	${.CURDIR}/pkg-message
diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 31d8d1378..415a5221a 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome3/Makefile,v 1.22 2011/04/14 06:36:53 kwm Exp $
+#   $MCom: ports/x11/gnome3/Makefile,v 1.23 2011/04/15 18:11:44 kwm Exp $
 #
 
 PORTNAME=	gnome3
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	The "meta-port" for the GNOME 3 integrated X11 desktop
 
-CONFLICTS?=	gnome3-lite-[0-9]*
+CONFLICTS?=	gnome2-[0-9]* gnome2-lite-[0-9]* gnome3-lite-[0-9]*
 
 RUN_DEPENDS?=	gnome-panel>=2.91.0:${PORTSDIR}/x11/gnome-panel3 \
 		dconf:${PORTSDIR}/devel/dconf \