summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2010-11-20 15:37:08 +0000
committerKoop Mast <kwm@FreeBSD.org>2010-11-20 15:37:08 +0000
commit3680f27ebff58ece429c4e032f9ad84fb1372114 (patch)
tree6c5ff4664c1a779ddad350ac887e5706dbfdd4eb /sysutils
parent- Upgrade 1.2000. (diff)
Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.32/ This will be the last release of the GNOME 2.x series, mainly a bugfix and bridge release to the first release of the GNOME 3.x series. This release features commits by avl, marcus, mezz and myself. The FreeBSD GNOME Team would like to thank the following contributors and testers for there help with this release: Zane C.B. <vvelox@vvelox.net> romain@ Olaf Seibert <O.Seibert@cs.ru.nl> DomiX Bapt <baptiste.daroussin@gmail.com> jsa@ miwi@ Sergio de Almeida Lenzi <lenzi.sergio@gmail.com> Maxim Samsonov <xors@mne.ru> Kris Moore And pav@ for 2 exp-runs PR: ports/152255 ports/143260 ports/141033 ports/149629 ports/150350 ports/151523 With hat: gnome@
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/brasero/Makefile15
-rw-r--r--sysutils/brasero/distinfo5
-rw-r--r--sysutils/brasero/files/patch-configure13
-rw-r--r--sysutils/brasero/pkg-plist37
-rw-r--r--sysutils/consolekit/Makefile5
-rw-r--r--sysutils/consolekit/distinfo6
-rw-r--r--sysutils/consolekit/files/patch-tools_Makefile.in34
-rw-r--r--sysutils/gconf-editor/Makefile5
-rw-r--r--sysutils/gconf-editor/distinfo6
-rw-r--r--sysutils/gconf-editor/pkg-plist3
-rw-r--r--sysutils/gnome-control-center/Makefile11
-rw-r--r--sysutils/gnome-control-center/distinfo5
-rw-r--r--sysutils/gnome-control-center/files/patch-configure10
-rw-r--r--sysutils/gnome-control-center/files/patch-libslab_directory-tile.c9
-rw-r--r--sysutils/gnome-control-center/pkg-plist30
-rw-r--r--sysutils/gnome-power-manager/Makefile11
-rw-r--r--sysutils/gnome-power-manager/distinfo6
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_Makefile.in47
-rw-r--r--sysutils/gnome-power-manager/pkg-plist2
-rw-r--r--sysutils/gnome-settings-daemon/Makefile8
-rw-r--r--sysutils/gnome-settings-daemon/distinfo5
-rw-r--r--sysutils/gnome-settings-daemon/pkg-plist21
-rw-r--r--sysutils/gnome-system-monitor/Makefile5
-rw-r--r--sysutils/gnome-system-monitor/distinfo6
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist1
-rw-r--r--sysutils/gnome-system-tools/Makefile9
-rw-r--r--sysutils/gnome-system-tools/distinfo6
-rw-r--r--sysutils/gnome-system-tools/files/patch-configure13
-rw-r--r--sysutils/gnome-system-tools/pkg-plist28
-rw-r--r--sysutils/pessulus/Makefile4
-rw-r--r--sysutils/pessulus/distinfo5
-rw-r--r--sysutils/pessulus/pkg-plist2
-rw-r--r--sysutils/polkit-gnome/Makefile5
-rw-r--r--sysutils/polkit-gnome/distinfo6
-rw-r--r--sysutils/polkit-gnome/pkg-plist15
-rw-r--r--sysutils/polkit/Makefile9
-rw-r--r--sysutils/polkit/distinfo6
-rw-r--r--sysutils/polkit/files/patch-src_polkitd_gposixsignal.c40
-rw-r--r--sysutils/polkit/pkg-plist7
-rw-r--r--sysutils/tracker-client/Makefile4
-rw-r--r--sysutils/upower/Makefile5
-rw-r--r--sysutils/upower/distinfo6
-rw-r--r--sysutils/upower/files/patch-libupower-glib_Makefile.in18
-rw-r--r--sysutils/upower/files/patch-src_up-daemon.c20
-rw-r--r--sysutils/upower/files/patch-src_up-polkit.c20
-rw-r--r--sysutils/upower/pkg-plist17
46 files changed, 330 insertions, 221 deletions
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 731acffa0603..43fc31288a68 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,11 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/brasero/Makefile,v 1.3 2010/06/23 15:46:07 kwm Exp $
+# $MCom: ports/sysutils/brasero/Makefile,v 1.83 2010/11/15 21:53:38 kwm Exp $
PORTNAME= brasero
-PORTVERSION= 2.30.2
-PORTREVISION= 2
+PORTVERSION= 2.32.1
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -28,20 +27,24 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_XORG= sm
USE_GNOME= intlhack gnomeprefix gnomehack gnomedocutils
+GNOME_DESKTOP_VERSION=2
USE_LDCONFIG= yes
USE_GSTREAMER= gconf core
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --disable-inotify --with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS= --disable-inotify --with-html-dir=${PREFIX}/share/doc \
+ --enable-gtk3=no --enable-introspection=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN1= brasero.1
-GCONF_SCHEMAS= brasero.schemas
+GLIB_SCHEMAS= org.gnome.brasero.gschema.xml
OPTIONS= NAUTILUS "Enable Nautilus extension" on \
LIBBURNIA "Enable libburnia plug-ins" off
+PLIST_SUB= FULL_VERSION=${PORTVERSION}
+
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_NAUTILUS)
@@ -65,5 +68,7 @@ PLIST_SUB+= LIBBURNIA="@comment "
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/libbrasero-burn/burn-process.c
+ @${REINPLACE_CMD} -e 's|" == "|" = "|g' \
+ ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index 1010f1a6855a..23e03e01f832 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/brasero-2.30.2.tar.bz2) = c1c995a01a087ad1d1062c8ed64405dd
-SHA256 (gnome2/brasero-2.30.2.tar.bz2) = 782b9c35e706fc405bc349d9cb4fab0ec6c64758bcb56a9e86c2899ca02f415b
-SIZE (gnome2/brasero-2.30.2.tar.bz2) = 4460261
+SHA256 (gnome2/brasero-2.32.1.tar.bz2) = 7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b
+SIZE (gnome2/brasero-2.32.1.tar.bz2) = 4530933
diff --git a/sysutils/brasero/files/patch-configure b/sysutils/brasero/files/patch-configure
new file mode 100644
index 000000000000..47011fb7a96f
--- /dev/null
+++ b/sysutils/brasero/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig 2010-08-18 15:30:33.000000000 +0200
++++ configure 2010-08-18 15:31:21.000000000 +0200
+@@ -11105,8 +11105,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index 679e284b08fe..3b2f6327a511 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -76,23 +76,23 @@ lib/brasero/plugins/libbrasero-vob.la
lib/brasero/plugins/libbrasero-vob.so
lib/brasero/plugins/libbrasero-wodim.la
lib/brasero/plugins/libbrasero-wodim.so
-lib/girepository-1.0/BraseroBurn-1.0.typelib
-lib/girepository-1.0/BraseroMedia-1.0.typelib
+lib/girepository-1.0/BraseroBurn-%%FULL_VERSION%%.typelib
+lib/girepository-1.0/BraseroMedia-%%FULL_VERSION%%.typelib
lib/libbrasero-burn.la
lib/libbrasero-burn.so
-lib/libbrasero-burn.so.2
+lib/libbrasero-burn.so.3
lib/libbrasero-media.la
lib/libbrasero-media.so
-lib/libbrasero-media.so.2
+lib/libbrasero-media.so.3
lib/libbrasero-utils.la
lib/libbrasero-utils.so
-lib/libbrasero-utils.so.2
+lib/libbrasero-utils.so.3
%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-brasero-extension.la
%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-brasero-extension.so
libdata/pkgconfig/libbrasero-burn.pc
libdata/pkgconfig/libbrasero-media.pc
+share/GConf/gsettings/brasero.convert
share/applications/brasero.desktop
-share/applications/brasero-copy-medium.desktop
%%NAUTILUS%%share/applications/brasero-nautilus.desktop
share/doc/libbrasero-burn/annotation-glossary.html
share/doc/libbrasero-burn/api-index-full.html
@@ -253,6 +253,7 @@ share/doc/libbrasero-media/up.png
%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-copy.png
%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-data-new.png
%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-video-new.png
+%%DATADIR%%/icons/hicolor/32x32/actions/transform-crop-and-resize.png
%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-00.png
%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-05.png
%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-10.png
@@ -305,9 +306,8 @@ share/doc/libbrasero-media/up.png
%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-85.svg
%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-90.svg
%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-95.svg
-%%DATADIR%%/logo.png
-share/gir-1.0/BraseroBurn-1.0.gir
-share/gir-1.0/BraseroMedia-1.0.gir
+share/gir-1.0/BraseroBurn-%%FULL_VERSION%%.gir
+share/gir-1.0/BraseroMedia-%%FULL_VERSION%%.gir
share/gnome/help/brasero/C/brasero.xml
share/gnome/help/brasero/C/figures/brasero_main.png
share/gnome/help/brasero/C/legal.xml
@@ -329,12 +329,16 @@ share/gnome/help/brasero/fi/brasero.xml
share/gnome/help/brasero/fi/figures/brasero_main.png
share/gnome/help/brasero/fr/brasero.xml
share/gnome/help/brasero/fr/figures/brasero_main.png
+share/gnome/help/brasero/gl/brasero.xml
+share/gnome/help/brasero/gl/figures/brasero_main.png
share/gnome/help/brasero/it/brasero.xml
share/gnome/help/brasero/it/figures/brasero_main.png
share/gnome/help/brasero/pl/brasero.xml
share/gnome/help/brasero/pl/figures/brasero_main.png
share/gnome/help/brasero/ru/brasero.xml
share/gnome/help/brasero/ru/figures/brasero_main.png
+share/gnome/help/brasero/sl/brasero.xml
+share/gnome/help/brasero/sl/figures/brasero_main.png
share/gnome/help/brasero/sv/brasero.xml
share/gnome/help/brasero/sv/figures/brasero_main.png
share/gnome/help/brasero/zh_CN/brasero.xml
@@ -367,6 +371,7 @@ share/locale/dz/LC_MESSAGES/brasero.mo
share/locale/el/LC_MESSAGES/brasero.mo
share/locale/en_GB/LC_MESSAGES/brasero.mo
share/locale/en@shaw/LC_MESSAGES/brasero.mo
+share/locale/eo/LC_MESSAGES/brasero.mo
share/locale/es/LC_MESSAGES/brasero.mo
share/locale/et/LC_MESSAGES/brasero.mo
share/locale/eu/LC_MESSAGES/brasero.mo
@@ -381,6 +386,7 @@ share/locale/hu/LC_MESSAGES/brasero.mo
share/locale/id/LC_MESSAGES/brasero.mo
share/locale/it/LC_MESSAGES/brasero.mo
share/locale/ja/LC_MESSAGES/brasero.mo
+share/locale/kk/LC_MESSAGES/brasero.mo
share/locale/kn/LC_MESSAGES/brasero.mo
share/locale/ko/LC_MESSAGES/brasero.mo
share/locale/ku/LC_MESSAGES/brasero.mo
@@ -390,6 +396,7 @@ share/locale/mai/LC_MESSAGES/brasero.mo
share/locale/mk/LC_MESSAGES/brasero.mo
share/locale/ml/LC_MESSAGES/brasero.mo
share/locale/mr/LC_MESSAGES/brasero.mo
+share/locale/ms/LC_MESSAGES/brasero.mo
share/locale/nb/LC_MESSAGES/brasero.mo
share/locale/nds/LC_MESSAGES/brasero.mo
share/locale/nl/LC_MESSAGES/brasero.mo
@@ -402,6 +409,7 @@ share/locale/pt/LC_MESSAGES/brasero.mo
share/locale/pt_BR/LC_MESSAGES/brasero.mo
share/locale/ro/LC_MESSAGES/brasero.mo
share/locale/ru/LC_MESSAGES/brasero.mo
+share/locale/sk/LC_MESSAGES/brasero.mo
share/locale/sl/LC_MESSAGES/brasero.mo
share/locale/sr/LC_MESSAGES/brasero.mo
share/locale/sr@latin/LC_MESSAGES/brasero.mo
@@ -410,6 +418,7 @@ share/locale/ta/LC_MESSAGES/brasero.mo
share/locale/te/LC_MESSAGES/brasero.mo
share/locale/th/LC_MESSAGES/brasero.mo
share/locale/tr/LC_MESSAGES/brasero.mo
+share/locale/ug/LC_MESSAGES/brasero.mo
share/locale/uk/LC_MESSAGES/brasero.mo
share/locale/vi/LC_MESSAGES/brasero.mo
share/locale/zh_CN/LC_MESSAGES/brasero.mo
@@ -426,9 +435,11 @@ share/omf/brasero/brasero-en_GB.omf
share/omf/brasero/brasero-es.omf
share/omf/brasero/brasero-fi.omf
share/omf/brasero/brasero-fr.omf
+share/omf/brasero/brasero-gl.omf
share/omf/brasero/brasero-it.omf
share/omf/brasero/brasero-pl.omf
share/omf/brasero/brasero-ru.omf
+share/omf/brasero/brasero-sl.omf
share/omf/brasero/brasero-sv.omf
share/omf/brasero/brasero-zh_CN.omf
share/omf/brasero/brasero-zh_HK.omf
@@ -442,12 +453,16 @@ share/omf/brasero/brasero-zh_TW.omf
@dirrm share/gnome/help/brasero/zh_CN
@dirrm share/gnome/help/brasero/sv/figures
@dirrm share/gnome/help/brasero/sv
+@dirrm share/gnome/help/brasero/sl/figures
+@dirrm share/gnome/help/brasero/sl
@dirrm share/gnome/help/brasero/ru/figures
@dirrm share/gnome/help/brasero/ru
@dirrm share/gnome/help/brasero/pl/figures
@dirrm share/gnome/help/brasero/pl
@dirrm share/gnome/help/brasero/it/figures
@dirrm share/gnome/help/brasero/it
+@dirrm share/gnome/help/brasero/gl/figures
+@dirrm share/gnome/help/brasero/gl
@dirrm share/gnome/help/brasero/fr/figures
@dirrm share/gnome/help/brasero/fr
@dirrm share/gnome/help/brasero/fi/figures
@@ -495,6 +510,8 @@ share/omf/brasero/brasero-zh_TW.omf
@dirrm lib/brasero/plugins
@dirrm lib/brasero
@dirrm include/brasero
+@dirrmtry share/GConf/gsettings
+@dirrmtry share/GConf
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -515,6 +532,8 @@ share/omf/brasero/brasero-zh_TW.omf
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 4fa1497a32e1..75a64bc3d9bb 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -3,11 +3,10 @@
# Whom: Florent Thoumie <flz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/consolekit/Makefile,v 1.23 2009/09/26 12:32:45 kwm Exp $
+# $MCom: ports/sysutils/consolekit/Makefile,v 1.25 2010/10/23 10:12:30 kwm Exp $
PORTNAME= consolekit
-PORTVERSION= 0.4.1
-PORTREVISION= 4
+PORTVERSION= 0.4.2
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/
DISTFILES= ConsoleKit-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo
index 0dbdd04a2b42..54e666b605cc 100644
--- a/sysutils/consolekit/distinfo
+++ b/sysutils/consolekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (ConsoleKit-0.4.1.tar.bz2) = 48eda4483cc97841d5f88e8e003eb6d7
-SHA256 (ConsoleKit-0.4.1.tar.bz2) = f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e
-SIZE (ConsoleKit-0.4.1.tar.bz2) = 398080
+MD5 (ConsoleKit-0.4.2.tar.bz2) = 285acb35bfcb2b8dc21c6071e6f6e116
+SHA256 (ConsoleKit-0.4.2.tar.bz2) = 656f406c9c436bd105c34d87e824cb2fbae09fa672b93894059281124480fe15
+SIZE (ConsoleKit-0.4.2.tar.bz2) = 412651
diff --git a/sysutils/consolekit/files/patch-tools_Makefile.in b/sysutils/consolekit/files/patch-tools_Makefile.in
index b818fd9319d0..ed58bbb7ad6d 100644
--- a/sysutils/consolekit/files/patch-tools_Makefile.in
+++ b/sysutils/consolekit/files/patch-tools_Makefile.in
@@ -1,8 +1,8 @@
---- tools/Makefile.in.orig 2008-01-31 16:09:08.000000000 -0500
-+++ tools/Makefile.in 2008-01-31 16:10:21.000000000 -0500
-@@ -39,8 +39,7 @@ bin_PROGRAMS = ck-list-sessions$(EXEEXT)
+--- tools/Makefile.in.orig 2010-10-23 11:29:43.000000000 +0200
++++ tools/Makefile.in 2010-10-23 11:32:41.000000000 +0200
+@@ -43,8 +43,7 @@ sbin_PROGRAMS = ck-log-system-start$(EXE
+ ck-log-system-restart$(EXEEXT) ck-log-system-stop$(EXEEXT) \
$(am__EXEEXT_1)
- sbin_PROGRAMS = ck-log-system-start$(EXEEXT) $(am__EXEEXT_1)
libexec_PROGRAMS = ck-collect-session-info$(EXEEXT) \
- ck-get-x11-server-pid$(EXEEXT) \
- ck-get-x11-display-device$(EXEEXT) $(am__EXEEXT_1)
@@ -10,10 +10,10 @@
subdir = tools
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -66,17 +65,6 @@ ck_collect_session_info_OBJECTS = \
- am__DEPENDENCIES_1 =
- ck_collect_session_info_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/src/libck.la $(am__DEPENDENCIES_1)
+@@ -71,17 +70,6 @@ ck_collect_session_info_DEPENDENCIES = $
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ am__v_lt_0 = --silent
-am_ck_get_x11_display_device_OBJECTS = \
- ck-get-x11-display-device.$(OBJEXT) $(am__objects_1)
-ck_get_x11_display_device_OBJECTS = \
@@ -28,7 +28,7 @@
am_ck_history_OBJECTS = ck-history.$(OBJEXT) $(am__objects_1)
ck_history_OBJECTS = $(am_ck_history_OBJECTS)
ck_history_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@@ -335,24 +323,6 @@ ck_collect_session_info_LDADD = \
+@@ -441,24 +429,6 @@ ck_collect_session_info_LDADD = \
$(top_builddir)/src/libck.la \
$(NULL)
@@ -53,25 +53,25 @@
EXTRA_DIST = \
$(NULL)
-@@ -480,12 +450,6 @@ clean-sbinPROGRAMS:
+@@ -632,12 +602,6 @@ clean-sbinPROGRAMS:
ck-collect-session-info$(EXEEXT): $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_DEPENDENCIES)
@rm -f ck-collect-session-info$(EXEEXT)
- $(LINK) $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_LDADD) $(LIBS)
-ck-get-x11-display-device$(EXEEXT): $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_DEPENDENCIES)
- @rm -f ck-get-x11-display-device$(EXEEXT)
-- $(LINK) $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_LDADD) $(LIBS)
+- $(AM_V_CCLD)$(LINK) $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_LDADD) $(LIBS)
-ck-get-x11-server-pid$(EXEEXT): $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_DEPENDENCIES)
- @rm -f ck-get-x11-server-pid$(EXEEXT)
-- $(LINK) $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_LDADD) $(LIBS)
+- $(AM_V_CCLD)$(LINK) $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_LDADD) $(LIBS)
ck-history$(EXEEXT): $(ck_history_OBJECTS) $(ck_history_DEPENDENCIES)
@rm -f ck-history$(EXEEXT)
- $(LINK) $(ck_history_OBJECTS) $(ck_history_LDADD) $(LIBS)
-@@ -503,8 +467,6 @@ distclean-compile:
+ $(AM_V_CCLD)$(LINK) $(ck_history_OBJECTS) $(ck_history_LDADD) $(LIBS)
+@@ -664,8 +628,6 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-collect-session-info.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-display-device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-server-pid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-history.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-start.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list-sessions.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-launch-session.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-restart.Po@am__quote@
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index a3a6cc8e3eb7..72a94f513e61 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.82 2010/04/01 15:48:36 kwm Exp $
+# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.85 2010/09/27 18:22:59 kwm Exp $
#
PORTNAME= gconf-editor
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.32.0
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index 5e4a61561202..04ade80dacac 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconf-editor-2.30.0.tar.bz2) = 2a941e3c64843be69190f38891470580
-SHA256 (gnome2/gconf-editor-2.30.0.tar.bz2) = 955d8eb6ff39f72002a7cfb0bed5e4b6eaad45410441e4a5a767767ec6db26d4
-SIZE (gnome2/gconf-editor-2.30.0.tar.bz2) = 1389176
+MD5 (gnome2/gconf-editor-2.32.0.tar.bz2) = 14e413e88380b0d7a463c2beea3bac2e
+SHA256 (gnome2/gconf-editor-2.32.0.tar.bz2) = c6d1d35ce5d136121ad76efe1c4033425bb2ad3800e711bd1bca9ce869c12a1f
+SIZE (gnome2/gconf-editor-2.32.0.tar.bz2) = 1397117
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 056eace55b96..9ae9658a2738 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -178,6 +178,7 @@ share/locale/id/LC_MESSAGES/gconf-editor.mo
share/locale/it/LC_MESSAGES/gconf-editor.mo
share/locale/ja/LC_MESSAGES/gconf-editor.mo
share/locale/ka/LC_MESSAGES/gconf-editor.mo
+share/locale/kk/LC_MESSAGES/gconf-editor.mo
share/locale/kn/LC_MESSAGES/gconf-editor.mo
share/locale/ko/LC_MESSAGES/gconf-editor.mo
share/locale/ku/LC_MESSAGES/gconf-editor.mo
@@ -305,6 +306,8 @@ share/omf/gconf-editor/gconf-editor-zh_CN.omf
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index dacbbc0ee6ae..8d13d34e7144 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.207 2010/04/28 08:26:27 kwm Exp $
+# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.214 2010/11/18 11:46:09 kwm Exp $
#
PORTNAME= gnome-control-center
-PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTVERSION= 2.32.1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,6 +16,8 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Control center for GNOME 2 project
LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
@@ -29,7 +30,7 @@ GNOME_DESKTOP_VERSION=2
USE_GSTREAMER= good
WANT_GNOME= yes
USE_GNOME= gnomeprefix gnomehack intlhack metacity gnomemenus \
- desktopfileutils libgnomekbd gnomedesktop librsvg2
+ desktopfileutils libgnomekbd gnomedesktop librsvg2 gconf2
USE_XORG= xscrnsaver
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
@@ -60,6 +61,8 @@ PLIST_SUB+= ABOUTME="@comment "
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/capplets/common/gnome-theme-info.c
+ @${REINPLACE_CMD} -e 's|/usr/sbin|${PREFIX}/sbin|g' \
+ ${WRKSRC}/capplets/display/org.gnome.randr.policy.in
post-install:
@-update-desktop-database
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 7a5ae7dcc490..2173acb5cf86 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-control-center-2.30.1.tar.bz2) = 9608eae5605cfc478ba35b683bf129c1
-SHA256 (gnome2/gnome-control-center-2.30.1.tar.bz2) = db050803a4bf3a2297255b8fff4810f2125a5b001d3fd785ee1ecd7f2c6f593b
-SIZE (gnome2/gnome-control-center-2.30.1.tar.bz2) = 2830194
+SHA256 (gnome2/gnome-control-center-2.32.1.tar.bz2) = 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66
+SIZE (gnome2/gnome-control-center-2.32.1.tar.bz2) = 2280217
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
deleted file mode 100644
index 31566627790d..000000000000
--- a/sysutils/gnome-control-center/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Tue Feb 13 07:51:47 2007
-+++ configure Tue Feb 13 07:51:47 2007
-@@ -12525,6 +12525,7 @@
- if test "${gt_cv_func_ngettext_libc+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-+ LIBS="-lintl $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
diff --git a/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c b/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
deleted file mode 100644
index 86acdbe0c46e..000000000000
--- a/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- libslab/directory-tile.c.orig Mon Mar 12 16:33:35 2007
-+++ libslab/directory-tile.c Mon Mar 12 16:35:48 2007
-@@ -644,5 +644,5 @@ static void
- disown_spawned_child (gpointer user_data)
- {
- setsid ();
-- setpgrp ();
-+ setpgrp (0, 0);
- }
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 54023d50b185..65d4d00b5e4f 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -28,10 +28,11 @@ lib/window-manager-settings/libmetacity.so
libdata/pkgconfig/gnome-default-applications.pc
libdata/pkgconfig/gnome-keybindings.pc
libdata/pkgconfig/gnome-window-settings-2.0.pc
+sbin/gnome-display-properties-install-systemwide
+%%ABOUTME%%share/applications/gnome-about-me.desktop
share/applications/at-properties.desktop
share/applications/default-applications.desktop
share/applications/display-properties.desktop
-%%ABOUTME%%share/applications/gnome-about-me.desktop
share/applications/gnome-appearance-properties.desktop
share/applications/gnome-font-viewer.desktop
share/applications/gnome-network-properties.desktop
@@ -54,8 +55,6 @@ share/desktop-directories/gnomecc.directory
%%DATADIR%%/pixmaps/double-click-maybe.png
%%DATADIR%%/pixmaps/double-click-off.png
%%DATADIR%%/pixmaps/double-click-on.png
-%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock-open.png
-%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png
%%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png
%%DATADIR%%/pixmaps/icon-theme-thumbnailing.png
%%ABOUTME%%%%DATADIR%%/pixmaps/left-index-finger.png
@@ -134,6 +133,7 @@ share/gnome/help/control-center/el/control-center.xml
share/gnome/help/control-center/en_GB/control-center.xml
share/gnome/help/control-center/es/control-center.xml
share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/id/control-center.xml
share/gnome/help/control-center/it/control-center.xml
share/gnome/help/control-center/ja/control-center.xml
share/gnome/help/control-center/oc/control-center.xml
@@ -147,23 +147,23 @@ share/gnome/help/control-center/th/control-center.xml
share/gnome/help/control-center/uk/control-center.xml
share/gnome/help/control-center/vi/control-center.xml
share/gnome/help/control-center/zh_CN/control-center.xml
-share/icons/hicolor/16x16/apps/gnome-display-properties.png
share/icons/hicolor/16x16/apps/gnome-network-properties.png
share/icons/hicolor/16x16/apps/gnome-settings-default-applications.png
-share/icons/hicolor/22x22/apps/gnome-display-properties.png
+share/icons/hicolor/16x16/apps/preferences-desktop-display.png
share/icons/hicolor/22x22/apps/gnome-network-properties.png
share/icons/hicolor/22x22/apps/gnome-settings-default-applications.png
-share/icons/hicolor/24x24/apps/gnome-display-properties.png
+share/icons/hicolor/22x22/apps/preferences-desktop-display.png
share/icons/hicolor/24x24/apps/gnome-network-properties.png
share/icons/hicolor/24x24/apps/gnome-settings-default-applications.png
-share/icons/hicolor/32x32/apps/gnome-display-properties.png
+share/icons/hicolor/24x24/apps/preferences-desktop-display.png
share/icons/hicolor/32x32/apps/gnome-network-properties.png
share/icons/hicolor/32x32/apps/gnome-settings-default-applications.png
+share/icons/hicolor/32x32/apps/preferences-desktop-display.png
share/icons/hicolor/48x48/apps/gnome-network-properties.png
share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png
share/icons/hicolor/48x48/apps/typing-monitor.png
-share/icons/hicolor/scalable/apps/gnome-display-properties.svg
share/icons/hicolor/scalable/apps/gnome-network-properties.svg
+share/icons/hicolor/scalable/apps/preferences-desktop-display.svg
share/icons/hicolor/scalable/apps/typing-monitor.svg
share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -203,11 +203,13 @@ share/locale/he/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/hr/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hy/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/id/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/kk/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -246,6 +248,7 @@ share/locale/ta/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/uz/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/uz@cyrillic/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -267,6 +270,7 @@ share/omf/control-center/control-center-el.omf
share/omf/control-center/control-center-en_GB.omf
share/omf/control-center/control-center-es.omf
share/omf/control-center/control-center-fr.omf
+share/omf/control-center/control-center-id.omf
share/omf/control-center/control-center-it.omf
share/omf/control-center/control-center-ja.omf
share/omf/control-center/control-center-oc.omf
@@ -280,6 +284,7 @@ share/omf/control-center/control-center-th.omf
share/omf/control-center/control-center-uk.omf
share/omf/control-center/control-center-vi.omf
share/omf/control-center/control-center-zh_CN.omf
+share/polkit-1/actions/org.gnome.randr.policy
@dirrm share/omf/control-center
@dirrm share/gnome/help/control-center/zh_CN
@dirrm share/gnome/help/control-center/vi
@@ -294,6 +299,7 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrm share/gnome/help/control-center/oc
@dirrm share/gnome/help/control-center/ja
@dirrm share/gnome/help/control-center/it
+@dirrm share/gnome/help/control-center/id
@dirrm share/gnome/help/control-center/fr
@dirrm share/gnome/help/control-center/es
@dirrm share/gnome/help/control-center/en_GB
@@ -314,6 +320,8 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrm include/gnome-window-settings-2.0
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@comment not sure about this ..
+@unexec rm -f %D/share/applications/mimeinfo.cache > /dev/null || /usr/bin/true
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/zu/LC_MESSAGES
@@ -324,6 +332,8 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrmtry share/locale/xh
@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -346,6 +356,10 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 5c4b8623ae54..3245f23db47d 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.63 2010/04/26 17:38:05 kwm Exp $
+# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.69 2010/09/27 18:49:22 kwm Exp $
#
PORTNAME= gnome-power-manager
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.32.0
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,12 +15,12 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Power management system for the GNOME Desktop
-LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
- devkit-power-gobject.1:${PORTSDIR}/sysutils/upower \
+LIB_DEPENDS= upower-glib.1:${PORTSDIR}/sysutils/upower \
canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
notify.1:${PORTSDIR}/devel/libnotify \
execinfo:${PORTSDIR}/devel/libexecinfo \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+RUN_DEPENDS= pkexec:${PORTSDIR}/sysutils/polkit
USE_GETTEXT= yes
USE_BZIP2= yes
@@ -29,7 +28,7 @@ USE_GMAKE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool:22
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libwnck \
+USE_GNOME= gnomeprefix gnomehack intlhack libwnck \
gnomedocutils gnomepanel
CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \
--disable-docbook-docs \
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
index 644f6020406d..5ba031ccfdf1 100644
--- a/sysutils/gnome-power-manager/distinfo
+++ b/sysutils/gnome-power-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-power-manager-2.30.1.tar.bz2) = b85178b8db77db5d22e185430549a295
-SHA256 (gnome2/gnome-power-manager-2.30.1.tar.bz2) = 47af6221ae83d329088abd8f5176f503fe5f81417a7c6766c95279b0af05021c
-SIZE (gnome2/gnome-power-manager-2.30.1.tar.bz2) = 3854167
+MD5 (gnome2/gnome-power-manager-2.32.0.tar.bz2) = 9a08e85dce3ffb90775f15e3bda4adda
+SHA256 (gnome2/gnome-power-manager-2.32.0.tar.bz2) = 17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476
+SIZE (gnome2/gnome-power-manager-2.32.0.tar.bz2) = 3892164
diff --git a/sysutils/gnome-power-manager/files/patch-src_Makefile.in b/sysutils/gnome-power-manager/files/patch-src_Makefile.in
index a161ee0fabad..0f4da29db278 100644
--- a/sysutils/gnome-power-manager/files/patch-src_Makefile.in
+++ b/sysutils/gnome-power-manager/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig 2010-03-30 18:08:05.000000000 +0800
-+++ src/Makefile.in 2010-03-30 18:09:04.000000000 +0800
-@@ -497,6 +497,7 @@
+--- src/Makefile.in.orig 2010-06-06 12:19:04.000000000 +0200
++++ src/Makefile.in 2010-06-06 12:21:46.000000000 +0200
+@@ -499,6 +499,7 @@
$(GNOME_LIBS) \
$(UNIQUE_LIBS) \
$(DBUS_LIBS) \
@@ -8,30 +8,27 @@
-lm
gnome_power_statistics_CFLAGS = \
-@@ -511,7 +512,7 @@
+@@ -520,6 +521,7 @@
+ $(UNIQUE_LIBS) \
+ $(GPM_EXTRA_LIBS) \
+ $(UPOWER_LIBS) \
++ -lexecinfo \
+ -lm
- gnome_power_preferences_LDADD = libgpmshared.a $(GLIB_LIBS) \
- $(X11_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(UNIQUE_LIBS) \
-- $(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lm $(am__append_1)
-+ $(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lexecinfo -lm $(am__append_1)
gnome_power_preferences_CFLAGS = \
- $(WARNINGFLAGS) \
- $(NULL)
-@@ -531,7 +532,7 @@
- gnome_power_manager_LDADD = libgpmshared.a $(GLIB_LIBS) $(X11_LIBS) \
- $(GSTREAMER_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(X11_LIBS) \
- $(CANBERRA_LIBS) $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) \
-- $(DEVKIT_LIBS) -lm $(am__append_3)
-+ $(DEVKIT_LIBS) -lexecinfo -lm $(am__append_3)
+@@ -573,6 +575,7 @@
+ $(LIBNOTIFY_LIBS) \
+ $(GPM_EXTRA_LIBS) \
+ $(UPOWER_LIBS) \
++ -lexecinfo \
+ -lm
+
gnome_power_manager_CFLAGS = \
- $(WARNINGFLAGS) \
- $(NULL)
-@@ -590,7 +591,7 @@
+@@ -639,6 +642,7 @@
+ $(X11_LIBS) \
+ $(LIBNOTIFY_LIBS) \
+ $(GPM_EXTRA_LIBS) \
++ -lexecinfo \
+ -lm
- gnome_power_self_test_LDADD = $(GLIB_LIBS) $(X11_LIBS) $(GNOME_LIBS) \
- $(GSTREAMER_LIBS) $(DEVKIT_LIBS) $(DBUS_LIBS) $(X11_LIBS) \
-- $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lm $(am__append_4)
-+ $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lexecinfo -lm $(am__append_4)
gnome_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS)
- BUILT_SOURCES = \
- org.gnome.PowerManager.h \
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
index 47e2c200a9c6..4bd92ff7ec09 100644
--- a/sysutils/gnome-power-manager/pkg-plist
+++ b/sysutils/gnome-power-manager/pkg-plist
@@ -7,6 +7,7 @@ libdata/bonobo/servers/GNOME_BrightnessApplet.server
libdata/bonobo/servers/GNOME_InhibitApplet.server
libexec/gnome-brightness-applet
libexec/gnome-inhibit-applet
+sbin/gnome-power-backlight-helper
share/applications/gnome-power-preferences.desktop
share/applications/gnome-power-statistics.desktop
share/dbus-1/services/gnome-power-manager.service
@@ -690,6 +691,7 @@ share/omf/gnome-power-manager/gnome-power-manager-pa.omf
share/omf/gnome-power-manager/gnome-power-manager-ru.omf
share/omf/gnome-power-manager/gnome-power-manager-sv.omf
share/omf/gnome-power-manager/gnome-power-manager-zh_CN.omf
+share/polkit-1/actions/org.gnome.power.policy
@dirrm share/omf/gnome-power-manager
@dirrm share/gnome/help/gnome-power-manager/zh_CN/figures
@dirrm share/gnome/help/gnome-power-manager/zh_CN
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 1530144d6baf..126aa92f9bbc 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/gnome-settings-daemon/Makefile,v 1.4 2010/06/23 20:44:39 kwm Exp $
+# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.72 2010/11/15 13:50:07 kwm Exp $
#
PORTNAME= gnome-settings-daemon
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +16,8 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 settings daemon
LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
- notify.1:${PORTSDIR}/devel/libnotify
+ notify.1:${PORTSDIR}/devel/libnotify \
+ nss3.1:${PORTSDIR}/security/nss
RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb
USE_XORG= xxf86misc
@@ -38,6 +39,7 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_housekeeping.schemas \
apps_gnome_settings_daemon_xrandr.schemas \
desktop_gnome_font_rendering.schemas \
desktop_gnome_keybindings.schemas \
+ desktop_gnome_peripherals_smartcard.schemas \
desktop_gnome_peripherals_touchpad.schemas \
gnome-settings-daemon.schemas
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 145591482cab..4720b385e071 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-settings-daemon-2.30.2.tar.bz2) = b945b1f542167c201a11f0ba1e1a4739
-SHA256 (gnome2/gnome-settings-daemon-2.30.2.tar.bz2) = 7cd22dab52f52900ee13a5bc0c1a186e91d33e77f5333c4622f84d85e4eb71f4
-SIZE (gnome2/gnome-settings-daemon-2.30.2.tar.bz2) = 1250365
+SHA256 (gnome2/gnome-settings-daemon-2.32.1.tar.bz2) = 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
+SIZE (gnome2/gnome-settings-daemon-2.32.1.tar.bz2) = 1331850
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index 144568d8cabe..054cf6ea336c 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -1,3 +1,4 @@
+etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
etc/xdg/autostart/gnome-settings-daemon.desktop
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
@@ -35,6 +36,9 @@ lib/gnome-settings-daemon-2.0/libkeyboard.so
lib/gnome-settings-daemon-2.0/libmouse.a
lib/gnome-settings-daemon-2.0/libmouse.la
lib/gnome-settings-daemon-2.0/libmouse.so
+lib/gnome-settings-daemon-2.0/libsmartcard.a
+lib/gnome-settings-daemon-2.0/libsmartcard.la
+lib/gnome-settings-daemon-2.0/libsmartcard.so
lib/gnome-settings-daemon-2.0/libsound.a
lib/gnome-settings-daemon-2.0/libsound.la
lib/gnome-settings-daemon-2.0/libsound.so
@@ -52,6 +56,7 @@ lib/gnome-settings-daemon-2.0/libxsettings.la
lib/gnome-settings-daemon-2.0/libxsettings.so
%%PULSEAUDIO%%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/smartcard.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
@@ -59,13 +64,20 @@ lib/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin
libdata/pkgconfig/gnome-settings-daemon.pc
libexec/gnome-settings-daemon
+libexec/gsd-datetime-mechanism
libexec/gsd-locate-pointer
share/dbus-1/services/org.gnome.SettingsDaemon.service
+share/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
share/gnome-control-center/keybindings/50-accessibility.xml
%%DATADIR%%/acme.ui
%%DATADIR%%/gsd-a11y-preferences-dialog.ui
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-off.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-on.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-off.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-on.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
%%DATADIR%%/modmap-dialog.ui
-%%DATADIR%%/show-layout.ui
%%DATADIR%%/xrdb/Editres.ad
%%DATADIR%%/xrdb/Emacs.ad
%%DATADIR%%/xrdb/General.ad
@@ -176,11 +188,18 @@ share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
+share/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
@dirrm %%DATADIR%%/xrdb
+@dirrm %%DATADIR%%/icons/hicolor/64x64/devices
+@dirrm %%DATADIR%%/icons/hicolor/64x64
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
@dirrm lib/gnome-settings-daemon-2.0
@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
@dirrm include/gnome-settings-daemon-2.0
+@dirrmtry etc/gnome-settings-daemon/xrandr
+@dirrmtry etc/gnome-settings-daemon
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 81d031828791..db9bc9a3ecc4 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.139 2010/04/01 13:05:19 kwm Exp $
+# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.141 2010/09/29 13:44:33 kwm Exp $
#
PORTNAME= gnome-system-monitor
-PORTVERSION= 2.28.1
-PORTREVISION= 1
+PORTVERSION= 2.28.2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 925fc1787965..5dbc7e84ca10 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 064cf1a97d3dd1946bc3e55d8272c2c8
-SHA256 (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 25b2566af336c44dc279afd7a522e3616b68047f1a1a34c8a5024a52f894429b
-SIZE (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 2335360
+MD5 (gnome2/gnome-system-monitor-2.28.2.tar.bz2) = 3f0bca9b0ebc7a365466851cd580d167
+SHA256 (gnome2/gnome-system-monitor-2.28.2.tar.bz2) = b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59
+SIZE (gnome2/gnome-system-monitor-2.28.2.tar.bz2) = 2432252
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index fe6d662fa1fa..3cde256016dd 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -219,6 +219,7 @@ share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en@shaw/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/eo/LC_MESSAGES/gnome-system-monitor.mo
share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
share/locale/et/LC_MESSAGES/gnome-system-monitor.mo
share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 5628f92ce6f4..afb5383de081 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,11 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/gnome-system-tools/Makefile,v 1.1 2010/06/24 08:02:01 kwm Exp $
+# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.103 2010/10/25 09:44:29 kwm Exp $
#
PORTNAME= gnome-system-tools
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.0
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Tools to configure workstations
-LIB_DEPENDS= oobs-1.4:${PORTSDIR}/devel/liboobs \
+LIB_DEPENDS= oobs-1.5:${PORTSDIR}/devel/liboobs \
polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome
USE_BZIP2= yes
@@ -31,6 +32,6 @@ CONFIGURE_ARGS= --enable-services
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GCONF_SCHEMAS= gnome-system-tools.schemas
+GLIB_SCHEMAS= org.gnome.system-tools.gschema.xml
.include <bsd.port.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index d981283007bf..11e810478463 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-2.30.2.tar.bz2) = 9211516168aa171b34823d8c58c807d4
-SHA256 (gnome2/gnome-system-tools-2.30.2.tar.bz2) = ee5d945a32fe962d3574c073416ee950d770e16a87dec2d51b8d4dd6521e880d
-SIZE (gnome2/gnome-system-tools-2.30.2.tar.bz2) = 5401601
+MD5 (gnome2/gnome-system-tools-2.32.0.tar.bz2) = 93e3d21b041c771d4ac12307e4ef3392
+SHA256 (gnome2/gnome-system-tools-2.32.0.tar.bz2) = 71d52698ccb60bc07d6e4e442b7cb178ebf1152396379500df5ec62da4c4d14a
+SIZE (gnome2/gnome-system-tools-2.32.0.tar.bz2) = 5433090
diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure
new file mode 100644
index 000000000000..ae9d19daa615
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig 2010-10-25 11:36:00.000000000 +0200
++++ configure 2010-10-25 11:36:25.000000000 +0200
+@@ -13173,8 +13173,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 0bfaa9786591..3fa6ba7b6512 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -62,6 +62,8 @@ share/gnome/help/services-admin/es/figures/services-tool.png
share/gnome/help/services-admin/es/services-admin.xml
share/gnome/help/services-admin/fr/figures/services-tool.png
share/gnome/help/services-admin/fr/services-admin.xml
+share/gnome/help/services-admin/gl/figures/services-tool.png
+share/gnome/help/services-admin/gl/services-admin.xml
share/gnome/help/services-admin/it/figures/services-tool.png
share/gnome/help/services-admin/it/services-admin.xml
share/gnome/help/services-admin/nl/figures/services-tool.png
@@ -94,6 +96,8 @@ share/gnome/help/shares-admin/es/figures/shares-tool.png
share/gnome/help/shares-admin/es/shares-admin.xml
share/gnome/help/shares-admin/fr/figures/shares-tool.png
share/gnome/help/shares-admin/fr/shares-admin.xml
+share/gnome/help/shares-admin/gl/figures/shares-tool.png
+share/gnome/help/shares-admin/gl/shares-admin.xml
share/gnome/help/shares-admin/it/figures/shares-tool.png
share/gnome/help/shares-admin/it/shares-admin.xml
share/gnome/help/shares-admin/oc/figures/shares-tool.png
@@ -145,6 +149,11 @@ share/gnome/help/time-admin/fr/figures/time-servers.png
share/gnome/help/time-admin/fr/figures/time-tool-automatic.png
share/gnome/help/time-admin/fr/figures/time-tool-manual.png
share/gnome/help/time-admin/fr/time-admin.xml
+share/gnome/help/time-admin/gl/figures/time-map.png
+share/gnome/help/time-admin/gl/figures/time-servers.png
+share/gnome/help/time-admin/gl/figures/time-tool-automatic.png
+share/gnome/help/time-admin/gl/figures/time-tool-manual.png
+share/gnome/help/time-admin/gl/time-admin.xml
share/gnome/help/time-admin/it/figures/time-map.png
share/gnome/help/time-admin/it/figures/time-servers.png
share/gnome/help/time-admin/it/figures/time-tool-automatic.png
@@ -205,6 +214,9 @@ share/gnome/help/users-admin/es/users-admin.xml
share/gnome/help/users-admin/fr/figures/groups.png
share/gnome/help/users-admin/fr/figures/users-tool.png
share/gnome/help/users-admin/fr/users-admin.xml
+share/gnome/help/users-admin/gl/figures/groups.png
+share/gnome/help/users-admin/gl/figures/users-tool.png
+share/gnome/help/users-admin/gl/users-admin.xml
share/gnome/help/users-admin/it/figures/groups.png
share/gnome/help/users-admin/it/figures/users-tool.png
share/gnome/help/users-admin/it/users-admin.xml
@@ -254,6 +266,7 @@ share/locale/el/LC_MESSAGES/gnome-system-tools.mo
share/locale/en@shaw/LC_MESSAGES/gnome-system-tools.mo
share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo
share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo
+share/locale/eo/LC_MESSAGES/gnome-system-tools.mo
share/locale/es/LC_MESSAGES/gnome-system-tools.mo
share/locale/et/LC_MESSAGES/gnome-system-tools.mo
share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
@@ -310,6 +323,7 @@ share/locale/ta/LC_MESSAGES/gnome-system-tools.mo
share/locale/te/LC_MESSAGES/gnome-system-tools.mo
share/locale/th/LC_MESSAGES/gnome-system-tools.mo
share/locale/tr/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ug/LC_MESSAGES/gnome-system-tools.mo
share/locale/uk/LC_MESSAGES/gnome-system-tools.mo
share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
@@ -339,6 +353,7 @@ share/omf/services-admin/services-admin-el.omf
share/omf/services-admin/services-admin-en_GB.omf
share/omf/services-admin/services-admin-es.omf
share/omf/services-admin/services-admin-fr.omf
+share/omf/services-admin/services-admin-gl.omf
share/omf/services-admin/services-admin-it.omf
share/omf/services-admin/services-admin-oc.omf
share/omf/services-admin/services-admin-pl.omf
@@ -353,6 +368,7 @@ share/omf/shares-admin/shares-admin-el.omf
share/omf/shares-admin/shares-admin-en_GB.omf
share/omf/shares-admin/shares-admin-es.omf
share/omf/shares-admin/shares-admin-fr.omf
+share/omf/shares-admin/shares-admin-gl.omf
share/omf/shares-admin/shares-admin-it.omf
share/omf/shares-admin/shares-admin-oc.omf
share/omf/shares-admin/shares-admin-pt_BR.omf
@@ -366,6 +382,7 @@ share/omf/time-admin/time-admin-el.omf
share/omf/time-admin/time-admin-en_GB.omf
share/omf/time-admin/time-admin-es.omf
share/omf/time-admin/time-admin-fr.omf
+share/omf/time-admin/time-admin-gl.omf
share/omf/time-admin/time-admin-it.omf
share/omf/time-admin/time-admin-oc.omf
share/omf/time-admin/time-admin-pt_BR.omf
@@ -380,6 +397,7 @@ share/omf/users-admin/users-admin-el.omf
share/omf/users-admin/users-admin-en_GB.omf
share/omf/users-admin/users-admin-es.omf
share/omf/users-admin/users-admin-fr.omf
+share/omf/users-admin/users-admin-gl.omf
share/omf/users-admin/users-admin-it.omf
share/omf/users-admin/users-admin-oc.omf
share/omf/users-admin/users-admin-pt_BR.omf
@@ -404,6 +422,8 @@ share/omf/users-admin/users-admin-zh_CN.omf
@dirrm share/gnome/help/users-admin/oc
@dirrm share/gnome/help/users-admin/it/figures
@dirrm share/gnome/help/users-admin/it
+@dirrm share/gnome/help/users-admin/gl/figures
+@dirrm share/gnome/help/users-admin/gl
@dirrm share/gnome/help/users-admin/fr/figures
@dirrm share/gnome/help/users-admin/fr
@dirrm share/gnome/help/users-admin/es/figures
@@ -435,6 +455,8 @@ share/omf/users-admin/users-admin-zh_CN.omf
@dirrm share/gnome/help/time-admin/nl
@dirrm share/gnome/help/time-admin/it/figures
@dirrm share/gnome/help/time-admin/it
+@dirrm share/gnome/help/time-admin/gl/figures
+@dirrm share/gnome/help/time-admin/gl
@dirrm share/gnome/help/time-admin/fr/figures
@dirrm share/gnome/help/time-admin/fr
@dirrm share/gnome/help/time-admin/es/figures
@@ -462,6 +484,8 @@ share/omf/users-admin/users-admin-zh_CN.omf
@dirrm share/gnome/help/shares-admin/oc
@dirrm share/gnome/help/shares-admin/it/figures
@dirrm share/gnome/help/shares-admin/it
+@dirrm share/gnome/help/shares-admin/gl/figures
+@dirrm share/gnome/help/shares-admin/gl
@dirrm share/gnome/help/shares-admin/fr/figures
@dirrm share/gnome/help/shares-admin/fr
@dirrm share/gnome/help/shares-admin/es/figures
@@ -493,6 +517,8 @@ share/omf/users-admin/users-admin-zh_CN.omf
@dirrm share/gnome/help/services-admin/nl
@dirrm share/gnome/help/services-admin/it/figures
@dirrm share/gnome/help/services-admin/it
+@dirrm share/gnome/help/services-admin/gl/figures
+@dirrm share/gnome/help/services-admin/gl
@dirrm share/gnome/help/services-admin/fr/figures
@dirrm share/gnome/help/services-admin/fr
@dirrm share/gnome/help/services-admin/es/figures
@@ -544,6 +570,8 @@ share/omf/users-admin/users-admin-zh_CN.omf
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index 111857bdc7f4..39774813e3f0 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -3,11 +3,11 @@
# Whom: FreeBSD GNOME Team
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/pessulus/Makefile,v 1.3 2010/06/23 20:01:35 kwm Exp $
+# $MCom: ports/sysutils/pessulus/Makefile,v 1.30 2010/11/17 11:53:24 kwm Exp $
#
PORTNAME= pessulus
-PORTVERSION= 2.30.2
+PORTVERSION= 2.30.4
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo
index 38102127c821..ff18ed10538b 100644
--- a/sysutils/pessulus/distinfo
+++ b/sysutils/pessulus/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/pessulus-2.30.2.tar.bz2) = fbcfb402e12af2006918fc4ee4c78285
-SHA256 (gnome2/pessulus-2.30.2.tar.bz2) = c6ff212f8db39fb4a4937b7a85a8b668ebbc4555742b00f3d2d40750c92f8e8e
-SIZE (gnome2/pessulus-2.30.2.tar.bz2) = 181716
+SHA256 (gnome2/pessulus-2.30.4.tar.bz2) = 6b623659bd95759b291a2739bc280e73f23dfa9f95b684fbc7d2c6057ceaa7c3
+SIZE (gnome2/pessulus-2.30.4.tar.bz2) = 187192
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
index 7a1d333456ee..57e8b89f1bb6 100644
--- a/sysutils/pessulus/pkg-plist
+++ b/sysutils/pessulus/pkg-plist
@@ -79,6 +79,7 @@ share/locale/eo/LC_MESSAGES/pessulus.mo
share/locale/es/LC_MESSAGES/pessulus.mo
share/locale/et/LC_MESSAGES/pessulus.mo
share/locale/eu/LC_MESSAGES/pessulus.mo
+share/locale/fa/LC_MESSAGES/pessulus.mo
share/locale/fi/LC_MESSAGES/pessulus.mo
share/locale/fr/LC_MESSAGES/pessulus.mo
share/locale/gl/LC_MESSAGES/pessulus.mo
@@ -101,6 +102,7 @@ share/locale/mk/LC_MESSAGES/pessulus.mo
share/locale/ml/LC_MESSAGES/pessulus.mo
share/locale/mn/LC_MESSAGES/pessulus.mo
share/locale/mr/LC_MESSAGES/pessulus.mo
+share/locale/ms/LC_MESSAGES/pessulus.mo
share/locale/nb/LC_MESSAGES/pessulus.mo
share/locale/nds/LC_MESSAGES/pessulus.mo
share/locale/ne/LC_MESSAGES/pessulus.mo
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 65b2e64c32ba..1bea70b0fe70 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast<kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.10 2010/05/10 04:21:19 marcus Exp $
+# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.14 2010/09/19 20:17:19 kwm Exp $
#
PORTNAME= polkit-gnome
-PORTVERSION= 0.96
-PORTREVISION= 4
+PORTVERSION= 0.99
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/polkit-gnome/distinfo b/sysutils/polkit-gnome/distinfo
index eed5204a9001..a3dd5f0b0f2b 100644
--- a/sysutils/polkit-gnome/distinfo
+++ b/sysutils/polkit-gnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (polkit-gnome-0.96.tar.bz2) = 611cf39fba2945320fc7a9ec49087e69
-SHA256 (polkit-gnome-0.96.tar.bz2) = 0d96c8032d658a2e1eef8adfbeafff0f569ef0cf68b35915423acc00873c8a92
-SIZE (polkit-gnome-0.96.tar.bz2) = 362723
+MD5 (polkit-gnome-0.99.tar.bz2) = f1a2565083266bc8c05c60aa7d8a0f6a
+SHA256 (polkit-gnome-0.99.tar.bz2) = 73c4d04aa89d9a9687f3650327c0ec1cba704e9d5b7fc193958fa81d621208ba
+SIZE (polkit-gnome-0.99.tar.bz2) = 388069
diff --git a/sysutils/polkit-gnome/pkg-plist b/sysutils/polkit-gnome/pkg-plist
index 3a4f4dddf06c..97158f9e5f5e 100644
--- a/sysutils/polkit-gnome/pkg-plist
+++ b/sysutils/polkit-gnome/pkg-plist
@@ -12,6 +12,7 @@ libdata/pkgconfig/polkit-gtk-1.pc
share/gir-1.0/PolkitGtk-1.0.gir
share/locale/ar/LC_MESSAGES/polkit-gnome-1.mo
share/locale/be/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/bn_IN/LC_MESSAGES/polkit-gnome-1.mo
share/locale/ca/LC_MESSAGES/polkit-gnome-1.mo
share/locale/cs/LC_MESSAGES/polkit-gnome-1.mo
share/locale/da/LC_MESSAGES/polkit-gnome-1.mo
@@ -25,19 +26,29 @@ share/locale/fr/LC_MESSAGES/polkit-gnome-1.mo
share/locale/gl/LC_MESSAGES/polkit-gnome-1.mo
share/locale/gu/LC_MESSAGES/polkit-gnome-1.mo
share/locale/he/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/hi/LC_MESSAGES/polkit-gnome-1.mo
share/locale/hu/LC_MESSAGES/polkit-gnome-1.mo
share/locale/it/LC_MESSAGES/polkit-gnome-1.mo
share/locale/ja/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/kn/LC_MESSAGES/polkit-gnome-1.mo
share/locale/lt/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/ml/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/mr/LC_MESSAGES/polkit-gnome-1.mo
share/locale/nb/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/or/LC_MESSAGES/polkit-gnome-1.mo
share/locale/pa/LC_MESSAGES/polkit-gnome-1.mo
share/locale/pl/LC_MESSAGES/polkit-gnome-1.mo
share/locale/pt/LC_MESSAGES/polkit-gnome-1.mo
share/locale/pt_BR/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/ro/LC_MESSAGES/polkit-gnome-1.mo
share/locale/ru/LC_MESSAGES/polkit-gnome-1.mo
share/locale/sk/LC_MESSAGES/polkit-gnome-1.mo
share/locale/sl/LC_MESSAGES/polkit-gnome-1.mo
share/locale/sv/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/ta/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/te/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/th/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/uk/LC_MESSAGES/polkit-gnome-1.mo
share/locale/zh_CN/LC_MESSAGES/polkit-gnome-1.mo
share/locale/zh_HK/LC_MESSAGES/polkit-gnome-1.mo
share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo
@@ -45,3 +56,7 @@ share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo
@dirrm include/polkit-gtk-1
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index c9441d0595c0..e1fcbac4cf51 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast<kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/polkit/Makefile,v 1.5 2009/11/26 14:22:58 mezz Exp $
+# $MCom: ports/sysutils/polkit/Makefile,v 1.10 2010/09/16 02:09:43 avl Exp $
#
PORTNAME= polkit
-PORTVERSION= 0.96
-PORTREVISION= 2
+PORTVERSION= 0.99
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
@@ -54,11 +53,11 @@ post-patch:
post-install:
${MKDIR} ${PREFIX}/etc/dbus-1/system.d/
if [ ! -f ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ]; then \
- ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \
+ ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \
${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; \
fi
${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \
- ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist
+ ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist
.if !defined(PACKAGE_BUILDING)
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
diff --git a/sysutils/polkit/distinfo b/sysutils/polkit/distinfo
index 628723b6c799..edf3d2550267 100644
--- a/sysutils/polkit/distinfo
+++ b/sysutils/polkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (polkit-0.96.tar.gz) = e0a06da501b04ed3bab986a9df5b5aa2
-SHA256 (polkit-0.96.tar.gz) = 3426ca917210b2a5525732559368c18f983a4c39a6a55c5dddba26071bd8054a
-SIZE (polkit-0.96.tar.gz) = 1034210
+MD5 (polkit-0.99.tar.gz) = fcc4d7b19c08ad54d3ce0eae0ab12398
+SHA256 (polkit-0.99.tar.gz) = f612c7c26ec822f67751420057a4ae113fc50ab51070758faacf2ad30bb3583f
+SIZE (polkit-0.99.tar.gz) = 1042461
diff --git a/sysutils/polkit/files/patch-src_polkitd_gposixsignal.c b/sysutils/polkit/files/patch-src_polkitd_gposixsignal.c
new file mode 100644
index 000000000000..4fb366f4f2de
--- /dev/null
+++ b/sysutils/polkit/files/patch-src_polkitd_gposixsignal.c
@@ -0,0 +1,40 @@
+--- src/polkitd/gposixsignal.c.orig 2010-08-29 20:05:07.000000000 -0400
++++ src/polkitd/gposixsignal.c 2010-08-29 20:13:20.000000000 -0400
+@@ -23,7 +23,13 @@
+ #include "config.h"
+
+ #include <unistd.h>
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/event.h>
++#include <sys/time.h>
++#else
+ #include <sys/signalfd.h>
++#endif
+ #include <signal.h>
+
+ #include "gposixsignal.h"
+@@ -83,6 +89,9 @@ _g_posix_signal_source_new (gint signum)
+ gint fd;
+ GSource *_source;
+ _GPosixSignalSource *source;
++#ifdef __FreeBSD__
++ struct kevent ev;
++#endif
+
+ _source = NULL;
+
+@@ -92,7 +101,13 @@ _g_posix_signal_source_new (gint signum)
+ if (sigprocmask (SIG_BLOCK, &sigset, NULL) == -1)
+ g_assert_not_reached ();
+
++#ifdef __FreeBSD__
++ fd = kqueue ();
++ EV_SET (&ev, signum, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL);
++ kevent (fd, &ev, 1, NULL, 0, NULL);
++#else
+ fd = signalfd (-1, &sigset, SFD_NONBLOCK | SFD_CLOEXEC);
++#endif
+
+ _source = g_source_new (&_g_posix_signal_source_funcs, sizeof (_GPosixSignalSource));
+ source = (_GPosixSignalSource *) _source;
diff --git a/sysutils/polkit/pkg-plist b/sysutils/polkit/pkg-plist
index 9c707ff65eb9..5f7672022836 100644
--- a/sysutils/polkit/pkg-plist
+++ b/sysutils/polkit/pkg-plist
@@ -18,6 +18,7 @@ include/polkit-1/polkit/polkitenumtypes.h
include/polkit-1/polkit/polkiterror.h
include/polkit-1/polkit/polkitidentity.h
include/polkit-1/polkit/polkitimplicitauthorization.h
+include/polkit-1/polkit/polkitpermission.h
include/polkit-1/polkit/polkitprivate.h
include/polkit-1/polkit/polkitsubject.h
include/polkit-1/polkit/polkitsystembusname.h
@@ -28,18 +29,16 @@ include/polkit-1/polkit/polkitunixprocess.h
include/polkit-1/polkit/polkitunixsession.h
include/polkit-1/polkit/polkitunixuser.h
include/polkit-1/polkitagent/polkitagent.h
+include/polkit-1/polkitagent/polkitagentenumtypes.h
include/polkit-1/polkitagent/polkitagentlistener.h
include/polkit-1/polkitagent/polkitagentsession.h
include/polkit-1/polkitagent/polkitagenttypes.h
+include/polkit-1/polkitagent/polkitagenttextlistener.h
include/polkit-1/polkitbackend/polkitbackend.h
include/polkit-1/polkitbackend/polkitbackendactionlookup.h
-include/polkit-1/polkitbackend/polkitbackendactionpool.h
include/polkit-1/polkitbackend/polkitbackendauthority.h
-include/polkit-1/polkitbackend/polkitbackendconfigsource.h
include/polkit-1/polkitbackend/polkitbackendinteractiveauthority.h
include/polkit-1/polkitbackend/polkitbackendlocalauthority.h
-include/polkit-1/polkitbackend/polkitbackendlocalauthorizationstore.h
-include/polkit-1/polkitbackend/polkitbackendsessionmonitor.h
include/polkit-1/polkitbackend/polkitbackendtypes.h
lib/girepository-1.0/Polkit-1.0.typelib
lib/libpolkit-agent-1.a
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index 685ce79c18e3..c9395a67b032 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tracker
PORTVERSION= 0.6.95
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX?= -client
@@ -18,7 +18,7 @@ COMMENT= Object database, tag/metadata database, search tool and indexer
LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \
+ poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk \
exif.12:${PORTSDIR}/graphics/libexif \
wv-1.2.4:${PORTSDIR}/textproc/wv \
gmime-2.0.4:${PORTSDIR}/mail/gmime2 \
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 7a5ad5df8f3e..6549d2ce17a6 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/upower/Makefile,v 1.1 2010/07/12 14:10:07 kwm Exp $
+# $MCom: ports/sysutils/upower/Makefile,v 1.19 2010/10/05 08:30:15 kwm Exp $
#
PORTNAME= upower
-PORTVERSION= 0.9.5
+PORTVERSION= 0.9.6
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://upower.freedesktop.org/releases/
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index 453b025431ce..3871fbb02191 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-MD5 (upower-0.9.5.tar.bz2) = 1c0e5f45345c17fc945dfb365847b587
-SHA256 (upower-0.9.5.tar.bz2) = b34074a5467d442720f4b5d4cee3946fa41dea932463f5e265deb90ae0e7c7a1
-SIZE (upower-0.9.5.tar.bz2) = 473750
+MD5 (upower-0.9.6.tar.bz2) = 9c41e4973fdd6e9b491d1b829a9a35db
+SHA256 (upower-0.9.6.tar.bz2) = aeff4a0c98a12b8beb56ca92314e1e8a6711f13929a294ae3c0a725125a1db4f
+SIZE (upower-0.9.6.tar.bz2) = 453993
diff --git a/sysutils/upower/files/patch-libupower-glib_Makefile.in b/sysutils/upower/files/patch-libupower-glib_Makefile.in
new file mode 100644
index 000000000000..7ecd30cfc5c6
--- /dev/null
+++ b/sysutils/upower/files/patch-libupower-glib_Makefile.in
@@ -0,0 +1,18 @@
+--- libupower-glib/Makefile.in.orig 2010-10-04 14:53:46.000000000 +0100
++++ libupower-glib/Makefile.in 2010-10-05 07:42:17.000000000 +0100
+@@ -364,12 +364,13 @@
+ up-version.h.in
+
+ CLEANFILES = $(BUILT_SOURCES) $(am__append_2)
+-@HAVE_INTROSPECTION_TRUE@introspection_sources = $(libupower_glib_la_SOURCES)
++@HAVE_INTROSPECTION_TRUE@introspection_sources = $(libupower_glib_include_HEADERS) $(libupower_glib_la_SOURCES)
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_CFLAGS = $(INCLUDES)
+-@HAVE_INTROSPECTION_TRUE@PackageKitGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --warn-all --add-include-path=$(srcdir)
++@HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --symbol-prefix=up_ --warn-all --add-include-path=$(srcdir)
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_LIBS = libupower-glib.la
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_FILES = $(introspection_sources)
++@HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_NAMESPACE = UPowerGlib
+ @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
+ @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(INTROSPECTION_GIRS)
+ @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
diff --git a/sysutils/upower/files/patch-src_up-daemon.c b/sysutils/upower/files/patch-src_up-daemon.c
deleted file mode 100644
index eea72a87b7c1..000000000000
--- a/sysutils/upower/files/patch-src_up-daemon.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/up-daemon.c.orig 2010-04-19 11:58:18.000000000 -0400
-+++ src/up-daemon.c 2010-05-09 13:38:28.000000000 -0400
-@@ -488,6 +488,8 @@ up_daemon_suspend_allowed (UpDaemon *dae
- goto out;
-
- ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.suspend", context);
-+ if (!ret)
-+ goto out;
- dbus_g_method_return (context, ret);
-
- out:
-@@ -575,6 +577,8 @@ up_daemon_hibernate_allowed (UpDaemon *d
- goto out;
-
- ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.hibernate", context);
-+ if (!ret)
-+ goto out;
- dbus_g_method_return (context, ret);
-
- out:
diff --git a/sysutils/upower/files/patch-src_up-polkit.c b/sysutils/upower/files/patch-src_up-polkit.c
deleted file mode 100644
index 88a074e9908c..000000000000
--- a/sysutils/upower/files/patch-src_up-polkit.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/up-polkit.c.orig 2010-04-08 21:38:56.000000000 -0400
-+++ src/up-polkit.c 2010-04-09 02:48:12.000000000 -0400
-@@ -69,7 +69,7 @@ up_polkit_check_auth (UpPolkit *polkit,
- {
- gboolean ret = FALSE;
- GError *error;
-- GError *error_local;
-+ GError *error_local = NULL;
- PolkitAuthorizationResult *result;
-
- /* check auth */
-@@ -104,7 +104,7 @@ up_polkit_is_allowed (UpPolkit *polkit,
- {
- gboolean ret = FALSE;
- GError *error;
-- GError *error_local;
-+ GError *error_local = NULL;
- PolkitAuthorizationResult *result;
-
- /* check auth */
diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist
index 8f96cd1fc98c..ba51b6f99593 100644
--- a/sysutils/upower/pkg-plist
+++ b/sysutils/upower/pkg-plist
@@ -2,16 +2,6 @@ bin/devkit-power
bin/upower
etc/UPower/UPower.conf
etc/dbus-1/system.d/org.freedesktop.UPower.conf
-include/DeviceKit-power/devkit-power-gobject/devicekit-power.h
-include/DeviceKit-power/devkit-power-gobject/dkp-client.h
-include/DeviceKit-power/devkit-power-gobject/dkp-device.h
-include/DeviceKit-power/devkit-power-gobject/dkp-enum.h
-include/DeviceKit-power/devkit-power-gobject/dkp-history-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-qos-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-stats-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-version.h
-include/DeviceKit-power/devkit-power-gobject/dkp-wakeups-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-wakeups.h
include/libupower-glib/up-client.h
include/libupower-glib/up-device.h
include/libupower-glib/up-history-item.h
@@ -23,15 +13,10 @@ include/libupower-glib/up-wakeup-item.h
include/libupower-glib/up-wakeups.h
include/libupower-glib/upower.h
lib/girepository-1.0/UPowerGlib-1.0.typelib
-lib/libdevkit-power-gobject.a
-lib/libdevkit-power-gobject.la
-lib/libdevkit-power-gobject.so
-lib/libdevkit-power-gobject.so.1
lib/libupower-glib.a
lib/libupower-glib.la
lib/libupower-glib.so
lib/libupower-glib.so.1
-libdata/pkgconfig/devkit-power-gobject.pc
libdata/pkgconfig/upower-glib.pc
libexec/devkit-power-daemon
libexec/upowerd
@@ -47,8 +32,6 @@ share/locale/sv/LC_MESSAGES/upower.mo
share/polkit-1/actions/org.freedesktop.upower.policy
share/polkit-1/actions/org.freedesktop.upower.qos.policy
@exec mkdir -p /var/lib/DeviceKit-power
-@dirrm include/DeviceKit-power/devkit-power-gobject
-@dirrm include/DeviceKit-power
@dirrm include/libupower-glib
@dirrm etc/UPower
@unexec rmdir /var/lib/DeviceKit-power 2>/dev/null || true