View | Details | Raw Unified | Return to bug 235608 | Differences between
and this patch

Collapse All | Expand All

(-)x11/temperature.app/Makefile (-3 / +2 lines)
Lines 2-11 Link Here
2
# $FreeBSD: head/x11/temperature.app/Makefile 491964 2019-02-02 17:34:27Z tobik $
2
# $FreeBSD: head/x11/temperature.app/Makefile 491964 2019-02-02 17:34:27Z tobik $
3
3
4
PORTNAME=	temperature.app
4
PORTNAME=	temperature.app
5
PORTVERSION=	1.4
5
PORTVERSION=	1.5
6
PORTREVISION=	5
7
CATEGORIES=	x11 windowmaker
6
CATEGORIES=	x11 windowmaker
8
MASTER_SITES=	http://www.fukt.bsnet.se/~per/temperature/
7
MASTER_SITES=	https://www.dockapps.net/download/
9
DISTNAME=	Temperature.app-${PORTVERSION}
8
DISTNAME=	Temperature.app-${PORTVERSION}
10
9
11
MAINTAINER=	mbeis@xs4all.nl
10
MAINTAINER=	mbeis@xs4all.nl
(-)x11/temperature.app/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (Temperature.app-1.4.tar.gz) = a7c4d630152625675d6d9638d0efad4952fca386e86acd1932d28c26e0e48ada
1
TIMESTAMP = 1549377674
2
SIZE (Temperature.app-1.4.tar.gz) = 16747
2
SHA256 (Temperature.app-1.5.tar.gz) = 1098e8d8eccb8b5bf2fc37d093e992c73731f115d5cd05e76ad6955c3429f56b
3
SIZE (Temperature.app-1.5.tar.gz) = 16948
(-)x11/temperature.app/files/patch-Temperature.cc (-10 / +6 lines)
Lines 1-16 Link Here
1
--- Temperature.cc.bak	2016-08-24 21:28:41.551324000 -0400
1
--- Temperature.cc.orig	2010-02-07 07:43:52.000000000 +0100
2
+++ Temperature.cc	2016-08-24 21:26:25.860220000 -0400
2
+++ Temperature.cc	2019-02-08 16:51:24.158937000 +0100
3
@@ -20,24 +20,29 @@
3
@@ -22,22 +22,27 @@
4
 //
5
 
6
 #include <X11/Xlib.h>
4
 #include <X11/Xlib.h>
7
-#include <iostream.h>
5
 #include <iostream>
8
-#include <fstream.h>
6
 #include <fstream>
9
-#include <stdlib.h>
7
-#include <stdlib.h>
10
-#include <stdio.h>
8
-#include <stdio.h>
11
-#include <string.h>
9
-#include <string.h>
12
+#include <iostream>
13
+#include <fstream>
14
+#include <cstdlib>
10
+#include <cstdlib>
15
+#include <cstdio>
11
+#include <cstdio>
16
+#include <cstring>
12
+#include <cstring>
Lines 45-50 Link Here
45
             sprintf(URL, METAR_URL, mStationId);
41
             sprintf(URL, METAR_URL, mStationId);
46
-            execlp("wget", "wget", "--cache=off", "--tries=0", verbose, "-O", tmpFile, URL, 0);
42
-            execlp("wget", "wget", "--cache=off", "--tries=0", verbose, "-O", tmpFile, URL, 0);
47
+            execlp("wget", "wget", "--no-cache", "--tries=0", verbose, "-O", tmpFile, URL, NULL);
43
+            execlp("wget", "wget", "--no-cache", "--tries=0", verbose, "-O", tmpFile, URL, NULL);
48
             cerr << APPNAME << ": could not fetch temperature (wget not found in $PATH)" << endl;
44
             std::cerr << APPNAME << ": could not fetch temperature (wget not found in $PATH)" << std::endl;
49
             remove(tmpFile);
45
             remove(tmpFile);
50
             exit(0);
46
             exit(0);
(-)x11/temperature.app/files/patch-Temperature.h (-14 / +4 lines)
Lines 1-17 Link Here
1
--- Temperature.h.bak	2016-08-24 21:28:32.665119000 -0400
1
--- Temperature.h.orig	2010-02-07 08:03:11.000000000 +0100
2
+++ Temperature.h	2016-08-24 21:26:20.577933000 -0400
2
+++ Temperature.h	2019-02-08 17:11:25.608097000 +0100
3
@@ -22,14 +22,16 @@
3
@@ -29,7 +29,7 @@
4
 #ifndef _TEMPERATURE_H_
4
 #define VERSION                 "1.5"
5
 #define _TEMPERATURE_H_
6
 
7
-#include <fstream.h>
8
+#include <fstream>
9
 #include <X11/Xlib.h>
10
 
11
+using std::ifstream;
12
+
13
 #define APPNAME                 "Temperature.app"
14
 #define VERSION                 "1.4"
15
 #define INSTANCENAME            "temperature_app"
5
 #define INSTANCENAME            "temperature_app"
16
 #define CLASSNAME               "Temperature_app"
6
 #define CLASSNAME               "Temperature_app"
17
-#define METAR_URL               "http://weather.noaa.gov/pub/data/observations/metar/decoded/%s.TXT"
7
-#define METAR_URL               "http://weather.noaa.gov/pub/data/observations/metar/decoded/%s.TXT"
(-)x11/temperature.app/files/patch-Xpm.cc (-9 / +6 lines)
Lines 1-22 Link Here
1
--- Xpm.cc.bak	2002-04-06 08:44:36.000000000 +0900
1
--- Xpm.cc.orig	2010-02-07 07:48:35.000000000 +0100
2
+++ Xpm.cc	2013-12-07 17:25:00.000000000 +0900
2
+++ Xpm.cc	2019-02-08 17:19:14.897110000 +0100
3
@@ -22,12 +22,16 @@
3
@@ -23,10 +23,14 @@
4
 #include <X11/Xlib.h>
5
 #include <X11/xpm.h>
4
 #include <X11/xpm.h>
6
 #include <X11/extensions/shape.h>
5
 #include <X11/extensions/shape.h>
7
-#include <iostream.h>
6
 #include <iostream>
8
-#include <stdlib.h>
7
-#include <stdlib.h>
9
-#include <string.h>
8
-#include <string.h>
10
+#include <iostream>
11
+#include <cstdlib>
9
+#include <cstdlib>
12
+#include <cstring>
10
+#include <cstring>
13
 #include "Temperature.h"
11
 #include "Temperature.h"
14
 #include "Xpm.h"
12
 #include "Xpm.h"
15
 
13
+
16
+using std::cerr;
14
+using std::cerr;
17
+using std::cout;
15
+using std::cout;
18
+using std::endl;
16
+using std::endl;
19
+
17
 
20
 Xpm::Xpm(Display* display, Window root, char** data) 
18
 Xpm::Xpm(Display* display, Window root, char** data) 
21
 {
19
 {
22
    int error;

Return to bug 235608