Date: Sun, 13 Jul 2003 19:34:41 +0200 (CEST) From: Pav Lucistnik <pav@oook.cz> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jylefort@brutele.be Subject: ports/54450: [update] misc/gkrellweather2 to 2.0.6 Message-ID: <200307131734.h6DHYfnj085677@hood.oook.cz> Resent-Message-ID: <200307131740.h6DHeDrS092349@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 54450 >Category: ports >Synopsis: [update] misc/gkrellweather2 to 2.0.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jul 13 10:40:12 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Pav Lucistnik >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD hood.oook.cz 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sat Jul 12 22:07:02 CEST 2003 root@hood.oook.cz:/usr/obj/usr/src/sys/PAV i386 >Description: Update gkrellweather2 to 2.0.6. This version add russian translation. - Convert some gkrellweather's Makefile patching into ports' Makefile magic. - Add patch to fix gettext support. - Take over maintainer from Jean-Yves Lefort <jylefort@brutele.be>, he wrote: I don't use gkrellm anymore, so feel free to submit a PR and take over the maintainership of the port. >How-To-Repeat: >Fix: diff -ruN /usr/ports/misc/gkrellweather2/Makefile gkrellweather2/Makefile --- /usr/ports/misc/gkrellweather2/Makefile Fri Feb 21 13:48:08 2003 +++ gkrellweather2/Makefile Sun Jul 13 19:21:41 2003 @@ -3,27 +3,31 @@ # Whom: Jean-Yves Lefort <jylefort@brutele.be> # # $FreeBSD: ports/misc/gkrellweather2/Makefile,v 1.3 2003/02/21 12:48:08 knu Exp $ -# $Id: Makefile,v 1.1.1.1 2002/11/24 03:13:54 jylefort Exp $ # PORTNAME= gkrellweather -PORTVERSION= 2.0.5 +PORTVERSION= 2.0.6 CATEGORIES= misc MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/ EXTRACT_SUFX= .tgz -MAINTAINER= jylefort@brutele.be +MAINTAINER= pav@oook.cz COMMENT= GKrellWeather is a weather plugin for GKrellM BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 \ ${X11BASE}/bin/GrabWeather:${PORTSDIR}/misc/wmweather +USE_GMAKE= yes USE_X_PREFIX= yes +ALL_TARGET= gkrellweather.so -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - INSTALL_DATA="${INSTALL_DATA}" +MAKE_ENV= enable_nls=1 PTHREAD_LIBS=${PTHREAD_LIBS} + +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 .include <bsd.port.mk> diff -ruN /usr/ports/misc/gkrellweather2/distinfo gkrellweather2/distinfo --- /usr/ports/misc/gkrellweather2/distinfo Fri Dec 20 15:09:33 2002 +++ gkrellweather2/distinfo Sun Jul 13 13:24:13 2003 @@ -1 +1 @@ -MD5 (gkrellweather-2.0.5.tgz) = 6b66c920d16b68bd9529f38f203495d3 +MD5 (gkrellweather-2.0.6.tgz) = 458125fe9276db3733a6c4b0e27eca86 diff -ruN /usr/ports/misc/gkrellweather2/files/patch-Makefile gkrellweather2/files/patch-Makefile --- /usr/ports/misc/gkrellweather2/files/patch-Makefile Fri Dec 20 15:09:33 2002 +++ gkrellweather2/files/patch-Makefile Sun Jul 13 13:58:21 2003 @@ -1,41 +1,23 @@ ---- Makefile.orig Tue Nov 26 19:24:39 2002 -+++ Makefile Fri Dec 13 02:59:14 2002 -@@ -1,6 +1,6 @@ +--- Makefile.orig Mon Mar 31 13:12:57 2003 ++++ Makefile Sun Jul 13 13:58:11 2003 +@@ -1,9 +1,9 @@ PKGNAME = gkrellweather - VERSION = 2.0.5 + VERSION = 2.0.6 -CFLAGS = -O2 -Wall -fPIC `pkg-config gtk+-2.0 --cflags` +CFLAGS += -Wall -fPIC `pkg-config gtk+-2.0 --cflags` LIBS = `pkg-config gtk+-2.0 --libs` LFLAGS = -shared +-PREFIX = /usr/local ++PREFIX ?= /usr/local -@@ -8,24 +8,20 @@ + LOCALEDIR := $(PREFIX)/share/locale - OBJS = gkrellweather.o +@@ -20,7 +20,7 @@ -+all: gkrellweather.so -+ gkrellweather.so: $(OBJS) -- $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) -lpthread -+ ${CC} ${OBJS} ${PTHREAD_LIBS} -DVERSION=\"${VERSION}\" -o gkrellweather.so ${LFLAGS} ${LIBS} + (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} clean: - rm -f *.o core *.so* *.bak *~ - - gkrellweather.o: gkrellweather.c -- $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c gkrellweather.c -+ ${CC} ${CFLAGS} ${PTHREAD_CFLAGS} -DVERSION=\"$(VERSION)\" -c gkrellweather.c - - install: -- if [ -d /usr/lib/gkrellm2/plugins/ ] ; then \ -- install -c -s -m 644 gkrellweather.so /usr/lib/gkrellm2/plugins/ ; \ -- elif [ -d /usr/local/lib/gkrellm2/plugins/ ] ; then \ -- install -c -s -m 644 gkrellweather.so /usr/local/lib/gkrellm2/plugins/ ; \ -- else \ -- install -D -c -s -m 644 gkrellweather.so /usr/local/lib/gkrellm2/plugins/gkrellweather.so ; \ -- fi -- install -c -m 755 GrabWeather /usr/local/bin -+ ${MKDIR} ${PREFIX}/libexec/gkrellm2/plugins -+ ${INSTALL_DATA} gkrellweather.so ${PREFIX}/libexec/gkrellm2/plugins - - uninstall: - rm -f /usr/lib/gkrellm2/plugins/gkrellweather.so + (cd po && ${MAKE} clean ) diff -ruN /usr/ports/misc/gkrellweather2/files/patch-gkrellweather.c gkrellweather2/files/patch-gkrellweather.c --- /usr/ports/misc/gkrellweather2/files/patch-gkrellweather.c Sun Nov 24 05:14:55 2002 +++ gkrellweather2/files/patch-gkrellweather.c Sun Jul 13 14:30:56 2003 @@ -1,15 +1,6 @@ ---- gkrellweather.c.orig Sun Nov 24 04:49:42 2002 -+++ gkrellweather.c Sun Nov 24 04:50:58 2002 -@@ -720,7 +720,7 @@ - options.station[1] = c[1]; - options.station[2] = c[2]; - options.station[3] = c[3]; -- sprintf(options.command, "/usr/local/bin/GrabWeather %s", options.station); -+ sprintf(options.command, "GrabWeather %s", options.station); - sprintf(options.filename, "%s/.wmWeatherReports/%s.dat", - getenv("HOME"), options.station); - net_update = FALSE; -@@ -981,7 +981,7 @@ +--- gkrellweather.c.orig Mon Mar 31 13:12:57 2003 ++++ gkrellweather.c Sun Jul 13 14:30:14 2003 +@@ -983,7 +983,7 @@ options.windspeed_unit = 1; options.pressure_unit = 1; strcpy(options.station, DEFAULT_STATION_ID); @@ -18,3 +9,11 @@ sprintf(options.filename, "%s/.wmWeatherReports/%s.dat", getenv("HOME"), options.station); } +@@ -993,6 +993,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); diff -ruN /usr/ports/misc/gkrellweather2/pkg-plist gkrellweather2/pkg-plist --- /usr/ports/misc/gkrellweather2/pkg-plist Sun Nov 24 05:14:55 2002 +++ gkrellweather2/pkg-plist Sun Jul 13 13:59:02 2003 @@ -1 +1,2 @@ libexec/gkrellm2/plugins/gkrellweather.so +share/locale/ru/LC_MESSAGES/gkrellweather.mo >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200307131734.h6DHYfnj085677>