Update libgweather to 2.26.0.

libgweather 2.26.0
==================

Locations.xml

	* Remove a duplicate copy of Warsaw (Dan)
	* Strip out the automated Canadian stations that (badly) duplicate
	  non-automated stations. This fixes Edmonton (Dan)
	* Regenerate with only currently-reporting locations. This fixes Berlin
	  (Dan)

Translators

	* Amitakhya Phukan (as)
	* Alexander Shopov (bg)
	* Runa Bhattacharjee (bn_IN)
	* Joan Duran (ca)
	* Pavel Šefránek (cs)
	* Kenneth Nielsen (da)
	* Hendrik Richter (de)
	* Jennie Petoumenou (el)
	* Philip Withnall (en_GB)
	* Jorge González (es_ES)
	* Jorge González (es)
	* Iñaki Larrañaga Murgoitio (eu)
	* Ilkka Tuohela (fi)
	* Suso Baleato (gl)
	* Ankit Patel (gu)
	* Mark Krapivner (he)
	* Rajesh Ranjan (hi)
	* Takeshi AIHANA (ja)
	* Shankar Prasad (kn)
	* Erdal Ronahi (ku)
	* Žygimantas Beručka (lt)
	* Rajesh Ranjan (mai)
	* Praveen Arimbrathodiyil (ml)
	* Sandeep Shedmake (mr)
	* Kjartan Maraas (nb)
	* Wouter Bolsterlee (nl)
	* Manoj Kumar Giri (or)
	* Krishnababu K (te)
	* Deniz Kocak (tr)
	* Theppitak Karoonboonyanan (th)

libgweather 2.25.92
===================

libgweather

	* Mark "Unknown" as translatable in the timezone menu (Vincent)

Translators

	* Ihar Hrachyshka (be@latin)
	* Yavor Doganov (bg)
	* David Lodge (en_GB)
	* Bruno Brouard (fr)
	* Milo Casagrande (it)
	* Takeshi AIHANA (ja)
	* Shankar Prasad (kn)
	* Praveen Arimbrathodiyil (ml)
	* Wouter Bolsterlee (nl)
	* Og Maciel (pt_BR)
	* Duarte Loreto (pt)
	* Adi Roiban (ro)
	* Nickolay V. Shmyrev (ru)
	* Daniel Nylander (sv)
	* Tirumurthi Vasudevan (ta)

libgweather 2.25.91
===================

Locations.xml

	* Use Asia/Kathmandu instead of Asia/Katmandu (Vincent)

Misc

	* Make it easier to regenerate locations.pot (Claude Paroz)

Translators

	* Alexander Shopov (bg)
	* Runa Bhattacharjee (bn_IN)
	* Gil Forcada (ca)
	* Kenneth Nielsen (da)
	* Christian Kirbach (de)
	* Iñaki Larrañaga Murgoitio (eu)
	* Yair Hershkovitz (he)
	* Gabor Kelemen (hu)
	* Milo Casagrande (it)
	* Takeshi AIHANA (ja)
	* Changwoo Ryu (ko)
	* Raivis Dejus (lv)
	* Subhransu Behera (or)
	* Tomasz Dominikowski (pl)
	* Enrico Nicoletto (pt_BR)
	* Adi Roiban (ro)
	* Theppitak Karoonboonyanan (th)
	* Clytie Siddall (vi)

libgweather 2.25.5
==================

Translators

	* Joan Duran (ca)
	* Christian Kirbach (de)
	* Ilkka Tuohela (fi)
	* Gabor Kelemen (hu)
	* Kjartan Maraas (nb)
	* Daniel Nylander (sv)

libgweather 2.25.4
==================

libgweather

	* Add gweather_xml_free_locations() API (Milan Crha)
	* Fix leaks (Milan Crha)

Translators

	* Jorge Gonzalez (es)
	* Kjartan Maraas (nb)

libgweather 2.25.3
==================

libgweather

	* Make libgweather work on Win32 (Tor Lillqvist, Vincent)

Misc

	* Improve regeneration framework for po file for Locations.xml (Dan)

Translators

	* Claude Paroz (fr)
	* Yair Hershkovitz (he)
	* Erdal Ronahi (ku)
	* Fábio Nogueira (pt_BR)

libgweather 2.25.2
==================

libgweather

	* Add new API to directly get WeatherInfo values instead of strings
	  (Milan Crha)
	* Use the degree sign followed by "C" or "F" rather than using the
	  combined "degrees C" and "degrees F" glyphs (Dan)
	* Handle wind reports in m/s (Dan)
	* Use new libsoup 2.25.1 API for proxy instead of some custom code
	  (Dan)
	* Use single includes for gtk/glib (Maxim Ermilov)
	* Do not use deprecated libsoup API (Dan)
	* Do not care about sub-city locations and only use the first child
	  (Dan)
	* Handle compressed Locations.xml files (Vincent)
	* Code cleanups (Vincent, Dan)

Locations.xml

	* Do not localize sub-city locations since they won't be used in the UI
	  (Dan)
	* Add "Bahamas" to the list of countries whose name we put "the" before
	  in comments (Dan)
	* Add msgctxt attributes to the XML for duplicate names (Dan)
	* When given a location name like "Covington / Cincinnati", only create
	  an entry for one of the two cities (Dan)
	* Fix spelling of local vs international names (Dan)
	* Do not assume a weather station is in the same country as a city.
	  This fixes Luxembourg not appearing in the list of countries (Dan)

