Update to 2.18.0.

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

5 files changed, 80 insertions, 49 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 65b063475..8f6172456 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-applets/Makefile,v 1.150 2007/02/26 18:57:43 marcus Exp $
+#   $MCom: ports/x11/gnome-applets/Makefile,v 1.151 2007/02/28 19:31:48 marcus Exp $
 #
 
 PORTNAME=	gnome-applets
-PORTVERSION=	2.17.90
-PORTREVISION=	1
+PORTVERSION=	2.18.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 7531858df..14fb514cf 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.17.90.tar.bz2) = 350d527d2f5391385402f28ad96a99c5
-SHA256 (gnome2/gnome-applets-2.17.90.tar.bz2) = f8879508caed4c2fb35dc1595f3f7e8fcb824df3595f464f702a14c43203380e
-SIZE (gnome2/gnome-applets-2.17.90.tar.bz2) = 7213023
+MD5 (gnome2/gnome-applets-2.18.0.tar.bz2) = db3ef99c00335798f30fc0a9162c0257
+SHA256 (gnome2/gnome-applets-2.18.0.tar.bz2) = f8f23e0c5e156afb0811d7a7fcbfec8dc667b8e35fa8a1cfff0b4866014c2157
+SIZE (gnome2/gnome-applets-2.18.0.tar.bz2) = 7133902
diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd
index a1126a228..e7f0e210d 100644
--- a/x11/gnome-applets/files/patch-cpufreq-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-freebsd
@@ -217,44 +217,6 @@
  
  void
  cpufreq_utils_display_error (const gchar *message,
---- cpufreq/src/Makefile.in.orig	Mon Feb 26 13:24:35 2007
-+++ cpufreq/src/Makefile.in	Mon Feb 26 13:24:35 2007
-@@ -61,7 +61,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
- 	cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \
- 	cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \
- 	cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \
--	cpufreq-monitor-cpuinfo.h
-+	cpufreq-monitor-cpuinfo.h cpufreq-monitor-sysctl.c \
-+	cpufreq-monitor-sysctl.h
- @HAVE_LIBCPUFREQ_TRUE@am__objects_1 =  \
- @HAVE_LIBCPUFREQ_TRUE@	cpufreq-monitor-libcpufreq.$(OBJEXT)
- am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \
-@@ -70,7 +71,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
- 	cpufreq-monitor-factory.$(OBJEXT) \
- 	cpufreq-monitor-procfs.$(OBJEXT) \
- 	cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \
--	cpufreq-monitor-cpuinfo.$(OBJEXT)
-+	cpufreq-monitor-cpuinfo.$(OBJEXT) \
-+	cpufreq-monitor-sysctl.$(OBJEXT)
- cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
- am__DEPENDENCIES_1 =
- cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -397,6 +399,7 @@ cpufreq_applet_SOURCES = \
- 	cpufreq-monitor.c       	cpufreq-monitor.h	      	\
- 	cpufreq-monitor-factory.c	cpufreq-monitor-factory.h	\
- 	cpufreq-monitor-procfs.c	cpufreq-monitor-procfs.h	\
-+	cpufreq-monitor-sysctl.c	cpufreq-monitor-sysctl.h	\
- 	cpufreq-monitor-sysfs.c	        cpufreq-monitor-sysfs.h	        \
- 	$(cpufreq_files)						\
- 	cpufreq-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
-@@ -482,6 +485,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@
 --- cpufreq/src/cpufreq-monitor-sysctl.c.orig	Wed Feb 28 14:03:58 2007
 +++ cpufreq/src/cpufreq-monitor-sysctl.c	Wed Feb 28 14:28:47 2007
 @@ -0,0 +1,176 @@
@@ -434,3 +396,49 @@
 +	return list;
 +}
 +#endif /* __FreeBSD__ */
+--- cpufreq/src/Makefile.in.orig	Mon Mar 12 11:58:09 2007
++++ cpufreq/src/Makefile.in	Mon Mar 12 12:12:06 2007
+@@ -62,7 +62,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
+ 	cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \
+ 	cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \
+ 	cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \
+-	cpufreq-monitor-cpuinfo.h
++	cpufreq-monitor-cpuinfo.h cpufreq-monitor-sysctl.c \
++	cpufreq-monitor-sysctl.h
+ @HAVE_LIBCPUFREQ_TRUE@am__objects_1 =  \
+ @HAVE_LIBCPUFREQ_TRUE@	cpufreq-monitor-libcpufreq.$(OBJEXT)
+ am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \
+@@ -71,7 +72,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
+ 	cpufreq-monitor-factory.$(OBJEXT) \
+ 	cpufreq-monitor-procfs.$(OBJEXT) \
+ 	cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \
+-	cpufreq-monitor-cpuinfo.$(OBJEXT)
++	cpufreq-monitor-cpuinfo.$(OBJEXT) \
++	cpufreq-monitor-sysctl.$(OBJEXT)
+ cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -85,6 +87,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-procfs.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-popup.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-prefs.Po \
+@@ -411,6 +414,7 @@ cpufreq_applet_SOURCES = \
+ 	cpufreq-monitor.c       	cpufreq-monitor.h	      	\
+ 	cpufreq-monitor-factory.c	cpufreq-monitor-factory.h	\
+ 	cpufreq-monitor-procfs.c	cpufreq-monitor-procfs.h	\
++	cpufreq-monitor-sysctl.c	cpufreq-monitor-sysctl.h	\
+ 	cpufreq-monitor-sysfs.c	        cpufreq-monitor-sysfs.h	        \
+ 	$(cpufreq_files)						\
+ 	cpufreq-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
+@@ -496,6 +500,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@
diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
index 608beb319..8d459fdee 100644
--- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -190,9 +190,9 @@
 +
 +	   return TRUE;
 +}
