Update to 2.20.2.

3 files changed, 56 insertions, 25 deletions

diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index d7c38f923ec6..f86c1d6f2ea5 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnome-power-manager
-PORTVERSION=	2.20.1
+PORTVERSION=	2.20.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -39,7 +39,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 GCONF_SCHEMAS=	gnome-power-manager.schemas
 
-MAN1=		gnome-power-manager.1 gnome-power-preferences.1
+MAN1=		gnome-power-manager.1 gnome-power-preferences.1 \
+		gnome-power-statistics.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lresolv|| ; s|-Werror||g' \
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
index 3e97db91805a..4b51dbe27140 100644
--- a/sysutils/gnome-power-manager/distinfo
+++ b/sysutils/gnome-power-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-power-manager-2.20.1.tar.bz2) = 6bf1bd7fba0ab8362d6ae1919dd7a732
-SHA256 (gnome2/gnome-power-manager-2.20.1.tar.bz2) = 49b9bd62e521f08eae5cf1eb8fa4b1c7440ddfb664e16833af5fd13b97bc7d80
-SIZE (gnome2/gnome-power-manager-2.20.1.tar.bz2) = 2592825
+MD5 (gnome2/gnome-power-manager-2.20.2.tar.bz2) = 8a38e3a169b80c44639f4383a64835d0
+SHA256 (gnome2/gnome-power-manager-2.20.2.tar.bz2) = 60c9f8e6893123d1837f3cd1fcf834e66bc6f69b9efea5e590b1a9a97e1850c2
+SIZE (gnome2/gnome-power-manager-2.20.2.tar.bz2) = 3020529
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
index efc61c06920e..9dba9e121c02 100644
--- a/sysutils/gnome-power-manager/pkg-plist
+++ b/sysutils/gnome-power-manager/pkg-plist
@@ -277,112 +277,142 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml
 %%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-charged.svg
 %%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-missing.svg
 share/gnome/autostart/gnome-power-manager.desktop
+share/gnome/help/gnome-power-manager/C/figures/applet-brightness.png
+share/gnome/help/gnome-power-manager/C/figures/applet-inhibit.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-critical.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-mouse-left.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-general.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/C/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/C/gnome-power-manager.xml
 share/gnome/help/gnome-power-manager/C/legal.xml
+share/gnome/help/gnome-power-manager/ca/figures/applet-brightness.png
+share/gnome/help/gnome-power-manager/ca/figures/applet-inhibit.png
 share/gnome/help/gnome-power-manager/ca/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/ca/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/ca/figures/gpm-critical.png
 share/gnome/help/gnome-power-manager/ca/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-mouse-left.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/ca/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/ca/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/ca/figures/gpm-prefs-general.png
 share/gnome/help/gnome-power-manager/ca/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/ca/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/ca/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/ca/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/ca/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/es/figures/applet-brightness.png
+share/gnome/help/gnome-power-manager/es/figures/applet-inhibit.png
 share/gnome/help/gnome-power-manager/es/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/es/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/es/figures/gpm-critical.png
 share/gnome/help/gnome-power-manager/es/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-mouse-left.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-prefs-general.png
 share/gnome/help/gnome-power-manager/es/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/es/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/es/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/es/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/es/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/fr/figures/applet-brightness.png
+share/gnome/help/gnome-power-manager/fr/figures/applet-inhibit.png
 share/gnome/help/gnome-power-manager/fr/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/fr/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/fr/figures/gpm-critical.png
 share/gnome/help/gnome-power-manager/fr/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-mouse-left.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-prefs-general.png
 share/gnome/help/gnome-power-manager/fr/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/fr/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/fr/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/fr/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/fr/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/hu/figures/applet-brightness.png
+share/gnome/help/gnome-power-manager/hu/figures/applet-inhibit.png
 share/gnome/help/gnome-power-manager/hu/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/hu/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/hu/figures/gpm-critical.png
 share/gnome/help/gnome-power-manager/hu/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-mouse-left.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-prefs-general.png
 share/gnome/help/gnome-power-manager/hu/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/hu/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/hu/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/hu/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/hu/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/it/figures/applet-brightness.png
+share/gnome/help/gnome-power-manager/it/figures/applet-inhibit.png
 share/gnome/help/gnome-power-manager/it/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/it/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/it/figures/gpm-critical.png
 share/gnome/help/gnome-power-manager/it/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-mouse-left.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/it/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/it/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/it/figures/gpm-prefs-general.png
 share/gnome/help/gnome-power-manager/it/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/it/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/it/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/it/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/it/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/oc/figures/applet-brightness.png
+share/gnome/help/gnome-power-manager/oc/figures/applet-inhibit.png
 share/gnome/help/gnome-power-manager/oc/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/oc/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/oc/figures/gpm-critical.png
 share/gnome/help/gnome-power-manager/oc/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-mouse-left.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/oc/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/oc/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/oc/figures/gpm-prefs-general.png
 share/gnome/help/gnome-power-manager/oc/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/oc/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/oc/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/oc/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/oc/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/pa/figures/applet-brightness.png
+share/gnome/help/gnome-power-manager/pa/figures/applet-inhibit.png
 share/gnome/help/gnome-power-manager/pa/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/pa/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/pa/figures/gpm-critical.png
 share/gnome/help/gnome-power-manager/pa/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-mouse-left.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-prefs-general.png
 share/gnome/help/gnome-power-manager/pa/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/pa/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/pa/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/pa/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/pa/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/ru/figures/applet-brightness.png
+share/gnome/help/gnome-power-manager/ru/figures/applet-inhibit.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-critical.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-mouse-left.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-general.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/ru/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/ru/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/sv/figures/applet-brightness.png
+share/gnome/help/gnome-power-manager/sv/figures/applet-inhibit.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-critical.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-mouse-left.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-general.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-unplugged.png