Make a bunch of net/ekiga optional. New options: dbus evolution-data-server gconf gnome notify Index: net/ekiga/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/net/ekiga/Makefile,v retrieving revision 1.45 diff -p -u -r1.45 Makefile --- net/ekiga/Makefile 28 Mar 2013 21:34:50 -0000 1.45 +++ net/ekiga/Makefile 23 Apr 2013 13:29:19 -0000 @@ -23,8 +23,6 @@ CONFIGURE_ARGS+= --enable-gstreamer .include "options.mk" -GCONF_SCHEMAS= ekiga.schemas - GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ @@ -37,25 +35,18 @@ BUILDLINK_TRANSFORM+= rm:-fno-exceptions .include "../../audio/esound/buildlink3.mk" .include "../../databases/openldap-client/buildlink3.mk" -.include "../../devel/GConf/schemas.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/libgnome/buildlink3.mk" -.include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libsigc++/buildlink3.mk" .include "../../devel/opal/buildlink3.mk" .include "../../devel/ptlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libv4l/buildlink3.mk" -.include "../../mail/evolution-data-server/buildlink3.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../security/cyrus-sasl/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/libnotify/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../mk/omf-scrollkeeper.mk" .include "../../x11/gtk2/buildlink3.mk" Index: net/ekiga/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/net/ekiga/PLIST,v retrieving revision 1.5 diff -p -u -r1.5 PLIST --- net/ekiga/PLIST 17 Nov 2009 19:50:57 -0000 1.5 +++ net/ekiga/PLIST 23 Apr 2013 13:29:19 -0000 @@ -1,12 +1,13 @@ @comment $NetBSD: PLIST,v 1.5 2009/11/17 19:50:57 wiz Exp $ bin/ekiga bin/ekiga-config-tool -bin/ekiga-helper +${PLIST.dbus}bin/ekiga-helper +${PLIST.not-gconf}etc/ekiga/ekiga.schemas man/man1/ekiga.1 share/applications/ekiga.desktop -share/dbus-1/services/org.ekiga.Ekiga.service -share/dbus-1/services/org.ekiga.Helper.service -share/gconf/schemas/ekiga.schemas +${PLIST.dbus}share/dbus-1/services/org.ekiga.Ekiga.service +${PLIST.dbus}share/dbus-1/services/org.ekiga.Helper.service +${PLIST.gconf}share/gconf/schemas/ekiga.schemas share/gnome/help/ekiga/C/ekiga.xml share/gnome/help/ekiga/C/figures/accounts_d1.png share/gnome/help/ekiga/C/figures/accounts_h323.png Index: net/ekiga/options.mk =================================================================== RCS file: /cvsroot/pkgsrc/net/ekiga/options.mk,v retrieving revision 1.1 diff -p -u -r1.1 options.mk --- net/ekiga/options.mk 22 Mar 2009 08:51:24 -0000 1.1 +++ net/ekiga/options.mk 23 Apr 2013 13:29:19 -0000 @@ -1,13 +1,56 @@ # $NetBSD: options.mk,v 1.1 2009/03/22 08:51:24 wiz Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.ekiga -PKG_SUPPORTED_OPTIONS+= avahi -PKG_SUGGESTED_OPTIONS+= avahi +PKG_OPTIONS_VAR= PKG_OPTIONS.ekiga +PKG_SUPPORTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify +#PKG_SUGGESTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify .include "../../mk/bsd.options.mk" +PLIST_VARS+= dbus gconf not-gconf + .if !empty(PKG_OPTIONS:Mavahi) .include "../../net/avahi/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-avahi .endif + +.if !empty(PKG_OPTIONS:Mdbus) +CONFIGURE_ARGS+= --enable-dbus --enable-dbus-service +PLIST.dbus= yes +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-dbus --disable-dbus-service +.endif + +.if !empty(PKG_OPTIONS:Mevolution-data-server) +CONFIGURE_ARGS+= --enable-eds +.include "../../mail/evolution-data-server/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-eds +.endif + +.if !empty(PKG_OPTIONS:Mgconf) +PLIST.gconf= yes +GCONF_SCHEMAS= ekiga.schemas +CONFIGURE_ARGS+= --enable-gconf +.include "../../devel/GConf/schemas.mk" +.else +PLIST.not-gconf= yes +CONFIGURE_ARGS+= --disable-gconf +.endif + +.if !empty(PKG_OPTIONS:Mgnome) +CONFIGURE_ARGS+= --enable-gnome +.include "../../devel/libgnome/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-gnome +.endif + +.if !empty(PKG_OPTIONS:Mnotify) +CONFIGURE_ARGS+= --enable-notify +.include "../../sysutils/libnotify/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-notify +.endif