5 files changed, 6 insertions, 44 deletions

diff --git a/astro/gdesklets-goodweather/Makefile b/astro/gdesklets-goodweather/Makefile
index df6cc6b6820a..3c9250562374 100644
--- a/astro/gdesklets-goodweather/Makefile
+++ b/astro/gdesklets-goodweather/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	goodweather
-PORTVERSION=	0.1
-PORTREVISION=	2
+PORTVERSION=	0.3
 CATEGORIES=	astro gnome
-MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/ \
-		http://people.roqe.org/kr/misc/
+MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
 DISTNAME=	GoodWeather-${PORTVERSION}
 
@@ -25,14 +23,12 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 
 NAME=		GoodWeather
+WRKSRC=		${WRKDIR}/${NAME}
 DATADIR=	${PREFIX}/share/gnome
 SKINS=		liquid um weather.com
 
 do-build:
 	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
-	@${PATCH} ${WRKSRC}/${NAME}/__init__.py < ${FILESDIR}/${NAME}::__init__.py
-	@${PATCH} ${WRKSRC}/${NAME}/weather.py < ${FILESDIR}/${NAME}::weather.py
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 do-install:
 	@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx
diff --git a/astro/gdesklets-goodweather/distinfo b/astro/gdesklets-goodweather/distinfo
index 2b8508691b46..87c8fed2573c 100644
--- a/astro/gdesklets-goodweather/distinfo
+++ b/astro/gdesklets-goodweather/distinfo
@@ -1 +1 @@
-MD5 (GoodWeather-0.1.tar.bz2) = 035ad488e7385ee4aacacc96ab8a283c
+MD5 (GoodWeather-0.3.tar.bz2) = f92d504e2e5732cb02ef08a23b282a0f
diff --git a/astro/gdesklets-goodweather/files/GoodWeather::__init__.py b/astro/gdesklets-goodweather/files/GoodWeather::__init__.py
deleted file mode 100644
index cf9a13b6464f..000000000000
--- a/astro/gdesklets-goodweather/files/GoodWeather::__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Many thanks to Franz Klammer <klammer@webonaut.com> for help
-# and create this patch.
-
---- GoodWeather/__init__.py.orig	Tue Nov 18 16:38:53 2003
-+++ GoodWeather/__init__.py	Tue Nov 18 16:40:14 2003
-@@ -151,7 +151,14 @@
-                 fh = urllib.urlopen(self.WEATHER_SOURCE % vars())
-                 data = fh.read()
-    
--                weather = parseGoodWeatherData(data) 
-+                #weather = parseGoodWeatherData(data)
-+                data_error = re.search(r'''(<error>)''', data)
-+                if not data_error:
-+                   weather = parseGoodWeatherData(data)
-+                else:
-+                   time.sleep(1)
-+                   continue
-+
-                 metric = 0
-                 if (units == self.CELSIUS): 
-                    metric = 1 
diff --git a/astro/gdesklets-goodweather/files/GoodWeather::weather.py b/astro/gdesklets-goodweather/files/GoodWeather::weather.py
deleted file mode 100644
index a84ead81ad30..000000000000
--- a/astro/gdesklets-goodweather/files/GoodWeather::weather.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- GoodWeather/weather.py.orig	Thu Nov 20 16:29:11 2003
-+++ GoodWeather/weather.py	Thu Nov 20 16:30:24 2003
-@@ -321,8 +321,9 @@
-         if m :
-             #print m
-             if m.upper() == 'AM':
--                if int(self._hour) > 11:
--                    raise ValueError ('AM hour can not be over 11 ['+ self._hour +']')
-+                if int(self._hour) > 12:
-+                    raise ValueError ('AM hour can not be over 12 ['+ self._hour +']')
-+	        if int(self._hour) == 12: self._hour = str(0)
-             if m.upper() == 'PM':
-                 if int(self._hour) > 12:
-                     raise ValueError ('PM hour can not be over 12 ['+ self._hour +']')
diff --git a/astro/gdesklets-goodweather/pkg-message b/astro/gdesklets-goodweather/pkg-message
index a36c141299e1..f8f9f8bccd89 100644
--- a/astro/gdesklets-goodweather/pkg-message
+++ b/astro/gdesklets-goodweather/pkg-message
@@ -15,5 +15,6 @@ To use those applets:
 Replace the ${name} with the correct name to what you want to use applets.
 
 NOTE: Be sure to login as your user when you use the gdesklets command,
-      as the configuration will be stored in the ~/.gdesklets/ directory.
+      as the configuration will be stored in the ~/.gdesklets/ directory
+      and/or gconf database.
 ##