Thu Jun 23 18:24:08 2016 UTC ()
Use BSD_INSTALL_* as suggested by cube to work around install problems on
old Solaris. Fixes PR 32296 Jake Kupersmith.

While here, add patch comment and use <ctype.h> correctly.


(dholland)
diff -r1.44 -r1.45 pkgsrc/x11/wmweather/Makefile
diff -r1.10 -r1.11 pkgsrc/x11/wmweather/distinfo
diff -r1.6 -r1.7 pkgsrc/x11/wmweather/patches/patch-aa
diff -r0 -r1.1 pkgsrc/x11/wmweather/patches/patch-wmweather.c
cvs diff -r1.44 -r1.45 pkgsrc/x11/wmweather/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/wmweather/Makefile 2016/03/05 11:29:49 1.44
+++ pkgsrc/x11/wmweather/Makefile 2016/06/23 18:24:07 1.45
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.44 2016/03/05 11:29:49 jperkin Exp $ 1# $NetBSD: Makefile,v 1.45 2016/06/23 18:24:07 dholland Exp $
2 2
3DISTNAME= wmweather-2.4.5 3DISTNAME= wmweather-2.4.5
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= http://people.debian.org/~godisch/wmweather/ 6MASTER_SITES= http://people.debian.org/~godisch/wmweather/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://people.debian.org/~godisch/ 9HOMEPAGE= http://people.debian.org/~godisch/
10COMMENT= WindowMaker DockApp showing local weather conditions 10COMMENT= WindowMaker DockApp showing local weather conditions
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13WRKSRC= ${WRKDIR}/${DISTNAME}/src 13WRKSRC= ${WRKDIR}/${DISTNAME}/src
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_TOOLS+= gmake xmessage:run 16USE_TOOLS+= gmake xmessage:run
17 17
cvs diff -r1.10 -r1.11 pkgsrc/x11/wmweather/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/wmweather/distinfo 2015/11/04 03:28:56 1.10
+++ pkgsrc/x11/wmweather/distinfo 2016/06/23 18:24:07 1.11
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.10 2015/11/04 03:28:56 agc Exp $ 1$NetBSD: distinfo,v 1.11 2016/06/23 18:24:07 dholland Exp $
2 2
3SHA1 (wmweather-2.4.5.tar.gz) = bb42dabd7e25e8996a50daf6623f9dda555eabdf 3SHA1 (wmweather-2.4.5.tar.gz) = bb42dabd7e25e8996a50daf6623f9dda555eabdf
4RMD160 (wmweather-2.4.5.tar.gz) = 22418b350d54a68c8625adca127e1ff7a50032b9 4RMD160 (wmweather-2.4.5.tar.gz) = 22418b350d54a68c8625adca127e1ff7a50032b9
5SHA512 (wmweather-2.4.5.tar.gz) = eb62a6d03875c087e306e83ec2010916da702f942b22b130c327d890daf29803bf01f52fe0e03b962656d0dd9a329696e8fc19238eedc32f5ce72d8929eab87b 5SHA512 (wmweather-2.4.5.tar.gz) = eb62a6d03875c087e306e83ec2010916da702f942b22b130c327d890daf29803bf01f52fe0e03b962656d0dd9a329696e8fc19238eedc32f5ce72d8929eab87b
6Size (wmweather-2.4.5.tar.gz) = 85128 bytes 6Size (wmweather-2.4.5.tar.gz) = 85128 bytes
7SHA1 (patch-aa) = 65f758bb94039e07a228c00d0b8cafdb6fc06db6 7SHA1 (patch-aa) = a882d59ff36a5fb23822ab9288c48f62edc094d8
 8SHA1 (patch-wmweather.c) = ef7e6a9ebc4bd28c3b99bf49715f8e02f670028a
cvs diff -r1.6 -r1.7 pkgsrc/x11/wmweather/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/wmweather/patches/patch-aa 2015/08/16 12:03:02 1.6
+++ pkgsrc/x11/wmweather/patches/patch-aa 2016/06/23 18:24:07 1.7
@@ -1,22 +1,33 @@ @@ -1,22 +1,33 @@
1$NetBSD: patch-aa,v 1.6 2015/08/16 12:03:02 leot Exp $ 1$NetBSD: patch-aa,v 1.7 2016/06/23 18:24:07 dholland Exp $
 2
 3 - Configure for pkgsrc
 4 - Use BSD_INSTALL_* to avoid problems on old Solaris (PR 32296)
 5 - Handle config file the pkgsrc way
