Use nbcompat correctly, add patch comments. Fixes build on SunOS.

11 files changed, 137 insertions, 42 deletions

diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index 6a381f723cd..92dc017a5da 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/10/09 14:06:42 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2015/07/09 11:44:09 jperkin Exp $
 
 DISTNAME=	ls
 PKGNAME=	colorls-2.2
@@ -17,6 +17,7 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 MANCOMPRESSED_IF_MANZ=	yes
 MAKE_ENV+=		BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \
 			MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q}
+MAKE_ENV+=		LDADD=${LIBS:Q}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
 
 CFLAGS.SunOS+=		-Du_quad_t=uint64_t -DS_ISTXT=S_ISVTX
diff --git a/misc/colorls/distinfo b/misc/colorls/distinfo
index f724f618ed1..0d01c195bce 100644
--- a/misc/colorls/distinfo
+++ b/misc/colorls/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.9 2013/09/10 14:24:20 joerg Exp $
+$NetBSD: distinfo,v 1.10 2015/07/09 11:44:09 jperkin Exp $
 
 SHA1 (ls.tar.gz) = f0d069e71faade167feaf14c4e6327bcc14d6616
 RMD160 (ls.tar.gz) = 7b607b7ab953ad0dc603c269fa03648cd54ac04f
 Size (ls.tar.gz) = 11768 bytes
-SHA1 (patch-aa) = 831f286605126a136b540b4456916db8cc8ff7e4
-SHA1 (patch-ab) = 8f26c3e16bb85371bbb16c5f77a667b3a456af68
-SHA1 (patch-ac) = c96de4d9964055ca0244cecbc5ed2249ce2aa803
-SHA1 (patch-ad) = d502e96261a950c5307794f01422147430c76aba
-SHA1 (patch-ae) = f217206de7b35bf03db4b95040f26bdf850b7cb7
-SHA1 (patch-extern.h) = ecb2f17ab8f17a42f744c26a86d243d90b309fd5
-SHA1 (patch-stat__flags.c) = 2def9b687a3c81611543875b5e99f86a65183680
+SHA1 (patch-aa) = d7d2381f1af5f8a452b6c875f7d0c84c80460ec0
+SHA1 (patch-ab) = 9e54a34c85ec0e4011aa6e5a4776b29e8cb0be54
+SHA1 (patch-ac) = ca39144a044969fe5aa17960c898c7e1b8bba86f
+SHA1 (patch-ad) = fb1d96b03fa028d45ddd4fe46ca520036f26be25
+SHA1 (patch-ae) = 70cfb2b8942e0130406e0c483b8e01de8c02a8d4
+SHA1 (patch-cmp.c) = 0f2675956bbf010055e39cd868337f1e452cf297
+SHA1 (patch-extern.h) = da879e819ce201ca434bb4bd6d15b92413877361
+SHA1 (patch-stat__flags.c) = 08f16c05d9383dc75c8954022fd491aa466312fa
+SHA1 (patch-util.c) = 312830c2a66925e44292426f857bf7704decaf4d
diff --git a/misc/colorls/patches/patch-aa b/misc/colorls/patches/patch-aa
index abb636a0f48..4daed88c40f 100644
--- a/misc/colorls/patches/patch-aa
+++ b/misc/colorls/patches/patch-aa
@@ -1,6 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2004/10/13 18:50:13 tv Exp $
+$NetBSD: patch-aa,v 1.8 2015/07/09 11:44:09 jperkin Exp $
 
---- Makefile.orig	Fri Sep 23 22:55:51 1994
+Use pkgsrc layout.
+
+--- Makefile.orig	1994-09-24 02:55:51.000000000 +0000
 +++ Makefile
 @@ -3,4 +3,7 @@
  
diff --git a/misc/colorls/patches/patch-ab b/misc/colorls/patches/patch-ab
index b2c4640bc22..e76ae9eca64 100644
--- a/misc/colorls/patches/patch-ab
+++ b/misc/colorls/patches/patch-ab
@@ -1,6 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2004/10/13 18:50:13 tv Exp $
+$NetBSD: patch-ab,v 1.8 2015/07/09 11:44:09 jperkin Exp $
 
---- colorls.1.orig	Wed Oct 13 14:49:05 2004
+Manual page fixes.
+
+--- colorls.1.orig	2015-07-09 11:19:52.025462425 +0000
 +++ colorls.1
 @@ -37,14 +37,22 @@
  .\"
