Index: head/x11/temperature.app/Makefile =================================================================== --- head/x11/temperature.app/Makefile (revision 492665) +++ head/x11/temperature.app/Makefile (revision 492666) @@ -1,33 +1,32 @@ # Created by: Per Otterstr=F6m # $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 COMMENT= Dockable WindowMaker applet which displays the local temperature LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= wget:ftp/wget USE_XORG= x11 xpm PORTDOCS= README PLIST_FILES= bin/Temperature.app OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Temperature.app ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Index: head/x11/temperature.app/distinfo =================================================================== --- head/x11/temperature.app/distinfo (revision 492665) +++ head/x11/temperature.app/distinfo (revision 492666) @@ -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 Index: head/x11/temperature.app/files/patch-Makefile =================================================================== --- head/x11/temperature.app/files/patch-Makefile (revision 492665) +++ head/x11/temperature.app/files/patch-Makefile (revision 492666) @@ -1,20 +1,20 @@ ---- 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 @@ # DESTDIR = -GNUSTEP_BINDIR = /usr/local/GNUstep/Apps/Temperature.app -X11_BINDIR = /usr/X11R6/bin +GNUSTEP_BINDIR = $(LOCALBASE)/GNUstep/Apps/Temperature.app +X11_BINDIR = $(LOCALBASE)/bin -CXX=c++ -CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include -LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11 +CXX ?= c++ +CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I$(LOCALBASE)/include +LDFLAGS += -L$(LOCALBASE)/lib -lXpm -lXext -lX11 OBJECTS = Main.o Temperature.o Xpm.o Index: head/x11/temperature.app/files/patch-Temperature.cc =================================================================== --- head/x11/temperature.app/files/patch-Temperature.cc (revision 492665) +++ head/x11/temperature.app/files/patch-Temperature.cc (revision 492666) @@ -1,50 +1,46 @@ ---- 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 --#include --#include + #include + #include -#include -#include -#include -+#include -+#include +#include +#include +#include #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include "Xpm.h" #include "Temperature.h" #include "pixmaps/main.xpm" #include "pixmaps/redlight.xpm" +using std::cerr; +using std::cout; +using std::endl; +using std::fstream; + 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); Index: head/x11/temperature.app/files/patch-Temperature.h =================================================================== --- head/x11/temperature.app/files/patch-Temperature.h (revision 492665) +++ head/x11/temperature.app/files/patch-Temperature.h (revision 492666) @@ -1,21 +1,11 @@ ---- 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 -+#include - #include - -+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" +#define METAR_URL "ftp://tgftp.nws.noaa.gov/data/observations/metar/decoded/%s.TXT" #define UPDATE_INTERVAL 900 #define TIME_POS 22 #define TEMP_POS 35 Index: head/x11/temperature.app/files/patch-Xpm.cc =================================================================== --- head/x11/temperature.app/files/patch-Xpm.cc (revision 492665) +++ head/x11/temperature.app/files/patch-Xpm.cc (revision 492666) @@ -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 +--- Xpm.cc.orig 2010-02-07 06:48:35 UTC ++++ Xpm.cc +@@ -23,10 +23,14 @@ #include #include --#include + #include -#include -#include -+#include +#include +#include #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; Index: head/x11/temperature.app/pkg-descr =================================================================== --- head/x11/temperature.app/pkg-descr (revision 492665) +++ head/x11/temperature.app/pkg-descr (revision 492666) @@ -1,5 +1,5 @@ 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