Update to 2.17.90

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

4 files changed, 34 insertions, 8 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index a5f20a814..b95f54fa5 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-session/Makefile,v 1.100 2007/01/10 01:32:14 ahze Exp $
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.101 2007/01/11 18:02:03 marcus Exp $
 #
 
 PORTNAME=	gnome-session
-PORTVERSION=	2.17.5
-PORTREVISION=	1
+PORTVERSION=	2.17.90
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -28,6 +27,7 @@ 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
 
+INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_XLIB=	yes
@@ -50,7 +50,7 @@ post-extract:
 	cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \
+	${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \
 		${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
 #	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
 #		${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 6e92528f5..024f0e975 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.17.5.tar.bz2) = 6fb7919586e8c60bcbde12b3404c26d7
-SHA256 (gnome2/gnome-session-2.17.5.tar.bz2) = a8e9e16d4c6bc39745ec4fbc2c2e537dc0ba9c4ca9be20f6cd0024d7816a0f5f
-SIZE (gnome2/gnome-session-2.17.5.tar.bz2) = 689728
+MD5 (gnome2/gnome-session-2.17.90.tar.bz2) = ed217f427544c6c7b058f44d964fbdd1
+SHA256 (gnome2/gnome-session-2.17.90.tar.bz2) = bd9c3dd011256e54a03f5e0dce9d0d2ff2f7c26431be679a0cfe704d92633417
+SIZE (gnome2/gnome-session-2.17.90.tar.bz2) = 671980
 MD5 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 4a098f0f2295c3333acff185d4bed5aa
 SHA256 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = c7008fc8f43cf07e3d84cbf0bd9b2846fa31aaf37d4f97993b185b4155f8ee27
 SIZE (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 1280000
diff --git a/x11/gnome-session/files/patch-data_Makefile.in b/x11/gnome-session/files/patch-data_Makefile.in
new file mode 100644
index 000000000..416354587
--- /dev/null
+++ b/x11/gnome-session/files/patch-data_Makefile.in
@@ -0,0 +1,22 @@
+--- data/Makefile.in.orig	Sun Jan 21 20:56:33 2007
++++ data/Makefile.in	Sun Jan 21 20:56:42 2007
+@@ -253,8 +253,8 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = icons
+-defaultdir = $(datadir)/gnome
+-default_DATA = default.session.in
++defaultdir = $(datadir)
++default_DATA = default.session
+ settingsdir = $(datadir)/applications
+ @SESSION_TRUE@settings_in_files = session-properties.desktop.in
+ @SESSION_TRUE@settings_DATA = $(settings_in_files:.desktop.in=.desktop)
+@@ -270,7 +270,7 @@
+ 	session-properties.desktop.in
+ 
+ CLEANFILES = default.session gnome-session.schemas session-properties.desktop
+-all: all-recursive
++all: all-recursive default.session
+ 
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 71e9b3048..4f2204671 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -5,7 +5,6 @@ bin/gnome-session-save
 bin/gnome-wm
 share/gnome/applications/session-properties.desktop
 share/gnome/default.session
-share/gnome/default.wm
 share/gnome/pixmaps/splash/MaMBaNgGaoX-2.12.png
 share/gnome/pixmaps/splash/adamw-piggy-2.12.png
 share/gnome/pixmaps/splash/adamw-trophy-2.12.png
@@ -21,6 +20,11 @@ share/gnome/pixmaps/splash/original-gnome-splash.png
 share/gnome/pixmaps/splash/tremulant-2.12.png
 share/gnome/pixmaps/splash/tremulant-blood-2.12.png
 share/gnome/pixmaps/splash/tremulant-brushed-metal-2.12.png
+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/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