* Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.

* Use REPLACE_PERL instead of patching GrabWeather directly.
* Remove unnecessary dependency on windowmaker; only xpm is required.
* Patch manpage to note that we need a FTP client that can fetch URLs, and
  not wget.  Point out that lukemftp satisfies this requirement for
  inferior platforms.
* Take second part of patch from pkg/13377 by Ben Wong <ben@wongs.net> so
  that ftp doesn't output to the terminal.

5 files changed, 69 insertions, 23 deletions

diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index 2ab0d6948bf..a8e8ec42d48 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:06:55 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/07/15 14:03:12 jlam Exp $
 #
 
 DISTNAME=	wmWeather-1.31
@@ -10,14 +10,12 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
 COMMENT=	WindowMaker DockApp showing local weather conditions
 
-DEPENDS+=	windowmaker-*:../../wm/windowmaker
+USE_BUILDLINK_ONLY=	# defined
+USE_X11BASE=		# defined
+USE_PERL5=		# defined
+REPLACE_PERL=		GrabWeather
 
-USE_PERL5=	# defined
-USE_X11BASE=	# defined
-
-do-configure:
-	${CP} ${WRKSRC}/GrabWeather ${WRKSRC}/GrabWeather.orig
-	${SED} "s:/usr/bin/perl:${PERL5}:g" \
-		<${WRKSRC}/GrabWeather.orig >${WRKSRC}/GrabWeather
+CPPFLAGS+=		-I${X11BASE}/include
 
+.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmweather/distinfo b/x11/wmweather/distinfo
index 3c1353caa3a..0a7cc0157fa 100644
--- a/x11/wmweather/distinfo
+++ b/x11/wmweather/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:47 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/07/15 14:03:13 jlam Exp $
 
 SHA1 (wmWeather-1.31.tar.gz) = b03ac1ad93f9e942feca26cfad91c1ea0b92eeb9
 Size (wmWeather-1.31.tar.gz) = 28639 bytes
-SHA1 (patch-aa) = 2fddb64c4044b9a76b4a41c0794dc640266c8bbe
-SHA1 (patch-ab) = ffe2f8bf5618470d8c03a50d04df206e475a54c4
+SHA1 (patch-aa) = 3eb90b8133cc4a935c87b427d1c92dc3106bfafa
+SHA1 (patch-ab) = 6defeb426c3977945c2df13e47e0a98027a2bd48
+SHA1 (patch-ac) = bd76256fa4479e3e9f3c2be2290debb36b941b72
diff --git a/x11/wmweather/patches/patch-aa b/x11/wmweather/patches/patch-aa
index 27e949b0c74..9dc601c3d2e 100644
--- a/x11/wmweather/patches/patch-aa
+++ b/x11/wmweather/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/12 05:57:52 rh Exp $
+$NetBSD: patch-aa,v 1.2 2001/07/15 14:03:13 jlam Exp $
 
 --- Makefile.orig	Wed Mar 17 01:59:39 1999
 +++ Makefile	Tue May  2 13:20:57 2000
@@ -8,9 +8,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/05/12 05:57:52 rh Exp $
 -INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
 -DESTDIR= /usr/X11R6
 -LIBDIR = -L/usr/X11R6/lib
-+INCDIR = -I${PREFIX}/include
++INCDIR = ${CPPFLAGS}
 +DESTDIR= ${PREFIX}
-+LIBDIR = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib
++LIBDIR = ${LDFLAGS}
  # for linux
  LIBS   = -lXpm -lX11 -lXext
  # for Solaris
diff --git a/x11/wmweather/patches/patch-ab b/x11/wmweather/patches/patch-ab
index 7f8f112906e..7833d5d26c2 100644
--- a/x11/wmweather/patches/patch-ab
+++ b/x11/wmweather/patches/patch-ab
@@ -1,13 +1,34 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/05/12 05:57:52 rh Exp $
+$NetBSD: patch-ab,v 1.2 2001/07/15 14:03:13 jlam Exp $
 
---- GrabWeather.orig	Fri Apr 16 23:41:53 1999
-+++ GrabWeather	Tue May  2 13:50:28 2000
-@@ -49,7 +49,7 @@
-     #  for some people? Dont know why... (Perhaps they have a ~/.wgetrc file
-     #  that overrides command line options?).
+--- GrabWeather.orig	Fri Apr 16 17:41:53 1999
++++ GrabWeather
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/pkg/bin/perl
+ 
+ #
+ #    Grabs the latest local weather conditions from the National Weather Service (NWS).
+@@ -38,19 +38,17 @@
+ 
+     $StationID    = $ARGV[0];
+     $HTMLFileName = "$StationID.TXT";
++    $FTP          = "ftp -V -r 5";
+     $URL          = "ftp://weather.noaa.gov/data/observations/metar/decoded/$HTMLFileName";
+     $DataFileName = "$StationID.dat";
+ 
+ 
+ 
+ 
++    # $FTP must be able to fetch URLs.
      #
+-    #  I think some of these wget command line options may cause problems
+-    #  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 = "/usr/bin/ftp -o $home/.wmWeatherReports/$StationID.TXT $URL";
-     system "$GrabCmd";
+-    system "$GrabCmd";
++    $GrabCmd = "$FTP -o $home/.wmWeatherReports/$StationID.TXT $URL";
++    system "$GrabCmd 2>/dev/null";
+ 
  
  
diff --git a/x11/wmweather/patches/patch-ac b/x11/wmweather/patches/patch-ac
new file mode 100644
index 00000000000..57077ba1945
--- /dev/null
+++ b/x11/wmweather/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.1 2001/07/15 14:03:14 jlam Exp $
+
+--- wmWeather.1.orig	Tue Apr 13 11:09:27 1999
++++ wmWeather.1
+@@ -11,7 +11,8 @@
+ designations and current weather reports are designed for use by the aviation
+ community. Since most major cities have at least one airport, there is usually
+ one or more METAR stations in a given city.) You (obviously) need to be
+-connected to the internet and you also need to have wget installed (most linux
++connected to the internet and you also need to have a FTP client capable of
++fetching URLs installed as "ftp" in the program PATH (Most NetBSD
+ systems should have it already).  wmWeather will then attempt to download the
+ latest METAR report for the station of your choice (from the National Weather
+ Sevice run by NOAA).
+@@ -88,7 +89,9 @@
+ .SH BUGS
+ Let me know if/when you find any. 
+ .SH NOTES
+-Requires that a (fairly recent) version of wget be installed on your machine. 
+-You can download wget from "http://sunsite.auc.dk/wget/".
++Requires that a FTP client capable of fetching URLs be installed on your
++machine.  Most NetBSD systems should have one installed in /usr/bin/ftp,
++or you can download lukemftp from
++"ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/".
+ .SH AUTHOR
+ Michael G. Henderson <mghenderson@lanl.gov>