diff --git a/misc/colorls/patches/patch-ac b/misc/colorls/patches/patch-ac
index 120eab67b60..f151189e9a7 100644
--- a/misc/colorls/patches/patch-ac
+++ b/misc/colorls/patches/patch-ac
@@ -1,8 +1,21 @@
-$NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
+$NetBSD: patch-ac,v 1.7 2015/07/09 11:44:09 jperkin Exp $
+
+Use nbcompat.
 
 --- ls.c.orig	1996-12-21 23:40:58.000000000 +0000
 +++ ls.c
-@@ -59,12 +59,26 @@ static char const sccsid[] = "@(#)ls.c	8
+@@ -53,18 +53,37 @@ static char const sccsid[] = "@(#)ls.c	8
+ #include <dirent.h>
+ #include <err.h>
+ #include <errno.h>
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat.h>
++#include <nbcompat/fts.h>
++#else
+ #include <fts.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
  #include <locale.h>
@@ -29,7 +42,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
  static void	 traverse __P((int, char **, int));
  
  static void (*printfcn) __P((DISPLAY *));
-@@ -76,7 +90,9 @@ int termwidth = 80;		/* default terminal
+@@ -76,7 +95,9 @@ int termwidth = 80;		/* default terminal
  /* flags */
  int f_accesstime;		/* use time of last access */
  int f_column;			/* columnated format */
@@ -39,7 +52,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
  int f_inode;			/* print inode */
  int f_kblocks;			/* print size in kilobytes */
  int f_listdir;			/* list actual directory, not contents */
-@@ -94,6 +110,7 @@ int f_statustime;		/* use time of last m
+@@ -94,6 +115,7 @@ int f_statustime;		/* use time of last m
  int f_dirname;			/* if precede with directory name */
  int f_timesort;			/* sort by time vice name */
  int f_type;			/* add type character for non-regular files */
@@ -47,7 +60,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
  #ifndef BSD4_4_LITE
  int f_whiteout;			/* show whiteout entries */
  #endif
-@@ -135,9 +152,13 @@ main(argc, argv)
+@@ -135,9 +157,13 @@ main(argc, argv)
  
  	fts_options = FTS_PHYSICAL;
  #ifdef BSD4_4_LITE
