Enable polkit support.

ok jasper@ robert@

x11/gnome/panel/Makefile

@@ -1,22 +1,15 @@
-# $OpenBSD: Makefile,v 1.73 2010/07/01 18:41:11 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.74 2010/07/07 16:38:27 ajacoutot Exp $
 
 COMMENT=	GNOME panel
 
 GNOME_PROJECT=	gnome-panel
 GNOME_VERSION=	2.30.2
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 
 SHARED_LIBS=	panel-applet-2       4.0      # .2.67
 
 CATEGORIES=	x11
 
-# OpenBSD does not have consolekit/policykit, so we fall back to the
-# previous behaviour, bypassing gnome-session. Only if GDM is running,
-# shutdown/restart is allowed.
-#MASTER_SITES0=	http://www.bsdfrog.org/OpenBSD/distfiles/
-#PATCHFILES=	gnome-panel-2.28.0-1.logout.patch:0
-#PATCH_DIST_STRIP= -p1
-
 # GPLv2/LGPLv2/GFDLv1.1
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -51,7 +44,8 @@ LIB_DEPENDS= 	camel-1.2,ebook-1.2,ecal-1.2,edataserver-1.2,edataserverui-1.2::da
 		gnome-menu::x11/gnome/menus \
 		gweather::x11/gnome/libgweather \
 		rsvg-2::x11/gnome/librsvg \
-		soup-gnome-2.4.>=1::devel/libsoup,-gnome
+		soup-gnome-2.4.>=1::devel/libsoup,-gnome \
+		polkit-gobject-1::sysutils/polkit
 RUN_DEPENDS=	:notification-daemon-*|notification-daemon-xfce-*|xfce4-notifyd-*:sysutils/notification-daemon
 
 MODGNOME_HELP_FILES= Yes
@@ -59,9 +53,11 @@ USE_X11=	Yes
 DESKTOP_FILES=	Yes
 MODGCONF2_SCHEMAS_DIR=	gnome-panel
 
+FAKE_FLAGS=	dbus_confdir=${PREFIX}/share/examples/gnome-panel/dbus-1/system.d
+
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-gtk-doc=no \
+		--enable-polkit \
-		--disable-polkit \
+		--disable-gtk-doc \
 		--disable-network-manager
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 		LDFLAGS="-L${LOCALBASE}/lib"

x11/gnome/panel/patches/patch-applets_clock_Makefile_in

@@ -1,17 +0,0 @@
-$OpenBSD: patch-applets_clock_Makefile_in,v 1.5 2010/06/22 18:22:57 ajacoutot Exp $
-
-Because we don't have PolicyKit-GNOME there's no point in
-installing the directory for it.
-
---- applets/clock/Makefile.in.orig	Tue Jun 22 19:29:08 2010
-+++ applets/clock/Makefile.in	Tue Jun 22 20:04:24 2010
-@@ -1557,8 +1557,7 @@ info: info-recursive
- info-am:
- 
- install-data-am: install-clock_appletlibLTLIBRARIES install-data-local \
--	install-dbus_confDATA install-dbus_servicesDATA \
--	install-polkitDATA install-schemasDATA install-serverDATA \
-+	install-schemasDATA install-serverDATA \
- 	install-uiDATA install-xmluiDATA
- 
- install-dvi: install-dvi-recursive

x11/gnome/panel/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.38 2010/06/22 18:22:57 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.39 2010/07/07 16:38:27 ajacoutot Exp $
 %%SHARED%%
 @bin bin/gnome-desktop-item-edit
 @bin bin/gnome-panel
@@ -19,11 +19,19 @@ lib/libpanel-applet-2.la
 lib/pkgconfig/libpanelapplet-2.0.pc
 @bin libexec/clock-applet
 @bin libexec/fish-applet-2
+@bin libexec/gnome-clock-applet-mechanism
 libexec/gnome-panel-add
 @bin libexec/notification-area-applet
 @bin libexec/wnck-applet
 @man man/man1/gnome-panel.1
 share/applications/gnome-panel.desktop
+share/dbus-1/system-services/
+share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
+share/examples/gnome-panel/
+share/examples/gnome-panel/dbus-1/
+share/examples/gnome-panel/dbus-1/system.d/
+share/examples/gnome-panel/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
+@sample ${SYSCONFDIR}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 share/gnome-2.0/
 share/gnome-2.0/ui/
 share/gnome-2.0/ui/GNOME_ClockApplet.xml
@@ -540,6 +548,9 @@ share/omf/fish/fish-th.omf
 share/omf/fish/fish-uk.omf
 @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
 share/omf/fish/fish-zh_CN.omf
+share/polkit-1/
+share/polkit-1/actions/
+share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
 ${SCHEMAS_INSTDIR}/
 ${SCHEMAS_INSTDIR}/clock.schemas
 ${SCHEMAS_INSTDIR}/fish.schemas