Attachment #135986 for bug #181066




# $FreeBSD: head/misc/gkrellweather2/Makefile 327745 2013-09-20 20:50:57Z bapt $

PORTNAME=	gkrellweather
PORTVERSION=	2.0.8
PORTREVISION=	9
CATEGORIES=	misc geography
MASTER_SITES=	https://sites.google.com/site/makovick/projects/
EXTRACT_SUFX=	.tgz

MAINTAINER=	ports@FreeBSD.org
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

FETCH_ARGS=	-Fpr
ALL_TARGET=	gkrellweather.so

MAKE_ENV=	enable_nls=1 PTHREAD_LIBS=${PTHREAD_LIBS}

USES=		gettext gmake pkgconfig
MAKE_ENV=	enable_nls=1
ALL_TARGET=	gkrellweather.so
# uses C99 builtin lrintf
.if ${ARCH} != "amd64"
EXTRA_PATCHES=	${FILESDIR}/extra-patch-lrintf
.endif

do-install:
	(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.mk>

Lines 1-2 Link Here

(-)misc/gkrellweather2/distinfo (-2 / +2 lines)
1	SHA256 (gkrellweather-2.0.7.tgz) = ad902acd0ffb8adb1f0d838e57545d1f52a31ae33711b73d28929c2786a740ca	1	SHA256 (gkrellweather-2.0.8.tgz) = 06236ad489151019e71bab4ba63b4b8b06d58c58890caed8b1a28fdd05cde16d
2	SIZE (gkrellweather-2.0.7.tgz) = 19968	2	SIZE (gkrellweather-2.0.8.tgz) = 20227

Lines 1-11 Link Here

(-)misc/gkrellweather2/files/extra-patch-lrintf (-11 lines)
1	--- gkrellweather.c.orig Wed Mar 2 00:23:34 2005
2	+++ gkrellweather.c Wed Mar 2 00:28:58 2005
3	@@ -7,6 +7,8 @@
4	#include <gkrellm2/gkrellm.h>
5	#include <math.h>
6
7	+#define lrintf(x) (int)rintf(x)
8	+
9	#define DEFAULT_STATION_ID "YSSY"
10
11	#define STYLE_NAME "weather"

Lines 24-30 Link Here

(-)misc/gkrellweather2/files/patch-Makefile (-1 / +1 lines)
24	gkrellweather.so: $(OBJS)	24	gkrellweather.so: $(OBJS)
25	(cd po && ${MAKE} all )	25	(cd po && ${MAKE} all )
26	- $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) -lpthread	26	- $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) -lpthread
27	+ $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) ${PTHREAD_LIBS}	27	+ $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) -pthread
28		28
29	clean:	29	clean:
30	(cd po && ${MAKE} clean )	30	(cd po && ${MAKE} clean )




--- gkrellweather.c.orig	Mon Mar 31 13:12:57 2003
+++ gkrellweather.c	Sun Jul 13 14:30:14 2003
@@ -986,7 +986,7 @@
     options.windspeed_unit = 1;
     options.pressure_unit = 1;
     strcpy(options.station, DEFAULT_STATION_ID);
-    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);
         bind_textdomain_codeset(PACKAGE, "UTF-8");
     #endif /* ENABLE_NLS */
     style_id = gkrellm_add_meter_style(&air_mon, STYLE_NAME);

Lines 13-16 Link Here

(-)misc/gkrellweather2/pkg-descr (-1 / +1 lines)
13	- Display pressure in kPa, hPa and mmHg	13	- Display pressure in kPa, hPa and mmHg
14	- Display wind speeds in kmph, mps and beaufort scale	14	- Display wind speeds in kmph, mps and beaufort scale
15		15
16	WWW: http://makovick.googlepages.com/gkrellmplugins	16	WWW: https://sites.google.com/site/makovick/gkrellm-plugins

Return to bug 181066

Lines 2-37 Link Here

(-)misc/gkrellweather2/Makefile (-21 / +18 lines)
2	# $FreeBSD: head/misc/gkrellweather2/Makefile 327745 2013-09-20 20:50:57Z bapt $	2	# $FreeBSD: head/misc/gkrellweather2/Makefile 327745 2013-09-20 20:50:57Z bapt $
3		3
4	PORTNAME= gkrellweather	4	PORTNAME= gkrellweather
5	PORTVERSION= 2.0.7	5	PORTVERSION= 2.0.8
6	PORTREVISION= 9
7	CATEGORIES= misc geography	6	CATEGORIES= misc geography
8	MASTER_SITES= http://makovick.googlepages.com/	7	MASTER_SITES= https://sites.google.com/site/makovick/projects/
9	EXTRACT_SUFX= .tgz	8	EXTRACT_SUFX= .tgz
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
12	COMMENT= GKrellWeather is a weather plugin for GKrellM	11	COMMENT= Weather plugin for GKrellM
		12
		13	LICENSE= GPLv2 # (or later)
