[pkgsrc/trunk]: pkgsrc update to 2.28.1

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d28fb1aa18b5
branches:  trunk
changeset: 400577:d28fb1aa18b5
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Oct 22 17:15:35 2009 +0000

description:
update to 2.28.1
This switches to the gnome-2.28 release branch.

diffstat:

 sysutils/gnome-settings-daemon/Makefile |  12 ++++++------
 sysutils/gnome-settings-daemon/PLIST    |  21 +++++++++------------
 sysutils/gnome-settings-daemon/distinfo |   8 ++++----
 x11/gnome-desktop/Makefile              |  12 +++---------
 x11/gnome-desktop/PLIST                 |   7 ++++++-
 x11/gnome-desktop/distinfo              |  10 ++++++----
 x11/gnome-desktop/patches/patch-aa      |  31 +++++++++++++++++++++++++++++++
 x11/gnome-desktop/patches/patch-ab      |  13 +++++++++++++
 8 files changed, 78 insertions(+), 36 deletions(-)

diffs (282 lines):

diff -r 1b906771f6e3 -r d28fb1aa18b5 sysutils/gnome-settings-daemon/Makefile
--- a/sysutils/gnome-settings-daemon/Makefile   Thu Oct 22 17:09:35 2009 +0000
+++ b/sysutils/gnome-settings-daemon/Makefile   Thu Oct 22 17:15:35 2009 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:58:18 sno Exp $
+# $NetBSD: Makefile,v 1.15 2009/10/22 17:16:35 drochner Exp $
 #
 
-DISTNAME=      gnome-settings-daemon-2.26.1
-PKGREVISION=   1
+DISTNAME=      gnome-settings-daemon-2.28.1
 CATEGORIES=    sysutils
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.26/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.28/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -23,8 +22,9 @@
 GCONF_SCHEMAS+=        desktop_gnome_font_rendering.schemas
 GCONF_SCHEMAS+=        desktop_gnome_keybindings.schemas
 GCONF_SCHEMAS+=        apps_gnome_settings_daemon_keybindings.schemas
-GCONF_SCHEMAS+=        apps_gnome_settings_daemon_screensaver.schemas
 GCONF_SCHEMAS+=        apps_gnome_settings_daemon_xrandr.schemas
+GCONF_SCHEMAS+=        apps_gnome_settings_daemon_housekeeping.schemas
+GCONF_SCHEMAS+=        desktop_gnome_peripherals_touchpad.schemas
 PKGCONFIG_OVERRIDE+=   data/gnome-settings-daemon.pc.in
 
 BUILDLINK_API_DEPENDS.libxklavier+=    libxklavier>=3.3
@@ -32,7 +32,7 @@
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
-.include "../../devel/libglade/buildlink3.mk"
+#.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
diff -r 1b906771f6e3 -r d28fb1aa18b5 sysutils/gnome-settings-daemon/PLIST
--- a/sysutils/gnome-settings-daemon/PLIST      Thu Oct 22 17:09:35 2009 +0000
+++ b/sysutils/gnome-settings-daemon/PLIST      Thu Oct 22 17:15:35 2009 +0000
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/10/22 17:16:35 drochner Exp $
 include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
 include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.h
 lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/dummy.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/font.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/housekeeping.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin
@@ -12,22 +11,17 @@
 lib/gnome-settings-daemon-2.0/liba11y-keyboard.la
 lib/gnome-settings-daemon-2.0/libbackground.la
 lib/gnome-settings-daemon-2.0/libclipboard.la
-lib/gnome-settings-daemon-2.0/libdummy.la
 lib/gnome-settings-daemon-2.0/libfont.la
 lib/gnome-settings-daemon-2.0/libhousekeeping.la
 lib/gnome-settings-daemon-2.0/libkeybindings.la
 lib/gnome-settings-daemon-2.0/libkeyboard.la
-lib/gnome-settings-daemon-2.0/libmedia-keys.la
 lib/gnome-settings-daemon-2.0/libmouse.la
-lib/gnome-settings-daemon-2.0/libscreensaver.la
 lib/gnome-settings-daemon-2.0/libsound.la
 lib/gnome-settings-daemon-2.0/libtyping-break.la
 lib/gnome-settings-daemon-2.0/libxrandr.la
 lib/gnome-settings-daemon-2.0/libxrdb.la
 lib/gnome-settings-daemon-2.0/libxsettings.la
-lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/screensaver.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin
@@ -35,18 +29,19 @@
 lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin
 lib/pkgconfig/gnome-settings-daemon.pc
 libexec/gnome-settings-daemon
+libexec/gsd-locate-pointer
 share/dbus-1/services/org.gnome.SettingsDaemon.service
+share/gconf/schemas/apps_gnome_settings_daemon_housekeeping.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
-share/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_xrandr.schemas
 share/gconf/schemas/desktop_gnome_font_rendering.schemas
 share/gconf/schemas/desktop_gnome_keybindings.schemas
