Patch up some problems found by compiling with gcc. PKGREVISION -> 12.

7 files changed, 231 insertions, 11 deletions

diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index eae515d1d56..27b01e9ff58 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2014/10/09 14:07:13 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2016/05/01 19:56:40 dholland Exp $
 #
 
 DISTNAME=	aterm-1.0.0
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aterm/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/aterm/distinfo b/x11/aterm/distinfo
index 77ce0309527..d4b6afed9ba 100644
--- a/x11/aterm/distinfo
+++ b/x11/aterm/distinfo
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.15 2015/11/04 03:28:25 agc Exp $
+$NetBSD: distinfo,v 1.16 2016/05/01 19:56:40 dholland Exp $
 
 SHA1 (aterm-1.0.0.tar.bz2) = 806fd20aec2851c5eea26d9e6a707985da3579a3
 RMD160 (aterm-1.0.0.tar.bz2) = b74f54b6aa6f1d4a094671507c30f627f074eb48
 SHA512 (aterm-1.0.0.tar.bz2) = 715cbf0416ff8cf23705a5333f0666a1f3afec3e17c6988e196f1798b1b4cf75e43085572b9d2906aee6060771a792545a7aa0aa9d2f4c2f0e7db7ac6e4021d3
 Size (aterm-1.0.0.tar.bz2) = 248708 bytes
-SHA1 (patch-aa) = 3db1064f3998d1d901902c4309841e102db32fa4
+SHA1 (patch-aa) = 63dd4599dcf49c6269502d7871b99ae01e42f581
 SHA1 (patch-ac) = 28c79343079680251a013ec3fe364b01f5a5ccac
 SHA1 (patch-ad) = 0c87ee69672e98189afa2cfdcdd9691a1571f354
-SHA1 (patch-ae) = f94dfb058d2b6e54e8deef96f6c8c429c0f64463
+SHA1 (patch-ae) = 4c08e766c18c46a9e606d80cc785d954cb2bf14c
+SHA1 (patch-src_misc.c) = af6b8c7ccde2dba8bbcdcd91f7e6e37c3d1c5301
+SHA1 (patch-src_pixmap.c) = 6288ba39bb7c7d80df7a48ff9df53cebee29a84c
+SHA1 (patch-src_xdefaults.c) = dec764692c359503d6bd091dbfd2c44bdf220cf8
diff --git a/x11/aterm/patches/patch-aa b/x11/aterm/patches/patch-aa
index 21c2d1d92f9..daa3aeb9140 100644
--- a/x11/aterm/patches/patch-aa
+++ b/x11/aterm/patches/patch-aa
@@ -1,7 +1,20 @@
-$NetBSD: patch-aa,v 1.5 2008/05/27 21:46:53 tonnerre Exp $
+$NetBSD: patch-aa,v 1.6 2016/05/01 19:56:40 dholland Exp $
 
---- src/main.c.orig	2005-06-20 18:10:19.000000000 +0200
+- Use ctype.h functions properly.
+- Silence debug prints.
+- Don't assume :0 if DISPLAY isn't set.
+
+--- src/main.c.orig	2005-06-20 16:10:19.000000000 +0000
 +++ src/main.c
