From c0374768a199da4272c27a8c7f60cec2ccab3e15 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 19 Sep 2011 07:53:15 +0000
Subject: [PATCH] MODGNOME_DESKTOP_FILE => MODXFCE_DESKTOP_FILE

discussed with and ok landry@
---
 x11/xfce4/exo/Makefile                      | 4 ++--
 x11/xfce4/mousepad/Makefile                 | 4 ++--
 x11/xfce4/notification-daemon-xfce/Makefile | 4 ++--
 x11/xfce4/orage/Makefile                    | 4 ++--
 x11/xfce4/parole/Makefile                   | 4 ++--
 x11/xfce4/ristretto/Makefile                | 4 ++--
 x11/xfce4/terminal/Makefile                 | 4 ++--
 x11/xfce4/thunar/Makefile                   | 4 ++--
 x11/xfce4/xfce-utils/Makefile               | 4 ++--
 x11/xfce4/xfce4-appfinder/Makefile          | 4 ++--
 x11/xfce4/xfce4-clipman/Makefile            | 4 ++--
 x11/xfce4/xfce4-dict/Makefile               | 4 ++--
 x11/xfce4/xfce4-mixer/Makefile              | 4 ++--
 x11/xfce4/xfce4-notes/Makefile              | 4 ++--
 x11/xfce4/xfce4-notifyd/Makefile            | 4 ++--
 x11/xfce4/xfce4-panel/Makefile              | 4 ++--
 x11/xfce4/xfce4-power-manager/Makefile      | 4 ++--
 x11/xfce4/xfce4-screenshooter/Makefile      | 4 ++--
 x11/xfce4/xfce4-session/Makefile            | 4 ++--
 x11/xfce4/xfce4-settings/Makefile           | 4 ++--
 x11/xfce4/xfce4-taskmanager/Makefile        | 4 ++--
 x11/xfce4/xfce4.port.mk                     | 4 ++--
 x11/xfce4/xfdesktop/Makefile                | 4 ++--
 x11/xfce4/xfmpc/Makefile                    | 4 ++--
 x11/xfce4/xfprint/Makefile                  | 4 ++--
 x11/xfce4/xfwm4/Makefile                    | 4 ++--
 26 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/x11/xfce4/exo/Makefile b/x11/xfce4/exo/Makefile
index b4c049e0658..5226b872246 100644
--- a/x11/xfce4/exo/Makefile
+++ b/x11/xfce4/exo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.35 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 extension library
 
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 CONFIGURE_ARGS=	--disable-python --disable-linker-opts
 CONFIGURE_ENV=	ac_cv_header_sys_ucred_h=yes \
diff --git a/x11/xfce4/mousepad/Makefile b/x11/xfce4/mousepad/Makefile
index 7d28b227362..3de28365cef 100644
--- a/x11/xfce4/mousepad/Makefile
+++ b/x11/xfce4/mousepad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 simple text editor
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 LIB_DEPENDS=	x11/xfce4/libxfcegui4
 
diff --git a/x11/xfce4/notification-daemon-xfce/Makefile b/x11/xfce4/notification-daemon-xfce/Makefile
index 96ba17b867c..903f1385053 100644
--- a/x11/xfce4/notification-daemon-xfce/Makefile
+++ b/x11/xfce4/notification-daemon-xfce/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 notification daemon
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 LIB_DEPENDS=	x11/xfce4/libxfcegui4 \
 		x11/libsexy \
diff --git a/x11/xfce4/orage/Makefile b/x11/xfce4/orage/Makefile
index be4007a0583..bf445b77304 100644
--- a/x11/xfce4/orage/Makefile
+++ b/x11/xfce4/orage/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.32 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 advanced calendar
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 LIB_DEPENDS =	x11/xfce4/xfce4-panel \
 		devel/popt \
