4 files changed, 19 insertions, 36 deletions

diff --git a/x11/temperature.app/files/patch-Makefile b/x11/temperature.app/files/patch-Makefile
index 344c692e2d3b..6eaa6b09177e 100644
--- a/x11/temperature.app/files/patch-Makefile
+++ b/x11/temperature.app/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Jun 25 12:03:07 2001
-+++ Makefile	Sun Jul  1 20:47:36 2001
+--- Makefile.orig	2001-06-25 16:03:07 UTC
++++ Makefile
 @@ -3,12 +3,12 @@
  #
  
diff --git a/x11/temperature.app/files/patch-Temperature.cc b/x11/temperature.app/files/patch-Temperature.cc
index 9d2d5149d421..76afbdf8fd7d 100644
--- a/x11/temperature.app/files/patch-Temperature.cc
+++ b/x11/temperature.app/files/patch-Temperature.cc
@@ -1,16 +1,12 @@
---- Temperature.cc.bak	2016-08-24 21:28:41.551324000 -0400
-+++ Temperature.cc	2016-08-24 21:26:25.860220000 -0400
-@@ -20,24 +20,29 @@
- //
- 
+--- Temperature.cc.orig	2010-02-07 06:43:52 UTC
++++ Temperature.cc
+@@ -22,22 +22,27 @@
  #include <X11/Xlib.h>
--#include <iostream.h>
--#include <fstream.h>
+ #include <iostream>
+ #include <fstream>
 -#include <stdlib.h>
 -#include <stdio.h>
 -#include <string.h>
-+#include <iostream>
-+#include <fstream>
 +#include <cstdlib>
 +#include <cstdio>
 +#include <cstring>
@@ -39,12 +35,12 @@
  volatile static ChildStatus childStatus;
  
  static void catchBrokenPipe(int sig) 
-@@ -415,7 +420,7 @@
+@@ -415,7 +420,7 @@ void Temperature::run() 
              const char* verbose = (mVerbose ? "--verbose" : "--quiet");
              char* URL = new char[strlen(METAR_URL) + strlen(mStationId) + 1];
              sprintf(URL, METAR_URL, mStationId);
 -            execlp("wget", "wget", "--cache=off", "--tries=0", verbose, "-O", tmpFile, URL, 0);
 +            execlp("wget", "wget", "--no-cache", "--tries=0", verbose, "-O", tmpFile, URL, NULL);
-             cerr << APPNAME << ": could not fetch temperature (wget not found in $PATH)" << endl;
+             std::cerr << APPNAME << ": could not fetch temperature (wget not found in $PATH)" << std::endl;
              remove(tmpFile);
              exit(0);
diff --git a/x11/temperature.app/files/patch-Temperature.h b/x11/temperature.app/files/patch-Temperature.h
index 22cbfbe6f9f5..62b2fcc3746b 100644
--- a/x11/temperature.app/files/patch-Temperature.h
+++ b/x11/temperature.app/files/patch-Temperature.h
@@ -1,17 +1,7 @@
---- Temperature.h.bak	2016-08-24 21:28:32.665119000 -0400
-+++ Temperature.h	2016-08-24 21:26:20.577933000 -0400
-@@ -22,14 +22,16 @@
- #ifndef _TEMPERATURE_H_
- #define _TEMPERATURE_H_
- 
--#include <fstream.h>
-+#include <fstream>
- #include <X11/Xlib.h>
- 
-+using std::ifstream;
-+
- #define APPNAME                 "Temperature.app"
- #define VERSION                 "1.4"
+--- Temperature.h.orig	2010-02-07 07:03:11 UTC
++++ Temperature.h
+@@ -29,7 +29,7 @@
+ #define VERSION                 "1.5"
  #define INSTANCENAME            "temperature_app"
  #define CLASSNAME               "Temperature_app"
 -#define METAR_URL               "http://weather.noaa.gov/pub/data/observations/metar/decoded/%s.TXT"
diff --git a/x11/temperature.app/files/patch-Xpm.cc b/x11/temperature.app/files/patch-Xpm.cc
index 6d687654fefb..514b3411fb6f 100644
--- a/x11/temperature.app/files/patch-Xpm.cc
+++ b/x11/temperature.app/files/patch-Xpm.cc
@@ -1,22 +1,19 @@
---- Xpm.cc.bak	2002-04-06 08:44:36.000000000 +0900
-+++ Xpm.cc	2013-12-07 17:25:00.000000000 +0900
-@@ -22,12 +22,16 @@
- #include <X11/Xlib.h>
+--- Xpm.cc.orig	2010-02-07 06:48:35 UTC
++++ Xpm.cc
+@@ -23,10 +23,14 @@
  #include <X11/xpm.h>
  #include <X11/extensions/shape.h>
--#include <iostream.h>
+ #include <iostream>
 -#include <stdlib.h>
 -#include <string.h>
-+#include <iostream>
 +#include <cstdlib>
 +#include <cstring>
  #include "Temperature.h"
  #include "Xpm.h"
- 
++
 +using std::cerr;
 +using std::cout;
 +using std::endl;
-+
+ 
  Xpm::Xpm(Display* display, Window root, char** data) 
  {
-    int error;