1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00

x11/temperature.app: Update to 1.5

While here,
- Update MASTER_SITES and WWW

PR:		235608
Submitted by:	Marco Beishuizen <mbeis@xs4all.nl>  (maintainer)
This commit is contained in:
Koichiro Iwao 2019-02-11 04:39:47 +00:00
parent 6dbbcff54e
commit cb9f5bae24
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=492666
7 changed files with 25 additions and 42 deletions

View File

@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= temperature.app
PORTVERSION= 1.4
PORTREVISION= 5
PORTVERSION= 1.5
CATEGORIES= x11 windowmaker
MASTER_SITES= http://www.fukt.bsnet.se/~per/temperature/
MASTER_SITES= https://www.dockapps.net/download/
DISTNAME= Temperature.app-${PORTVERSION}
MAINTAINER= mbeis@xs4all.nl

View File

@ -1,2 +1,3 @@
SHA256 (Temperature.app-1.4.tar.gz) = a7c4d630152625675d6d9638d0efad4952fca386e86acd1932d28c26e0e48ada
SIZE (Temperature.app-1.4.tar.gz) = 16747
TIMESTAMP = 1549377674
SHA256 (Temperature.app-1.5.tar.gz) = 1098e8d8eccb8b5bf2fc37d093e992c73731f115d5cd05e76ad6955c3429f56b
SIZE (Temperature.app-1.5.tar.gz) = 16948

View File

@ -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 @@
#

View File

@ -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);

View File

@ -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"

View File

@ -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;

View File

@ -2,4 +2,4 @@ Temperature.app is a Window Maker dock application which
fetches local temperature information every 15 minutes from
ftp://weather.noaa.gov and displays it (in Celsius or Fahrenheit).
WWW: http://www.fukt.bsnet.se/~per/temperature/
WWW: https://www.dockapps.net/temperatureapp