diff --git a/x11/xfce4/parole/Makefile b/x11/xfce4/parole/Makefile
index 3378bf46399..872277a4359 100644
--- a/x11/xfce4/parole/Makefile
+++ b/x11/xfce4/parole/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT =	Xfce4 media player
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes
 
 MODULES =	x11/xfce4
-MODGNOME_DESKTOP_FILE =	Yes
+MODXFCE_DESKTOP_FILE =	Yes
 
 CONFIGURE_ARGS =	--disable-power-manager-plugin
 
diff --git a/x11/xfce4/ristretto/Makefile b/x11/xfce4/ristretto/Makefile
index 0bc10bfc6fa..dd86df680e4 100644
--- a/x11/xfce4/ristretto/Makefile
+++ b/x11/xfce4/ristretto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 lightweight image-viewer
 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 RUN_DEPENDS=	misc/shared-mime-info
 
 LIB_DEPENDS=	x11/dbus-glib \
diff --git a/x11/xfce4/terminal/Makefile b/x11/xfce4/terminal/Makefile
index d628c644382..6f7e69541e7 100644
--- a/x11/xfce4/terminal/Makefile
+++ b/x11/xfce4/terminal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.30 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 vte-based terminal
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 USE_GROFF =	Yes
 CONFIGURE_ARGS +=	--program-transform-name='s/Terminal/xfce4-terminal/' \
 			--disable-linker-opts
diff --git a/x11/xfce4/thunar/Makefile b/x11/xfce4/thunar/Makefile
index d3bb3b4e7cb..1b2d340e150 100644
--- a/x11/xfce4/thunar/Makefile
+++ b/x11/xfce4/thunar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 file manager
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 NO_REGRESS=	Yes
 
 CONFIGURE_ENV=	ac_cv_header_sys_ucred_h=yes \
diff --git a/x11/xfce4/xfce-utils/Makefile b/x11/xfce4/xfce-utils/Makefile
index ad953d473e0..2caf9deab48 100644
--- a/x11/xfce4/xfce-utils/Makefile
+++ b/x11/xfce4/xfce-utils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.38 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 essential utilities and scripts
 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 LIB_DEPENDS=	x11/xfce4/libxfce4ui>=4.8.0 \
 		x11/dbus-glib
diff --git a/x11/xfce4/xfce4-appfinder/Makefile b/x11/xfce4/xfce4-appfinder/Makefile
index 1ba8df501e2..033aee5cee7 100644
--- a/x11/xfce4/xfce4-appfinder/Makefile
+++ b/x11/xfce4/xfce4-appfinder/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 application finder
 
@@ -11,7 +11,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 CONFIGURE_ARGS= --disable-linker-opts
 LIB_DEPENDS=	x11/xfce4/garcon \
diff --git a/x11/xfce4/xfce4-clipman/Makefile b/x11/xfce4/xfce4-clipman/Makefile
index 1f9da3c98b6..31ed614cfec 100644
--- a/x11/xfce4/xfce4-clipman/Makefile
+++ b/x11/xfce4/xfce4-clipman/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.30 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 clipboard history panel plugin
 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 LIB_DEPENDS+=	x11/xfce4/xfconf \
 		x11/xfce4/libxfcegui4 \
diff --git a/x11/xfce4/xfce4-dict/Makefile b/x11/xfce4/xfce4-dict/Makefile
index 88de8b85c81..8c1b47010ce 100644
--- a/x11/xfce4/xfce4-dict/Makefile
+++ b/x11/xfce4/xfce4-dict/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 dictionary application
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 LIB_DEPENDS=	x11/xfce4/xfce4-panel \
 		x11/xfce4/libxfcegui4
diff --git a/x11/xfce4/xfce4-mixer/Makefile b/x11/xfce4/xfce4-mixer/Makefile
index aef0888097e..916c790bf89 100644
--- a/x11/xfce4/xfce4-mixer/Makefile
+++ b/x11/xfce4/xfce4-mixer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.30 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 volume mixer
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 LIB_DEPENDS=	x11/xfce4/libxfce4ui \
 		multimedia/gstreamer-0.10/core \