13		14
14	BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2	15	BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
15	RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2	16	RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
16		17
17	USES= gmake pkgconfig	18	FETCH_ARGS= -Fpr
18	ALL_TARGET= gkrellweather.so
19
20	MAKE_ENV= enable_nls=1 PTHREAD_LIBS=${PTHREAD_LIBS}
21		19
22	NO_STAGE= yes	20	USES= gettext gmake pkgconfig
23	.include <bsd.port.pre.mk>	21	MAKE_ENV= enable_nls=1
24		22	ALL_TARGET= gkrellweather.so
25	# uses C99 builtin lrintf
26	.if ${ARCH} != "amd64"
27	EXTRA_PATCHES= ${FILESDIR}/extra-patch-lrintf
28	.endif
29		23
30	do-install:	24	do-install:
31	${MKDIR} ${PREFIX}/libexec/gkrellm2/plugins	25	(cd ${WRKSRC} && ${INSTALL_SCRIPT} GrabWeather \
32	${INSTALL_DATA} ${WRKSRC}/gkrellweather.so ${PREFIX}/libexec/gkrellm2/plugins	26	${STAGEDIR}${PREFIX}/bin)
33	${MKDIR} ${PREFIX}/share/locale/ru/	27	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins
34	${INSTALL_DATA} ${WRKSRC}/po/ru.mo ${PREFIX}/share/locale/ru/LC_MESSAGES/gkrellweather.mo	28	(cd ${WRKSRC} && ${INSTALL_DATA} gkrellweather.so \
35	${INSTALL_SCRIPT} ${WRKSRC}/GrabWeather ${PREFIX}/bin	29	${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins)
		30	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/ru
		31	(cd ${WRKSRC}/po && ${INSTALL_DATA} ru.mo \
		32	${STAGEDIR}${PREFIX}/share/locale/ru/LC_MESSAGES/gkrellweather.mo)
36		33
37	.include <bsd.port.post.mk>	34	.include <bsd.port.mk>

Lines 1-19 Link Here

(-)misc/gkrellweather2/files/patch-gkrellweather.c (-8 / +8 lines)
1	--- gkrellweather.c.orig Mon Mar 31 13:12:57 2003	1	--- gkrellweather.c.orig Mon Mar 31 13:12:57 2003
2	+++ gkrellweather.c Sun Jul 13 14:30:14 2003	2	+++ gkrellweather.c Sun Jul 13 14:30:14 2003
3	@@ -983,7 +983,7 @@	3	@@ -986,7 +986,7 @@
4	options.windspeed_unit = 1;	4	options.windspeed_unit = 1;
5	options.pressure_unit = 1;	5	options.pressure_unit = 1;
6	strcpy(options.station, DEFAULT_STATION_ID);	6	strcpy(options.station, DEFAULT_STATION_ID);
7	- sprintf(options.command, "/usr/share/gkrellm/GrabWeather %s", options.station);	7	- snprintf(options.command, 512, "/usr/share/gkrellm/GrabWeather %s", options.station);
8	+ sprintf(options.command, "GrabWeather %s", options.station);	8	+ snprintf(options.command, 512, "GrabWeather %s", options.station);
9	sprintf(options.filename, "%s/.wmWeatherReports/%s.dat",	9	options.command[511] = 0;
10	getenv("HOME"), options.station);	10	snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat",
11	}	11	getenv("HOME"), options.station);
12	@@ -993,6 +993,7 @@	12	@@ -998,6 +998,7 @@
13	gkrellm_init_plugin(void)	13	gkrellm_init_plugin(void)
14	{	14	{
15	#ifdef ENABLE_NLS	15	#ifdef ENABLE_NLS
16	+ bindtextdomain(PACKAGE, LOCALEDIR);	16	+ bindtextdomain(PACKAGE, LOCALEDIR);
17	bind_textdomain_codeset(PACKAGE, "UTF-8");	17	bind_textdomain_codeset(PACKAGE, "UTF-8");
18	#endif /* ENABLE_NLS */	18	#endif /* ENABLE_NLS */
19	style_id = gkrellm_add_meter_style(&air_mon, STYLE_NAME);	19	style_id = gkrellm_add_meter_style(&air_mon, STYLE_NAME);