Attachment #118444 for bug #160680

View | Details | Raw Unified | Return to bug 160680
Collapse All | Expand All




#

PORTNAME=	conkyforecast
PORTVERSION=	2.20
PORTREVISION=	1
CATEGORIES=	deskutils
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


post-patch:
	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/${PORTNAME},${DATADIR},g' \
		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}

Lines 1-2 Link Here

(-)conkyforecast/distinfo (-2 / +2 lines)
1	SHA256 (conkyforecast_2.09.tar.gz) = a7c196f9cb05e76098ff27149c34f634e0baaf8bf895e58156d3200135dd28cc	1	SHA256 (conkyforecast_2.20.tar.gz) = 884e49409459af50255cffc76d2231c8d0c49744d30863ccabe7737c042b2c2b
2	SIZE (conkyforecast_2.09.tar.gz) = 11029079	2	SIZE (conkyforecast_2.20.tar.gz) = 11097961




--- 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/
 
-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 "$@"




--- 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 "$@"

Lines 1-7 Link Here

(-)conkyforecast/files/patch-conkyForecast.py (-3 / +3 lines)
1	--- conkyForecast.py.orig 2010-01-07 05:02:45.000000000 +0700	1	--- conkyForecast.py.orig 2011-09-12 16:53:29.846760560 +0400
2	+++ conkyForecast.py 2010-05-07 01:54:00.000000000 +0800	2	+++ conkyForecast.py 2011-09-12 16:53:37.428868063 +0400
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#!/usr/bin/python	4	-#!/usr/bin/env python2
5	+#!/usr/bin/env python	5	+#!/usr/bin/env python
6	# -- coding: utf-8 --	6	# -- coding: utf-8 --
7	###############################################################################	7	###############################################################################

Lines 1-9 Link Here

(-)conkyforecast/pkg-plist (-5 / +31 lines)
1	bin/conkyForecast	1	bin/conkyForecast
		2	bin/conkyForecast-SunsetSunriseCountdown
2	%%DATADIR%%/conkyForecast.config	3	%%DATADIR%%/conkyForecast.config
3	%%DATADIR%%/conkyForecast.pot
4	%%DATADIR%%/conkyForecast.py	4	%%DATADIR%%/conkyForecast.py
5	%%DATADIR%%/example/conkyForecast.template
6	%%DATADIR%%/example/conkyrc
7	%%FONTSDIR%%/Arrows.sfd.tar.gz	5	%%FONTSDIR%%/Arrows.sfd.tar.gz
8	%%FONTSDIR%%/Arrows.ttf	6	%%FONTSDIR%%/Arrows.ttf
9	%%FONTSDIR%%/ConkyWeather.otf	7	%%FONTSDIR%%/ConkyWeather.otf
Lines 168-182 Link Here
168	%%DATADIR%%/locale/fr/LC_MESSAGES/conkyForecast.po	166	%%DATADIR%%/locale/fr/LC_MESSAGES/conkyForecast.po
169	%%DATADIR%%/locale/it/LC_MESSAGES/conkyForecast.mo	167	%%DATADIR%%/locale/it/LC_MESSAGES/conkyForecast.mo
170	%%DATADIR%%/locale/it/LC_MESSAGES/conkyForecast.po	168	%%DATADIR%%/locale/it/LC_MESSAGES/conkyForecast.po
		169	%%DATADIR%%/locale/lt/LC_MESSAGES/conkyForecast.mo
		170	%%DATADIR%%/locale/lt/LC_MESSAGES/conkyForecast.po
		171	%%DATADIR%%/locale/locale_codes.txt
