Revert the hack to disable DeviceKit-power support.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13338 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 293 insertions, 0 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
new file mode 100644
index 000000000..510294a0f
--- /dev/null
+++ b/x11/gnome-session/Makefile
@@ -0,0 +1,65 @@
+# New ports collection makefile for:	gnomesession
+# Date created:				08 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.175 2009/09/22 09:18:35 kwm Exp $
+#
+
+PORTNAME=	gnome-session
+PORTVERSION=	2.28.0
+PORTREVISION=	1
+CATEGORIES=	x11 gnome
+MASTER_SITES=	GNOME \
+		http://www.marcuscom.com/downloads/:local
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${SPLASHES}:local
+DIST_SUBDIR=	gnome2
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Session component for the GNOME 2 desktop
+
+BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
+		notify.1:${PORTSDIR}/devel/libnotify \
+		execinfo:${PORTSDIR}/devel/libexecinfo \
+		devkit-power-gobject.1:${PORTSDIR}/sysutils/devicekit-power
+RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
+    		${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
+		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
+
+INSTALLS_ICONS=	yes
+USE_GETTEXT=	yes
+USE_BZIP2=	yes
+USE_XORG=	ice sm xau xrandr
+USE_GNOME=	gnomeprefix gnomehack intlhack gconf2
+GNOME_DESKTOP_VERSION=2
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-docbook-docs \
+		--enable-splash
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+MAN1=		gnome-session.1 gnome-wm.1 gnome-session-properties.1 \
+		gnome-session-save.1
+GCONF_SCHEMAS=	gnome-session.schemas
+
+SPLASHES=	freebsd-splashes-gnome-2.18_1.tar
+
+post-extract:
+	cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \
+		${PREFIX}/share/pixmaps/splash/original-gnome-splash.png
+#	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
+#		${PREFIX}/share/pixmaps/splash/gnome-splash.png
+.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png franz-splash_218.png adamw-bat-2.18.jpg adamw-conky-2.18.png adamw-cow-2.18.png adamw-mouth-2.18.png adamw-swing-2.18.png
+	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.18/${splash} \
+		${PREFIX}/share/pixmaps/splash
+.endfor
+
+.include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
new file mode 100644
index 000000000..7870703d6
--- /dev/null
+++ b/x11/gnome-session/distinfo
@@ -0,0 +1,6 @@
+MD5 (gnome2/gnome-session-2.28.0.tar.bz2) = b1a2307b02e833010d6c5312b9ff9048
+SHA256 (gnome2/gnome-session-2.28.0.tar.bz2) = 83e89a04fb090f1a1f6b609bdc39f1e69390269b885b7da6b32e980f4e765c0c
+SIZE (gnome2/gnome-session-2.28.0.tar.bz2) = 822009
+MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5
+SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508
+SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
new file mode 100644
index 000000000..48f55c540
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in
@@ -0,0 +1,10 @@
+--- gnome-session/Makefile.in.orig	2009-08-26 14:18:15.000000000 -0400
++++ gnome-session/Makefile.in	2009-08-26 14:20:10.000000000 -0400
+@@ -360,6 +360,7 @@ test_client_dbus_LDADD = \
+ 
+ gnome_session_LDADD = \
+ 	libgsmutil.la 				\
++	-lexecinfo				\
+ 	$(top_builddir)/egg/libeggdesktopfile.la \
+ 	$(SM_LIBS)				\
+ 	$(ICE_LIBS)				\
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c b/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c
new file mode 100644
index 000000000..3044f1b89
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c
@@ -0,0 +1,10 @@
+--- gnome-session/gsm-autostart-app.c.orig	2008-08-20 14:18:52.000000000 -0400
++++ gnome-session/gsm-autostart-app.c	2008-08-20 14:19:02.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <sys/wait.h>
+ #include <errno.h>
++#include <signal.h>
+ 
+ #include <glib.h>
+ #include <gio/gio.h>
diff --git a/x11/gnome-session/pkg-descr b/x11/gnome-session/pkg-descr
new file mode 100644
index 000000000..ee3e0826e
--- /dev/null
+++ b/x11/gnome-session/pkg-descr
@@ -0,0 +1,4 @@
+This provides session management for the GNOME 2 desktop, and
+provides the tools used to start the desktop.
+
+WWW: http://www.gnome.org
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
new file mode 100644
index 000000000..306533fcb
--- /dev/null
+++ b/x11/gnome-session/pkg-plist
@@ -0,0 +1,198 @@
+bin/gnome-session
+bin/gnome-session-properties
+bin/gnome-session-save
+bin/gnome-wm
+etc/xdg/autostart/gnome-session-splash.desktop
+etc/xdg/autostart/gnome-settings-daemon-helper.desktop
+lib/gnome-session/helpers/gnome-session-splash
+lib/gnome-session/helpers/gnome-settings-daemon-helper
+share/applications/session-properties.desktop
+%%DATADIR%%/gsm-inhibit-dialog.ui
+%%DATADIR%%/session-properties.ui
+share/icons/hicolor/16x16/apps/session-properties.png
+share/icons/hicolor/22x22/apps/session-properties.png
+share/icons/hicolor/24x24/apps/session-properties.png
+share/icons/hicolor/32x32/apps/session-properties.png
+share/icons/hicolor/48x48/apps/session-properties.png
+share/icons/hicolor/scalable/apps/session-properties.svg
+share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ast/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/br/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/crh/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/de/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/el/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/eo/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/es/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/et/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/gu/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ha/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/hy/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ig/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ku/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mi/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/nso/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ps/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/uz/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/yo/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
+share/pixmaps/splash/MaMBaNgGaoX-2.12.png
+share/pixmaps/splash/adamw-bat-2.18.jpg
+share/pixmaps/splash/adamw-conky-2.18.png
+share/pixmaps/splash/adamw-cow-2.18.png
+share/pixmaps/splash/adamw-mouth-2.18.png
+share/pixmaps/splash/adamw-piggy-2.12.png
+share/pixmaps/splash/adamw-swing-2.18.png
+share/pixmaps/splash/adamw-trophy-2.12.png
+share/pixmaps/splash/andreas-slogan-2.12.png
+share/pixmaps/splash/andreas-splash-2.12.png
+share/pixmaps/splash/domix-splash-2.12.png
+share/pixmaps/splash/domix-splash2-2.12.png
+share/pixmaps/splash/franz-splash_218.png
+share/pixmaps/splash/gnome-splash.png
+share/pixmaps/splash/mumija-2.12.png
+share/pixmaps/splash/mumija2-2.12.png
+share/pixmaps/splash/mumija3-2.12.png
+share/pixmaps/splash/original-gnome-splash.png
+share/pixmaps/splash/tremulant-2.12.png
+share/pixmaps/splash/tremulant-blood-2.12.png
+share/pixmaps/splash/tremulant-brushed-metal-2.12.png
+share/xsessions/gnome.desktop
+@dirrmtry share/xsessions
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrm lib/gnome-session/helpers
+@dirrm lib/gnome-session
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ig/LC_MESSAGES
+@dirrmtry share/locale/ig
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/ha/LC_MESSAGES
+@dirrmtry share/locale/ha
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as