diff -uNr --exclude=CVS ../x11/wmweather/Makefile wmweather/Makefile
--- ../x11/wmweather/Makefile	Sun Dec 19 20:27:05 2004
+++ wmweather/Makefile	Mon Jan 22 22:46:24 2007
@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.14 2004/12/19 17:27:05 alek Exp $
+# $OpenBSD$
 
-COMMENT=		'wm-dockapp; weather monitor'
+COMMENT=		'wm dockapp - weather monitor'
 
-DISTNAME=		wmWeather-1.31
-PKGNAME=		${DISTNAME:L}
+DISTNAME=		wmweather-2.4.3
 CATEGORIES=		x11 x11/windowmaker
 
-HOMEPAGE=		http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+HOMEPAGE=		http://www.godisch.de/debian/wmweather/
 
 MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>
 
+MASTER_SITES=		${HOMEPAGE}
+
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -17,13 +18,16 @@
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 Xext Xpm c
 
-MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/
+LIB_DEPENDS=		curl.::net/curl
 
-RUN_DEPENDS=		:wget-*:net/wget
-
+USE_GMAKE=		Yes
 USE_X11=		Yes
-NO_REGRESS=		Yes
 
-WRKSRC=			${WRKDIST}/Src
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS=		--with-xmessage
+CONFIGURE_ENV=		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+
+WRKSRC=			${WRKDIST}/src
 
 .include <bsd.port.mk>