diff --git a/x11/xfce4/xfce4-notes/Makefile b/x11/xfce4/xfce4-notes/Makefile
index 56d6dccce42..6aafe6e9ca7 100644
--- a/x11/xfce4/xfce4-notes/Makefile
+++ b/x11/xfce4/xfce4-notes/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.33 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 sticky notes panel plugin
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE =	Yes
+MODXFCE_DESKTOP_FILE =	Yes
 
 LIB_DEPENDS +=	devel/libunique
 LIB_DEPENDS +=	x11/xfce4/libxfcegui4
diff --git a/x11/xfce4/xfce4-notifyd/Makefile b/x11/xfce4/xfce4-notifyd/Makefile
index dccfd4685a2..41664e0372a 100644
--- a/x11/xfce4/xfce4-notifyd/Makefile
+++ b/x11/xfce4/xfce4-notifyd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 alternative notification daemon
 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 LIB_DEPENDS=	x11/xfce4/libxfce4ui \
 		x11/xfce4/xfconf
diff --git a/x11/xfce4/xfce4-panel/Makefile b/x11/xfce4/xfce4-panel/Makefile
index de564752241..6acf0a8351d 100644
--- a/x11/xfce4/xfce4-panel/Makefile
+++ b/x11/xfce4/xfce4-panel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.43 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 desktop panel
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 CONFIGURE_ARGS=--disable-linker-opts
 LIB_DEPENDS=	x11/xfce4/exo>=0.6.0 \
diff --git a/x11/xfce4/xfce4-power-manager/Makefile b/x11/xfce4/xfce4-power-manager/Makefile
index e0d64d8cdb2..84b18f23ec5 100644
--- a/x11/xfce4/xfce4-power-manager/Makefile
+++ b/x11/xfce4/xfce4-power-manager/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT =	Xfce4 power manager
 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES =	x11/xfce4
-MODGNOME_DESKTOP_FILE =	Yes
+MODXFCE_DESKTOP_FILE =	Yes
 
 LIB_DEPENDS =	x11/xfce4/xfce4-panel \
 		devel/libnotify
diff --git a/x11/xfce4/xfce4-screenshooter/Makefile b/x11/xfce4/xfce4-screenshooter/Makefile
index f1055b40272..6d1f8e14f24 100644
--- a/x11/xfce4/xfce4-screenshooter/Makefile
+++ b/x11/xfce4/xfce4-screenshooter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 desktop screenshot panel plugin
 
@@ -18,7 +18,7 @@ LIB_DEPENDS=	x11/xfce4/xfce4-panel \
 		x11/xfce4/libxfcegui4 \
 		devel/libsoup
 
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 WANTLIB=	ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
 		Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
diff --git a/x11/xfce4/xfce4-session/Makefile b/x11/xfce4/xfce4-session/Makefile
index b24de7445a2..e027b943336 100644
--- a/x11/xfce4/xfce4-session/Makefile
+++ b/x11/xfce4/xfce4-session/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.51 2011/09/19 07:53:15 ajacoutot Exp $
 
 COMMENT=	Xfce4 session manager
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 CONFIGURE_ARGS=	--disable-linker-opts \
 		--disable-hal \
diff --git a/x11/xfce4/xfce4-settings/Makefile b/x11/xfce4/xfce4-settings/Makefile
index 24198f4d97c..0937fc2ba9a 100644
--- a/x11/xfce4/xfce4-settings/Makefile
+++ b/x11/xfce4/xfce4-settings/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2011/09/19 07:53:16 ajacoutot Exp $
 
 COMMENT=	Xfce4 settings helpers
 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES =	x11/xfce4
-MODGNOME_DESKTOP_FILE =	Yes
+MODXFCE_DESKTOP_FILE =	Yes
 LIB_DEPENDS=	x11/xfce4/libxfce4ui>=4.8.0 \
 		devel/libnotify \
 		x11/xfce4/exo>=0.6.0 \