2 6
3--- Makefile.in.orig 2007-05-13 17:27:21.000000000 +0000 7--- Makefile.in.orig 2007-05-13 17:27:21.000000000 +0000
4+++ Makefile.in 8+++ Makefile.in
5@@ -2,5 +2,4 @@ 9@@ -2,5 +2,4 @@
6 # @configure_input@ 10 # @configure_input@
7  11
8-DESTDIR = 12-DESTDIR =
9 prefix = @prefix@ 13 prefix = @prefix@
10 exec_prefix = @exec_prefix@ 14 exec_prefix = @exec_prefix@
11@@ -31,7 +30,8 @@ install: wmweather wmweather.1 15@@ -28,10 +27,12 @@ wmgeneral.o: wmgeneral.c wmgeneral.h
12 ${INSTALL_PROGRAM} wmweather ${DESTDIR}${bindir} 16
13 ${INSTALL_DATA} wmweather.1 ${DESTDIR}${mandir}/man1 17 install: wmweather wmweather.1
 18- ${INSTALL} -d ${DESTDIR}${bindir} ${DESTDIR}${mandir}/man1 ${DESTDIR}${sysconfdir}
 19- ${INSTALL_PROGRAM} wmweather ${DESTDIR}${bindir}
 20- ${INSTALL_DATA} wmweather.1 ${DESTDIR}${mandir}/man1
14- ${LN_S} wmweather ${DESTDIR}${bindir}/wmWeather 21- ${LN_S} wmweather ${DESTDIR}${bindir}/wmWeather
15- ${LN_S} wmweather.1 ${DESTDIR}${mandir}/man1/wmWeather.1 22- ${LN_S} wmweather.1 ${DESTDIR}${mandir}/man1/wmWeather.1
16- test -e ${DESTDIR}${sysconfdir}/${sysconffile} || ${INSTALL_DATA} wmweather.conf ${DESTDIR}${sysconfdir}/${sysconffile} 23- test -e ${DESTDIR}${sysconfdir}/${sysconffile} || ${INSTALL_DATA} wmweather.conf ${DESTDIR}${sysconfdir}/${sysconffile}
 24+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${bindir}
 25+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${mandir}/man1 ${DESTDIR}${sysconfdir}
 26+ ${BSD_INSTALL_PROGRAM} wmweather ${DESTDIR}${bindir}
 27+ ${BSD_INSTALL_DATA} wmweather.1 ${DESTDIR}${mandir}/man1
17+ ${LN_S} -f wmweather ${DESTDIR}${bindir}/wmWeather 28+ ${LN_S} -f wmweather ${DESTDIR}${bindir}/wmWeather
18+ ${LN_S} -f wmweather.1 ${DESTDIR}${mandir}/man1/wmWeather.1 29+ ${LN_S} -f wmweather.1 ${DESTDIR}${mandir}/man1/wmWeather.1
19+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${prefix}/share/examples/wmweather 30+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${prefix}/share/examples/wmweather
20+ ${BSD_INSTALL_DATA} wmweather.conf ${DESTDIR}${prefix}/share/examples/wmweather/ 31+ ${BSD_INSTALL_DATA} wmweather.conf ${DESTDIR}${prefix}/share/examples/wmweather/
21  32
22 uninstall: 33 uninstall:
File Added: pkgsrc/x11/wmweather/patches/patch-wmweather.c
$NetBSD: patch-wmweather.c,v 1.1 2016/06/23 18:24:07 dholland Exp $

Use ctype.h functions correctly.

--- wmweather.c~	2009-07-03 16:00:38.000000000 +0000
+++ wmweather.c
@@ -270,7 +270,7 @@ static void do_conf(const char *rcfile)
 				exit(1);
 			}
 			for (i = 0; i < 4; i++)
-				optarg[i] = toupper(optarg[i]);
+				optarg[i] = toupper((unsigned char)optarg[i]);
 			if (station != NULL)
 				free(station);
 			station = strdup(optarg);
@@ -407,7 +407,7 @@ static void do_opts(int argc, char *argv
 				exit(1);
 			}
 			for (i = 0; i < 4; i++)
-				optarg[i] = toupper(optarg[i]);
+				optarg[i] = toupper((unsigned char)optarg[i]);
 			if (station != NULL)
 				free(station);
 			station = optarg;