10 files changed, 50 insertions, 57 deletions

diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index e52b1b7f925b..edc9b3232fd0 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	wmweather+
-PORTVERSION=	2.4
-PORTREVISION=	2
+PORTVERSION=	2.9
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wmweatherplus
diff --git a/misc/wmweather+/distinfo b/misc/wmweather+/distinfo
index 47191bddd34a..3e40ccd3c751 100644
--- a/misc/wmweather+/distinfo
+++ b/misc/wmweather+/distinfo
@@ -1,2 +1,2 @@
-MD5 (wmweather+-2.4.tar.gz) = f09d1b31da5fd171b27715121e2d9662
-SIZE (wmweather+-2.4.tar.gz) = 216938
+MD5 (wmweather+-2.9.tar.gz) = ede58d7ed589d5c41b9b68a2703a8f7d
+SIZE (wmweather+-2.9.tar.gz) = 292955
diff --git a/misc/wmweather+/files/patch-convert.c b/misc/wmweather+/files/patch-convert.c
index 0bb59872ff77..c6c22ab66d82 100644
--- a/misc/wmweather+/files/patch-convert.c
+++ b/misc/wmweather+/files/patch-convert.c
@@ -1,6 +1,16 @@
 --- convert.c.orig	Sun Sep 22 22:00:53 2002
-+++ convert.c	Fri Apr 11 02:07:44 2003
-@@ -52,7 +52,7 @@
++++ convert.c	Thu Jul 22 19:04:18 2004
+@@ -18,6 +18,9 @@
+ */
+ 
+ #include <math.h>
++#ifndef NAN
++#define NAN (0.0/0.0)
++#endif
+ #if TM_IN_SYS_TIME
+ # if TIME_WITH_SYS_TIME
+ #  include <sys/time.h>
+@@ -52,7 +55,7 @@
      if(temp_C==999 || dewpt_C==999) return 999;
  
      f=1782.75*(dewpt_C-temp_C)/((237.7+dewpt_C)*(237.7+temp_C));
@@ -9,7 +19,7 @@
  }
  
  int rh_F(int temp_F, int dewpt_F){
-@@ -61,7 +61,7 @@
+@@ -61,7 +64,7 @@
      if(temp_F==999 || dewpt_F==999) return 999;
  
      f=3208.95*(dewpt_F-temp_F)/((395.86+dewpt_F)*(395.86+temp_F));
@@ -18,7 +28,7 @@
  }
  
  int heatindex_C(int temp_C, int rh){
-@@ -75,7 +75,7 @@
+@@ -75,7 +78,7 @@
  
      temp2=temp_C*temp_C;
      rh2=rh*rh;
@@ -27,7 +37,7 @@
  #endif
  }
  
-@@ -88,9 +88,9 @@
+@@ -88,9 +91,9 @@
      temp3=temp2*temp_F;
      rh2=rh*rh;
      rh3=rh2*rh;
@@ -39,7 +49,7 @@
  #endif
  }
  
-@@ -106,14 +106,14 @@
+@@ -106,14 +109,14 @@
  
      ret=35.74 + 0.6215*temp_F + (-35.75 + 0.4275*temp_F)*pow(windspeed*50292/57875.0, 0.16);
      if(ret>temp_F) return temp_F;
