pkg/33529: optional evolution dependency for gnome-panel

[pancake%phreaker.net@localhost]

>Number:         33529
>Category:       pkg
>Synopsis:       evolution dependency must be optional for gnome-panel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Mon May 22 14:45:00 +0000 2006
>Originator:     pancake%phreaker.net@localhost
>Release:        Linux 2.6.15bare
>Organization:
        
>Environment:
        
        
System: Linux bare 2.6.15bare #7 PREEMPT Tue Mar 14 14:34:34 CET 2006 i686 
GNU/Linux
Architecture: unknown
Machine: i686
>Description:
        I think that evolution must be an optional dependency for the 
gnome-panel
        package, because not everybody needs ldap+evolution+(etc..) to run the
        gnome desktop.

        I've been removing this dependency manually since gnome 2.8 and I think
        would be good to allow the user to choose't.
        
>How-To-Repeat:
        
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome-panel/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- Makefile    3 May 2006 11:19:23 -0000       1.73
+++ Makefile    22 May 2006 14:33:24 -0000
@@ -38,6 +38,11 @@
 BUILDLINK_API_DEPENDS.libgnome+=       libgnome>=2.13.0
 BUILDLINK_API_DEPENDS.libwnck+=        libwnck>=2.13.5
 
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gnome-panel
+PKG_SUGGESTED_OPTIONS= evolution
+PKG_SUPPORTED_OPTIONS= evolution
+
+.include "../../mk/bsd.options.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
@@ -49,7 +54,9 @@
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mevolution)
 .include "../../mail/evolution-data-server/buildlink3.mk"
+.endif
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
        

>Unformatted: