head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.6
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.4
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.2
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q3:1.3.0.2
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.1.0.24
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.22
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.20
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.18
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.16
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.14
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.12
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.10
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.8
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.6
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.4
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.2
	cube-native-xorg-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2011.10.06.15.50.38;	author dholland;	state dead;
branches;
next	1.3;

1.3
date	2011.09.19.07.15.52;	author dholland;	state Exp;
branches;
next	1.2;

1.2
date	2011.07.03.20.15.58;	author dholland;	state Exp;
branches;
next	1.1;

1.1
date	2008.08.31.06.52.29;	author dholland;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Roll all the pkgsrc patches (of which there were far too many, and
none pkgsrc-specific) into a distfile jumbo patch. Sort the PLIST.

While this is not supposed to change the resulting package, bump the
PKGREVISION as a precaution and to make sure the build with the patch
gets tested properly.
@
text
@$NetBSD: patch-ab,v 1.3 2011/09/19 07:15:52 dholland Exp $

- use modern C
- use isdigit() correctly
- silence warnings about assignments within if conditions
- fix parenthesization, caught by clang

--- lib/Xmc/common.c.orig	1998-04-01 23:51:21.000000000 +0000
+++ lib/Xmc/common.c
@@@@ -27,8 +27,14 @@@@
 #include <sys/select.h>
 #endif
 #include <sys/socket.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
 #include <errno.h>
 #include <netdb.h>
+#include <arpa/inet.h>
 #include <xmc.h>
 #include <xmclib.h>
 #include <xmcp.h>
@@@@ -103,7 +109,7 @@@@ Xmc_event_shift
 {
    XmcEventList *elp;
 
-   if (elp = muxp->qhead) {
+   if ((elp = muxp->qhead) != NULL) {
       *event = elp->event;
       muxp->qhead = elp->next;
       if (muxp->qhead == 0)
@@@@ -212,7 +218,7 @@@@ Xmc_newId
 {
    static ulong_t id;
 
-   return muxp->base | (++id << muxp->shift) & muxp->mask;
+   return muxp->base | ((++id << muxp->shift) & muxp->mask);
 }
 
 void
@@@@ -642,7 +648,7 @@@@ Xmc_parse_display
    if (n == 0 || n > sizeof(nbuf) - 1) 	/* sanity check */
       return -1;
    for (i=0; i<n; i++)
-      if (isdigit(display[i]))
+      if (isdigit((unsigned char)display[i]))
          nbuf[i] = display[i];
       else
          return -1;
@@@@ -658,7 +664,7 @@@@ Xmc_parse_display
          if (n == 0 || n > sizeof(nbuf) - 1)
             return -1;
          for (i=0; i<n; i++)
-            if (isdigit(display[i]))
+            if (isdigit((unsigned char)display[i]))
                nbuf[i] = display[i];
             else
                return -1;
@@@@ -666,7 +672,7 @@@@ Xmc_parse_display
          scrno = atoi(nbuf);
       }
 
-   if (n = strlen(hostbuf)) {
+   if ((n = strlen(hostbuf)) != 0) {
       if ((cp = (char *)malloc(n + 1)) == 0)
          return 0;
       strcpy(cp, hostbuf);
@@@@ -713,8 +719,8 @@@@ Xmc_host_addr
    static ulong_t iaddr;
    static struct hostent *hp;
 
-   if (isdigit(*hostname)) {
-      for (cp=hostname; *cp && (isdigit(*cp) || *cp == '.'); cp++);
+   if (isdigit((unsigned char)*hostname)) {
+      for (cp=hostname; *cp && (isdigit((unsigned char)*cp) || *cp == '.'); cp++);
       if (*cp == '\0') {	/* it's an inet number */
          if ((long)(iaddr = inet_addr(hostname)) != -1) {
             *famp = AddrFamInternet;
@@@@ -724,7 +730,7 @@@@ Xmc_host_addr
          }
       }
    }
-   if (hp = gethostbyname(hostname)) {
+   if ((hp = gethostbyname(hostname)) != NULL) {
       *famp = Xmc_family_utox(hp->h_addrtype);
       *lenp = hp->h_length;
       *addrp = *hp->h_addr_list;
@


1.3
log
@Fix up a bunch of clang warnings and errors. This includes some bug
fixes, because clang found a couple things that were decidedly
wrong/broken; therefore PKGREVISION -> 3.

This package has too many patches (it only looks like a moderate number
compared to xview) and many/most of them should be rolled into a jumbo
patch and posted as a distfile. One of these years...
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@add patch comments
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.1 2008/08/31 06:52:29 dholland Exp $
d4 3
d8 3
a10 3
--- lib/Xmc/common.c~	1998-04-01 18:51:21.000000000 -0500
+++ lib/Xmc/common.c	2008-08-31 00:16:29.000000000 -0400
@@@@ -27,6 +27,8 @@@@
d14 1
d17 2
d21 1
d23 67
@


1.1
log
@Fix the "minor PLIST problems" and unmark this as only for SunOS.
Add proper deps.
Add destdir support.
And, finally, make it build properly. (82 (small) patches later...)
@
text
@d1 3
a3 1
$NetBSD$
@