diff --git a/x11/xfce4/xfce4-taskmanager/Makefile b/x11/xfce4/xfce4-taskmanager/Makefile
index 388a07f04cf..546816f5cd8 100644
--- a/x11/xfce4/xfce4-taskmanager/Makefile
+++ b/x11/xfce4/xfce4-taskmanager/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/19 07:53:16 ajacoutot Exp $
 
 COMMENT=	Xfce4 task manager and system monitor
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 LIB_DEPENDS=	x11/gtk+2 \
 		devel/libwnck
diff --git a/x11/xfce4/xfce4.port.mk b/x11/xfce4/xfce4.port.mk
index 632f4276ec5..646ad8dc00b 100644
--- a/x11/xfce4/xfce4.port.mk
+++ b/x11/xfce4/xfce4.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: xfce4.port.mk,v 1.14 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: xfce4.port.mk,v 1.15 2011/09/19 07:53:15 ajacoutot Exp $
 
 # Module for Xfce related ports, divided into five categories:
 # core, goodie, artwork, thunar plugins, panel plugins.
@@ -23,7 +23,7 @@ XFCE_VERSION=	${XFCE_DESKTOP_VERSION}
 XFCE_BRANCH=	${XFCE_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
 # Set to 'yes' if there are .desktop files in share/applications/.
-.if defined(MODGNOME_DESKTOP_FILE) && ${MODGNOME_DESKTOP_FILE:L} == "yes"
+.if defined(MODXFCE_DESKTOP_FILE) && ${MODXFCE_DESKTOP_FILE:L} == "yes"
 MODXFCE_RUN_DEPENDS+=	devel/desktop-file-utils
 .endif
 
diff --git a/x11/xfce4/xfdesktop/Makefile b/x11/xfce4/xfdesktop/Makefile
index aa09cec71bf..ece1f2c8e4d 100644
--- a/x11/xfce4/xfdesktop/Makefile
+++ b/x11/xfce4/xfdesktop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2011/09/19 07:44:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2011/09/19 07:53:16 ajacoutot Exp $
 
 COMMENT=	Xfce4 desktop manager
 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 CONFIGURE_ARGS=	--enable-thunarx \
 		--enable-exo
diff --git a/x11/xfce4/xfmpc/Makefile b/x11/xfce4/xfmpc/Makefile
index fa07d80fab6..568692f880e 100644
--- a/x11/xfce4/xfmpc/Makefile
+++ b/x11/xfce4/xfmpc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2011/09/19 07:45:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/19 07:53:16 ajacoutot Exp $
 
 COMMENT=	Xfce4 Music Player Daemon client
 
@@ -12,7 +12,7 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 MODULES=	x11/xfce4
 
 LIB_DEPENDS=	audio/libmpd \
diff --git a/x11/xfce4/xfprint/Makefile b/x11/xfce4/xfprint/Makefile
index f92b5838567..b615ee52e32 100644
--- a/x11/xfce4/xfprint/Makefile
+++ b/x11/xfce4/xfprint/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2011/09/19 07:45:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2011/09/19 07:53:16 ajacoutot Exp $
 
 COMMENT=	Xfce4 printing helper
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 CONFIGURE_ARGS=	--enable-cups \
 		--enable-bsdlpr \
diff --git a/x11/xfce4/xfwm4/Makefile b/x11/xfce4/xfwm4/Makefile
index 693943814e0..7a46c0bcb71 100644
--- a/x11/xfce4/xfwm4/Makefile
+++ b/x11/xfce4/xfwm4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2011/09/19 07:45:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.34 2011/09/19 07:53:16 ajacoutot Exp $
 
 COMMENT=	Xfce4 window manager
 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
-MODGNOME_DESKTOP_FILE=	Yes
+MODXFCE_DESKTOP_FILE=	Yes
 
 LIB_DEPENDS=	x11/xfce4/libxfce4ui>=4.8.0 \
 		devel/libwnck \