From b94868dcab0f6b3bbe98caa20d5afa7c87b20a74 Mon Sep 17 00:00:00 2001 From: xtraeme Date: Sat, 8 Nov 2003 06:21:14 +0000 Subject: Upgrade to 2.4.2, by Soren Jacobsen via PR pkg/23384. Changes since 1.31: * Complete rewrite by new author. * Perl no longer used * Uses curl * ~/.wmWeatherReports/ -> ~/.wmweather/ While here s/USE_X11BASE/USE_X11/, sync DESCR, MASTER_SITES and COMMENT with reality. --- x11/wmweather/DESCR | 6 ++--- x11/wmweather/Makefile | 28 +++++++++++-------- x11/wmweather/PLIST | 5 ++-- x11/wmweather/distinfo | 10 +++---- x11/wmweather/patches/patch-aa | 61 +++++++++++------------------------------- x11/wmweather/patches/patch-ab | 28 ------------------- x11/wmweather/patches/patch-ac | 26 ------------------ 7 files changed, 43 insertions(+), 121 deletions(-) delete mode 100644 x11/wmweather/patches/patch-ab delete mode 100644 x11/wmweather/patches/patch-ac (limited to 'x11/wmweather') diff --git a/x11/wmweather/DESCR b/x11/wmweather/DESCR index a975cfa0149..df7161a9d5c 100644 --- a/x11/wmweather/DESCR +++ b/x11/wmweather/DESCR @@ -1,7 +1,7 @@ - wmWeather displays your current local weather conditions. You need +wmweather displays your current local weather conditions. You need to give it a 4-character "METAR" station identifier code (most major -airports have one). Shows station ID, time of last update (i.e. time -the data was updated not the time the App last checked for data), +airports have one). It shows station ID, time of last update (i.e. time +the data was updated, not the time the App last checked for data), temperature, dew point, pressure, humidity, and wind speed. The various entries can be forced to display in a variety of different units. diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile index fddbeef2876..317185c6689 100644 --- a/x11/wmweather/Makefile +++ b/x11/wmweather/Makefile @@ -1,28 +1,34 @@ -# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:49 grant Exp $ +# $NetBSD: Makefile,v 1.13 2003/11/08 06:21:14 xtraeme Exp $ # -DISTNAME= wmWeather-1.31 -WRKSRC= ${WRKDIR}/${DISTNAME}/Src +DISTNAME= wmweather-2.4.2 +WRKSRC= ${WRKDIR}/${DISTNAME}/src CATEGORIES= x11 -MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/ +MASTER_SITES= http://www.godisch.de/debian/wmweather/ MAINTAINER= rh@NetBSD.org -HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml +HOMEPAGE= http://www.godisch.de/debian/wmweather/ COMMENT= WindowMaker DockApp showing local weather conditions -USE_BUILDLINK2= # defined -USE_X11BASE= # defined -REPLACE_PERL= GrabWeather +USE_BUILDLINK2= # defined +USE_X11= yes -MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS} +GNU_CONFIGURE= yes +USE_GMAKE= yes + +USE_PKGINSTALL= yes +CONFIGURE_ARGS+= --with-sysconfdir=${PKG_SYSCONFDIR} + +EGDIR= ${PREFIX}/share/examples/${PKGBASE} +CONF_FILES+= ${EGDIR}/wmweather.conf ${PKG_SYSCONFDIR}/wmweather.conf .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -EXTRA_LOCAL_LIBS= -lsocket +LDFLAGS+= -lsocket .endif .include "../../graphics/xpm/buildlink2.mk" -.include "../../lang/perl5/buildlink2.mk" +.include "../../www/curl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wmweather/PLIST b/x11/wmweather/PLIST index 0f87e3b4627..ea7fc580a74 100644 --- a/x11/wmweather/PLIST +++ b/x11/wmweather/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:50 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/11/08 06:21:14 xtraeme Exp $ bin/wmWeather -bin/GrabWeather +bin/wmweather man/man1/wmWeather.1 +man/man1/wmweather.1 diff --git a/x11/wmweather/distinfo b/x11/wmweather/distinfo index 78fb2ac9150..f015d912cca 100644 --- a/x11/wmweather/distinfo +++ b/x11/wmweather/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.5 2002/10/27 13:41:26 bouyer Exp $ +$NetBSD: distinfo,v 1.6 2003/11/08 06:21:14 xtraeme Exp $ -SHA1 (wmWeather-1.31.tar.gz) = b03ac1ad93f9e942feca26cfad91c1ea0b92eeb9 -Size (wmWeather-1.31.tar.gz) = 28639 bytes -SHA1 (patch-aa) = aa534dfeea9040d5868eacdb899d92727899ee27 -SHA1 (patch-ab) = 0421f488743d8416f9e061302c38e08e03aaadd6 -SHA1 (patch-ac) = bd76256fa4479e3e9f3c2be2290debb36b941b72 +SHA1 (wmweather-2.4.2.tar.gz) = e5ea21644a18c3fc3d1b6f46b8f139164781fedd +Size (wmweather-2.4.2.tar.gz) = 77417 bytes +SHA1 (patch-aa) = c0f42c142cd20efb0219417907547d5e2d82d5ea diff --git a/x11/wmweather/patches/patch-aa b/x11/wmweather/patches/patch-aa index d91611bf9ad..8e9d152dd72 100644 --- a/x11/wmweather/patches/patch-aa +++ b/x11/wmweather/patches/patch-aa @@ -1,47 +1,18 @@ -$NetBSD: patch-aa,v 1.3 2002/10/27 13:41:26 bouyer Exp $ +$NetBSD: patch-aa,v 1.4 2003/11/08 06:21:14 xtraeme Exp $ ---- Makefile.orig Wed Mar 17 01:59:39 1999 -+++ Makefile Tue May 2 13:20:57 2000 -@@ -1,8 +1,6 @@ --CC = gcc --CFLAGS = -O2 -Wall --INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include --DESTDIR= /usr/X11R6 --LIBDIR = -L/usr/X11R6/lib -+INCDIR = ${CPPFLAGS} -+DESTDIR= ${PREFIX} -+LIBDIR = ${LDFLAGS} - # for linux --LIBS = -lXpm -lX11 -lXext -+LIBS = -lXpm -lX11 -lXext ${EXTRA_LOCAL_LIBS} - # for Solaris -@@ -10,16 +8,14 @@ - OBJS = wmWeather.o \ - xutils.o - -- - .c.o: -- $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) -- -+ $(CC) $(CFLAGS) -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} $(LIBDIR) $(LIBS) - - clean: - for i in $(OBJS) ; do \ -@@ -28,7 +24,7 @@ - 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 $(DESTDIR)/bin -+ ${BSD_INSTALL_SCRIPT} GrabWeather $(DESTDIR)/bin -+ ${BSD_INSTALL_MAN} wmWeather.1 $(DESTDIR)/man/man1 +--- Makefile.in.orig 2003-11-08 07:07:47.000000000 +0100 ++++ Makefile.in 2003-11-08 07:11:54.000000000 +0100 +@@ -29,9 +29,10 @@ + ${INSTALL} -d ${DESTDIR}${bindir} ${DESTDIR}${mandir}/man1 ${DESTDIR}${sysconfdir} + ${INSTALL_PROGRAM} wmweather ${DESTDIR}${bindir} + ${INSTALL_DATA} wmweather.1 ${DESTDIR}${mandir}/man1 +- ${LN_S} wmweather ${DESTDIR}${bindir}/wmWeather +- ${LN_S} wmweather.1 ${DESTDIR}${mandir}/man1/wmWeather.1 +- test -e ${DESTDIR}${sysconfdir}/${sysconffile} || ${INSTALL_DATA} wmweather.conf ${DESTDIR}${sysconfdir}/${sysconffile} ++ ${LN_S} -f wmweather ${DESTDIR}${bindir}/wmWeather ++ ${LN_S} -f wmweather.1 ${DESTDIR}${mandir}/man1/wmWeather.1 ++ ${BSD_INSTALL_DATA_DIR} ${prefix}/share/examples/wmweather ++ ${BSD_INSTALL_DATA} wmweather.conf ${prefix}/share/examples/wmweather/ + uninstall: + ${RM} ${DESTDIR}${bindir}/wmweather ${DESTDIR}${bindir}/wmWeather diff --git a/x11/wmweather/patches/patch-ab b/x11/wmweather/patches/patch-ab deleted file mode 100644 index 27121771cfa..00000000000 --- a/x11/wmweather/patches/patch-ab +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2002/01/19 15:31:44 jlam Exp $ - ---- GrabWeather.orig Fri Apr 16 17:41:53 1999 -+++ GrabWeather -@@ -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"; -- 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 deleted file mode 100644 index 57077ba1945..00000000000 --- a/x11/wmweather/patches/patch-ac +++ /dev/null @@ -1,26 +0,0 @@ -$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 -- cgit v1.2.3