Attachment #175950 for bug #213629

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

Lines 1-7 Link Here

(-)Makefile (-1 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= ansiweather	3	PORTNAME= ansiweather
4	PORTVERSION= 1.08	4	PORTVERSION= 1.09
5	CATEGORIES= misc	5	CATEGORIES= misc
6		6
7	MAINTAINER= dbaio@bsd.com.br	7	MAINTAINER= dbaio@bsd.com.br
Lines 29-34 Link Here
29	${MKDIR} ${STAGEDIR}${DATADIR}	29	${MKDIR} ${STAGEDIR}${DATADIR}
30	${INSTALL_SCRIPT} ${WRKSRC}/ansiweather ${STAGEDIR}${PREFIX}/bin	30	${INSTALL_SCRIPT} ${WRKSRC}/ansiweather ${STAGEDIR}${PREFIX}/bin
31	${INSTALL_DATA} ${WRKSRC}/ansiweather.plugin.zsh ${STAGEDIR}${DATADIR}	31	${INSTALL_DATA} ${WRKSRC}/ansiweather.plugin.zsh ${STAGEDIR}${DATADIR}
		32	${INSTALL_MAN} ${WRKSRC}/ansiweather.1 ${STAGEDIR}${MANPREFIX}/man/man1
32		33
33	do-install-EXAMPLES-on:	34	do-install-EXAMPLES-on:
34	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	35	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1469537228	1	TIMESTAMP = 1476884144
2	SHA256 (fcambus-ansiweather-1.08_GH0.tar.gz) = 22dd814ef158df13b3fdbe72ca39e820874e710a4d341d1a2367aa771609665d	2	SHA256 (fcambus-ansiweather-1.09_GH0.tar.gz) = 75f705263c8ca1eea74039c478b6c760632f26e3b503ac9d04cd1ab188d1ca77
3	SIZE (fcambus-ansiweather-1.08_GH0.tar.gz) = 16991	3	SIZE (fcambus-ansiweather-1.09_GH0.tar.gz) = 17360




--- ansiweather.orig	2016-10-18 17:14:59 UTC
+++ ansiweather
@@ -205,7 +205,7 @@ then
 
 if [ "$usage" = true ]
 then
-	printf "%s\n" \
+	gprintf "%s\n" \
 		"" \
 		"AnsiWeather 1.08" \
 		"Copyright (c) 2013-2016, Frederic Cambus" \
@@ -224,7 +224,7 @@ then
 	forecast=$([ "$forecast" -gt "$flength" ] && echo "$flength" || echo "$forecast")
 else
 	city=$(echo "$weather" | jq -r '.name')

 	humidity=$(echo "$weather" | jq '.main.humidity')
 	pressure=$(echo "$weather" | jq '.main.pressure')
 	sky=$(echo "$weather" | jq -r '.weather[0].main')
@@ -285,7 +285,7 @@ case $units in
 		scale="°C"
 		speed_unit="m/s"
 		pressure_unit="hPa"

 		;;
 	imperial)
 		scale="°F"
@@ -293,7 +293,7 @@ case $units in
 		pressure_unit="inHg"
 		if [ "$forecast" = 0 ]
 		then

 		fi
 		;;
 esac
@@ -349,8 +349,8 @@ then
 	do
 		day=$(echo "$weather" | jq ".list[$i]")
 		date=$(epoch_to_date "$(echo "$day" | jq -r '.dt')")

 
 		icon=""
 		if [ "$symbols" = true ]
@@ -397,7 +397,7 @@ fi
 
 if [ "$ansi" = true ]
 then

Lines 1-4 Link Here

(-)pkg-plist (+1 lines)
1	bin/ansiweather	1	bin/ansiweather
		2	man/man1/ansiweather.1.gz
2	%%DATADIR%%/ansiweather.plugin.zsh	3	%%DATADIR%%/ansiweather.plugin.zsh
3	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	4	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
4	%%PORTDOCS%%%%DOCSDIR%%/README.md	5	%%PORTDOCS%%%%DOCSDIR%%/README.md

Return to bug 213629

Lines 1-15 Link Here

(-)files/patch-ansiweather (-15 / +6 lines)
1	--- ansiweather.orig 2016-07-26 11:16:31 UTC	1	--- ansiweather.orig 2016-10-18 17:14:59 UTC
2	+++ ansiweather	2	+++ ansiweather
3	@@ -66,7 +66,7 @@ done	3	@@ -205,7 +205,7 @@ then
4
5	if [ "$usage" = true ]
6	then
7	- printf "%s\n" \
8	+ gprintf "%s\n" \
9	"" \
10	"AnsiWeather 1.08" \
11	"Copyright (c) 2013-2016, Frederic Cambus" \
12	@@ -224,7 +224,7 @@ then
13	forecast=$([ "$forecast" -gt "$flength" ] && echo "$flength" \|\| echo "$forecast")	4	forecast=$([ "$forecast" -gt "$flength" ] && echo "$flength" \|\| echo "$forecast")
14	else	5	else
15	city=$(echo "$weather" \| jq -r '.name')	6	city=$(echo "$weather" \| jq -r '.name')
Lines 18-24 Link Here
18	humidity=$(echo "$weather" \| jq '.main.humidity')	9	humidity=$(echo "$weather" \| jq '.main.humidity')
19	pressure=$(echo "$weather" \| jq '.main.pressure')	10	pressure=$(echo "$weather" \| jq '.main.pressure')
20	sky=$(echo "$weather" \| jq -r '.weather[0].main')	11	sky=$(echo "$weather" \| jq -r '.weather[0].main')
21	@@ -304,7 +304,7 @@ case $units in	12	@@ -285,7 +285,7 @@ case $units in
22	scale="°C"	13	scale="°C"
23	speed_unit="m/s"	14	speed_unit="m/s"
24	pressure_unit="hPa"	15	pressure_unit="hPa"
Lines 27-33 Link Here
27	;;	18	;;
28	imperial)	19	imperial)
29	scale="°F"	20	scale="°F"
30	@@ -312,7 +312,7 @@ case $units in	21	@@ -293,7 +293,7 @@ case $units in
31	pressure_unit="inHg"	22	pressure_unit="inHg"
32	if [ "$forecast" = 0 ]	23	if [ "$forecast" = 0 ]
33	then	24	then
Lines 36-42 Link Here
36	fi	27	fi
37	;;	28	;;
38	esac	29	esac
39	@@ -368,8 +368,8 @@ then	30	@@ -349,8 +349,8 @@ then
40	do	31	do
41	day=$(echo "$weather" \| jq ".list[$i]")	32	day=$(echo "$weather" \| jq ".list[$i]")
42	date=$(epoch_to_date "$(echo "$day" \| jq -r '.dt')")	33	date=$(epoch_to_date "$(echo "$day" \| jq -r '.dt')")
Lines 47-53 Link Here
47		38
48	icon=""	39	icon=""
49	if [ "$symbols" = true ]	40	if [ "$symbols" = true ]
50	@@ -401,7 +401,7 @@ fi	41	@@ -397,7 +397,7 @@ fi
51		42
52	if [ "$ansi" = true ]	43	if [ "$ansi" = true ]
53	then	44	then