for consistency, obey the "evolution" option introduced in gnome-panel,

which allows to switch off features depending on evolution (here:
an "about me" dialog which is sync'd to the address book)
no change to default configuration

2 files changed, 20 insertions, 8 deletions

diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index 9ccebcbe0d9..cf5bea72a90 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/11/29 20:42:13 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/17 16:50:45 drochner Exp $
 #
 
 DISTNAME=	gnome-control-center-2.20.1
@@ -20,7 +20,6 @@ CONFLICTS+=		gnome2-control-center-[0-9]* control-center-[0-9]*
 
 CONFIGURE_ARGS+=	--disable-alsa
 CONFIGURE_ARGS+=	--disable-hal
-CONFIGURE_ARGS+=	--enable-aboutme
 CONFIGURE_ARGS+=	--with-gstreamer=0.10
 
 CPPFLAGS+=		-DDBUS_API_SUBJECT_TO_CHANGE
@@ -54,6 +53,17 @@ BUILDLINK_API_DEPENDS.gst-plugins0.10-base=	gst-plugins0.10-base>=0.10.1.2
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.12
 BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-control-center
+PKG_SUPPORTED_OPTIONS=	evolution
+PKG_SUGGESTED_OPTIONS=	evolution
+.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Mevolution)
+CONFIGURE_ARGS+=	--enable-aboutme
+PLIST_SUBST+=		EVOLUTION=""
+.else
+PLIST_SUBST+=		EVOLUTION="@comment "
+.endif
+
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
@@ -65,7 +75,9 @@ BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mevolution)
 .include "../../mail/evolution-data-server/buildlink3.mk"
+.endif
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/x11/gnome-control-center/PLIST b/x11/gnome-control-center/PLIST
index 2c5fbe09c15..719080bd8b3 100644
--- a/x11/gnome-control-center/PLIST
+++ b/x11/gnome-control-center/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2007/11/29 20:42:13 drochner Exp $
-bin/gnome-about-me
+@comment $NetBSD: PLIST,v 1.3 2007/12/17 16:50:45 drochner Exp $
+${EVOLUTION}bin/gnome-about-me
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-appearance-properties
 bin/gnome-at-mobility
@@ -35,7 +35,7 @@ share/applications/accessibility-keyboard.desktop
 share/applications/at-properties.desktop
 share/applications/default-applications.desktop
 share/applications/display-properties.desktop
-share/applications/gnome-about-me.desktop
+${EVOLUTION}share/applications/gnome-about-me.desktop
 share/applications/gnome-appearance-properties.desktop
 share/applications/gnome-font-viewer.desktop
 share/applications/gnome-network-preferences.desktop
@@ -65,7 +65,7 @@ share/gnome-control-center/glade/acme.glade
 share/gnome-control-center/glade/appearance.glade
 share/gnome-control-center/glade/apply-font.glade
 share/gnome-control-center/glade/at-enable-dialog.glade
-share/gnome-control-center/glade/gnome-about-me.glade
+${EVOLUTION}share/gnome-control-center/glade/gnome-about-me.glade
 share/gnome-control-center/glade/gnome-accessibility-keyboard-properties.glade
 share/gnome-control-center/glade/gnome-default-applications-properties.glade
 share/gnome-control-center/glade/gnome-keybinding-properties.glade
@@ -93,8 +93,8 @@ share/gnome-control-center/pixmaps/bar.png
 share/gnome-control-center/pixmaps/double-click-maybe.png
 share/gnome-control-center/pixmaps/double-click-off.png
 share/gnome-control-center/pixmaps/double-click-on.png
-share/gnome-control-center/pixmaps/gnome-about-me-lock-open.png
-share/gnome-control-center/pixmaps/gnome-about-me-lock.png
+${EVOLUTION}share/gnome-control-center/pixmaps/gnome-about-me-lock-open.png
+${EVOLUTION}share/gnome-control-center/pixmaps/gnome-about-me-lock.png
 share/gnome-control-center/pixmaps/gtk-theme-thumbnailing.png
 share/gnome-control-center/pixmaps/icon-theme-thumbnailing.png
 share/gnome-control-center/pixmaps/keyboard-bell.png