Remove GNOME_DESKTOP_VERSION and reset the $FreeBSD$ in gdm.

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

9 files changed, 10 insertions, 18 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 10b7ef028..4c35aca00 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/archivers/file-roller/Makefile,v 1.184 2010/11/15 22:58:48 kwm Exp $
+#   $MCom: ports/archivers/file-roller/Makefile,v 1.186 2011/04/11 10:18:16 kwm Exp $
 #
 
 PORTNAME=	file-roller
@@ -31,7 +31,6 @@ INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \
 		gtk20 gconf2
-GNOME_DESKTOP_VERSION=2
 USE_XORG=	sm
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 1e5e4f54e..f9741ad19 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.158 2011/04/16 07:42:38 kwm Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.159 2011/04/30 20:43:12 mezz Exp $
 #
 
 PORTNAME=	gnome-media
@@ -29,7 +29,6 @@ INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libxml2 gconf2
 USE_GSTREAMER=	gconf good
 CONFIGURE_ARGS=	--disable-gstmix
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 12e27956a..e9ac9a00a 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/gedit/Makefile,v 1.127 2011/04/26 03:09:52 mezz Exp $
+#   $MCom: ports/editors/gedit/Makefile,v 1.128 2011/04/30 20:43:16 mezz Exp $
 #
 
 PORTNAME=	gedit
@@ -32,7 +32,6 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \
 		desktopfileutils gnomedocutils ltasneededhack
-GNOME_DESKTOP_VERSION=2
 WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index b79169ef7..36929106f 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/eog/Makefile,v 1.125 2011/04/22 16:10:56 mezz Exp $
+#   $MCom: ports/graphics/eog/Makefile,v 1.126 2011/04/30 20:43:17 mezz Exp $
 #
 
 PORTNAME=	eog
@@ -32,7 +32,6 @@ INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-GNOME_DESKTOP_VERSION=2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 575b04406..4f858f032 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 Hendrik Scholz <hendrik@scholz.net>
 #
 # $FreeBSD$
-#   $MCom: ports/multimedia/totem/Makefile,v 1.153 2011/04/25 19:23:44 mezz Exp $
+#   $MCom: ports/multimedia/totem/Makefile,v 1.154 2011/04/30 20:43:22 mezz Exp $
 #
 
 PORTNAME=	totem
@@ -32,7 +32,6 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils \
 		nautilus2 ltverhack pygtk2
-GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	core gconf hal good mpeg2dec soup ugly python gio
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index b6d4234a0..06cebf91b 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.216 2011/04/25 19:49:26 mezz Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.217 2011/04/30 20:43:26 mezz Exp $
 #
 
 PORTNAME=	gnome-control-center
@@ -28,7 +28,6 @@ CONFLICTS=	gnome-control-center-3.[0-9]*
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	good
 WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack metacity gnomemenus \
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index ff0c31fdd..3e9d3f7b8 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.208 2011/04/25 22:17:51 mezz Exp $
+#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.209 2011/04/30 20:43:31 mezz Exp $
 #
 
 PORTNAME=	nautilus
@@ -29,7 +29,6 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
 		librsvg2 desktopfileutils ltverhack gvfs ltasneededhack
-GNOME_DESKTOP_VERSION=2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 365843f78..3b6d89e8b 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -2,8 +2,8 @@
 # Date created:        20 May 2002
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/x11/gdm/Makefile,v 1.137 2011/03/29 13:40:09 kwm Exp $
-#   $MCom: ports/x11/gdm/Makefile,v 1.186 2011/06/02 11:58:24 kwm Exp $
+# $FreeBSD$
+#   $MCom: ports/x11/gdm/Makefile,v 1.187 2011/06/03 19:56:54 kwm Exp $
 #
 
 PORTNAME=	gdm
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index f9d8081c0..3ba424519 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-panel/Makefile,v 1.232 2011/04/25 21:58:24 mezz Exp $
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.233 2011/04/30 20:43:30 mezz Exp $
 #
 
 PORTNAME=	gnome-panel
@@ -34,7 +34,6 @@ INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \
 		gnomedocutils ltverhack referencehack librsvg2
 WANT_GNOME=	yes
-GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-network-manager \