171	%%DATADIR%%/locale/nl/LC_MESSAGES/conkyForecast.mo	172	%%DATADIR%%/locale/nl/LC_MESSAGES/conkyForecast.mo
172	%%DATADIR%%/locale/nl/LC_MESSAGES/conkyForecast.po	173	%%DATADIR%%/locale/nl/LC_MESSAGES/conkyForecast.po
173	%%DATADIR%%/locale/pl/LC_MESSAGES/conkyForecast.mo	174	%%DATADIR%%/locale/pl/LC_MESSAGES/conkyForecast.mo
174	%%DATADIR%%/locale/pl/LC_MESSAGES/conkyForecast.po	175	%%DATADIR%%/locale/pl/LC_MESSAGES/conkyForecast.po
175	%%DATADIR%%/locale/ro/LC_MESSAGES/conkyForecast.mo	176	%%DATADIR%%/locale/ro/LC_MESSAGES/conkyForecast.mo
176	%%DATADIR%%/locale/ro/LC_MESSAGES/conkyForecast.po	177	%%DATADIR%%/locale/ro/LC_MESSAGES/conkyForecast.po
177	%%DATADIR%%/test/conkyForecast.template	178	%%DATADIR%%/locale/sk/LC_MESSAGES/conkyForecast.po
178	%%DATADIR%%/test/conkyrc	179	%%DATADIR%%/locale/sk/LC_MESSAGES/conkyForecast.mo
		180	%%DATADIR%%/locale/conkyForecast.pot
		181	%%DATADIR%%/locale/sv/LC_MESSAGES/conkyForecast.po
		182	%%DATADIR%%/locale/sv/LC_MESSAGES/conkyForecast.mo
		183	%%DATADIR%%/locale/zh/LC_MESSAGES/conkyForecast.mo
		184	%%DATADIR%%/locale/zh/LC_MESSAGES/conkyForecast.po
		185	%%DATADIR%%/test/conkyForecast.test.sh
		186	%%DATADIR%%/test/conkyForecast.test.template
		187	%%DATADIR%%/test/conkyForecast.test.conkyrc
		188	%%DATADIR%%/example/conkyForecast.fontbased.sh
		189	%%DATADIR%%/example/conkyForecast.imagebasedtemplate.template
		190	%%DATADIR%%/example/conkyForecast.imagebasedtemplate.conkyrc
		191	%%DATADIR%%/example/conkyForecast.fontbased.conkyrc
		192	%%DATADIR%%/example/conkyForecast.imagebasedtemplate.sh
		193	%%DATADIR%%/example/conkyForecast.fontbasedtemplate.template
		194	%%DATADIR%%/example/conkyForecast.fontbasedtemplate.sh
		195	%%DATADIR%%/example/conkyForecast.fontbasedtemplate.conkyrc
		196	%%DATADIR%%/conkyForecast-SunsetSunriseCountdown.py
179	@dirrm %%DATADIR%%/test	197	@dirrm %%DATADIR%%/test
		198	@dirrm %%DATADIR%%/locale/zh/LC_MESSAGES
		199	@dirrm %%DATADIR%%/locale/zh
		200	@dirrm %%DATADIR%%/locale/sv/LC_MESSAGES
		201	@dirrm %%DATADIR%%/locale/sv
		202	@dirrm %%DATADIR%%/locale/sk/LC_MESSAGES
		203	@dirrm %%DATADIR%%/locale/sk
		204	@dirrm %%DATADIR%%/locale/lt/LC_MESSAGES
		205	@dirrm %%DATADIR%%/locale/lt
180	@dirrm %%DATADIR%%/locale/ro/LC_MESSAGES	206	@dirrm %%DATADIR%%/locale/ro/LC_MESSAGES
181	@dirrm %%DATADIR%%/locale/ro	207	@dirrm %%DATADIR%%/locale/ro
182	@dirrm %%DATADIR%%/locale/pl/LC_MESSAGES	208	@dirrm %%DATADIR%%/locale/pl/LC_MESSAGES

Return to bug 160680

Lines 6-23 Link Here

(-)conkyforecast/Makefile (-5 / +20 lines)
6	#	6	#
7		7
8	PORTNAME= conkyforecast	8	PORTNAME= conkyforecast
9	PORTVERSION= 2.09	9	PORTVERSION= 2.20
10	PORTREVISION= 1
11	CATEGORIES= deskutils	10	CATEGORIES= deskutils
12	MASTER_SITES= http://launchpadlibrarian.net/37518633/ \	11	MASTER_SITES= https://launchpadlibrarian.net/70673352/ \
13	http://fbsd.zlonet.ru/distfiles/	12	http://fbsd.zlonet.ru/distfiles/
14	DISTNAME= ${PORTNAME}_${PORTVERSION}	13	DISTNAME= ${PORTNAME}_${PORTVERSION}
15		14
16	MAINTAINER= g.veniamin@googlemail.com	15	MAINTAINER= g.veniamin@googlemail.com
17	COMMENT= Weather forecast script for conky	16	COMMENT= Weather forecast script for conky
18		17
		18	LICENSE= GPLv3
		19
19	BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig	20	BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
20	RUN_DEPENDS= conky:${PORTSDIR}/sysutils/conky \	21	RUN_DEPENDS= conky:${PORTSDIR}/sysutils/conky \
		22	pidof:${PORTSDIR}/sysutils/pidof \
