3 files changed, 0 insertions, 85 deletions
diff --git a/misc/gkrellweather2/files/patch-GrabWeather b/misc/gkrellweather2/files/patch-GrabWeather
deleted file mode 100644
index 9c1411eae493..000000000000
--- a/misc/gkrellweather2/files/patch-GrabWeather
+++ /dev/null
@@ -1,27 +0,0 @@
---- GrabWeather.orig	2009-01-11 18:15:02 UTC
-+++ GrabWeather
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
- 
- #
- # Grabs the latest local weather conditions from the 
-@@ -12,7 +12,7 @@
- 
- $ReportDir  = '.wmWeatherReports';
- #$WeatherSrc = 'ftp://weather.noaa.gov/data/observations/metar/decoded';
--$WeatherSrc = 'http://weather.noaa.gov/pub/data/observations/metar/decoded';
-+$WeatherSrc = 'http://tgftp.nws.noaa.gov/data/observations/metar/decoded';
- 
- use strict; 
- use vars qw( $ReportDir $WeatherSrc );
-@@ -40,8 +40,7 @@ my $DataFileName = "$StationID.dat";
- # 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{fetch -d -p -1 -q -o $home/$ReportDir/$HTMLFileName $URL};
-   `$cmd` == 0 or die "unable to fetch weather: $?";
- } else {
-   $ENV{FTP_PASSIVE} = 1; # LWP uses Net::FTP internally.
diff --git a/misc/gkrellweather2/files/patch-Makefile b/misc/gkrellweather2/files/patch-Makefile
deleted file mode 100644
index 0104529dce95..000000000000
--- a/misc/gkrellweather2/files/patch-Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.orig	2009-01-11 18:15:02 UTC
-+++ Makefile
-@@ -1,9 +1,9 @@
- PKGNAME = gkrellweather
- VERSION = 2.0.8
--CFLAGS = -O2 -std=gnu99 -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
- 
- LOCALEDIR := $(PREFIX)/share/locale
- 
-@@ -14,13 +14,13 @@ endif
- CFLAGS += -DPACKAGE="\"$(PKGNAME)\""
- export PKGNAME LOCALEDIR
- 
--CC = gcc
-+CC ?= gcc
- 
- OBJS = gkrellweather.o
- 
- 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
- 
- clean:
- 	(cd po && ${MAKE} clean )
diff --git a/misc/gkrellweather2/files/patch-gkrellweather.c b/misc/gkrellweather2/files/patch-gkrellweather.c
deleted file mode 100644
index a455f386a75b..000000000000
--- a/misc/gkrellweather2/files/patch-gkrellweather.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- gkrellweather.c.orig	2009-01-11 18:15:02 UTC
-+++ gkrellweather.c
-@@ -777,7 +777,7 @@ create_air_tab (GtkWidget *tab)
-         " switch interval - number of seconds (0 = never)" \
-         " between switching display\n")
-     };
--    static gchar url[] = "http://www.nws.noaa.gov/tg/siteloc.shtml";
-+    static gchar url[] = "http://www.nws.noaa.gov/tg/siteloc.php";
-     laptop = gtk_notebook_new();
-     gtk_notebook_set_tab_pos(GTK_NOTEBOOK(laptop), GTK_POS_TOP);
-     gtk_box_pack_start(GTK_BOX(tab), laptop, TRUE, TRUE, 0);
-@@ -986,7 +986,7 @@ read_default(void)
-     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 @@ GkrellmMonitor *
- 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);