Date: Mon, 12 Sep 2011 14:49:36 GMT From: Veniamin Gvozdikov <g.veniamin@googlemail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/160680: [patch] deskutils/conkyforecast new version Message-ID: <201109121449.p8CEnapl028186@red.freebsd.org> Resent-Message-ID: <201109121450.p8CEo6To013373@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160680 >Category: ports >Synopsis: [patch] deskutils/conkyforecast new version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Sep 12 14:50:06 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Veniamin Gvozdikov >Release: FreeBSD 8.2-RELEASE >Organization: >Environment: FreeBSD ololo 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Aug 18 11:19:07 MSD 2011 root@ololo:/usr/obj/usr/src/sys/OLOLO amd64 >Description: Up to 2.20 >How-To-Repeat: >Fix: diff -ruN conkyforecast.orig/Makefile conkyforecast/Makefile --- conkyforecast.orig/Makefile 2011-09-12 18:46:50.156428968 +0400 +++ conkyforecast/Makefile 2011-09-12 18:46:34.069736106 +0400 @@ -6,18 +6,20 @@ # PORTNAME= conkyforecast -PORTVERSION= 2.09 -PORTREVISION= 1 +PORTVERSION= 2.20 CATEGORIES= deskutils -MASTER_SITES= http://launchpadlibrarian.net/37518633/ \ +MASTER_SITES= https://launchpadlibrarian.net/70673352/ \ http://fbsd.zlonet.ru/distfiles/ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= g.veniamin@googlemail.com COMMENT= Weather forecast script for conky +LICENSE= GPLv3 + BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= conky:${PORTSDIR}/sysutils/conky \ + pidof:${PORTSDIR}/sysutils/pidof \ fc-cache:${PORTSDIR}/x11-fonts/fontconfig USE_PYTHON= yes @@ -33,8 +35,21 @@ post-patch: @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/${PORTNAME},${DATADIR},g' \ - setup.py test/conkyrc example/conkyrc conkyForecast.py conkyForecast - @cd ${WRKSRC} && ${RM} -fr test/conkyrc.bak example/conkyrc.bak + setup.py \ + test/conkyForecast.test.conkyrc \ + test/conkyForecast.test.sh \ + example/conkyForecast.fontbased.sh \ + example/conkyForecast.fontbasedtemplate.conkyrc \ + example/conkyForecast.fontbasedtemplate.sh \ + example/conkyForecast.imagebasedtemplate.conkyrc \ + example/conkyForecast.imagebasedtemplate.sh \ + conkyForecast.py \ + conkyForecast \ + conkyForecast-SunsetSunriseCountdown + @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/bin/python,/usr/bin/env,g' \ + conkyForecast \ + conkyForecast-SunsetSunriseCountdown + @cd ${WRKSRC} && ${RM} -fr test/*.bak example/*.bak post-install: @${MKDIR} ${FONTSDIR} diff -ruN conkyforecast.orig/distinfo conkyforecast/distinfo --- conkyforecast.orig/distinfo 2011-09-12 18:46:50.157452282 +0400 +++ conkyforecast/distinfo 2011-09-12 16:49:12.976068615 +0400 @@ -1,2 +1,2 @@ -SHA256 (conkyforecast_2.09.tar.gz) = a7c196f9cb05e76098ff27149c34f634e0baaf8bf895e58156d3200135dd28cc -SIZE (conkyforecast_2.09.tar.gz) = 11029079 +SHA256 (conkyforecast_2.20.tar.gz) = 884e49409459af50255cffc76d2231c8d0c49744d30863ccabe7737c042b2c2b +SIZE (conkyforecast_2.20.tar.gz) = 11097961 diff -ruN conkyforecast.orig/files/patch-conkyForecast conkyforecast/files/patch-conkyForecast --- conkyforecast.orig/files/patch-conkyForecast 2011-09-12 18:46:50.156428968 +0400 +++ conkyforecast/files/patch-conkyForecast 2011-09-12 18:06:08.128705891 +0400 @@ -1,7 +1,21 @@ ---- conkyForecast.orig 2010-01-07 05:02:45.000000000 +0700 -+++ conkyForecast 2010-05-07 02:07:30.000000000 +0800 -@@ -1,3 +1,3 @@ +--- conkyForecast.orig 2011-09-12 18:05:15.686489911 +0400 ++++ conkyForecast 2011-09-12 18:05:39.133432190 +0400 +@@ -1,17 +1,6 @@ #! /bin/sh cd /usr/share/conkyforecast/ --$PYTHONPATH /usr/bin/python /usr/share/conkyforecast/conkyForecast.py "$@" -+$PYTHONPATH /usr/bin/env python /usr/share/conkyforecast/conkyForecast.py "$@" + +-if [ -f /usr/bin/python2 ]; then +- pythoncmd="/usr/bin/python2" +-elif [ -f /usr/bin/python2.7 ] ; then +- pythoncmd="/usr/bin/python2.7" +-elif [ -f /usr/bin/python2.6 ] ; then +- pythoncmd="/usr/bin/python2.6" +-else +- # here's hoping! +- pythoncmd="/usr/bin/python" +-fi +- + pythonfile="/usr/share/conkyforecast/conkyForecast.py" + +-exec $pythoncmd $pythonfile "$@" ++/usr/bin/env python $pythonfile "$@" diff -ruN conkyforecast.orig/files/patch-conkyForecast-SunsetSunriseCountdown conkyforecast/files/patch-conkyForecast-SunsetSunriseCountdown --- conkyforecast.orig/files/patch-conkyForecast-SunsetSunriseCountdown 1970-01-01 03:00:00.000000000 +0300 +++ conkyforecast/files/patch-conkyForecast-SunsetSunriseCountdown 2011-09-12 18:05:05.928566209 +0400 @@ -0,0 +1,21 @@ +--- conkyForecast-SunsetSunriseCountdown.orig 2011-09-12 18:04:11.318676684 +0400 ++++ conkyForecast-SunsetSunriseCountdown 2011-09-12 18:04:42.204794053 +0400 +@@ -1,17 +1,6 @@ + #! /bin/sh + cd /usr/share/conkyforecast/ + +-if [ -f /usr/bin/python2 ]; then +- pythoncmd="/usr/bin/python2" +-elif [ -f /usr/bin/python2.7 ] ; then +- pythoncmd="/usr/bin/python2.7" +-elif [ -f /usr/bin/python2.6 ] ; then +- pythoncmd="/usr/bin/python2.6" +-else +- # here's hoping! +- pythoncmd="/usr/bin/python" +-fi +- + pythonfile="/usr/share/conkyforecast/conkyForecast-SunsetSunriseCountdown.py" + +-exec $pythoncmd $pythonfile "$@" ++/usr/bin/env python $pythonfile "$@" diff -ruN conkyforecast.orig/files/patch-conkyForecast.py conkyforecast/files/patch-conkyForecast.py --- conkyforecast.orig/files/patch-conkyForecast.py 2011-09-12 18:46:50.156428968 +0400 +++ conkyforecast/files/patch-conkyForecast.py 2011-09-12 16:54:03.569042582 +0400 @@ -1,7 +1,7 @@ ---- conkyForecast.py.orig 2010-01-07 05:02:45.000000000 +0700 -+++ conkyForecast.py 2010-05-07 01:54:00.000000000 +0800 +--- conkyForecast.py.orig 2011-09-12 16:53:29.846760560 +0400 ++++ conkyForecast.py 2011-09-12 16:53:37.428868063 +0400 @@ -1,4 +1,4 @@ --#!/usr/bin/python +-#!/usr/bin/env python2 +#!/usr/bin/env python # -*- coding: utf-8 -*- ############################################################################### diff -ruN conkyforecast.orig/pkg-plist conkyforecast/pkg-plist --- conkyforecast.orig/pkg-plist 2011-09-12 18:46:50.157452282 +0400 +++ conkyforecast/pkg-plist 2011-09-12 17:15:43.588330229 +0400 @@ -1,9 +1,7 @@ bin/conkyForecast +bin/conkyForecast-SunsetSunriseCountdown %%DATADIR%%/conkyForecast.config -%%DATADIR%%/conkyForecast.pot %%DATADIR%%/conkyForecast.py -%%DATADIR%%/example/conkyForecast.template -%%DATADIR%%/example/conkyrc %%FONTSDIR%%/Arrows.sfd.tar.gz %%FONTSDIR%%/Arrows.ttf %%FONTSDIR%%/ConkyWeather.otf @@ -168,15 +166,43 @@ %%DATADIR%%/locale/fr/LC_MESSAGES/conkyForecast.po %%DATADIR%%/locale/it/LC_MESSAGES/conkyForecast.mo %%DATADIR%%/locale/it/LC_MESSAGES/conkyForecast.po +%%DATADIR%%/locale/lt/LC_MESSAGES/conkyForecast.mo +%%DATADIR%%/locale/lt/LC_MESSAGES/conkyForecast.po +%%DATADIR%%/locale/locale_codes.txt %%DATADIR%%/locale/nl/LC_MESSAGES/conkyForecast.mo %%DATADIR%%/locale/nl/LC_MESSAGES/conkyForecast.po %%DATADIR%%/locale/pl/LC_MESSAGES/conkyForecast.mo %%DATADIR%%/locale/pl/LC_MESSAGES/conkyForecast.po %%DATADIR%%/locale/ro/LC_MESSAGES/conkyForecast.mo %%DATADIR%%/locale/ro/LC_MESSAGES/conkyForecast.po -%%DATADIR%%/test/conkyForecast.template -%%DATADIR%%/test/conkyrc +%%DATADIR%%/locale/sk/LC_MESSAGES/conkyForecast.po +%%DATADIR%%/locale/sk/LC_MESSAGES/conkyForecast.mo +%%DATADIR%%/locale/conkyForecast.pot +%%DATADIR%%/locale/sv/LC_MESSAGES/conkyForecast.po +%%DATADIR%%/locale/sv/LC_MESSAGES/conkyForecast.mo +%%DATADIR%%/locale/zh/LC_MESSAGES/conkyForecast.mo +%%DATADIR%%/locale/zh/LC_MESSAGES/conkyForecast.po +%%DATADIR%%/test/conkyForecast.test.sh +%%DATADIR%%/test/conkyForecast.test.template +%%DATADIR%%/test/conkyForecast.test.conkyrc +%%DATADIR%%/example/conkyForecast.fontbased.sh +%%DATADIR%%/example/conkyForecast.imagebasedtemplate.template +%%DATADIR%%/example/conkyForecast.imagebasedtemplate.conkyrc +%%DATADIR%%/example/conkyForecast.fontbased.conkyrc +%%DATADIR%%/example/conkyForecast.imagebasedtemplate.sh +%%DATADIR%%/example/conkyForecast.fontbasedtemplate.template +%%DATADIR%%/example/conkyForecast.fontbasedtemplate.sh +%%DATADIR%%/example/conkyForecast.fontbasedtemplate.conkyrc +%%DATADIR%%/conkyForecast-SunsetSunriseCountdown.py @dirrm %%DATADIR%%/test +@dirrm %%DATADIR%%/locale/zh/LC_MESSAGES +@dirrm %%DATADIR%%/locale/zh +@dirrm %%DATADIR%%/locale/sv/LC_MESSAGES +@dirrm %%DATADIR%%/locale/sv +@dirrm %%DATADIR%%/locale/sk/LC_MESSAGES +@dirrm %%DATADIR%%/locale/sk +@dirrm %%DATADIR%%/locale/lt/LC_MESSAGES +@dirrm %%DATADIR%%/locale/lt @dirrm %%DATADIR%%/locale/ro/LC_MESSAGES @dirrm %%DATADIR%%/locale/ro @dirrm %%DATADIR%%/locale/pl/LC_MESSAGES >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109121449.p8CEnapl028186>