Update to wmweather 2.4.3

6 files changed, 20 insertions, 41 deletions

diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile
index 90da2a475130..ee1240c4764b 100644
--- a/misc/wmweather/Makefile
+++ b/misc/wmweather/Makefile
@@ -4,27 +4,31 @@
 #
 # $FreeBSD$
 
-PORTNAME=	wmWeather
-PORTVERSION=	1.31
-PORTREVISION=	1
+PORTNAME=	wmweather
+PORTVERSION=	2.4.3
 CATEGORIES=	misc windowmaker
-MASTER_SITES= 	http://nis-www.lanl.gov/~mgh/WindowMaker/
+MASTER_SITES=	http://www.godisch.de/debian/wmweather/
 
 MAINTAINER=	kris@FreeBSD.org
 COMMENT=	A WMaker dockapp which displays meteorological data for your city
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/Src
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-ALL_TARGET=	clean all
 
-MAN1=		wmWeather.1
+MAN1=		wmweather.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmWeather ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/GrabWeather ${PREFIX}/bin/GrabWeather
-	${INSTALL_MAN} ${WRKSRC}/wmWeather.1 ${PREFIX}/man/man1/
+	${INSTALL_PROGRAM} ${WRKSRC}/wmweather ${PREFIX}/bin/
+	${LN} ${PREFIX}/bin/wmweather ${PREFIX}/bin/wmWeather
+	${INSTALL_MAN} ${WRKSRC}/wmweather.1 ${PREFIX}/man/man1/
+	${INSTALL_DATA} -m 644 ${WRKSRC}/wmweather.conf ${PREFIX}/etc/wmweather.conf.sample
+	test -f ${PREFIX}/etc/wmweather.conf || ${CP} ${PREFIX}/etc/wmweather.conf.sample ${PREFIX}/etc/wmweather.conf
 
 .include <bsd.port.mk>
diff --git a/misc/wmweather/distinfo b/misc/wmweather/distinfo
index 428beaaabd2b..6a6bafc3d86b 100644
--- a/misc/wmweather/distinfo
+++ b/misc/wmweather/distinfo
@@ -1,2 +1,2 @@
-MD5 (wmWeather-1.31.tar.gz) = f04693aa86d22099162cff3d0b5c9275
-SIZE (wmWeather-1.31.tar.gz) = 28639
+MD5 (wmweather-2.4.3.tar.gz) = 4e2e6a7bb982362f821ba3f9a11c457e
+SIZE (wmweather-2.4.3.tar.gz) = 79540
diff --git a/misc/wmweather/files/patch-aa b/misc/wmweather/files/patch-aa
deleted file mode 100644
index 0155927c431b..000000000000
--- a/misc/wmweather/files/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-*** Makefile.orig	Fri Apr 16 14:40:55 1999
---- Makefile	Fri Apr 16 14:41:25 1999
-***************
-*** 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
---- 1,6 ----
-! CC     ?= gcc
-! CFLAGS ?= -O2
-! CFLAGS += -Wall 
-  INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-  DESTDIR= /usr/X11R6
-  LIBDIR = -L/usr/X11R6/lib
diff --git a/misc/wmweather/files/patch-ab b/misc/wmweather/files/patch-ab
deleted file mode 100644
index 8f23c404a60e..000000000000
--- a/misc/wmweather/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- GrabWeather.orig	Wed Apr 14 22:58:15 1999
-+++ GrabWeather	Sun Apr 25 12:48:20 1999
-@@ -49,7 +49,7 @@
-     #  for some people? Dont know why... (Perhaps they have a ~/.wgetrc file
-     #  that overrides command line options?).
-     #
--    $GrabCmd = "wget --proxy=off --passive-ftp --tries 0 -q -O $home/.wmWeatherReports/$StationID.TXT $URL";
-+    $GrabCmd = "fetch -p -q -o $home/.wmWeatherReports/$StationID.TXT $URL";
-     system "$GrabCmd";
- 
- 
diff --git a/misc/wmweather/pkg-descr b/misc/wmweather/pkg-descr
index b249ef55a9ee..1ee157de852a 100644
--- a/misc/wmweather/pkg-descr
+++ b/misc/wmweather/pkg-descr
@@ -3,4 +3,4 @@ This is a windowmaker dockapp which displays meteorological data
 city, retrieved from the net. You will need to look up the METAR code for
 your city (a standard code used in aviation)
 
-WWW: http://www.nws.noaa.gov/oso/siteloc.shtml
+WWW: http://www.godisch.de/debian/wmweather/
diff --git a/misc/wmweather/pkg-plist b/misc/wmweather/pkg-plist
index ef1e7b2fb04a..408bb1149fba 100644
--- a/misc/wmweather/pkg-plist
+++ b/misc/wmweather/pkg-plist
@@ -1,2 +1,4 @@
 bin/wmWeather
-bin/GrabWeather
+bin/wmweather
+@unexec if cmp -s %D/etc/wmweather.conf %D/etc/wmweather.conf.sample; then rm -f %D/etc/wmweather.conf; fi
+etc/wmweather.conf.sample