+@@ -196,7 +196,7 @@ xerror_handler (Display * dpy, XErrorEve
+ void
+ color_aliases(int idx)
+ {
+-    if (rs_color[idx] && isdigit(*rs_color[idx])) {
++    if (rs_color[idx] && isdigit((unsigned char)*rs_color[idx])) {
+ 	int             i = atoi(rs_color[idx]);
+ 
+ 	if (i >= 8 && i <= 15) {	/* bright colors */
 @@ -1037,12 +1037,10 @@ resize_window(XEvent* ev)
  	XConfigureEvent *xconf = &(ev->xconfigure);
  	
@@ -15,6 +28,24 @@ $NetBSD: patch-aa,v 1.5 2008/05/27 21:46:53 tonnerre Exp $
  	TermWin.root_x = root_x ; 
  	TermWin.root_y = root_y ; 
  	TermWin.root_width = xconf->width ; 
+@@ -1215,7 +1213,7 @@ set_window_color(int idx, const char *co
+ 	return;
+ 
+ /* handle color aliases */
+-    if (isdigit(*color)) {
++    if (isdigit((unsigned char)*color)) {
+ 	i = atoi(color);
+ 	if (i >= 8 && i <= 15) {	/* bright colors */
+ 	    i -= 8;
+@@ -1432,7 +1430,7 @@ change_font(int init, const char *fontna
+ 		break;
+ 
+ 	    default:
+-		if (fontname[1] != '\0' && !isdigit(fontname[1]))
++		if (fontname[1] != '\0' && !isdigit((unsigned char)fontname[1]))
+ 		    return;
+ 		if (idx < 0 || idx >= (NFONTS))
+ 		    return;
 @@ -2047,9 +2045,14 @@ main(int argc, char *argv[])
   */
      get_options(argc, argv);
diff --git a/x11/aterm/patches/patch-ae b/x11/aterm/patches/patch-ae
index b10656f6a9c..e1bdec71125 100644
--- a/x11/aterm/patches/patch-ae
+++ b/x11/aterm/patches/patch-ae
@@ -1,9 +1,10 @@
-$NetBSD: patch-ae,v 1.7 2012/09/29 17:59:34 asau Exp $
+$NetBSD: patch-ae,v 1.8 2016/05/01 19:56:40 dholland Exp $
 
-Tags: from-upstream
+- Use pseudo-terminal multiplexor on NetBSD.
+- Correctly set the terminal size on FreeBSD and NetBSD.
+(these parts apparently from upstream)
 
-Use pseudo-terminal multiplexor on NetBSD.
-Correctly set the terminal size on FreeBSD and NetBSD.
+- Use ctype.h functions correctly.
 
 --- src/command.c.orig	2005-06-21 20:08:16.000000000 +0000
 +++ src/command.c
@@ -25,3 +26,48 @@ Correctly set the terminal size on FreeBSD and NetBSD.
      /* reset signals and spin off the command interpreter */
  	signal(SIGINT, SIG_DFL);
  	signal(SIGQUIT, SIG_DFL);
+@@ -1225,9 +1227,9 @@ init_command(char *argv[])
+     meta_char = (Options & Opt_meta8 ? 0x80 : 033);
+     if (rs_modifier
+ 	&& strlen(rs_modifier) == 4
+-	&& toupper(*rs_modifier) == 'M'
+-	&& toupper(rs_modifier[1]) == 'O'
+-	&& toupper(rs_modifier[2]) == 'D')
++	&& toupper((unsigned char)*rs_modifier) == 'M'
++	&& toupper((unsigned char)rs_modifier[1]) == 'O'
++	&& toupper((unsigned char)rs_modifier[2]) == 'D')
+ 	switch (rs_modifier[3]) {
+ 	case '2':
+ 	    ModXMask = Mod2Mask;
+@@ -1302,13 +1304,13 @@ init_xlocale(void)
+ 	for (s = tmp; *s; s++) {
+ 	    char           *end, *next_s;
+ 
+-	    for (; *s && isspace(*s); s++)
++	    for (; *s && isspace((unsigned char)*s); s++)
+ 		/* */ ;
+ 	    if (!*s)
+ 		break;
+ 	    for (end = s; (*end && (*end != ',')); end++)
+ 		/* */ ;
+-	    for (next_s = end--; ((end >= s) && isspace(*end)); end--)
++	    for (next_s = end--; ((end >= s) && isspace((unsigned char)*end)); end--)
+ 		/* */ ;
+ 	    *++end = '\0';
+ 	    if (*s) {
+@@ -1340,13 +1342,13 @@ init_xlocale(void)
+ 	unsigned short  i;
+ 	char           *end, *next_s;
+ 
+-	for (; *s && isspace(*s); s++)
++	for (; *s && isspace((unsigned char)*s); s++)
+ 	    /* */ ;
+ 	if (!*s)
+ 	    break;
+ 	for (end = s; (*end && (*end != ',')); end++)
+ 	    /* */ ;
+-	for (next_s = end--; ((end >= s) && isspace(*end));)
++	for (next_s = end--; ((end >= s) && isspace((unsigned char)*end));)
+ 	    *end-- = 0;
+ 
+ 	if (!strcmp(s, "OverTheSpot"))
diff --git a/x11/aterm/patches/patch-src_misc.c b/x11/aterm/patches/patch-src_misc.c
new file mode 100644
index 00000000000..76d57d763fe
--- /dev/null
+++ b/x11/aterm/patches/patch-src_misc.c
@@ -0,0 +1,48 @@
+$NetBSD: patch-src_misc.c,v 1.1 2016/05/01 19:56:40 dholland Exp $
+
+- Use ctype.h functions correctly.
+
+--- src/misc.c~	2004-11-10 17:21:46.000000000 +0000
++++ src/misc.c
+@@ -85,7 +85,7 @@ char           *
+ Str_skip_space(char *str)
+ {
+     if (str && *str) {
+-	while (*str && isspace(*str))
++	while (*str && isspace((unsigned char)*str))
+ 	    str++;
+     }
+     return str;
+@@ -102,7 +102,7 @@ Str_trim(char *str)
+ 	src = Str_skip_space(str);
+ 	n = strlen(src) - 1;
+ 
+-	while (n > 0 && isspace(src[n]))
++	while (n > 0 && isspace((unsigned char)src[n]))
+ 	    n--;
+ 	src[n + 1] = '\0';
+ 
+@@ -159,12 +159,12 @@ Str_escaped(char *str)
+ 	str[i++] = '\033';	/* destination */
+ 	len--;
+ 	p += n;
+-	if (toupper(*p) == 'X') {
++	if (toupper((unsigned char)*p) == 'X') {
+ 	/* append carriage-return for `M-xcommand' */
+ 	    append = '\r';
+ 	    str[i++] = 'x';	/* destination */
+ 	    p++;
+-	    while (isspace(*p)) {
++	    while (isspace((unsigned char)*p)) {
+ 		p++;
+ 		len--;
+ 	    }
+@@ -214,7 +214,7 @@ Str_escaped(char *str)
+ 	    ch = *p;
+ 	    p++;
+ 	    len--;
+-	    ch = toupper(ch);
++	    ch = toupper((unsigned char)ch);
+ 	    ch = (ch == '?' ? 127 : (ch - '@'));
+ 	}
+ 	str[i] = ch;
diff --git a/x11/aterm/patches/patch-src_pixmap.c b/x11/aterm/patches/patch-src_pixmap.c
new file mode 100644
index 00000000000..64720527253
--- /dev/null
+++ b/x11/aterm/patches/patch-src_pixmap.c
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_pixmap.c,v 1.1 2016/05/01 19:56:40 dholland Exp $
+
+Silence some sign-mismatch warnings.
+
+--- src/pixmap.c~	2005-06-21 20:08:16.000000000 +0000
++++ src/pixmap.c
+@@ -83,19 +83,20 @@ ValidatePixmap (Pixmap p, int bSetHandle
+     /* we need to check if pixmap is still valid */
+ 	Window root;
+     int junk;
++    unsigned ujunk;
+ 	if (bSetHandler)
+ 		oldXErrorHandler = XSetErrorHandler (pixmap_error_handler);
+ 
+     if (bTransparent)
+ 	    p = GetRootPixmap (None);
+ 	if (!pWidth)
+-  		pWidth = &junk;
++  		pWidth = &ujunk;
+     if (!pHeight)
+-	    pHeight = &junk;
++	    pHeight = &ujunk;
+ 
+     if (p != None)
+ 	{
+-  		if (!XGetGeometry (dpy, p, &root, &junk, &junk, pWidth, pHeight, &junk, &junk))
++  		if (!XGetGeometry (dpy, p, &root, &junk, &junk, pWidth, pHeight, &ujunk, &junk))
+ 			p = None;
+     }
+ 	if(bSetHandler)
diff --git a/x11/aterm/patches/patch-src_xdefaults.c b/x11/aterm/patches/patch-src_xdefaults.c
new file mode 100644
index 00000000000..524e5bc0759
--- /dev/null
+++ b/x11/aterm/patches/patch-src_xdefaults.c
@@ -0,0 +1,62 @@
+$NetBSD: patch-src_xdefaults.c,v 1.1 2016/05/01 19:56:40 dholland Exp $
+
+- Pass the right type (int) for %*s formats.
+- Use ctype.h functions correctly.
+
+--- src/xdefaults.c~	2005-06-03 20:11:55.000000000 +0000
++++ src/xdefaults.c
+@@ -516,7 +516,7 @@ usage(int type)
+ 		fprintf(stderr, "    %s%s %-*s%s%s\n",
+ 			(optList_isBool(i) ? "-/+" : "-"),
+ 			optList[i].opt,
+-			(INDENT - strlen(optList[i].opt)
++			(int)(INDENT - strlen(optList[i].opt)
+ 			 + (optList_isBool(i) ? 0 : 2)),
+ 			(optList[i].arg ? optList[i].arg : ""),
+ 			(optList_isBool(i) ? "turn on/off " : ""),
+@@ -533,12 +533,12 @@ usage(int type)
+ 	    if (optList[i].kw != NULL)
+ 		fprintf(stderr, "    %s: %*s\n",
+ 			optList[i].kw,
+-			(INDENT - strlen(optList[i].kw)),
++			(int)(INDENT - strlen(optList[i].kw)),
+ 			(optList_isBool(i) ? "boolean" : optList[i].arg));
+ 
+ #ifdef KEYSYM_RESOURCE
+ 	fprintf(stderr, "    " "keysym.sym" ": %*s\n",
+-		(INDENT - strlen("keysym.sym")), "keysym");
++		(int)(INDENT - strlen("keysym.sym")), "keysym");
+ #endif
+ 	fprintf(stderr, "\n    -help to list options\n    -version for the version information with options list\n\n");
+ 	break;
+@@ -686,8 +686,8 @@ int
+ my_strcasecmp(const char *s1, const char *s2)
+ {
+     for ( /*nil */ ; (*s1 && *s2); s1++, s2++) {
+-	register int    c1 = toupper(*s1);
+-	register int    c2 = toupper(*s2);
++	register int    c1 = toupper((unsigned char)*s1);
++	register int    c2 = toupper((unsigned char)*s2);
+ 
+ 	if (c1 != c2)
+ 	    return (c1 - c2);
+@@ -739,8 +739,8 @@ parse_keysym(char *str, char *arg)
+ 	str += n;		/* skip `keysym.' */
+     }
+ /* some scanf() have trouble with a 0x prefix */
+-    if (isdigit(str[0])) {
+-	if (str[0] == '0' && toupper(str[1]) == 'X')
++    if (isdigit((unsigned char)str[0])) {
++	if (str[0] == '0' && toupper((unsigned char)str[1]) == 'X')
+ 	    str += 2;
+ 	if (arg) {
+ 	    if (sscanf(str, (strchr(str, ':') ? "%x:" : "%x"), &sym) != 1)
+@@ -823,7 +823,7 @@ get_xdefaults(FILE * stream, const char 
+     while ((str = fgets(buffer, sizeof(buffer), stream)) != NULL) {
+ 	unsigned int    entry, n;
+ 
+-	while (*str && isspace(*str))
++	while (*str && isspace((unsigned char)*str))
+ 	    str++;		/* leading whitespace */
+ 
+ 	if ((str[len] != '*' && str[len] != '.') ||