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.

4 files changed, 44 insertions, 8 deletions

diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index febc2ab6ecb..d7b807c1955 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2016/03/05 11:29:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.45 2016/06/23 18:24:07 dholland Exp $
 
 DISTNAME=	wmweather-2.4.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://people.debian.org/~godisch/wmweather/
 
diff --git a/x11/wmweather/distinfo b/x11/wmweather/distinfo
index 4bb192e2996..9ae4024eaad 100644
--- a/x11/wmweather/distinfo
+++ b/x11/wmweather/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 03:28:56 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/06/23 18:24:07 dholland Exp $
 
 SHA1 (wmweather-2.4.5.tar.gz) = bb42dabd7e25e8996a50daf6623f9dda555eabdf
 RMD160 (wmweather-2.4.5.tar.gz) = 22418b350d54a68c8625adca127e1ff7a50032b9
 SHA512 (wmweather-2.4.5.tar.gz) = eb62a6d03875c087e306e83ec2010916da702f942b22b130c327d890daf29803bf01f52fe0e03b962656d0dd9a329696e8fc19238eedc32f5ce72d8929eab87b
 Size (wmweather-2.4.5.tar.gz) = 85128 bytes
-SHA1 (patch-aa) = 65f758bb94039e07a228c00d0b8cafdb6fc06db6
+SHA1 (patch-aa) = a882d59ff36a5fb23822ab9288c48f62edc094d8
+SHA1 (patch-wmweather.c) = ef7e6a9ebc4bd28c3b99bf49715f8e02f670028a
diff --git a/x11/wmweather/patches/patch-aa b/x11/wmweather/patches/patch-aa
index 9e680d58c55..ff88e7b45b3 100644
--- a/x11/wmweather/patches/patch-aa
+++ b/x11/wmweather/patches/patch-aa
@@ -1,4 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2015/08/16 12:03:02 leot Exp $
+$NetBSD: patch-aa,v 1.7 2016/06/23 18:24:07 dholland Exp $
+
+ - Configure for pkgsrc
+ - Use BSD_INSTALL_* to avoid problems on old Solaris (PR 32296)
+ - Handle config file the pkgsrc way
 
 --- Makefile.in.orig	2007-05-13 17:27:21.000000000 +0000
 +++ Makefile.in
@@ -8,12 +12,19 @@ $NetBSD: patch-aa,v 1.6 2015/08/16 12:03:02 leot Exp $
 -DESTDIR         =
  prefix          = @prefix@
  exec_prefix     = @exec_prefix@
-@@ -31,7 +30,8 @@ install: wmweather wmweather.1
- 	${INSTALL_PROGRAM} wmweather   ${DESTDIR}${bindir}
- 	${INSTALL_DATA}    wmweather.1 ${DESTDIR}${mandir}/man1
+@@ -28,10 +27,12 @@ wmgeneral.o: wmgeneral.c wmgeneral.h
+ 
+ install: wmweather wmweather.1
+-	${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}
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${bindir}
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${mandir}/man1 ${DESTDIR}${sysconfdir}
++	${BSD_INSTALL_PROGRAM} wmweather   ${DESTDIR}${bindir}
++	${BSD_INSTALL_DATA}    wmweather.1 ${DESTDIR}${mandir}/man1
 +	${LN_S} -f wmweather   ${DESTDIR}${bindir}/wmWeather
 +	${LN_S} -f wmweather.1 ${DESTDIR}${mandir}/man1/wmWeather.1
 +	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${prefix}/share/examples/wmweather
diff --git a/x11/wmweather/patches/patch-wmweather.c b/x11/wmweather/patches/patch-wmweather.c
new file mode 100644
index 00000000000..50aa6e8bdbb
--- /dev/null
+++ b/x11/wmweather/patches/patch-wmweather.c
@@ -0,0 +1,24 @@
+$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;