cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to gkrellweather-2.0.7

Browse Source 
from David Hill, thanks!
- remove unused pre-configure target
- respect CFLAGS
This commit is contained in:
ajacoutot 2008-07-05 08:36:47 +00:00
parent 7a64cf7405
commit 76fb2d8fd3
5 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sysutils/gkrellm/plugins/weather/Makefile
View File

@ -1,21 +1,17 @@
# $OpenBSD: Makefile,v 1.14 2008/06/06 10:27:55 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2008/07/05 08:36:47 ajacoutot Exp $
COMMENT= Weather plugin for GkrellM2
DISTNAME= gkrellweather-2.0.6
PKGNAME= ${DISTNAME}p9
DISTNAME= gkrellweather-2.0.7
CATEGORIES= x11
EXTRACT_SUFX= .tgz
HOMEPAGE= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/index.html
MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
HOMEPAGE= http://makovick.googlepages.com/gkrellmplugins
MASTER_SITES= http://makovick.googlepages.com/
ALL_TARGET= gkrellweather.so
PLUGIN= ${WRKSRC}/gkrellweather.so
pre-configure:
@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/gkrellweather.c
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/GrabWeather \
${PREFIX}/bin/gkrellm.GrabWeather

10
sysutils/gkrellm/plugins/weather/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gkrellweather-2.0.6.tgz) = RYEl/pJ22zczpsSw4n7Khg==
RMD160 (gkrellweather-2.0.6.tgz) = WNn0qkIoAWfWMt8W3XHZSpWj0hs=
SHA1 (gkrellweather-2.0.6.tgz) = xU9eSIeRWPJduexOUibNDKaGhh8=
SHA256 (gkrellweather-2.0.6.tgz) = reooYZN4ufBL1CPqJZcRpar9fUJ2u16xVAy04WlD6Uc=
SIZE (gkrellweather-2.0.6.tgz) = 20399
MD5 (gkrellweather-2.0.7.tgz) = c/XsTpUPkzpZBDFwN9at0g==
RMD160 (gkrellweather-2.0.7.tgz) = qPkqReoEjBlJcPVhXlDEsIEg7+A=
SHA1 (gkrellweather-2.0.7.tgz) = U/YpmaSv8Bj2lDuLVt2eVJB3VMM=
SHA256 (gkrellweather-2.0.7.tgz) = rZAqzQ/7itsfDYOOV1RdH1KjGuM3Ebc9KJKcJ4anQMo=
SIZE (gkrellweather-2.0.7.tgz) = 19968

9
sysutils/gkrellm/plugins/weather/patches/patch-GrabWeather
View File

@ -1,13 +1,12 @@
$OpenBSD: patch-GrabWeather,v 1.1 2004/04/12 04:55:36 sturm Exp $
--- GrabWeather.orig 2004-04-11 21:34:07.000000000 +0200
+++ GrabWeather 2004-04-11 21:36:14.000000000 +0200
@@ -40,8 +40,7 @@ my $DataFileName = "$StationID.dat";
--- GrabWeather.orig Fri Jul 4 19:28:21 2008
+++ GrabWeather Fri Jul 4 19:29:05 2008
@@ -40,8 +40,7 @@
# Is LWP installed?
eval { require LWP::UserAgent };
if ($@) {
- my $cmd = qq{wget --proxy=off --passive-ftp --tries=0 --quiet } .
- qq{--output-document=$home/$ReportDir/$HTMLFileName $URL};
+ my $cmd = qq{ftp -o $home/$ReportDir/$HTMLFileName $URL };
+ my $cmd = qq{ftp -o $home/$ReportDir/$HTMLFileName $URL};
`$cmd` == 0 or die "unable to fetch weather: $?";
} else {
$ENV{FTP_PASSIVE} = 1; # LWP uses Net::FTP internally.

17
sysutils/gkrellm/plugins/weather/patches/patch-Makefile
View File

@ -1,20 +1,19 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
--- Makefile.orig 2003-03-31 13:12:35.000000000 +0200
+++ Makefile 2003-11-02 13:32:52.000000000 +0100
--- Makefile.orig Fri Jul 4 19:25:28 2008
+++ Makefile Fri Jul 4 19:24:57 2008
@@ -1,9 +1,8 @@
PKGNAME = gkrellweather
VERSION = 2.0.6
-CFLAGS = -O2 -Wall -fPIC `pkg-config gtk+-2.0 --cflags`
VERSION = 2.0.7
-CFLAGS = -O2 -std=gnu99 -Wall -fPIC `pkg-config gtk+-2.0 --cflags`
-LIBS = `pkg-config gtk+-2.0 --libs`
-LFLAGS = -shared
-PREFIX = /usr/local
+CFLAGS += -fPIC `pkg-config gtk+-2.0 gthread-2.0 --cflags` -I${LOCALBASE}/include
+LIBS += `pkg-config gtk+-2.0 gthread-2.0 --libs`
+LFLAGS += -shared -pthread
+CFLAGS += -fPIC `pkg-config gtk+-2.0 gthread-2.0 --cflags`
+LIBS = `pkg-config gtk+-2.0 gthread-2.0 --libs`
+LFLAGS = -shared -pthread
LOCALEDIR := $(PREFIX)/share/locale
@@ -14,13 +13,11 @@ endif
@@ -14,13 +13,11 @@
CFLAGS += -DPACKAGE="\"$(PKGNAME)\""
export PKGNAME LOCALEDIR

9
sysutils/gkrellm/plugins/weather/patches/patch-gkrellweather_c
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-gkrellweather_c,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
--- gkrellweather.c.orig 2003-03-31 03:12:57.000000000 -0800
+++ gkrellweather.c 2003-10-27 11:23:12.000000000 -0800
@@ -720,7 +720,7 @@ apply_air_config (void)
--- gkrellweather.c.orig Fri Jul 4 19:27:02 2008
+++ gkrellweather.c Fri Jul 4 19:27:51 2008
@@ -714,7 +714,7 @@
options.station[1] = c[1];
options.station[2] = c[2];
options.station[3] = c[3];
@ -10,7 +9,7 @@ $OpenBSD: patch-gkrellweather_c,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
sprintf(options.filename, "%s/.wmWeatherReports/%s.dat",
getenv("HOME"), options.station);
net_update = FALSE;
@@ -983,7 +983,7 @@ read_default(void)
@@ -977,7 +977,7 @@
options.windspeed_unit = 1;
options.pressure_unit = 1;
strcpy(options.station, DEFAULT_STATION_ID);