@@ -63,7 +76,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
  #endif
  		switch (ch) {
  		/*
-@@ -168,6 +189,10 @@ main(argc, argv)
+@@ -168,6 +194,10 @@ main(argc, argv)
  		case 'F':
  			f_type = 1;
  			break;
@@ -74,7 +87,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
  		case 'L':
  			fts_options &= ~FTS_PHYSICAL;
  			fts_options |= FTS_LOGICAL;
-@@ -197,9 +222,11 @@ main(argc, argv)
+@@ -197,9 +227,11 @@ main(argc, argv)
  		case 'k':
  			f_kblocks = 1;
  			break;
@@ -86,7 +99,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
  		case 'q':
  			f_nonprint = 1;
  			break;
-@@ -228,18 +255,21 @@ main(argc, argv)
+@@ -228,18 +260,21 @@ main(argc, argv)
  	argc -= optind;
  	argv += optind;
  
@@ -110,7 +123,19 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
  		fts_options |= FTS_COMFOLLOW;
  
  #ifndef BSD4_4_LITE
-@@ -384,7 +414,8 @@ display(p, list)
+@@ -257,7 +292,11 @@ main(argc, argv)
+ 		if (f_kblocks)
+ 			blocksize = 2;
+ 		else {
++#ifdef __sun
++			blocksize = 512;
++#else
+ 			(void)getbsize(&notused, &blocksize);
++#endif
+ 			blocksize /= 512;
+ 		}
+ 	}
+@@ -384,7 +423,8 @@ display(p, list)
  	u_long btotal, maxblock, maxinode, maxlen, maxnlink;
  	int bcfile, flen, glen, ulen, maxflags, maxgroup, maxuser;
  	int entries, needstats;
@@ -120,7 +145,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
  
  	/*
  	 * If list is NULL there are two possibilities: that the parent
-@@ -452,12 +483,14 @@ display(p, list)
+@@ -452,12 +492,14 @@ display(p, list)
  				group = group_from_gid(sp->st_gid, 0);
  				if ((glen = strlen(group)) > maxgroup)
  					maxgroup = glen;
@@ -135,7 +160,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
  					flen = 0;
  
  				if ((np = malloc(sizeof(NAMES) +
-@@ -473,10 +506,12 @@ display(p, list)
+@@ -473,10 +515,12 @@ display(p, list)
  				    S_ISBLK(sp->st_mode))
  					bcfile = 1;
  
@@ -148,7 +173,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
  				cur->fts_pointer = np;
  			}
  		}
-@@ -500,7 +535,7 @@ display(p, list)
+@@ -500,7 +544,7 @@ display(p, list)
  		d.s_inode = strlen(buf);
  		(void)snprintf(buf, sizeof(buf), "%lu", maxnlink);
  		d.s_nlink = strlen(buf);
@@ -157,7 +182,7 @@ $NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
  		d.s_size = strlen(buf);
  		d.s_user = maxuser;
  	}
-@@ -521,7 +556,11 @@ display(p, list)
+@@ -521,7 +565,11 @@ display(p, list)
   */
  static int
  mastercmp(a, b)
diff --git a/misc/colorls/patches/patch-ad b/misc/colorls/patches/patch-ad
index 513aeadfa2f..43f35f292ab 100644
--- a/misc/colorls/patches/patch-ad
+++ b/misc/colorls/patches/patch-ad
@@ -1,8 +1,10 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:10:12 agc Exp $
+$NetBSD: patch-ad,v 1.3 2015/07/09 11:44:09 jperkin Exp $
 
---- ls.h.orig	Sun Dec 22 00:40:58 1996
-+++ ls.h	Thu May 21 15:42:08 1998
-@@ -54,6 +54,7 @@
+Add color.
+
+--- ls.h.orig	1996-12-21 23:40:58.000000000 +0000
++++ ls.h
+@@ -54,6 +54,7 @@ extern int f_sectime;		/* print the real
  extern int f_size;		/* list size in short listing */
  extern int f_statustime;	/* use time of last mode change */
  extern int f_type;		/* add type character for non-regular files */
diff --git a/misc/colorls/patches/patch-ae b/misc/colorls/patches/patch-ae
index 7e9bbe91305..b62e4c8da28 100644
--- a/misc/colorls/patches/patch-ae
+++ b/misc/colorls/patches/patch-ae
@@ -1,16 +1,26 @@
-$NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
+$NetBSD: patch-ae,v 1.5 2015/07/09 11:44:09 jperkin Exp $
+
+Use nbcompat.
 
 --- print.c.orig	1996-12-21 23:40:58.000000000 +0000
 +++ print.c
-@@ -43,6 +43,7 @@ static char const sccsid[] = "@(#)print.
+@@ -43,9 +43,15 @@ static char const sccsid[] = "@(#)print.
  #include <sys/param.h>
  #include <sys/stat.h>
  
 +#include <ctype.h>
  #include <err.h>
  #include <errno.h>
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat.h>
++#include <nbcompat/fts.h>
++#else
  #include <fts.h>
-@@ -64,6 +65,26 @@ static int	printtype __P((u_int));
++#endif
+ #include <grp.h>
+ #include <pwd.h>
+ #include <stdio.h>
+@@ -64,6 +70,26 @@ static int	printtype __P((u_int));
  
  #define	IS_NOPRINT(p)	((p)->fts_number == NO_PRINT)
  
@@ -37,7 +47,7 @@ $NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
  void
  printscol(dp)
  	DISPLAY *dp;
-@@ -97,8 +118,8 @@ printlong(dp)
+@@ -97,15 +123,17 @@ printlong(dp)
  		if (f_inode)
  			(void)printf("%*lu ", dp->s_inode, (u_long)sp->st_ino);
  		if (f_size)
@@ -48,7 +58,16 @@ $NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
  		(void)strmode(sp->st_mode, buf);
  		np = p->fts_pointer;
  		(void)printf("%s %*u %-*s  %-*s  ", buf, dp->s_nlink,
-@@ -114,20 +135,24 @@ printlong(dp)
+ 		    sp->st_nlink, dp->s_user, np->user, dp->s_group,
+ 		    np->group);
++#ifndef __sun
+ 		if (f_flags)
+ 			(void)printf("%-*s ", dp->s_flags, np->flags);
++#endif
+ 		if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode))
+ 			if (minor(sp->st_rdev) > 255)
+ 				(void)printf("%3d, 0x%08x ",
+@@ -114,20 +142,24 @@ printlong(dp)
  				(void)printf("%3d, %3d ",
  				    major(sp->st_rdev), minor(sp->st_rdev));
  		else if (dp->bcfile)
@@ -77,7 +96,7 @@ $NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
  			printlink(p);
  		(void)putchar('\n');
  	}