+share/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas
 share/gconf/schemas/gnome-settings-daemon.schemas
 share/gnome-control-center/keybindings/50-accessibility.xml
-share/gnome-settings-daemon/acme-eject.png
-share/gnome-settings-daemon/acme.glade
-share/gnome-settings-daemon/gsd-a11y-preferences-dialog.glade
-share/gnome-settings-daemon/modmap-dialog.glade
+share/gnome-settings-daemon/acme.ui
+share/gnome-settings-daemon/gsd-a11y-preferences-dialog.ui
+share/gnome-settings-daemon/modmap-dialog.ui
 share/gnome-settings-daemon/xrdb/Editres.ad
 share/gnome-settings-daemon/xrdb/Emacs.ad
 share/gnome-settings-daemon/xrdb/General.ad
@@ -73,6 +68,7 @@
 share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/da/LC_MESSAGES/gnome-settings-daemon.mo
@@ -104,6 +100,7 @@
 share/locale/ku/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/lt/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/lv/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/mai/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/mg/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/mk/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ml/LC_MESSAGES/gnome-settings-daemon.mo
diff -r 1b906771f6e3 -r d28fb1aa18b5 sysutils/gnome-settings-daemon/distinfo
--- a/sysutils/gnome-settings-daemon/distinfo   Thu Oct 22 17:09:35 2009 +0000
+++ b/sysutils/gnome-settings-daemon/distinfo   Thu Oct 22 17:15:35 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2009/04/17 18:00:52 drochner Exp $
+$NetBSD: distinfo,v 1.10 2009/10/22 17:16:35 drochner Exp $
 
-SHA1 (gnome-settings-daemon-2.26.1.tar.bz2) = 0c2cef37a0a3333c314a8205cefea9edb8f0669a
-RMD160 (gnome-settings-daemon-2.26.1.tar.bz2) = 5cca5fdcbf144d6fc950c5b5f7d5f1304168f4bd
-Size (gnome-settings-daemon-2.26.1.tar.bz2) = 1084129 bytes
+SHA1 (gnome-settings-daemon-2.28.1.tar.bz2) = 2fd672a3c85a33d49522ff0938dbd04a842ac768
+RMD160 (gnome-settings-daemon-2.28.1.tar.bz2) = f73e361e92101f5ca03f6634d1165b0b5ab686f0
+Size (gnome-settings-daemon-2.28.1.tar.bz2) = 1174173 bytes
 SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23
diff -r 1b906771f6e3 -r d28fb1aa18b5 x11/gnome-desktop/Makefile
--- a/x11/gnome-desktop/Makefile        Thu Oct 22 17:09:35 2009 +0000
+++ b/x11/gnome-desktop/Makefile        Thu Oct 22 17:15:35 2009 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.96 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: Makefile,v 1.97 2009/10/22 17:15:35 drochner Exp $
 #
 
-DISTNAME=              gnome-desktop-2.26.3
-PKGREVISION=           1
+DISTNAME=              gnome-desktop-2.28.1
 CATEGORIES=            x11 gnome
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-desktop/2.26/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-desktop/2.28/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
@@ -16,7 +15,6 @@
 GNU_CONFIGURE=         yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake intltool msgfmt perl:run pkg-config
-USE_TOOLS+=            automake autoconf aclocal autoreconf m4
 USE_LIBTOOL=           yes
 
 AUTOCONF_REQD=         2.62
@@ -25,10 +23,6 @@
 
 BUILD_DEPENDS+=                gettext-m4>=0.14.6:../../devel/gettext-m4
 
-pre-configure:
-       cd ${WRKSRC} && autoconf -f
-       cd ${WRKSRC} && autoheader -f
-
 post-install:
 .for f in netbsd-logo-icon.png netbsd-logo-icon-transparent.png
        ${INSTALL_DATA} ${FILESDIR}/${f} ${DESTDIR}${PREFIX}/share/pixmaps/${f}
diff -r 1b906771f6e3 -r d28fb1aa18b5 x11/gnome-desktop/PLIST
--- a/x11/gnome-desktop/PLIST   Thu Oct 22 17:09:35 2009 +0000
+++ b/x11/gnome-desktop/PLIST   Thu Oct 22 17:15:35 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2009/07/09 17:50:16 drochner Exp $
+@comment $NetBSD: PLIST,v 1.39 2009/10/22 17:15:35 drochner Exp $
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
 include/gnome-desktop-2.0/libgnome/gnome-desktop-utils.h
@@ -36,6 +36,7 @@
 share/gnome/help/fdl/hu/fdl.xml
 share/gnome/help/fdl/ko/fdl.xml
 share/gnome/help/fdl/oc/fdl.xml
+share/gnome/help/fdl/pl/fdl.xml
 share/gnome/help/fdl/sv/fdl.xml
 share/gnome/help/fdl/uk/fdl.xml
 share/gnome/help/fdl/vi/fdl.xml