diff -uNr --exclude=CVS ../x11/wmweather/distinfo wmweather/distinfo
--- ../x11/wmweather/distinfo	Wed Jan  5 20:54:15 2005
+++ wmweather/distinfo	Mon Jan 22 22:11:58 2007
@@ -1,4 +1,4 @@
-MD5 (wmWeather-1.31.tar.gz) = f04693aa86d22099162cff3d0b5c9275
-RMD160 (wmWeather-1.31.tar.gz) = 60266955f7c9692ea73c1bc85f85f863d9f639e3
-SHA1 (wmWeather-1.31.tar.gz) = b03ac1ad93f9e942feca26cfad91c1ea0b92eeb9
-SIZE (wmWeather-1.31.tar.gz) = 28639
+MD5 (wmweather-2.4.3.tar.gz) = 4e2e6a7bb982362f821ba3f9a11c457e
+RMD160 (wmweather-2.4.3.tar.gz) = 505fb29d562c4e0a2437c07cd4994bc4309c08b7
+SHA1 (wmweather-2.4.3.tar.gz) = d0b6345038d05b2dc4a85bd95f24341a5cbb3f7c
+SIZE (wmweather-2.4.3.tar.gz) = 79540
diff -uNr --exclude=CVS ../x11/wmweather/patches/patch-Makefile wmweather/patches/patch-Makefile
--- ../x11/wmweather/patches/patch-Makefile	Wed Jan 10 01:13:42 2001
+++ wmweather/patches/patch-Makefile	Thu Jan  1 03:00:00 1970
@@ -1,42 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2001/01/09 22:13:42 naddy Exp $
---- Src/Makefile.orig	Wed Mar 17 01:59:39 1999
-+++ Src/Makefile	Tue Jan  9 18:21:05 2001
-@@ -1,8 +1,5 @@
--CC     = gcc
--CFLAGS = -O2 -Wall
--INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
--DESTDIR= /usr/X11R6
--LIBDIR = -L/usr/X11R6/lib
-+CFLAGS += -I${X11BASE}/include
-+LIBDIR = -L${X11BASE}/lib
- # for linux
- LIBS   = -lXpm -lX11 -lXext
- # for Solaris
-@@ -11,15 +8,11 @@ OBJS   = wmWeather.o \
-          xutils.o
- 
- 
--.c.o:
--	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
--
--
- all:	wmWeather.o wmWeather
- 
- wmWeather.o: wmWeather_master.xpm wmWeather_mask.xbm
- wmWeather:	$(OBJS) 
--	$(CC) $(CFLAGS) $(SYSTEM) -o wmWeather $^ $(INCDIR) $(LIBDIR) $(LIBS)
-+	$(CC) $(CFLAGS) $(SYSTEM) -o wmWeather $(OBJS) $(INCDIR) $(LIBDIR) $(LIBS)
- 
- clean:
- 	for i in $(OBJS) ; do \
-@@ -28,7 +21,6 @@ clean:
- 	rm -f wmWeather
- 
- install:: wmWeather
--	install -c -s -m 0755 wmWeather $(DESTDIR)/bin
--	install -c    -m 0755 GrabWeather $(DESTDIR)/bin
--	install -c    -m 0644 wmWeather.1 $(DESTDIR)/man/man1 
--
-+	$(BSD_INSTALL_PROGRAM) wmWeather $(PREFIX)/bin
-+	$(BSD_INSTALL_SCRIPT) GrabWeather $(PREFIX)/bin
-+	$(BSD_INSTALL_MAN) wmWeather.1 $(PREFIX)/man/man1 
diff -uNr --exclude=CVS ../x11/wmweather/patches/patch-wmWeather_c wmweather/patches/patch-wmWeather_c
--- ../x11/wmweather/patches/patch-wmWeather_c	Wed Jan 10 01:13:42 2001
+++ wmweather/patches/patch-wmWeather_c	Thu Jan  1 03:00:00 1970
@@ -1,108 +0,0 @@
-$OpenBSD: patch-wmWeather_c,v 1.1.1.1 2001/01/09 22:13:42 naddy Exp $
---- Src/wmWeather.c.orig	Tue May  4 22:20:04 1999
-+++ Src/wmWeather.c	Tue Jan  9 18:54:59 2001
-@@ -229,12 +229,12 @@ char		dir[5];
- int 		Year, Month, Day;
- int		Hours, Mins, Secs;
- int		UpdateLTHour = 0.0, UpdateLTMin = 0.0, UpdateUTHour, UpdateUTMin;
--long		CurrentLocalTime;
-+time_t		CurrentLocalTime;
- double		UpdateUT, UpdateLT, UT, LT, DT, hour24();
- 
- 
- double		jd(), CurrentJD;
--char		command[1024], Line[512], FileName[10];
-+char		command[1024], Line[512], FileName[1024];
- int		Tens, q, digit, chr;
- double		Pressure, Temperature, sgn, Humidity, DewPoint, WindChill, val;
- double		Direction, Speed;
-@@ -416,7 +416,7 @@ FILE		*fp;
-     	    /*
-     	     *  Read in weather data
-     	     */
--	    sprintf(FileName, "%s/.wmWeatherReports/%s.dat", getenv("HOME"), StationID);
-+	    snprintf(FileName, sizeof(FileName), "%s/.wmWeatherReports/%s.dat", getenv("HOME"), StationID);
-     	    if ((fp = fopen(FileName, "r")) != NULL){
- 
- 	    	fgets(Line, 512, fp);
-@@ -713,7 +713,7 @@ FILE		*fp;
- 	            q = 0;
- 		    i = (int)(Direction/360.0*16.0 + 0.5);
- 		    if (i>15) i = 0;
--		    strcpy(dir, CompassDirection[i]);
-+		    strlcpy(dir, CompassDirection[i], sizeof(dir));
- 		    len = strlen(dir);
- 		    for (j=0; j<len; ++j){
- 			digit = (int)dir[j] - 48;
-@@ -816,7 +816,7 @@ UpToDate = 0;
- 	    /*
- 	     *  Execute Perl script to grab the Latest METAR Report
- 	     */
--	    sprintf(command, "GrabWeather %s &", StationID);
-+	    snprintf(command, sizeof(command), "GrabWeather %s &", StationID);
- 	    system(command);
- 
- 	    ForceDownload = 0;
-@@ -868,7 +868,7 @@ void ParseCMDLine(int argc, char *argv[]
- 		print_usage();
- 		exit(-1);
- 	    }
--            strcpy(BackColor, argv[++i]);
-+            strlcpy(BackColor, argv[++i], sizeof(BackColor));
- 
-         } else if (!strcmp(argv[i], "-tc")){
- 
-@@ -877,7 +877,7 @@ void ParseCMDLine(int argc, char *argv[]
- 		print_usage();
- 		exit(-1);
- 	    }
--            strcpy(StationTimeColor, argv[++i]);
-+            strlcpy(StationTimeColor, argv[++i], sizeof(StationTimeColor));
- 
-         } else if (!strcmp(argv[i], "-lc")){
- 
-@@ -886,7 +886,7 @@ void ParseCMDLine(int argc, char *argv[]
- 		print_usage();
- 		exit(-1);
- 	    }
--            strcpy(LabelColor, argv[++i]);
-+            strlcpy(LabelColor, argv[++i], sizeof(LabelColor));
- 
-         } else if (!strcmp(argv[i], "-wgc")){
- 
-@@ -895,7 +895,7 @@ void ParseCMDLine(int argc, char *argv[]
- 		print_usage();
- 		exit(-1);
- 	    }
--            strcpy(WindGustColor, argv[++i]);
-+            strlcpy(WindGustColor, argv[++i], sizeof(WindGustColor));
- 
-         } else if (!strcmp(argv[i], "-dc")){
- 
-@@ -904,7 +904,7 @@ void ParseCMDLine(int argc, char *argv[]
- 		print_usage();
- 		exit(-1);
- 	    }
--            strcpy(DataColor, argv[++i]);
-+            strlcpy(DataColor, argv[++i], sizeof(DataColor));
- 
-          } else if (!strcmp(argv[i], "-beaufort")){
-  
-@@ -944,7 +944,7 @@ void ParseCMDLine(int argc, char *argv[]
- 		print_usage();
- 		exit(-1);
- 	    }
--            strcpy(StationID, StringToUpper(argv[++i]));
-+            strlcpy(StationID, StringToUpper(argv[++i]), sizeof(StationID));
- 
-         } else if (!strcmp(argv[i], "-delay")) {
- 
-@@ -1131,7 +1131,7 @@ void ButtonPressEvent(XButtonEvent *xev)
-     if (GotDoubleClick1) {
- 	GotFirstClick1 = 0;
- 	GotDoubleClick1 = 0;
--	sprintf(Command, "xmessage -center -file %s/.wmWeatherReports/%s.TXT &", getenv("HOME"), StationID);
-+	snprintf(Command, sizeof(Command), "xmessage -center -file %s/.wmWeatherReports/%s.TXT &", getenv("HOME"), StationID);
- 	system(Command);
-     }
- 
diff -uNr --exclude=CVS ../x11/wmweather/pkg/DESCR wmweather/pkg/DESCR
--- ../x11/wmweather/pkg/DESCR	Tue Dec 16 00:55:56 2003
+++ wmweather/pkg/DESCR	Mon Jan 22 22:07:18 2007
@@ -1,2 +1,2 @@
-wmWeather monitors local weather conditions (temperature, dew point,
+wm(W/w)eather monitors local weather conditions (temperature, dew point,
 pressure, humidity and wind direction and speed).
diff -uNr --exclude=CVS ../x11/wmweather/pkg/PLIST wmweather/pkg/PLIST
--- ../x11/wmweather/pkg/PLIST	Sat Sep 18 17:19:26 2004
+++ wmweather/pkg/PLIST	Mon Jan 22 22:46:34 2007
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/09/18 13:19:26 espie Exp $
-@conflict gkrellweather-*
-bin/GrabWeather
+@comment $OpenBSD$
 bin/wmWeather
+bin/wmweather
 @man man/man1/wmWeather.1
+@man man/man1/wmweather.1