-@@ -190,10 +215,22 @@ printcol(dp)
+@@ -190,10 +222,22 @@ printcol(dp)
  			    dp->s_block);
  			if ((base += numrows) >= num)
  				break;
@@ -104,7 +123,7 @@ $NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
  			endcol += colwidth;
  		}
  		(void)putchar('\n');
-@@ -217,11 +254,15 @@ printaname(p, inodefield, sizefield)
+@@ -217,11 +261,15 @@ printaname(p, inodefield, sizefield)
  	if (f_inode)
  		chcnt += printf("%*lu ", (int)inodefield, (u_long)sp->st_ino);
  	if (f_size)
@@ -122,7 +141,7 @@ $NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
  	return (chcnt);
  }
  
-@@ -281,6 +322,96 @@ printtype(mode)
+@@ -281,6 +329,96 @@ printtype(mode)
  	return (0);
  }
  
diff --git a/misc/colorls/patches/patch-cmp.c b/misc/colorls/patches/patch-cmp.c
new file mode 100644
index 00000000000..284becb4416
--- /dev/null
+++ b/misc/colorls/patches/patch-cmp.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-cmp.c,v 1.1 2015/07/09 11:44:09 jperkin Exp $
+
+Use nbcompat.
+
+--- cmp.c.orig	1997-01-02 06:25:13.000000000 +0000
++++ cmp.c
+@@ -43,7 +43,12 @@ static char const sccsid[] = "@(#)cmp.c
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat.h>
++#include <nbcompat/fts.h>
++#else
+ #include <fts.h>
++#endif
+ #include <string.h>
+ 
+ #include "ls.h"
diff --git a/misc/colorls/patches/patch-extern.h b/misc/colorls/patches/patch-extern.h
index aca9bc6cd2c..03412502d6c 100644
--- a/misc/colorls/patches/patch-extern.h
+++ b/misc/colorls/patches/patch-extern.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-extern.h,v 1.1 2011/06/14 13:25:57 wiz Exp $
+$NetBSD: patch-extern.h,v 1.2 2015/07/09 11:44:09 jperkin Exp $
+
+Add colors.
 
 --- extern.h.orig	1994-09-24 02:55:52.000000000 +0000
 +++ extern.h
diff --git a/misc/colorls/patches/patch-stat__flags.c b/misc/colorls/patches/patch-stat__flags.c
index 370ed260379..8dfd21641d8 100644
--- a/misc/colorls/patches/patch-stat__flags.c
+++ b/misc/colorls/patches/patch-stat__flags.c
@@ -1,7 +1,9 @@
-$NetBSD: patch-stat__flags.c,v 1.1 2012/03/01 16:25:16 hans Exp $
+$NetBSD: patch-stat__flags.c,v 1.2 2015/07/09 11:44:09 jperkin Exp $
 
---- stat_flags.c.orig	1996-12-22 00:40:58.000000000 +0100
-+++ stat_flags.c	2012-03-01 15:39:46.769141152 +0100
+Avoid file flags on SunOS.
+
+--- stat_flags.c.orig	1996-12-21 23:40:58.000000000 +0000
++++ stat_flags.c
 @@ -43,6 +43,8 @@ static char const sccsid[] = "@(#)stat_f
  #include <stddef.h>
  #include <string.h>
diff --git a/misc/colorls/patches/patch-util.c b/misc/colorls/patches/patch-util.c
new file mode 100644
index 00000000000..76ccd6dc6d0
--- /dev/null
+++ b/misc/colorls/patches/patch-util.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-util.c,v 1.1 2015/07/09 11:44:09 jperkin Exp $
+
+Use nbcompat.
+
+--- util.c.orig	1996-12-21 23:40:58.000000000 +0000
++++ util.c
+@@ -44,7 +44,12 @@ static char const sccsid[] = "@(#)util.c
+ #include <sys/stat.h>
+ 
+ #include <ctype.h>
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat.h>
++#include <nbcompat/fts.h>
++#else
+ #include <fts.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>