@@ -79,6 +80,7 @@
 share/gtk-doc/html/gnome-desktop/background.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop-GnomeDesktopItem.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop-Miscellaneous-Functions.html
+share/gtk-doc/html/gnome-desktop/gnome-desktop-Miscellaneous-Thumbnail-Functions.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop-gnome-rr-config.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop-gnome-rr-crtc.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop-gnome-rr-mode.html
@@ -97,6 +99,7 @@
 share/gtk-doc/html/gnome-desktop/style.css
 share/gtk-doc/html/gnome-desktop/thumbnail.html
 share/gtk-doc/html/gnome-desktop/up.png
+share/libgnome-desktop/pnp.ids
 share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -161,6 +164,7 @@
 share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/nds/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -212,6 +216,7 @@
 share/omf/fdl/fdl-hu.omf
 share/omf/fdl/fdl-ko.omf
 share/omf/fdl/fdl-oc.omf
+share/omf/fdl/fdl-pl.omf
 share/omf/fdl/fdl-sv.omf
 share/omf/fdl/fdl-uk.omf
 share/omf/fdl/fdl-vi.omf
diff -r 1b906771f6e3 -r d28fb1aa18b5 x11/gnome-desktop/distinfo
--- a/x11/gnome-desktop/distinfo        Thu Oct 22 17:09:35 2009 +0000
+++ b/x11/gnome-desktop/distinfo        Thu Oct 22 17:15:35 2009 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.47 2009/07/09 17:50:16 drochner Exp $
+$NetBSD: distinfo,v 1.48 2009/10/22 17:15:35 drochner Exp $
 
-SHA1 (gnome-desktop-2.26.3.tar.bz2) = 5b1090354ee775392d8faf4ee667a84c9c7a9e79
-RMD160 (gnome-desktop-2.26.3.tar.bz2) = 04e0de4e9e31e2994e1a3220f2183f25ac780399
-Size (gnome-desktop-2.26.3.tar.bz2) = 3107987 bytes
+SHA1 (gnome-desktop-2.28.1.tar.bz2) = 27909d67d4f8d1116d106ef65f612cf673d6802a
+RMD160 (gnome-desktop-2.28.1.tar.bz2) = 4bcbb7e3c743e864afa1895c363427586b70be19
+Size (gnome-desktop-2.28.1.tar.bz2) = 1639948 bytes
+SHA1 (patch-aa) = ca45f4cb5c1fabdb911034d1f32a823c5d0eb8f2
+SHA1 (patch-ab) = 2d6e3f7da1c53ea1d5c3c8011c2f649e33fa7710
diff -r 1b906771f6e3 -r d28fb1aa18b5 x11/gnome-desktop/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-desktop/patches/patch-aa        Thu Oct 22 17:15:35 2009 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.5 2009/10/22 17:15:35 drochner Exp $
+
+--- libgnome-desktop/gnome-desktop-thumbnail.c.orig    2009-07-27 13:38:54.000000000 +0200
++++ libgnome-desktop/gnome-desktop-thumbnail.c
+@@ -1049,7 +1049,7 @@ gnome_desktop_thumbnail_factory_save_thu
+     }
+   close (tmp_fd);
+   
+-  g_snprintf (mtime_str, 21, "%ld",  original_mtime);
++  g_snprintf (mtime_str, 21, "%lld",  (long long)original_mtime);
+   width = gdk_pixbuf_get_option (thumbnail, "tEXt::Thumb::Image::Width");
+   height = gdk_pixbuf_get_option (thumbnail, "tEXt::Thumb::Image::Height");
+ 
+@@ -1151,7 +1151,7 @@ gnome_desktop_thumbnail_factory_create_f
+     }
+   close (tmp_fd);
+   
+-  g_snprintf (mtime_str, 21, "%ld",  mtime);
++  g_snprintf (mtime_str, 21, "%lld",  (long long)mtime);
+   pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 1, 1);
+   saved_ok  = gdk_pixbuf_save (pixbuf,
+                              tmp_path,
+@@ -1281,7 +1281,7 @@ gnome_desktop_thumbnail_is_valid (GdkPix
+   thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
+   if (!thumb_mtime_str)
+     return FALSE;
+-  thumb_mtime = atol (thumb_mtime_str);
++  thumb_mtime = atoll (thumb_mtime_str);
+   if (mtime != thumb_mtime)
+     return FALSE;
+   
diff -r 1b906771f6e3 -r d28fb1aa18b5 x11/gnome-desktop/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-desktop/patches/patch-ab        Thu Oct 22 17:15:35 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2009/10/22 17:15:35 drochner Exp $
+
+--- configure.orig     2009-10-22 16:05:04.000000000 +0200
++++ configure
+@@ -12385,7 +12385,7 @@ fi
+ 
+ GNOME_PLATFORM=2
+ GNOME_MINOR=28
+-GNOME_MICRO=0
++GNOME_MICRO=1
+ GNOME_DISTRIBUTOR="GNOME.Org"
+ GNOME_DATE=`date +"%Y-%m-%d"`
+