Misc

	* Make sure that the shipped COPYING file is GPLv2 (Dan)
	* Add various flags like -DG_DISABLE_SINGLE_INCLUDES and
	  _DISABLE_DEPRECATED flags (Dan, Vincent)
	* Remove locations_file from the pkg-config pc file (Dan, Vincent)
	* Require intltool 0.40.3 (Dan)
	* Add --enable-locations-compression configure flag to compress
	  Locations.xml files with gzip (Vincent)
	* Add some (incomplete) API documentation with gtk-doc (Vincent, Dan)

Translators

	* Jorge González (es_ES)
	* Jorge González (es)
	* Daniel Nylander (sv)

4 files changed, 53 insertions, 8 deletions

diff --git a/devel/libgweather/Makefile b/devel/libgweather/Makefile
index 2ceb7c250ea..032b7e116eb 100644
--- a/devel/libgweather/Makefile
+++ b/devel/libgweather/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2009/01/13 15:25:24 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2009/03/17 21:49:02 jmcneill Exp $
 #
 
-DISTNAME=	libgweather-2.24.3
+DISTNAME=	libgweather-2.26.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgweather/2.24/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgweather/2.26/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -21,6 +21,14 @@ PKGCONFIG_OVERRIDE+=	libgweather/gweather.pc.in
 
 CONFLICTS+=	gnome-applets<2.22.0
 
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ${WRKSRC}/po-locations/*.po ; do \
+		mv $$f $$f.original ; \
+		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/devel/libgweather/PLIST b/devel/libgweather/PLIST
index 32d0be8d406..3cdfe3f2c70 100644
--- a/devel/libgweather/PLIST
+++ b/devel/libgweather/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/10/16 13:36:46 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/03/17 21:49:02 jmcneill Exp $
 include/libgweather/gweather-enum-types.h
 include/libgweather/gweather-gconf.h
 include/libgweather/gweather-location.h
@@ -11,6 +11,24 @@ include/libgweather/weather.h
 lib/libgweather.la
 lib/pkgconfig/gweather.pc
 share/gconf/schemas/gweather.schemas
+share/gtk-doc/html/libgweather/GWeatherLocationEntry.html
+share/gtk-doc/html/libgweather/GWeatherTimezoneMenu.html
+share/gtk-doc/html/libgweather/ch01.html
+share/gtk-doc/html/libgweather/home.png
+share/gtk-doc/html/libgweather/index.html
+share/gtk-doc/html/libgweather/index.sgml
+share/gtk-doc/html/libgweather/left.png
+share/gtk-doc/html/libgweather/libgweather-gweather-gconf.html
+share/gtk-doc/html/libgweather/libgweather-gweather-location.html
+share/gtk-doc/html/libgweather/libgweather-gweather-prefs.html
+share/gtk-doc/html/libgweather/libgweather-gweather-timezone.html
+share/gtk-doc/html/libgweather/libgweather-gweather-xml.html
+share/gtk-doc/html/libgweather/libgweather-weather.html
+share/gtk-doc/html/libgweather/libgweather.devhelp
+share/gtk-doc/html/libgweather/libgweather.devhelp2
+share/gtk-doc/html/libgweather/right.png
+share/gtk-doc/html/libgweather/style.css
+share/gtk-doc/html/libgweather/up.png
 share/libgweather/Locations.ang.xml
 share/libgweather/Locations.ar.xml
 share/libgweather/Locations.as.xml
@@ -190,5 +208,6 @@ share/locale/zh_CN/LC_MESSAGES/libgweather.mo
 share/locale/zh_HK/LC_MESSAGES/libgweather.mo
 share/locale/zh_TW/LC_MESSAGES/libgweather.mo
 @dirrm share/libgweather
+@dirrm share/gtk-doc/html/libgweather
 @comment in GConf: @dirrm share/gconf/schemas
 @dirrm include/libgweather
diff --git a/devel/libgweather/distinfo b/devel/libgweather/distinfo
index d29dddd0e26..dfa1bb40230 100644
--- a/devel/libgweather/distinfo
+++ b/devel/libgweather/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2009/01/13 15:25:24 wiz Exp $
+$NetBSD: distinfo,v 1.9 2009/03/17 21:49:02 jmcneill Exp $
 
-SHA1 (libgweather-2.24.3.tar.bz2) = 6a8134d4d2170ea7879dc8f1e847148b3e81edc8
-RMD160 (libgweather-2.24.3.tar.bz2) = 4875b5f150d6c99d958de37e5eca16e0c19ca8e4
-Size (libgweather-2.24.3.tar.bz2) = 7094107 bytes
+SHA1 (libgweather-2.26.0.tar.bz2) = 4abeb0f84704754d362a740360e8da99fa84eeae
+RMD160 (libgweather-2.26.0.tar.bz2) = da117498487184b27b5a18388208069ca7b5b72a
+Size (libgweather-2.26.0.tar.bz2) = 6536099 bytes
diff --git a/devel/libgweather/files/msgfmtstrip b/devel/libgweather/files/msgfmtstrip
new file mode 100644
index 00000000000..9e690daf337
--- /dev/null
+++ b/devel/libgweather/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2009/03/17 21:49:02 jmcneill Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}