From ab9a8a9a5c3503e65543a38e23645e1f27e3fe3f Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Tue, 13 Jul 2010 17:11:27 +0000
Subject: Check if gnome-panel3 is installed and default to
 GNOME_DESKTOP_VERSION=3 if not default to 2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14338 df743ca5-7f9a-e211-a948-0013205c9059
---
 Mk/bsd.gnome.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Mk')

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 8d5ee6865..207e375eb 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
 #
 # $FreeBSD$
 #	$NetBSD: $
-#     $MCom: ports/Mk/bsd.gnome.mk,v 1.504 2010/07/13 15:33:58 kwm Exp $
+#     $MCom: ports/Mk/bsd.gnome.mk,v 1.505 2010/07/13 16:59:06 kwm Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -631,10 +631,10 @@ gvfs_USE_GNOME_IMPL=		glib20 gconf2
 # If the user has not defined GNOME_DESKTOP_VERSION, let's try to prevent
 # users from shooting themselves in the foot.  We will try to make an
 # intelligent choice on the user's behalf.
-.if exists(${gnomepanel_DETECT})
+.if exists(${gnomepanel3_DETECT})
+GNOME_DESKTOP_VERSION?=	3
+.elif exists(${gnomepanel_DETECT})
 GNOME_DESKTOP_VERSION?=	2
-#.elif exists(${libpanel_DETECT})
-#GNOME_DESKTOP_VERSION?=	1
 .endif
 
 # We also check each component to see if it has a desktop requirement.  If
-- 
cgit v1.2.3