21	fc-cache:${PORTSDIR}/x11-fonts/fontconfig	23	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
22		24
23	USE_PYTHON= yes	25	USE_PYTHON= yes
Lines 33-40 Link Here
33		35
34	post-patch:	36	post-patch:
35	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/${PORTNAME},${DATADIR},g' \	37	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/${PORTNAME},${DATADIR},g' \
36	setup.py test/conkyrc example/conkyrc conkyForecast.py conkyForecast	38	setup.py \
37	@cd ${WRKSRC} && ${RM} -fr test/conkyrc.bak example/conkyrc.bak	39	test/conkyForecast.test.conkyrc \
		40	test/conkyForecast.test.sh \
		41	example/conkyForecast.fontbased.sh \
		42	example/conkyForecast.fontbasedtemplate.conkyrc \
		43	example/conkyForecast.fontbasedtemplate.sh \
		44	example/conkyForecast.imagebasedtemplate.conkyrc \
		45	example/conkyForecast.imagebasedtemplate.sh \
		46	conkyForecast.py \
		47	conkyForecast \
		48	conkyForecast-SunsetSunriseCountdown
		49	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/bin/python,/usr/bin/env,g' \
		50	conkyForecast \
		51	conkyForecast-SunsetSunriseCountdown
		52	@cd ${WRKSRC} && ${RM} -fr test/.bak example/.bak
38		53
39	post-install:	54	post-install:
40	@${MKDIR} ${FONTSDIR}	55	@${MKDIR} ${FONTSDIR}

Lines 1-7 Link Here

(-)conkyforecast/files/patch-conkyForecast (-5 / +19 lines)
1	--- conkyForecast.orig 2010-01-07 05:02:45.000000000 +0700	1	--- conkyForecast.orig 2011-09-12 18:05:15.686489911 +0400
2	+++ conkyForecast 2010-05-07 02:07:30.000000000 +0800	2	+++ conkyForecast 2011-09-12 18:05:39.133432190 +0400
3	@@ -1,3 +1,3 @@	3	@@ -1,17 +1,6 @@
4	#! /bin/sh	4	#! /bin/sh
5	cd /usr/share/conkyforecast/	5	cd /usr/share/conkyforecast/
6	-$PYTHONPATH /usr/bin/python /usr/share/conkyforecast/conkyForecast.py "$@"	6
7	+$PYTHONPATH /usr/bin/env python /usr/share/conkyforecast/conkyForecast.py "$@"	7	-if [ -f /usr/bin/python2 ]; then
		8	- pythoncmd="/usr/bin/python2"
		9	-elif [ -f /usr/bin/python2.7 ] ; then
		10	- pythoncmd="/usr/bin/python2.7"
		11	-elif [ -f /usr/bin/python2.6 ] ; then
		12	- pythoncmd="/usr/bin/python2.6"
		13	-else
		14	- # here's hoping!
		15	- pythoncmd="/usr/bin/python"
		16	-fi
		17	-
		18	pythonfile="/usr/share/conkyforecast/conkyForecast.py"
		19
		20	-exec $pythoncmd $pythonfile "$@"
		21	+/usr/bin/env python $pythonfile "$@"

Line 0 Link Here

(-)conkyforecast/files/patch-conkyForecast-SunsetSunriseCountdown (+21 lines)
	1	--- conkyForecast-SunsetSunriseCountdown.orig 2011-09-12 18:04:11.318676684 +0400
	2	+++ conkyForecast-SunsetSunriseCountdown 2011-09-12 18:04:42.204794053 +0400
	3	@@ -1,17 +1,6 @@
	4	#! /bin/sh
	5	cd /usr/share/conkyforecast/
	6
	7	-if [ -f /usr/bin/python2 ]; then
	8	- pythoncmd="/usr/bin/python2"
	9	-elif [ -f /usr/bin/python2.7 ] ; then
	10	- pythoncmd="/usr/bin/python2.7"
	11	-elif [ -f /usr/bin/python2.6 ] ; then
	12	- pythoncmd="/usr/bin/python2.6"
	13	-else
	14	- # here's hoping!
	15	- pythoncmd="/usr/bin/python"
	16	-fi
	17	-
	18	pythonfile="/usr/share/conkyforecast/conkyForecast-SunsetSunriseCountdown.py"
	19
	20	-exec $pythoncmd $pythonfile "$@"
	21	+/usr/bin/env python $pythonfile "$@"