>Number:         23384
>Category:       pkg
>Synopsis:       update of x11/wmweather to 2.4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Nov 07 04:55:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Soren Jacobsen
>Release:        NetBSD 1.6ZE
>Organization:
>Environment:
pkgsrc as of 11/05/2003.
>Description:
Kill USE_X11BASE, USE_PKGINSTALL.

Changes since 1.31:
* Complete rewrite by new author.
* Perl no longer used
* Uses curl
* ~/.wmWeatherReports/ -> ~/.wmweather/
>How-To-Repeat:
>Fix:
Index: DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wmweather/DESCR,v
retrieving revision 1.1
diff -u -r1.1 DESCR
--- DESCR	2001/10/31 22:11:50	1.1
+++ DESCR	2003/11/07 04:44:23
@@ -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.
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wmweather/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	2003/07/17 22:56:49	1.12
+++ Makefile	2003/11/07 04:44:23
@@ -1,28 +1,34 @@
 # $NetBSD: Makefile,v 1.12 2003/07/17 22:56:49 grant 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_X11=	# defined
 
-MAKE_FLAGS+=    EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS}
+GNU_CONFIGURE=	YES
+USE_GNU_TOOLS+=	make
 
+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"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wmweather/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- PLIST	2001/10/31 22:11:50	1.1
+++ PLIST	2003/11/07 04:44:23
@@ -1,4 +1,5 @@
 @comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:50 zuntum Exp $
 bin/wmWeather
-bin/GrabWeather
+bin/wmweather
 man/man1/wmWeather.1
+man/man1/wmweather.1
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wmweather/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	2002/10/27 13:41:26	1.5
+++ distinfo	2003/11/07 04:44:23
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.5 2002/10/27 13:41:26 bouyer 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) = 67b8edc149f82cbb92d9c58d128efadb1f963751
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wmweather/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- patches/patch-aa	2002/10/27 13:41:26	1.3
+++ patches/patch-aa	2003/11/07 04:44:23
@@ -1,47 +1,18 @@
-$NetBSD: patch-aa,v 1.3 2002/10/27 13:41:26 bouyer Exp $
+$NetBSD$
 
---- 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
+--- Makefile.in.orig	2003-08-01 05:46:16.000000000 -0700
++++ Makefile.in	2003-11-06 12:35:09.000000000 -0800
+@@ -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/
  
--
- .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 
- 
+ uninstall:
+ 	${RM} ${DESTDIR}${bindir}/wmweather ${DESTDIR}${bindir}/wmWeather
>Release-Note:
>Audit-Trail:
>Unformatted: