summaryrefslogtreecommitdiff
path: root/x11/gnome-session
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gnome-session')
-rw-r--r--x11/gnome-session/Makefile18
-rw-r--r--x11/gnome-session/distinfo6
-rw-r--r--x11/gnome-session/files/patch-data_Makefile.in19
-rw-r--r--x11/gnome-session/files/patch-disable_debug13
-rw-r--r--x11/gnome-session/pkg-plist6
5 files changed, 44 insertions, 18 deletions
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index c8e6b86efd94..56e06481b759 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/gnome-session/Makefile,v 1.1 2007/12/01 20:11:32 marcus Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.141 2008/03/10 23:48:33 ahze Exp $
#
PORTNAME= gnome-session
-PORTVERSION= 2.20.3
+PORTVERSION= 2.22.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://www.marcuscom.com/downloads/:local
@@ -20,23 +20,23 @@ 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-control-center
+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
-RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center \
+ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
+ notify.1:${PORTSDIR}/devel/libnotify
+RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_XLIB= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop
+USE_XORG= xau xrandr
+USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- ESD_SERVER="${LOCALBASE}/bin/esd"
+ LDFLAGS="-L${LOCALBASE}/lib"
MAN1= gnome-session.1 gnome-wm.1 session-properties.1 \
gnome-session-save.1
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index b4863f6af36a..c77a3cf49892 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.20.3.tar.bz2) = f9d80e12c8fd79efa9786f617ba18bc7
-SHA256 (gnome2/gnome-session-2.20.3.tar.bz2) = eff4f7a1eb15a9a92317de9c07f9530ce1110c9ac84fc777f97a59316b9f2ee1
-SIZE (gnome2/gnome-session-2.20.3.tar.bz2) = 751906
+MD5 (gnome2/gnome-session-2.22.0.tar.bz2) = 5f9531565c5ec08104c3518c72c79f42
+SHA256 (gnome2/gnome-session-2.22.0.tar.bz2) = ae426a2f356012aea1086dca89e0551d6970c404a56e31b814a53e24eab19939
+SIZE (gnome2/gnome-session-2.22.0.tar.bz2) = 778868
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-data_Makefile.in b/x11/gnome-session/files/patch-data_Makefile.in
index 8fcdd3e2c5e7..82e1ed49f216 100644
--- a/x11/gnome-session/files/patch-data_Makefile.in
+++ b/x11/gnome-session/files/patch-data_Makefile.in
@@ -1,9 +1,18 @@
---- data/Makefile.in.orig Sun Jan 28 20:39:50 2007
-+++ data/Makefile.in Sun Jan 28 20:41:03 2007
-@@ -271,7 +271,7 @@ EXTRA_DIST = \
- session-properties.desktop.in
+--- data/Makefile.in.orig 2008-03-01 02:09:17.000000000 -0500
++++ data/Makefile.in 2008-03-01 02:10:21.000000000 -0500
+@@ -258,7 +258,7 @@ default_in_files = default.session.in
+ default_DATA = $(default_in_files:.session.in=.session)
+ xsessiondir = $(datadir)/xsessions
+ xsession_in_files = gnome.desktop.in
+-xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
++xsession_DATA = # $(xsession_in_files:.desktop.in=.desktop)
+ settingsdir = $(datadir)/applications
+ @SESSION_TRUE@settings_in_files = session-properties.desktop.in
+ @SESSION_TRUE@settings_DATA = $(settings_in_files:.desktop.in=.desktop)
+@@ -280,7 +280,7 @@ CLEANFILES = \
+ gnome.desktop \
+ session-properties.desktop
- CLEANFILES = default.session gnome-session.schemas session-properties.desktop
-all: all-recursive
+all: all-recursive default.session
diff --git a/x11/gnome-session/files/patch-disable_debug b/x11/gnome-session/files/patch-disable_debug
new file mode 100644
index 000000000000..778d72c9e67f
--- /dev/null
+++ b/x11/gnome-session/files/patch-disable_debug
@@ -0,0 +1,13 @@
+--- gnome-session/main.c.orig 2008-01-16 16:48:55.000000000 -0600
++++ gnome-session/main.c 2008-01-16 16:50:01.000000000 -0600
+@@ -626,8 +626,8 @@
+ major = atoi (versions [1]);
+ if ((major % 2) != 0)
+ {
+- g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
+- g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
++ /* g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
++ g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); */
+ }
+ }
+ g_strfreev (versions);
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index d90630fed19f..9c51b437c0e5 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -36,6 +36,7 @@ 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
@@ -116,6 +117,8 @@ 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
+@dirrmtry share/xsessions
+@dirrmtry share/applications
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -142,10 +145,11 @@ share/pixmaps/splash/tremulant-brushed-metal-2.12.png
@dirrmtry share/locale/ku
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@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/applications