Index: head/astro/gdesklets-goodweather/files/GoodWeather::__init__.py =================================================================== --- head/astro/gdesklets-goodweather/files/GoodWeather::__init__.py (revision 95756) +++ head/astro/gdesklets-goodweather/files/GoodWeather::__init__.py (nonexistent) @@ -1,21 +0,0 @@ -# Many thanks to Franz Klammer 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'''()''', data) -+ if not data_error: -+ weather = parseGoodWeatherData(data) -+ else: -+ time.sleep(1) -+ continue -+ - metric = 0 - if (units == self.CELSIUS): - metric = 1 Property changes on: head/astro/gdesklets-goodweather/files/GoodWeather::__init__.py ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/astro/gdesklets-goodweather/files/GoodWeather::weather.py =================================================================== --- head/astro/gdesklets-goodweather/files/GoodWeather::weather.py (revision 95756) +++ head/astro/gdesklets-goodweather/files/GoodWeather::weather.py (nonexistent) @@ -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 +']') Property changes on: head/astro/gdesklets-goodweather/files/GoodWeather::weather.py ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/astro/gdesklets-goodweather/Makefile =================================================================== --- head/astro/gdesklets-goodweather/Makefile (revision 95756) +++ head/astro/gdesklets-goodweather/Makefile (revision 95757) @@ -1,59 +1,55 @@ # New ports collection makefile for: gdesklets-goodweather # Date created: 17 November 2003 # Whom: Mezz # # $FreeBSD$ # 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} MAINTAINER= mezz7@cox.net COMMENT= A desklet that displays current weather condition and forecast RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets USE_BZIP2= yes USE_PYTHON= yes 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 .for ii in ${SKINS} @${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}/${ii}/large_icons @${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}/${ii}/small_icons @${INSTALL_DATA} ${WRKSRC}/${NAME}/${ii}/large_icons/*.png \ ${DATADIR}/gdesklets/Sensors/${NAME}/${ii}/large_icons/ @${INSTALL_DATA} ${WRKSRC}/${NAME}/${ii}/small_icons/*.png \ ${DATADIR}/gdesklets/Sensors/${NAME}/${ii}/small_icons/ .endfor @${INSTALL_DATA} ${WRKSRC}/${NAME}/*.py ${DATADIR}/gdesklets/Sensors/${NAME}/ @${INSTALL_DATA} ${WRKSRC}/*.display ${DATADIR}/gdesklets/Displays/${NAME}/ @${INSTALL_DATA} ${WRKSRC}/gfx/*.png ${DATADIR}/gdesklets/Displays/${NAME}/gfx/ @${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}/gdesklets/Displays/${NAME}/ @${LN} -s ${DATADIR}/gdesklets/Displays/${NAME}/README \ ${DATADIR}/gdesklets/Sensors/${NAME}/README post-install: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME} @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME} @${CAT} ${PKGMESSAGE} .include Property changes on: head/astro/gdesklets-goodweather/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/astro/gdesklets-goodweather/distinfo =================================================================== --- head/astro/gdesklets-goodweather/distinfo (revision 95756) +++ head/astro/gdesklets-goodweather/distinfo (revision 95757) @@ -1 +1 @@ -MD5 (GoodWeather-0.1.tar.bz2) = 035ad488e7385ee4aacacc96ab8a283c +MD5 (GoodWeather-0.3.tar.bz2) = f92d504e2e5732cb02ef08a23b282a0f Property changes on: head/astro/gdesklets-goodweather/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/astro/gdesklets-goodweather/pkg-message =================================================================== --- head/astro/gdesklets-goodweather/pkg-message (revision 95756) +++ head/astro/gdesklets-goodweather/pkg-message (revision 95757) @@ -1,19 +1,20 @@ ## To view the README: cat ${PREFIX}/share/gnome/gdesklets/Displays/${name}/README cat ${PREFIX}/share/gnome/gdesklets/Sensors/${name}/README To view the installed applets: ls ${PREFIX}/share/gnome/gdesklets/Displays To use those applets: gdesklets ${PREFIX}/share/gnome/gdesklets/Displays/${name}/${name}.display 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. ## Property changes on: head/astro/gdesklets-goodweather/pkg-message ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property