---- cpufreq/src/cpufreq-selector/Makefile.in.orig	Mon Feb 26 13:27:02 2007
-+++ cpufreq/src/cpufreq-selector/Makefile.in	Mon Feb 26 13:27:03 2007
-@@ -57,13 +57,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig	Mon Mar 12 11:58:09 2007
++++ cpufreq/src/cpufreq-selector/Makefile.in	Mon Mar 12 12:12:33 2007
+@@ -58,13 +58,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
  	cpufreq-selector.h cpufreq-selector-sysfs.c \
  	cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \
  	cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \
@@ -210,7 +210,15 @@
  cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
  am__DEPENDENCIES_1 =
  cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -376,6 +378,7 @@ cpufreq_selector_SOURCES = \
+@@ -75,6 +77,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-selector-libcpufreq.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-procfs.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-sysfs.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-sysctl.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/main.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -385,6 +388,7 @@ cpufreq_selector_SOURCES = \
  	cpufreq-selector.c               cpufreq-selector.h        \
  	cpufreq-selector-sysfs.c         cpufreq-selector-sysfs.h  \
  	cpufreq-selector-procfs.c        cpufreq-selector-procfs.h \
@@ -218,7 +226,7 @@
  	$(cpufreq_files)					   \
  	main.c
  
-@@ -457,6 +460,7 @@ distclean-compile:
+@@ -466,6 +470,7 @@ distclean-compile:
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 061f49bef..411ee4906 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -470,6 +470,12 @@ share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/ru/drivemount.xml
+share/gnome/help/drivemount/ru/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/sv/drivemount.xml
 share/gnome/help/drivemount/sv/figures/drivemount-applet_eject.png
 share/gnome/help/drivemount/sv/figures/drivemount-applet_example.png
@@ -676,6 +682,10 @@ share/gnome/help/multiload/pa/figures/multiload-preferences.png
 share/gnome/help/multiload/pa/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/pa/figures/system_monitor.png
 share/gnome/help/multiload/pa/multiload.xml
+share/gnome/help/multiload/ru/figures/multiload-preferences.png
+share/gnome/help/multiload/ru/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ru/figures/system_monitor.png
+share/gnome/help/multiload/ru/multiload.xml
 share/gnome/help/multiload/sv/figures/multiload-preferences.png
 share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/sv/figures/system_monitor.png
@@ -795,6 +805,7 @@ share/gnome/omf/drivemount/drivemount-es.omf
 share/gnome/omf/drivemount/drivemount-fr.omf
 share/gnome/omf/drivemount/drivemount-it.omf
 share/gnome/omf/drivemount/drivemount-pa.omf
+share/gnome/omf/drivemount/drivemount-ru.omf
 share/gnome/omf/drivemount/drivemount-sv.omf
 share/gnome/omf/drivemount/drivemount-uk.omf
 share/gnome/omf/drivemount/drivemount-zh_CN.omf
@@ -836,6 +847,7 @@ share/gnome/omf/multiload/multiload-en_GB.omf
 share/gnome/omf/multiload/multiload-es.omf
 share/gnome/omf/multiload/multiload-fr.omf
 share/gnome/omf/multiload/multiload-pa.omf
+share/gnome/omf/multiload/multiload-ru.omf
 share/gnome/omf/multiload/multiload-sv.omf
 share/gnome/omf/multiload/multiload-uk.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
@@ -1168,6 +1180,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/multiload/uk
 @dirrm share/gnome/help/multiload/sv/figures
 @dirrm share/gnome/help/multiload/sv
+@dirrm share/gnome/help/multiload/ru/figures
+@dirrm share/gnome/help/multiload/ru
 @dirrm share/gnome/help/multiload/pa/figures
 @dirrm share/gnome/help/multiload/pa
 @dirrm share/gnome/help/multiload/fr/figures
@@ -1248,6 +1262,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/drivemount/uk
 @dirrm share/gnome/help/drivemount/sv/figures
 @dirrm share/gnome/help/drivemount/sv
+@dirrm share/gnome/help/drivemount/ru/figures
+@dirrm share/gnome/help/drivemount/ru
 @dirrm share/gnome/help/drivemount/pa/figures
 @dirrm share/gnome/help/drivemount/pa
 @dirrm share/gnome/help/drivemount/it/figures