Date: Thu, 31 Oct 2013 19:40:01 GMT From: KATO Tsuguru <tkato432@yahoo.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/181066: misc/gkrellweather2: Update to version 2.0.8 Message-ID: <201310311940.r9VJe1i8063927@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/181066; it has been noted by GNATS. From: KATO Tsuguru <tkato432@yahoo.com> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/181066: misc/gkrellweather2: Update to version 2.0.8 Date: Fri, 1 Nov 2013 04:26:00 +0900 This is a multi-part message in MIME format. --Multipart=_Fri__1_Nov_2013_04_26_00_+0900_DTc3CkSq._ixCdQS Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Remake of the patch against current tree. --Multipart=_Fri__1_Nov_2013_04_26_00_+0900_DTc3CkSq._ixCdQS Content-Type: text/x-diff; name="misc_gkrellweather2.diff" Content-Disposition: attachment; filename="misc_gkrellweather2.diff" Content-Transfer-Encoding: 7bit diff -urN /usr/ports/misc/gkrellweather2/Makefile misc/gkrellweather2/Makefile --- /usr/ports/misc/gkrellweather2/Makefile 2013-09-22 00:31:19.000000000 +0900 +++ misc/gkrellweather2/Makefile 2013-11-01 00:00:00.000000000 +0900 @@ -2,36 +2,33 @@ # $FreeBSD: head/misc/gkrellweather2/Makefile 327745 2013-09-20 20:50:57Z bapt $ PORTNAME= gkrellweather -PORTVERSION= 2.0.7 -PORTREVISION= 9 +PORTVERSION= 2.0.8 CATEGORIES= misc geography -MASTER_SITES= http://makovick.googlepages.com/ +MASTER_SITES= https://sites.google.com/site/makovick/projects/ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= GKrellWeather is a weather plugin for GKrellM +COMMENT= Weather plugin for GKrellM + +LICENSE= GPLv2 # (or later) BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 -USES= gmake pkgconfig -ALL_TARGET= gkrellweather.so - -MAKE_ENV= enable_nls=1 PTHREAD_LIBS=${PTHREAD_LIBS} +FETCH_ARGS= -Fpr -NO_STAGE= yes -.include <bsd.port.pre.mk> - -# uses C99 builtin lrintf -.if ${ARCH} != "amd64" -EXTRA_PATCHES= ${FILESDIR}/extra-patch-lrintf -.endif +USES= gettext gmake pkgconfig +MAKE_ENV= enable_nls=1 +ALL_TARGET= gkrellweather.so do-install: - ${MKDIR} ${PREFIX}/libexec/gkrellm2/plugins - ${INSTALL_DATA} ${WRKSRC}/gkrellweather.so ${PREFIX}/libexec/gkrellm2/plugins - ${MKDIR} ${PREFIX}/share/locale/ru/ - ${INSTALL_DATA} ${WRKSRC}/po/ru.mo ${PREFIX}/share/locale/ru/LC_MESSAGES/gkrellweather.mo - ${INSTALL_SCRIPT} ${WRKSRC}/GrabWeather ${PREFIX}/bin + (cd ${WRKSRC} && ${INSTALL_SCRIPT} GrabWeather \ + ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins + (cd ${WRKSRC} && ${INSTALL_DATA} gkrellweather.so \ + ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins) + @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/ru + (cd ${WRKSRC}/po && ${INSTALL_DATA} ru.mo \ + ${STAGEDIR}${PREFIX}/share/locale/ru/LC_MESSAGES/gkrellweather.mo) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/misc/gkrellweather2/distinfo misc/gkrellweather2/distinfo --- /usr/ports/misc/gkrellweather2/distinfo 2013-06-21 03:48:25.000000000 +0900 +++ misc/gkrellweather2/distinfo 2013-11-01 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (gkrellweather-2.0.7.tgz) = ad902acd0ffb8adb1f0d838e57545d1f52a31ae33711b73d28929c2786a740ca -SIZE (gkrellweather-2.0.7.tgz) = 19968 +SHA256 (gkrellweather-2.0.8.tgz) = 06236ad489151019e71bab4ba63b4b8b06d58c58890caed8b1a28fdd05cde16d +SIZE (gkrellweather-2.0.8.tgz) = 20227 diff -urN /usr/ports/misc/gkrellweather2/files/extra-patch-lrintf misc/gkrellweather2/files/extra-patch-lrintf --- /usr/ports/misc/gkrellweather2/files/extra-patch-lrintf 2013-06-21 03:48:25.000000000 +0900 +++ misc/gkrellweather2/files/extra-patch-lrintf 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- gkrellweather.c.orig Wed Mar 2 00:23:34 2005 -+++ gkrellweather.c Wed Mar 2 00:28:58 2005 -@@ -7,6 +7,8 @@ - #include <gkrellm2/gkrellm.h> - #include <math.h> - -+#define lrintf(x) (int)rintf(x) -+ - #define DEFAULT_STATION_ID "YSSY" - - #define STYLE_NAME "weather" diff -urN /usr/ports/misc/gkrellweather2/files/patch-Makefile misc/gkrellweather2/files/patch-Makefile --- /usr/ports/misc/gkrellweather2/files/patch-Makefile 2013-06-21 03:48:25.000000000 +0900 +++ misc/gkrellweather2/files/patch-Makefile 2013-11-01 00:00:00.000000000 +0900 @@ -24,7 +24,7 @@ gkrellweather.so: $(OBJS) (cd po && ${MAKE} all ) - $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) -lpthread -+ $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) ${PTHREAD_LIBS} ++ $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) -pthread clean: (cd po && ${MAKE} clean ) diff -urN /usr/ports/misc/gkrellweather2/files/patch-gkrellweather.c misc/gkrellweather2/files/patch-gkrellweather.c --- /usr/ports/misc/gkrellweather2/files/patch-gkrellweather.c 2013-06-21 03:48:25.000000000 +0900 +++ misc/gkrellweather2/files/patch-gkrellweather.c 2013-11-01 00:00:00.000000000 +0900 @@ -1,19 +1,19 @@ --- gkrellweather.c.orig Mon Mar 31 13:12:57 2003 +++ gkrellweather.c Sun Jul 13 14:30:14 2003 -@@ -983,7 +983,7 @@ +@@ -986,7 +986,7 @@ options.windspeed_unit = 1; options.pressure_unit = 1; strcpy(options.station, DEFAULT_STATION_ID); -- sprintf(options.command, "/usr/share/gkrellm/GrabWeather %s", options.station); -+ sprintf(options.command, "GrabWeather %s", options.station); - sprintf(options.filename, "%s/.wmWeatherReports/%s.dat", - getenv("HOME"), options.station); - } -@@ -993,6 +993,7 @@ +- snprintf(options.command, 512, "/usr/share/gkrellm/GrabWeather %s", options.station); ++ snprintf(options.command, 512, "GrabWeather %s", options.station); + options.command[511] = 0; + snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat", + getenv("HOME"), options.station); +@@ -998,6 +998,7 @@ gkrellm_init_plugin(void) { #ifdef ENABLE_NLS -+ bindtextdomain(PACKAGE, LOCALEDIR); ++ bindtextdomain(PACKAGE, LOCALEDIR); bind_textdomain_codeset(PACKAGE, "UTF-8"); #endif /* ENABLE_NLS */ style_id = gkrellm_add_meter_style(&air_mon, STYLE_NAME); diff -urN /usr/ports/misc/gkrellweather2/pkg-descr misc/gkrellweather2/pkg-descr --- /usr/ports/misc/gkrellweather2/pkg-descr 2013-06-21 03:48:25.000000000 +0900 +++ misc/gkrellweather2/pkg-descr 2013-11-01 00:00:00.000000000 +0900 @@ -13,4 +13,4 @@ - Display pressure in kPa, hPa and mmHg - Display wind speeds in kmph, mps and beaufort scale -WWW: http://makovick.googlepages.com/gkrellmplugins +WWW: https://sites.google.com/site/makovick/gkrellm-plugins --Multipart=_Fri__1_Nov_2013_04_26_00_+0900_DTc3CkSq._ixCdQS--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310311940.r9VJe1i8063927>