@@ -56,7 +66,7 @@
  }
  
  float m2mi(int meters){
-@@ -125,27 +125,27 @@
+@@ -125,27 +128,27 @@
  
  int knots2mph(int knots){
      if(knots<0) return knots;
@@ -89,7 +99,7 @@
  }
  
  int knots2beaufort(int knots){
-@@ -170,12 +170,12 @@
+@@ -170,12 +173,12 @@
  
  int temp_C2F(int temp_C){
      if(temp_C==999) return 999;
diff --git a/misc/wmweather+/files/patch-convert.h b/misc/wmweather+/files/patch-convert.h
index 31339f20c4a3..e69de29bb2d1 100644
--- a/misc/wmweather+/files/patch-convert.h
+++ b/misc/wmweather+/files/patch-convert.h
@@ -1,11 +0,0 @@
---- convert.h.orig	Fri Sep  6 04:04:06 2002
-+++ convert.h	Fri Apr 11 02:07:44 2003
-@@ -12,6 +12,8 @@
-  *   x<0 is used for rh, pressure, and windspeed
-  */
- 
-+#define NAN 0/0
-+
- /* Calculations */
- int rh_C(int temp_C, int dewpt_C);
- int rh_F(int temp_F, int dewpt_F);
diff --git a/misc/wmweather+/files/patch-forecast.c b/misc/wmweather+/files/patch-forecast.c
new file mode 100644
index 000000000000..da9df8f09676
--- /dev/null
+++ b/misc/wmweather+/files/patch-forecast.c
@@ -0,0 +1,12 @@
+--- forecast.orig	Sun Mar 23 01:04:40 2003
++++ forecast.c	Wed Jul 28 11:43:58 2004
+@@ -36,6 +36,9 @@
+ #include <string.h>
+ #include <limits.h>
+ #include <math.h>
++#ifndef NAN
++#define NAN (0.0/0.0)
++#endif
+ #include <pcre.h>
+ 
+ #include "forecast.h"
diff --git a/misc/wmweather+/files/patch-metar.c b/misc/wmweather+/files/patch-metar.c
new file mode 100644
index 000000000000..1dc32ff021ae
--- /dev/null
+++ b/misc/wmweather+/files/patch-metar.c
@@ -0,0 +1,11 @@
+--- metar.orig	Sun Sep 22 22:00:53 2002
++++ metar.c	Wed Jul 28 11:44:50 2004
+@@ -36,6 +36,9 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <math.h>
++#ifndef NAN
++#define NAN (0.0/0.0)
++#endif
+ #include <sys/stat.h>
+ #include <sys/wait.h>
diff --git a/misc/wmweather+/files/patch-moon.c b/misc/wmweather+/files/patch-moon.c
index 5402458672c7..70800af73e0d 100644
--- a/misc/wmweather+/files/patch-moon.c
+++ b/misc/wmweather+/files/patch-moon.c
@@ -1,5 +1,5 @@
---- moon.c.orig	Sun Sep 22 22:00:53 2002
-+++ moon.c	Fri Apr 11 02:07:44 2003
+--- moon.c.old	Fri May 14 04:55:39 2004
++++ moon.c	Thu Jul 22 17:26:25 2004
 @@ -44,7 +44,7 @@
  #include "wmgeneral/wmgeneral-x11.h"
  
diff --git a/misc/wmweather+/files/patch-subst.c b/misc/wmweather+/files/patch-subst.c
index 47970b1ce01d..e69de29bb2d1 100644
--- a/misc/wmweather+/files/patch-subst.c
+++ b/misc/wmweather+/files/patch-subst.c
@@ -1,11 +0,0 @@
---- subst.c.orig	Sun Sep 22 22:00:53 2002
-+++ subst.c	Fri Apr 11 02:07:44 2003
-@@ -48,7 +48,7 @@
-     char *format=NULL;
-     size_t formatlen=0;
-     int flags;
--    ssize_t str_start;
-+    size_t str_start;
- 
-     for(i=j=0; s[i]!='\0'; i++){
-         if(s[i]!='%'){
diff --git a/misc/wmweather+/files/patch-wmweather+.c b/misc/wmweather+/files/patch-wmweather+.c
index dfc56f2d8529..bb1d19b0b026 100644
--- a/misc/wmweather+/files/patch-wmweather+.c
+++ b/misc/wmweather+/files/patch-wmweather+.c
@@ -1,6 +1,6 @@
---- wmweather+.c.orig	Sun Mar 23 01:04:41 2003
-+++ wmweather+.c	Fri Apr 11 02:07:45 2003
-@@ -103,7 +103,7 @@
+--- wmweather+.c.old	Tue Mar 30 05:17:20 2004
++++ wmweather+.c	Thu Jul 22 17:26:54 2004
+@@ -104,7 +104,7 @@
  /**********************************
   * Prototypes
   **********************************/
@@ -9,20 +9,3 @@
  void printversion(void);
  int readconf(char *file);
  int parse_option(char *option, char *value);
-@@ -671,12 +671,12 @@
-         F("Please specify a METAR station.\n   See http://www.nws.noaa.gov/tg/siteloc.shtml\n");
-     }
-     if(latitude==999){{
--        time_t t=0;
-         int flag=0;
--
--        localtime(&t);
-+	time_t t=time(NULL);
-+	struct tm *tm;
-+	tm=gmtime(&t);
-         latitude=0;
--        longitude=timezone/240;
-+        longitude=tm->tm_gmtoff/240;
-         if(longitude<0){
-             flag=1;
-             longitude=-longitude;
diff --git a/misc/wmweather+/pkg-descr b/misc/wmweather+/pkg-descr
index f330281d7ae4..51fff58ea159 100644
--- a/misc/wmweather+/pkg-descr
+++ b/misc/wmweather+/pkg-descr
@@ -5,4 +5,4 @@ and a sky condition display.
 You will need to look up the METAR code for your city (a standard code
 used in aviation)
 
-WWW: http://www.nws.noaa.gov/tg/siteloc.shtml
+WWW: http://sourceforge.net/projects/wmweatherplus/