Update to version 2.0.6, by tripledes /AT/ eslack /DOT/ org in pkgsrc-wip.

This is the GKrellM-2 port of the weather plugin.

5 files changed, 63 insertions, 77 deletions

diff --git a/misc/gkrellm-weather/DESCR b/misc/gkrellm-weather/DESCR
index 59084359fae..bd9672cb6cf 100644
--- a/misc/gkrellm-weather/DESCR
+++ b/misc/gkrellm-weather/DESCR
@@ -1,11 +1,16 @@
-GKrellWeather is a weather plugin for GKrellM.
+GKrellM plugin which shows weather info from the US National Weather
+Service
+
 Features
- -Choose your own location by 4-letter METAR station identifier code.
- -Monitor temperature, dew point, pressure, relative humidity, sky
-   condition, wind direction and speed
- -Display using imperial units (degrees Fareheight, inches of Mercury,
-    miles per hour)
- -Display using metric units (degrees Celsius, millimeters of Mercury,
-    kilometers per hour)
- -Display pressure in kPa, hPa and mmHg
- -Display wind speeds in kmph, mps and beaufort scale
+- Choose the location nearest to you by 4-letter METAR station
+  identifier code. (http://www.nws.noaa.gov/oso/siteloc.shtml)
+- Monitor temperature, dew point, pressure, relative humidity, sky
+  condition, wind direction and speed
+- Display using imperial units (degrees Fareheight, inches of
+  Mercury, miles per hour)
+- Display using metric units (degrees Celsius, millimeters of
+  Mercury, kilometers per hour)
+- Display pressure in kPa, hPa and mmHg
+- Display wind speeds in kmph, mps and beaufort scale
+
+WWW: http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm
diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile
index 7dae6f5b096..7875849cab5 100644
--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,21 +1,36 @@
-# $NetBSD: Makefile,v 1.10 2004/01/03 18:49:46 reed Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/24 23:15:55 cube Exp $
 
-DISTNAME=	gkrellweather-0.2.7
-PKGNAME=	gkrellm-weather-0.2.7
-PKGREVISION=	4
+DISTNAME=       gkrellweather-2.0.6
+PKGNAME=        gkrellm-weather-2.0.6
 CATEGORIES=	misc
-MASTER_SITES=	http://www.cse.unsw.edu.au/~flam/repository/c/gkrellm/
+MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	damon@NetBSD.org
-HOMEPAGE=	http://www.cse.unsw.edu.au/~flam/programs/gkrellweather.html
-COMMENT=	gkrellm weather plugin
+MAINTAINER=	tripledes@eslack.org
+HOMEPAGE=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
+COMMENT=	Gkrellm2 weather plugin
 
-DEPENDS+=       wmweather>=1.3:../../x11/wmweather
+DEPENDS+=       wget>=1.8:../../net/wget
+BUILD_USES_MSGFMT=      YES
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=		YES
+USE_GNU_TOOLS+=		make
+USE_PKGLOCALEDIR=	YES
+ALL_TARGET=		gkrellweather.so
 
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
+MAKE_ENV+=	LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
+		enable_nls=1
+
+pre-build:
+	${MV} ${WRKSRC}/GrabWeather ${WRKSRC}/GrabWeather.orig
+	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig
+	${SED} -e "s|/usr/local|${PREFIX}|" \
+	${WRKSRC}/Makefile.orig > ${WRKSRC}/Makefile
+	${SED}  -e "s|/usr/bin/perl|${PERL5}|" \
+	${WRKSRC}/GrabWeather.orig > ${WRKSRC}/GrabWeather
+
+.include "../../sysutils/gkrellm/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
-.include "../../sysutils/gkrellm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gkrellm-weather/PLIST b/misc/gkrellm-weather/PLIST
index 46190ed6bbe..92946b11cb3 100644
--- a/misc/gkrellm-weather/PLIST
+++ b/misc/gkrellm-weather/PLIST
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:08 zuntum Exp $
-lib/gkrellm/plugins/gkrellweather.so
+@comment $NetBSD: PLIST,v 1.2 2004/02/24 23:15:55 cube Exp $
+bin/GrabWeather
+lib/gkrellm2/plugins/gkrellweather.so
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gkrellweather.mo
diff --git a/misc/gkrellm-weather/distinfo b/misc/gkrellm-weather/distinfo
index 802905b468a..a49c893481d 100644
--- a/misc/gkrellm-weather/distinfo
+++ b/misc/gkrellm-weather/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/30 13:24:58 damon Exp $
+$NetBSD: distinfo,v 1.2 2004/02/24 23:15:55 cube Exp $
 
-SHA1 (gkrellweather-0.2.7.tar.gz) = 509ec48ee81022f22ebe8cfa01768bcc6db2a7a7
-Size (gkrellweather-0.2.7.tar.gz) = 17188 bytes
-SHA1 (patch-aa) = e1fed69e9ea938c1295bff7b06c29187c5a5ed4b
+SHA1 (gkrellweather-2.0.6.tgz) = c54f5e48879158f25db9ec4e5226cd0ca686861f
+Size (gkrellweather-2.0.6.tgz) = 20399 bytes
+SHA1 (patch-aa) = ab3068c247a1e8cc2c9f636aa5b10d317c93ac04
diff --git a/misc/gkrellm-weather/patches/patch-aa b/misc/gkrellm-weather/patches/patch-aa
index fe81eaad371..ab88bed5dbc 100644
--- a/misc/gkrellm-weather/patches/patch-aa
+++ b/misc/gkrellm-weather/patches/patch-aa
@@ -1,49 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/30 13:24:58 damon Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/24 23:15:55 cube Exp $
 
---- Makefile.orig	Sat Oct 20 01:16:36 2001
-+++ Makefile
-@@ -5,14 +5,16 @@
- IMLIB_LIB = `imlib-config --libs-gdk`
- 
- 
--FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE)
-+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) -I${PREFIX}/include
- LIBS = $(GTK_LIB) $(IMLIB_LIB)
- LFLAGS = -shared
- 
--CC = gcc $(CFLAGS) $(FLAGS)
-+CC = gcc $(CFLAGS)
- 
- OBJS = gkrellweather.o
- 
-+all: gkrellweather.so
-+
- gkrellweather.so: $(OBJS)
- 	$(CC) $(OBJS) -o gkrellweather.so $(LFLAGS) $(LIBS)  -lpthread
- 
-@@ -22,23 +24,7 @@
- gkrellweather.o: gkrellweather.c
- 
- install:
--	if [ -d /usr/lib/gkrellm/plugins/ ] ; then \
--		install -c -s -m 644 gkrellweather.so /usr/lib/gkrellm/plugins/ ; \
--	elif [ -d /usr/share/gkrellm/plugins/ ] ; then \
--		install -c -s -m 644 gkrellweather.so /usr/share/gkrellm/plugins/ ; \
--	elif [ -d /usr/local/lib/gkrellm/plugins/ ] ; then \
--		install -c -s -m 644 gkrellweather.so /usr/local/lib/gkrellm/plugins/ ; \
--	elif [ -d /usr/lib/gkrellm/plugins/ ] ; then \
--		install -c -s -m 644 gkrellweather.so /usr/lib/gkrellm/plugins/ ; \
--	else \
--		install -D -c -s -m 644 gkrellweather.so /usr/lib/gkrellm/plugins/gkrellweather.so ; \
--	fi
--	install -c -m 755 GrabWeather /usr/X11R6/bin
-+	install -c -s -m 644 gkrellweather.so ${PREFIX}/lib/gkrellm/plugins/
- 
- uninstall:
--	rm -f /usr/lib/gkrellm/plugins/gkrellweather.so
--	rm -f /usr/share/gkrellm/plugins/gkrellweather.so
--	rm -f /usr/local/lib/gkrellm/plugins/gkrellweather.so
--	rm -f /usr/lib/gkrellm/plugins/gkrellweather.so
--	rm -f /usr/X11R6/bin/GrabWeather
--
-+	rm -f ${PREFIX}/lib/plugins/gkrellweather.so
+--- gkrellweather.c.orig	2003-11-02 12:05:08.000000000 +0000
++++ gkrellweather.c	2003-11-02 12:05:23.000000000 +0000
+@@ -983,7 +983,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);
+ }