Update to 2.21.3.

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

3 files changed, 15 insertions, 21 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 3817c7de5..a9f40d455 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-applets/Makefile,v 1.167 2007/11/13 06:33:41 marcus Exp $
+#   $MCom: ports/x11/gnome-applets/Makefile,v 1.168 2007/12/26 23:00:24 kwm Exp $
 #
 
 PORTNAME=	gnome-applets
-PORTVERSION=	2.21.2
+PORTVERSION=	2.21.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,6 +19,7 @@ COMMENT=	Applets components for the GNOME 2 Desktop Environment
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
+		gweather.0:${PORTSDIR}/net/libgweather \
 		xklavier.11:${PORTSDIR}/x11/libxklavier \
 		gucharmap.6:${PORTSDIR}/deskutils/gucharmap
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
@@ -44,8 +45,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		OS_SYS="/usr/include"
 
 GCONF_SCHEMAS=	charpick.schemas drivemount.schemas geyes.schemas \
-		gweather.schemas mixer.schemas multiload.schemas \
-		stickynotes.schemas
+		mixer.schemas multiload.schemas stickynotes.schemas
 
 OPTIONS=	MINI_COMMANDER "Enable mini-commander applet" off
 
@@ -95,8 +95,6 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
-		${WRKSRC}/libgweather/weather-met.c
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 	    	's|" == "|" = "|g'
 .if !defined(USE_PYTHON)
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 9eec16f8e..b6578cc8e 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.21.2.tar.bz2) = 2a511432e38b222dffc0909f81419503
-SHA256 (gnome2/gnome-applets-2.21.2.tar.bz2) = 25125c864b7fa7bb87545612c8b501bd65d4e93eed775e32e16f36d12bff6fc5
-SIZE (gnome2/gnome-applets-2.21.2.tar.bz2) = 7579446
+MD5 (gnome2/gnome-applets-2.21.3.tar.bz2) = b520082a34fce27c0e676a30fa044e79
+SHA256 (gnome2/gnome-applets-2.21.3.tar.bz2) = d0910f2632b36ce5f1a34d829bc666b2769bcd717b28624c059cea29fd3d86dc
+SIZE (gnome2/gnome-applets-2.21.3.tar.bz2) = 6247585
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 3c252c33f..ced04008f 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,13 +1,6 @@
 %%CPUFREQ%%bin/cpufreq-selector
 %%PYTHON%%bin/invest-chart
 %%BATTERY%%etc/sound/events/battstat_applet.soundlist
-include/libgweather/gweather-gconf.h
-include/libgweather/gweather-prefs.h
-include/libgweather/weather.h
-lib/libgweather.a
-lib/libgweather.la
-lib/libgweather.so
-lib/libgweather.so.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyo
@@ -52,7 +45,6 @@ libdata/bonobo/servers/GNOME_Panel_TrashApplet.server
 libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
 libdata/bonobo/servers/GNOME_StickyNotesApplet.server
 %%PYTHON%%libdata/bonobo/servers/Invest_Applet.server
-libdata/pkgconfig/gweather.pc
 libexec/accessx-status-applet
 %%BATTERY%%libexec/battstat-applet-2
 libexec/charpick_applet2
@@ -112,8 +104,6 @@ share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
 %%PYTHON%%%%DATADIR%%/glade/prefs-dialog.glade
 %%DATADIR%%/glade/stickynotes.glade
 %%DATADIR%%/glade/trashapplet.glade
-%%DATADIR%%/gweather/Locations.xml
-%%DATADIR%%/gweather/locations.dtd
 %%PYTHON%%%%DATADIR%%/invest-applet/invest-16.png
 %%PYTHON%%%%DATADIR%%/invest-applet/invest-button.png
 %%PYTHON%%%%DATADIR%%/invest-applet/invest.svg
@@ -322,6 +312,11 @@ share/gnome/help/char-palette/bg/figures/charpalette_applet.png
 share/gnome/help/char-palette/bg/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/bg/figures/charpick-preferences.png
 share/gnome/help/char-palette/bg/figures/charpick_characters.png
+share/gnome/help/char-palette/ca/char-palette.xml
+share/gnome/help/char-palette/ca/figures/charpalette_applet.png
+share/gnome/help/char-palette/ca/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/ca/figures/charpick-preferences.png
+share/gnome/help/char-palette/ca/figures/charpick_characters.png
 share/gnome/help/char-palette/en_GB/char-palette.xml
 share/gnome/help/char-palette/en_GB/figures/charpalette_applet.png
 share/gnome/help/char-palette/en_GB/figures/charpalette_chargroup.png
@@ -1089,6 +1084,7 @@ share/omf/accessx-status/accessx-status-uk.omf
 %%BATTERY%%share/omf/battstat/battstat-uk.omf
 share/omf/char-palette/char-palette-C.omf
 share/omf/char-palette/char-palette-bg.omf
+share/omf/char-palette/char-palette-ca.omf
 share/omf/char-palette/char-palette-en_GB.omf
 share/omf/char-palette/char-palette-es.omf
 share/omf/char-palette/char-palette-fr.omf
@@ -1602,6 +1598,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/char-palette/es
 @dirrm share/gnome/help/char-palette/en_GB/figures
 @dirrm share/gnome/help/char-palette/en_GB
+@dirrm share/gnome/help/char-palette/ca/figures
+@dirrm share/gnome/help/char-palette/ca
 @dirrm share/gnome/help/char-palette/bg/figures
 @dirrm share/gnome/help/char-palette/bg
 @dirrm share/gnome/help/char-palette/C/figures
@@ -1652,7 +1650,6 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/accessx-status/C
 @dirrm share/gnome/help/accessx-status
 %%PYTHON%%@dirrm %%DATADIR%%/invest-applet
-@dirrm %%DATADIR%%/gweather
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/geyes/Tango
 @dirrm %%DATADIR%%/geyes/Horrid
@@ -1664,7 +1661,6 @@ share/xmodmap/xmodmap.yu
 @dirrm %%DATADIR%%
 %%COMMANDER%%@dirrmtry libexec/gnome-applets
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest
-@dirrm include/libgweather
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES