Date: Fri, 5 Dec 2003 14:28:12 -0600 (CST) From: Jeremy Messenger <mezz7@cox.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/59983: Maintainer update: astro/gdesklets-goodweather 0.1 -> 0.3 Message-ID: <200312052028.hB5KSCRD047554@ns1.mezzweb.com> Resent-Message-ID: <200312052100.hB5L0bIj013435@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59983 >Category: ports >Synopsis: Maintainer update: astro/gdesklets-goodweather 0.1 -> 0.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Dec 05 13:00:37 PST 2003 >Closed-Date: >Last-Modified: >Originator: Mezz >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD ns1.mezzweb.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 13 22:39:47 CDT 2003 mezz@mezz.mezzweb.com:/usr/obj/usr/src/sys/BSDROCKS i386 >Description: Update to 0.3. >How-To-Repeat: n/a >Fix: Remove all patches in the gdesklets-goodweather/files/, those patches have been merged in 0.3. --- gdesklets-goodweather.diff begins here --- diff -urN gdesklets-goodweather.orig/Makefile gdesklets-goodweather/Makefile --- gdesklets-goodweather.orig/Makefile Fri Nov 21 20:15:36 2003 +++ gdesklets-goodweather/Makefile Fri Dec 5 14:46:05 2003 @@ -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_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 -urN gdesklets-goodweather.orig/distinfo gdesklets-goodweather/distinfo --- gdesklets-goodweather.orig/distinfo Tue Nov 18 01:30:13 2003 +++ gdesklets-goodweather/distinfo Fri Dec 5 14:40:44 2003 @@ -1 +1 @@ -MD5 (GoodWeather-0.1.tar.bz2) = 035ad488e7385ee4aacacc96ab8a283c +MD5 (GoodWeather-0.3.tar.bz2) = f92d504e2e5732cb02ef08a23b282a0f diff -urN gdesklets-goodweather.orig/files/GoodWeather::__init__.py gdesklets-goodweather/files/GoodWeather::__init__.py --- gdesklets-goodweather.orig/files/GoodWeather::__init__.py Sun Nov 30 12:19:02 2003 +++ gdesklets-goodweather/files/GoodWeather::__init__.py Wed Dec 31 18:00:00 1969 @@ -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 -urN gdesklets-goodweather.orig/files/GoodWeather::weather.py gdesklets-goodweather/files/GoodWeather::weather.py --- gdesklets-goodweather.orig/files/GoodWeather::weather.py Fri Nov 21 20:15:36 2003 +++ gdesklets-goodweather/files/GoodWeather::weather.py Wed Dec 31 18:00:00 1969 @@ -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 -urN gdesklets-goodweather.orig/pkg-message gdesklets-goodweather/pkg-message --- gdesklets-goodweather.orig/pkg-message Tue Nov 18 01:30:13 2003 +++ gdesklets-goodweather/pkg-message Fri Dec 5 14:43:14 2003 @@ -15,5 +15,6 @@ 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. ## --- gdesklets-goodweather.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312052028.hB5KSCRD047554>