--- old/usr/src/cmd/abi/appcert/static_prof/Makefile.com	Tue Jan  8 12:29:47 2019
+++ new/usr/src/cmd/abi/appcert/static_prof/Makefile.com	Tue Jan  8 12:29:47 2019
@@ -26,6 +26,7 @@
 #
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		$(SRC)/cmd/Makefile.cmd
 
@@ -35,6 +36,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lelf
 
 LINTFLAGS =	-nmxsuF -errtags=yes
--- old/usr/src/cmd/abi/spectrans/Makefile.cmd	Tue Jan  8 12:29:49 2019
+++ new/usr/src/cmd/abi/spectrans/Makefile.cmd	Tue Jan  8 12:29:49 2019
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -40,6 +39,9 @@
 LDFLAGS	+=	-L$(U_DIR)
 LINTFLAGS +=	-xsuF -errtags=yes
 
+# not linted
+SMATCH=off
+
 LDLIBS	+=	-l$(U_LIB) -lgen
 LINTLIBS =	-L$(U_DIR) -l$(U_LIB)
 
--- old/usr/src/cmd/abi/spectrans/parser/Makefile.targ	Tue Jan  8 12:29:51 2019
+++ new/usr/src/cmd/abi/spectrans/parser/Makefile.targ	Tue Jan  8 12:29:51 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 .KEEP_STATE:
 
@@ -45,6 +46,9 @@
 CERRWARN	+= -_gcc=-Wno-unused-label
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 objs/%.o: ../%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
--- old/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ	Tue Jan  8 12:29:53 2019
+++ new/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ	Tue Jan  8 12:29:53 2019
@@ -26,6 +26,7 @@
 #
 # Copyright 2015 Nexenta Systems, Inc.  All right reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 .KEEP_STATE:
 
@@ -49,3 +50,7 @@
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-label
+
+# not linted
+SMATCH=off
+
--- old/usr/src/cmd/acct/Makefile	Tue Jan  8 12:29:56 2019
+++ new/usr/src/cmd/acct/Makefile	Tue Jan  8 12:29:56 2019
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		acctcms acctcom acctcon acctcon1 acctcon2 \
 		acctdisk acctdusg acctmerg accton acctprc acctprc1 \
@@ -92,6 +93,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL: $(ALL)
--- old/usr/src/cmd/acct/lib/Makefile	Tue Jan  8 12:29:58 2019
+++ new/usr/src/cmd/acct/lib/Makefile	Tue Jan  8 12:29:58 2019
@@ -19,14 +19,13 @@
 #
 # CDDL HEADER END
 #
-#
 # Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
-#
 LIBS=	a.a
 
-OBJS=	pnpsplit.o  copyn.o devtolin.o expand.o lintodev.o \
-	namtouid.o tmless.o tmsecs.o uidtonam.o substr.o 
+OBJS=	pnpsplit.o devtolin.o expand.o lintodev.o \
+	namtouid.o tmless.o tmsecs.o uidtonam.o substr.o
 SRCS=	$(OBJS:%.o=%.c)
 
 include	../../Makefile.cmd
@@ -36,6 +35,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-extra
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL: $(OBJS)
--- old/usr/src/cmd/acpi/acpidump/Makefile	Tue Jan  8 12:30:01 2019
+++ new/usr/src/cmd/acpi/acpidump/Makefile	Tue Jan  8 12:30:01 2019
@@ -8,7 +8,7 @@
 # source.  A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 #
-# Copyright 2016 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 # Copyright 2016 RackTop Systems.
 #
 
@@ -23,6 +23,9 @@
 
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_DUMP_APP
 
 LDLIBS += -ldevinfo
--- old/usr/src/cmd/acpi/acpixtract/Makefile	Tue Jan  8 12:30:03 2019
+++ new/usr/src/cmd/acpi/acpixtract/Makefile	Tue Jan  8 12:30:03 2019
@@ -8,7 +8,7 @@
 # source.  A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 #
-# Copyright 2016 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 # Copyright 2016 RackTop Systems.
 #
 
@@ -22,6 +22,9 @@
 
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_XTRACT_APP
 
 .KEEP_STATE:
--- old/usr/src/cmd/acpi/common/Makefile	Tue Jan  8 12:30:06 2019
+++ new/usr/src/cmd/acpi/common/Makefile	Tue Jan  8 12:30:06 2019
@@ -8,7 +8,7 @@
 # source.  A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 #
-# Copyright 2016 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY =	acpi.a
@@ -21,6 +21,9 @@
 
 CERRWARN += -_gcc=-Wno-unused-function
 
+# needs work
+SMOFF=all_func_returns
+
 CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_APPLICATION
 
 LDLIBS += -lc
--- old/usr/src/cmd/adbgen/Makefile.com	Tue Jan  8 12:30:08 2019
+++ new/usr/src/cmd/adbgen/Makefile.com	Tue Jan  8 12:30:09 2019
@@ -25,6 +25,7 @@
 #
 # Copyright 2015 RackTop Systems.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROGS = adbgen1 adbgen3 adbgen4
 OBJS = adbsub.o
@@ -36,7 +37,11 @@
 .KEEP_STATE:
 
 include ../../Makefile.cmd
+include ../../Makefile.targ
 
+# not linted
+SMATCH=off
+
 ROOTADBDIR32	= $(ROOT)/usr/lib/adb
 ROOTADBDIR64	= $(ROOT)/usr/lib/adb/$(MACH64)
 ROOTADBDIR	= $(ROOTADBDIR32)
@@ -77,5 +82,3 @@
 
 $(ROOTADBDIR64): $(ROOTADBDIR32)
 	$(INS.dir)
-
-include ../../Makefile.targ
--- old/usr/src/cmd/addbadsec/Makefile	Tue Jan  8 12:30:10 2019
+++ new/usr/src/cmd/addbadsec/Makefile	Tue Jan  8 12:30:11 2019
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= 		addbadsec
 OBJECTS=	addbadsec.o ix_altsctr.o
@@ -34,6 +35,9 @@
 
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/allocate/Makefile	Tue Jan  8 12:30:12 2019
+++ new/usr/src/cmd/allocate/Makefile	Tue Jan  8 12:30:12 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 ETCTSOLFILES =	devalloc_defaults
 
@@ -32,6 +33,9 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 ROOTSEC =	$(ROOTETC)/security
 ROOTSECDEV =	$(ROOTSEC)/dev
 ROOTSECLIB =	$(ROOTSEC)/lib
--- old/usr/src/cmd/ast/msgcc/Makefile	Tue Jan  8 12:30:12 2019
+++ new/usr/src/cmd/ast/msgcc/Makefile	Tue Jan  8 12:30:12 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SHELL=/usr/bin/ksh93
 
@@ -51,6 +52,9 @@
 CERRWARN += -_gcc=-Wno-empty-body
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS += -last
 msgcpp   := LDLIBS += -lpp
 
--- old/usr/src/cmd/audio/audioplay/Makefile	Tue Jan  8 12:30:13 2019
+++ new/usr/src/cmd/audio/audioplay/Makefile	Tue Jan  8 12:30:13 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	audioplay
 
@@ -40,6 +41,8 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += indenting
+
 LINTFLAGS += -m -v -u $(LDFLAGS)
 
 .KEEP_STATE:
--- old/usr/src/cmd/audio/utilities/Makefile	Tue Jan  8 12:30:15 2019
+++ new/usr/src/cmd/audio/utilities/Makefile	Tue Jan  8 12:30:16 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Makefile for C++ Audio Library (libAudio.a) 
+# Copyright (c) 2018, Joyent, Inc.
 
 include ../../Makefile.cmd
 
@@ -37,6 +37,9 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 LINTFLAGS += -m -v -u
 
 AR=     /usr/ccs/bin/ar
--- old/usr/src/cmd/auditd/Makefile	Tue Jan  8 12:30:16 2019
+++ new/usr/src/cmd/auditd/Makefile	Tue Jan  8 12:30:16 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = auditd
 
@@ -39,6 +40,8 @@
 
 CERRWARN += -_gcc=-Wno-parentheses
 
+SMOFF += macros
+
 LDLIBS += -lbsm -lsecdb
 
 OBJS = auditd.o doorway.o queue.o
--- old/usr/src/cmd/auditreduce/Makefile	Tue Jan  8 12:30:18 2019
+++ new/usr/src/cmd/auditreduce/Makefile	Tue Jan  8 12:30:18 2019
@@ -24,7 +24,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 TABLEDIR = ../praudit
 
@@ -44,6 +44,9 @@
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-parentheses
 
+# false positives / need cleanup
+SMOFF += indenting,no_if_block,strcpy_overflow
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/awk/Makefile	Tue Jan  8 12:30:18 2019
+++ new/usr/src/cmd/awk/Makefile	Tue Jan  8 12:30:18 2019
@@ -24,6 +24,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 # NOTE: awk is oawk.
 
@@ -42,6 +43,9 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 #
 # Message catalog
 #
--- old/usr/src/cmd/awk_xpg4/Makefile	Tue Jan  8 12:30:20 2019
+++ new/usr/src/cmd/awk_xpg4/Makefile	Tue Jan  8 12:30:20 2019
@@ -25,6 +25,7 @@
 #
 # cmd/awk_xpg4/Makefile
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 # NOTE: this is nawk in usr/src/cmd/awk_xpg4 to reside as /usr/xpg4/bin/awk
 
@@ -48,6 +49,9 @@
 LDLIBS += -lm
 CLEANFILES= awk.c y.tab.h
 
+# not linted
+SMATCH=off
+
 # for messaging catalog
 
 POFILE= awk_xpg4.po
--- old/usr/src/cmd/backup/Makefile.backup	Tue Jan  8 12:30:22 2019
+++ new/usr/src/cmd/backup/Makefile.backup	Tue Jan  8 12:30:22 2019
@@ -23,6 +23,7 @@
 #
 # cmd/backup/Makefile.backup
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -44,6 +45,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 UFSROOTETC=		$(ROOT)/etc
 UFSROOTUSR=		$(ROOT)/usr
 UFSROOTUSRLIB=		$(UFSROOTUSR)/lib
--- old/usr/src/cmd/bart/Makefile	Tue Jan  8 12:30:22 2019
+++ new/usr/src/cmd/bart/Makefile	Tue Jan  8 12:30:22 2019
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	bart
 SRCS=	rules.c create.c compare.c main.c lutbl.c
@@ -34,6 +35,8 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF +=	indenting
+
 #
 # for messaging catalog
 #
@@ -46,7 +49,7 @@
 
 .KEEP_STATE:
 
-all:	$(PROG) 
+all:	$(PROG)
 
 $(PROG):	$(OBJS)
 	$(CC) -o $(PROG) $(OBJS) $(LDFLAGS) $(LDLIBS)
--- old/usr/src/cmd/bc/Makefile	Tue Jan  8 12:30:23 2019
+++ new/usr/src/cmd/bc/Makefile	Tue Jan  8 12:30:23 2019
@@ -23,6 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= bc
 XPG6PROG= bc
@@ -39,6 +40,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-label
 
+# nothing lintable
+SMATCH=off
+
 $(XPG6EXOBJS) := CFLAGS += -DXPG6
 ROOTLIBB= $(LIBB:%=$(ROOTLIB)/%)
 $(ROOTLIBB) :=	FILEMODE =	$(LIBFILEMODE)
--- old/usr/src/cmd/bdiff/Makefile	Tue Jan  8 12:30:25 2019
+++ new/usr/src/cmd/bdiff/Makefile	Tue Jan  8 12:30:25 2019
@@ -23,6 +23,7 @@
 # Copyright (c) 1989, 1996 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= bdiff 
 
@@ -33,6 +34,9 @@
 CPPFLAGS += -D_FILE_OFFSET_BITS=64
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
--- old/usr/src/cmd/boot/bootadm/Makefile	Tue Jan  8 12:30:25 2019
+++ new/usr/src/cmd/boot/bootadm/Makefile	Tue Jan  8 12:30:25 2019
@@ -25,7 +25,7 @@
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 # Copyright 2016 Nexenta Systems, Inc.
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= bootadm
 
@@ -52,6 +52,8 @@
 CPPFLAGS +=	-D_FILE_OFFSET_BITS=64
 CPPFLAGS +=	-I$(SRC)/uts/common -I$(SRC)/common -I$(SRC)/common/ficl
 
+SMOFF +=	all_func_returns
+
 CSTD=	$(CSTD_GNU99)
 
 LINTFLAGS += -erroff=E_INCONS_ARG_DECL2
--- old/usr/src/cmd/boot/fiocompress/Makefile	Tue Jan  8 12:30:27 2019
+++ new/usr/src/cmd/boot/fiocompress/Makefile	Tue Jan  8 12:30:27 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= fiocompress
 
@@ -39,6 +40,8 @@
 CFLAGS +=	-I../../../uts/common
 LINTFLAGS +=	-I../../../uts/common
 
+SMOFF += 	leaks
+
 all: $(PROG)
 
 $(PROG): $(OBJS)
--- old/usr/src/cmd/boot/installgrub/Makefile	Tue Jan  8 12:30:28 2019
+++ new/usr/src/cmd/boot/installgrub/Makefile	Tue Jan  8 12:30:28 2019
@@ -20,7 +20,7 @@
 #
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015, Nexenta Systems, Inc.
-# 
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= installgrub
 
@@ -40,6 +40,9 @@
 CPPFLAGS += -I$(SRC)/uts/i86pc -I$(SRC)/uts/intel -I$(SRC)/uts/common
 CPPFLAGS += -I$(SRC)/common/util
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lmd5
 
 i386_CFLAGS += -D_LARGEFILE64_SOURCE
--- old/usr/src/cmd/captoinfo/Makefile	Tue Jan  8 12:30:30 2019
+++ new/usr/src/cmd/captoinfo/Makefile	Tue Jan  8 12:30:30 2019
@@ -23,6 +23,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= captoinfo
 
@@ -36,9 +37,12 @@
 CPPFLAGS +=	-I../../lib/libcurses/screen
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# code is a mess right now
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 $(PROG): $(OBJS) $(MAPFILE.INT)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
--- old/usr/src/cmd/cdrw/Makefile	Tue Jan  8 12:30:32 2019
+++ new/usr/src/cmd/cdrw/Makefile	Tue Jan  8 12:30:32 2019
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= cdrw
 
@@ -42,6 +43,9 @@
 CPPFLAGS +=	-D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(HAL_DBUS_CPPFLAGS)
 LINTFLAGS += 	-um
 
+# not linted
+SMATCH=off
+
 $(ROOTBIN)/cdrw := FILEMODE = 04755
 
 .KEEP_STATE:
@@ -52,7 +56,7 @@
 	$(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS) $(NONLINTLDLIBS) $(CFLAGS)
 	$(POST_PROCESS)
 
-install: all $(ROOTPROG) 
+install: all $(ROOTPROG)
 
 clean:
 	$(RM) $(OBJS)
--- old/usr/src/cmd/cfgadm/Makefile	Tue Jan  8 12:30:35 2019
+++ new/usr/src/cmd/cfgadm/Makefile	Tue Jan  8 12:30:35 2019
@@ -23,11 +23,9 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/cfgadm/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
-PROG= cfgadm 
+PROG= cfgadm
 
 include ../Makefile.cmd
 
@@ -36,12 +34,14 @@
 
 XGETFLAGS += -a -x cfgadm.xcl
 
-LDLIBS += -lcfgadm 
+LDLIBS += -lcfgadm
 LINTFLAGS += $(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) $(LDLIBS)
 
+SMOFF += snprintf_overflow
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 	-$(RM) $(ROOTETCPROG)
--- old/usr/src/cmd/cmd-crypto/pktool/Makefile	Tue Jan  8 12:30:37 2019
+++ new/usr/src/cmd/cmd-crypto/pktool/Makefile	Tue Jan  8 12:30:37 2019
@@ -21,6 +21,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =	pktool
 
@@ -55,8 +56,11 @@
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-label
 
-LDLIBS +=  -lkmf -lpkcs11 -lcryptoutil 
+# not linted, too much mess, but it should be
+SMATCH=off
 
+LDLIBS +=  -lkmf -lpkcs11 -lcryptoutil
+
 .KEEP_STATE:
 
 all : $(PROG)
--- old/usr/src/cmd/cmd-inet/lib/nwamd/Makefile	Tue Jan  8 12:30:39 2019
+++ new/usr/src/cmd/cmd-inet/lib/nwamd/Makefile	Tue Jan  8 12:30:39 2019
@@ -21,8 +21,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# usr/src/cmd/cmd-inet/lib/nwamd/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 # Needed for ROOTFS_LIBDIR definition
 include		../../../../lib/Makefile.lib
@@ -60,6 +59,9 @@
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 #
 # Instrument with CTF data to ease debugging.
 #
--- old/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile	Tue Jan  8 12:30:41 2019
+++ new/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile	Tue Jan  8 12:30:41 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG    = dhcpagent
@@ -41,6 +42,9 @@
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 #
 # to compile a debug version, do a `make COPTFLAG="-g -XO0"'
 #
--- old/usr/src/cmd/cmd-inet/usr.bin/Makefile	Tue Jan  8 12:30:43 2019
+++ new/usr/src/cmd/cmd-inet/usr.bin/Makefile	Tue Jan  8 12:30:43 2019
@@ -24,6 +24,7 @@
 #
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=		finger rdate ruptime rwho whois
@@ -34,7 +35,7 @@
 
 SUBDIRS=	chat dns-sd ftp nc nca netstat \
 		pppd pppdump pppstats rdist talk telnet tftp
-SUBDIR1=	talk 
+SUBDIR1=	talk
 MSGSUBDIRS=	nca talk
 
 # As programs get lint-clean, add them here.  Eventually.
@@ -75,6 +76,8 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+ruptime :=     SMOFF += leaks
+
 # Eventually just plain CFLAGS should be += -v, but not until all in
 # PROGS are lint clean.
 $(LINTCLEAN)	:=	CFLAGS += $(CCVERBOSE)
@@ -148,7 +151,7 @@
 rlogin: rlogin.o $(COMMONOBJS)
 	$(LINK.c) $@.o $(COMMONOBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
- 
+
 rcp: rcp.o $(COMMONOBJS)
 	$(LINK.c) $@.o $(COMMONOBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
@@ -156,7 +159,7 @@
 rsh: rsh.o $(COMMONOBJS)
 	$(LINK.c) $@.o $(COMMONOBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
- 
+
 $(ROOTSUNWRCP):
 	$(RM) $@; $(SYMLINK) ../bin/rcp $@
 
@@ -177,7 +180,7 @@
 
 clobber: $(SUBDIRS) clobber_local
 clobber_local: clean_local
-	$(RM) $(CLOBBERFILES) 
+	$(RM) $(CLOBBERFILES)
 
 LINTLOCALS=	$(LINTCLEAN:%.c=lint-%)
 
--- old/usr/src/cmd/cmd-inet/usr.bin/chat/Makefile	Tue Jan  8 12:30:46 2019
+++ new/usr/src/cmd/cmd-inet/usr.bin/chat/Makefile	Tue Jan  8 12:30:46 2019
@@ -2,6 +2,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 #  Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		chat
 OBJS=		chat.o
@@ -14,6 +15,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-trigraphs
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile	Tue Jan  8 12:30:49 2019
+++ new/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile	Tue Jan  8 12:30:49 2019
@@ -11,10 +11,9 @@
 
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2018, Joyent, Inc.
 #
 
-# cmd/cmd-inet/usr.bin/dns-sd/Makefile
-
 PROG=		dns-sd
 
 include ../../../Makefile.cmd
@@ -27,6 +26,9 @@
 CPPFLAGS += -DMDNS_VERSIONSTR_NODTS
 LDLIBS += -lsocket -ldns_sd
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile	Tue Jan  8 12:30:50 2019
+++ new/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile	Tue Jan  8 12:30:50 2019
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		ftp
 DEFAULTFILES =	ftp.dfl
@@ -44,6 +45,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lsocket -lnsl -lgss
 
 # ftp defines its own delete and glob - localize all symbols to prevent a
--- old/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile	Tue Jan  8 12:30:52 2019
+++ new/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile	Tue Jan  8 12:30:52 2019
@@ -24,7 +24,7 @@
 #
 # Copyright (c) 1990 Mentat Inc.
 #
-# cmd/cmd-inet/usr.bin/netstat/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		netstat
 
@@ -50,9 +50,12 @@
 CERRWARN += -_gcc=-Wno-parentheses
 LDLIBS += -ldhcpagent -lsocket -lnsl -lkstat -ltsnet -ltsol
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) $(NPROG) 
+all: $(PROG) $(NPROG)
 
 ROOTPROG=   $(PROG:%=$(ROOTBIN)/%)
 
--- old/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile	Tue Jan  8 12:30:52 2019
+++ new/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile	Tue Jan  8 12:30:52 2019
@@ -1,6 +1,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=		pppdump
@@ -16,6 +17,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:		$(PROG)
--- old/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile	Tue Jan  8 12:30:54 2019
+++ new/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile	Tue Jan  8 12:30:54 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/cmd-inet/usr.bin/rdist/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	rdist
 OBJS=	docmd.o expand.o lookup.o main.o server.o
@@ -55,6 +55,9 @@
 CERRWARN +=	-_gcc=-Wno-clobbered
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 ROOTSYMLINK=	$(ROOT)/usr/ucb/$(PROG)
 
 # conditional assignments
--- old/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile	Tue Jan  8 12:30:55 2019
+++ new/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile	Tue Jan  8 12:30:55 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	talk
 OBJS=	talk.o get_names.o display.o io.o ctl.o init_disp.o \
@@ -42,6 +43,9 @@
 CPPFLAGS +=	-DSYSV -DSTRNET -DBSD_COMP
 LDLIBS +=	-lcurses -lsocket -lnsl
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL: $(OBJS)
--- old/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile	Tue Jan  8 12:30:55 2019
+++ new/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile	Tue Jan  8 12:30:55 2019
@@ -22,6 +22,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
 PROG=		telnet
 OBJS=		telnet.o commands.o main.o network.o ring.o \
@@ -53,6 +55,9 @@
 LDLIBS +=	-lmech_krb5 
 LDFLAGS +=	$(KRUNPATH) -L$(ROOT)$(KLIBDIR_DO) -L$(ROOT)$(KLIBDIR_GL)
 
+# "missing type for func"
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile	Tue Jan  8 12:30:57 2019
+++ new/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile	Tue Jan  8 12:30:57 2019
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 ILBD=		ilbd
 PROG=		$(ILBD)
@@ -53,6 +54,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 CSTD =      $(CSTD_GNU99)
 
 # I18n
--- old/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile	Tue Jan  8 12:30:58 2019
+++ new/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile	Tue Jan  8 12:30:58 2019
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		in.ndpd
 OBJS=		config.o main.o ndp.o tables.o trace.o
@@ -59,6 +60,9 @@
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CTFCONVERT_HOOK = && $(CTFCONVERT_O)
 CTFMERGE_HOOK = && $(CTFMERGE) -L VERSION -o $@ $(OBJS)
 $(OBJS) := CFLAGS += $(CTF_FLAGS)
--- old/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/Makefile	Tue Jan  8 12:31:00 2019
+++ new/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/Makefile	Tue Jan  8 12:31:00 2019
@@ -23,6 +23,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SVCMETHOD=	svc-ripng
 MANIFEST=	ripng.xml
@@ -43,6 +44,9 @@
 
 LINTFLAGS +=	$(_D_UNIX98_EXTN)
 
+# not linted
+SMATCH=off
+
 # in.ripngd uses the ancillary data feature which is available only through
 # UNIX 98 standards version of Socket interface. This interface is supposed to
 # be accessed by -lxnet. In addition, -lsocket is used to
--- old/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile	Tue Jan  8 12:31:01 2019
+++ new/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile	Tue Jan  8 12:31:01 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG	=	inetd
 MANIFEST=	inetd.xml inetd-upgrade.xml
@@ -42,6 +43,8 @@
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-unused-label
 
+SMOFF += kmalloc_wrong_size
+
 LDLIBS    += -lsocket -lnsl -lrestart -lscf -lcontract -linetutil \
 		-lwrap -linetsvc -luutil -lumem -lbsm
 
--- old/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile	Tue Jan  8 12:31:02 2019
+++ new/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile	Tue Jan  8 12:31:02 2019
@@ -22,6 +22,7 @@
 # Use is subject to license terms.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		mdnsd
 MANIFEST=	multicast.xml
@@ -53,6 +54,9 @@
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 ROOTMANIFESTDIR=	$(ROOTSVCNETWORKDNS)
 $(ROOTMANIFEST)		:= FILEMODE= 444
 
--- old/usr/src/cmd/cmd-inet/usr.lib/pppoe/Makefile	Tue Jan  8 12:31:06 2019
+++ new/usr/src/cmd/cmd-inet/usr.lib/pppoe/Makefile	Tue Jan  8 12:31:06 2019
@@ -23,10 +23,7 @@
 # Copyright 2000-2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/cmd-inet/usr.lib/pppoe/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../../../Makefile.cmd
 
@@ -36,6 +33,9 @@
 
 CPPFLAGS +=	-I$(SRC)/uts/common
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:		$(PROG)
--- old/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile	Tue Jan  8 12:31:08 2019
+++ new/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile	Tue Jan  8 12:31:08 2019
@@ -21,6 +21,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		wpad
 MANIFEST =	wpa.xml
@@ -37,6 +38,8 @@
 
 LINTFLAGS += 	-u
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all:		$(PROG)
--- old/usr/src/cmd/cmd-inet/usr.sbin/Makefile	Tue Jan  8 12:31:09 2019
+++ new/usr/src/cmd/cmd-inet/usr.sbin/Makefile	Tue Jan  8 12:31:09 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 SYNCPROG=	syncinit syncloop syncstat
@@ -109,6 +110,9 @@
 CERRWARN += -_gcc=-Wno-extra
 CERRWARN += -_gcc=-Wno-address
 
+# "missing type for func"
+SMATCH=off
+
 #
 # Message catalog
 #
--- old/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile	Tue Jan  8 12:31:09 2019
+++ new/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile	Tue Jan  8 12:31:09 2019
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		ilbadm
 
@@ -39,6 +40,9 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CSTD =	$(CSTD_GNU99)
 
 POFILES =	$(OBJS:%.o=%.po)
--- old/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/Makefile	Tue Jan  8 12:31:10 2019
+++ new/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/Makefile	Tue Jan  8 12:31:10 2019
@@ -21,6 +21,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
 PROG=		in.rdisc
 MANIFEST=	rdisc.xml
@@ -35,6 +37,9 @@
 CPPFLAGS +=	-DSYSV -DBSD_COMP
 CERRWARN +=	-_gcc=-Wno-extra
 
+# "missing type for func"
+SMATCH =	off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile	Tue Jan  8 12:31:10 2019
+++ new/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile	Tue Jan  8 12:31:10 2019
@@ -3,6 +3,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 ROUTEDPROG=	in.routed
 ROUTEDOBJS=	common.o if.o input.o main.o output.o parms.o radix.o \
@@ -39,6 +40,9 @@
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lxnet -lmd -lsocket
 CLEAN_FILES +=	$(ROUTEDOBJS) $(RTQUERYOBJS)
 CLOBBERFILES +=	$(ROUTEDPROG) $(RTQUERYPROG)
--- old/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile	Tue Jan  8 12:31:11 2019
+++ new/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile	Tue Jan  8 12:31:11 2019
@@ -22,10 +22,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
-#
-# cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
-
 PROG=		ipqosconf
 OBJS=		ipqosconf.o
 SRCS=		$(OBJS:%.o=%.c)
@@ -55,6 +53,9 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lsocket -lnsl -lnvpair -lipp
 
 .KEEP_STATE:
--- old/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile	Tue Jan  8 12:31:12 2019
+++ new/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile	Tue Jan  8 12:31:12 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		ikeadm ipsecalgs ipsecconf ipseckey ikecert
 SOCKETPROG=	ipsecalgs ipsecconf ipseckey 
@@ -59,6 +60,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 CFLAGS += $(XSTRCONST)
 LDLIBS += -lipsecutil -lnsl
 
--- old/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile	Tue Jan  8 12:31:12 2019
+++ new/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile	Tue Jan  8 12:31:12 2019
@@ -23,8 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# cmd/cmd-inet/usr.sbin/nwamadm/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= nwamadm
 
@@ -36,9 +35,12 @@
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 
--- old/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile	Tue Jan  8 12:31:14 2019
+++ new/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile	Tue Jan  8 12:31:14 2019
@@ -24,7 +24,7 @@
 # Use is subject to license terms.
 # Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
 #
-# cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	nwamcfg
 OBJS=	nwamcfg.o nwamcfg_lex.o nwamcfg_grammar.tab.o
@@ -44,9 +44,11 @@
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 $(PROG): $(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
--- old/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile	Tue Jan  8 12:31:16 2019
+++ new/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile	Tue Jan  8 12:31:16 2019
@@ -22,6 +22,7 @@
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=	snoop
@@ -60,6 +61,9 @@
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-unused-function
 
+# we really should have smatch running on this code but...
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL: $(OBJS)
--- old/usr/src/cmd/cmd-inet/usr.sbin/wificonfig/Makefile	Tue Jan  8 12:31:18 2019
+++ new/usr/src/cmd/cmd-inet/usr.sbin/wificonfig/Makefile	Tue Jan  8 12:31:18 2019
@@ -23,6 +23,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		wificonfig	
 OBJS=		wificonfig.o
@@ -37,6 +38,9 @@
 CERRWARN += -_gcc=-Wno-char-subscripts
 CERRWARN += -_gcc=-Wno-parentheses
 
+# needs work
+SMOFF += index_overflow,memcpy_overflow
+
 .KEEP_STATE:
 
 all:	$(PROG)
--- old/usr/src/cmd/cpc/cpustat/Makefile	Tue Jan  8 12:31:20 2019
+++ new/usr/src/cmd/cpc/cpustat/Makefile	Tue Jan  8 12:31:20 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		cpustat
 OBJS =		$(PROG).o caps.o time.o setgrp.o strtoset.o
@@ -40,6 +41,9 @@
 CPPFLAGS	+= -D_REENTRANT -I$(SRC)/lib/libcpc/common -I$(STATCOMMONDIR)
 LDLIBS +=	-lcpc -lkstat
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:	$(PROG)
--- old/usr/src/cmd/cpc/cputrack/Makefile.com	Tue Jan  8 12:31:22 2019
+++ new/usr/src/cmd/cpc/cputrack/Makefile.com	Tue Jan  8 12:31:22 2019
@@ -22,8 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include	../../../Makefile.cmd
 
@@ -36,6 +35,9 @@
 CFLAGS64 +=	$(CCVERBOSE) $(CTF_FLAGS)
 CPPFLAGS +=	-I$(SRC)/lib/libcpc/common
 
+# not linted
+SMATCH=off
+
 LINTFLAGS +=	-u
 LINTFLAGS64 +=	-u
 
--- old/usr/src/cmd/cpio/Makefile	Tue Jan  8 12:31:23 2019
+++ new/usr/src/cmd/cpio/Makefile	Tue Jan  8 12:31:24 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= cpio
 
@@ -32,12 +33,15 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lsec -lcmdutils -lnvpair
 XGETFLAGS += -a -x cpio.xcl
 
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 $(PROG): $(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
--- old/usr/src/cmd/cron/Makefile	Tue Jan  8 12:31:27 2019
+++ new/usr/src/cmd/cron/Makefile	Tue Jan  8 12:31:27 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 DEFAULTFILES =	cron.dfl
 
@@ -39,6 +40,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-value
 
+# not linted
+SMATCH=off
+
 ROOTVAR =	$(ROOT)/var
 
 ROOTSPCRON =	$(ROOTVAR)/spool/cron
--- old/usr/src/cmd/csh/i386/Makefile	Tue Jan  8 12:31:29 2019
+++ new/usr/src/cmd/csh/i386/Makefile	Tue Jan  8 12:31:29 2019
@@ -6,8 +6,9 @@
 # Copyright (c) 1980 Regents of the University of California.
 # All rights reserved.  The Berkeley Software License Agreement
 # specifies the terms and conditions for redistribution.
-
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
 #
@@ -34,6 +35,9 @@
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-extra
 
+# "missing type for func"
+SMATCH=off
+
 MAPFILES =	../mapfile-intf $(MAPFILE.NGB)
 LDFLAGS +=	$(MAPFILES:%=-M%)
 
--- old/usr/src/cmd/cxgbetool/Makefile	Tue Jan  8 12:31:32 2019
+++ new/usr/src/cmd/cxgbetool/Makefile	Tue Jan  8 12:31:32 2019
@@ -12,6 +12,8 @@
 #
 # Copyright (c) 2018 by Chelsio Communications, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
+
 PROG =  cxgbetool
 
 include ../Makefile.cmd
@@ -18,6 +20,8 @@
 
 CFLAGS += $(CCVERBOSE) -I$(SRC)/uts/common/io/cxgbe/t4nex -I$(SRC)/uts/common/io/cxgbe/firmware
 
+SMOFF += all_func_returns
+
 all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
--- old/usr/src/cmd/dc/Makefile	Tue Jan  8 12:31:33 2019
+++ new/usr/src/cmd/dc/Makefile	Tue Jan  8 12:31:33 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= dc
 XPG6PROG= dc
@@ -37,6 +38,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(MAPFILE.NGB) $(PROG) $(XPG6)
--- old/usr/src/cmd/devfsadm/Makefile.com	Tue Jan  8 12:31:36 2019
+++ new/usr/src/cmd/devfsadm/Makefile.com	Tue Jan  8 12:31:36 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 # This target builds both a command (daemon) and various shared objects.  This
 # isn't a typical target, and the inclusion of both library and command
@@ -99,6 +100,9 @@
 CERRWARN += -_gcc=-Wno-char-subscripts
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 # Define the dependencies required by devfsadm and all shared objects.
 LDLIBS +=		-ldevinfo
 devfsadm :=		LDLIBS += -lgen -lsysevent -lnvpair -lzonecfg -lbsm
--- old/usr/src/cmd/devmgmt/cmds/Makefile	Tue Jan  8 12:31:38 2019
+++ new/usr/src/cmd/devmgmt/cmds/Makefile	Tue Jan  8 12:31:38 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include ../../Makefile.cmd
 
@@ -38,6 +39,8 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += signed
+
 .KEEP_STATE:
 
 .PARALLEL: $(PROG)
--- old/usr/src/cmd/diskscan/Makefile	Tue Jan  8 12:31:41 2019
+++ new/usr/src/cmd/diskscan/Makefile	Tue Jan  8 12:31:41 2019
@@ -20,15 +20,18 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1989, 2001 by Sun Microsystems, Inc.
 # All rights reserved.
+#
+# Copyright (c) 2018, Joyent, Inc.
 
+
 PROG= diskscan
 
 include ../Makefile.cmd
 
+SMOFF += leaks
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/dladm/Makefile	Tue Jan  8 12:31:42 2019
+++ new/usr/src/cmd/dladm/Makefile	Tue Jan  8 12:31:42 2019
@@ -18,11 +18,10 @@
 #
 # CDDL HEADER END
 #
-
-#
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		dladm
 ROOTFS_PROG=	$(PROG)
@@ -45,6 +44,8 @@
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += snprintf_overflow
+
 # For headers from librstp.
 LINTFLAGS +=	-erroff=E_TRAILING_COMMA_IN_ENUM
 lint :=		ZLAZYLOAD=
--- old/usr/src/cmd/dlstat/Makefile	Tue Jan  8 12:31:45 2019
+++ new/usr/src/cmd/dlstat/Makefile	Tue Jan  8 12:31:45 2019
@@ -22,7 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= dlstat
 
@@ -35,6 +35,9 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 XGETFLAGS += -a -x $(PROG).xcl
 LDLIBS += -L$(ROOT)/lib
 LDLIBS += -ldladm -lofmt
--- old/usr/src/cmd/dtrace/test/cmd/baddof/Makefile	Tue Jan  8 12:31:47 2019
+++ new/usr/src/cmd/dtrace/test/cmd/baddof/Makefile	Tue Jan  8 12:31:47 2019
@@ -23,6 +23,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -40,6 +41,9 @@
 
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 $(CMDS) := FILEMODE = 0555
 
 all: $(SRCS)
--- old/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile	Tue Jan  8 12:31:50 2019
+++ new/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile	Tue Jan  8 12:31:50 2019
@@ -23,6 +23,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -40,6 +41,9 @@
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 $(CMDS) := FILEMODE = 0555
 
 all: $(SRCS)
--- old/usr/src/cmd/dtrace/test/tst/Makefile.com	Tue Jan  8 12:31:53 2019
+++ new/usr/src/cmd/dtrace/test/tst/Makefile.com	Tue Jan  8 12:31:53 2019
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -66,6 +67,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 all: $(EXES)
 
 clean lint:
--- old/usr/src/cmd/ed/Makefile	Tue Jan  8 12:31:54 2019
+++ new/usr/src/cmd/ed/Makefile	Tue Jan  8 12:31:54 2019
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= ed
 XPG4PROG= ed
@@ -42,6 +43,10 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 $(XPG4) := CFLAGS += -DXPG4  
 $(XPG6) := CFLAGS += -DXPG6 -I$(SRC)/lib/libc/inc 
 lint := LDLIBS += -lgen -lcrypt
--- old/usr/src/cmd/eeprom/Makefile.com	Tue Jan  8 12:31:55 2019
+++ new/usr/src/cmd/eeprom/Makefile.com	Tue Jan  8 12:31:55 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 #	Create default so empty rules don't
@@ -41,6 +42,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 LINT_OBJS = $(OBJS:%.o=%.ln)
 SOURCES = $(OBJS:%.o=%.c)
 
--- old/usr/src/cmd/enhance/Makefile	Tue Jan  8 12:31:55 2019
+++ new/usr/src/cmd/enhance/Makefile	Tue Jan  8 12:31:55 2019
@@ -23,8 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= enhance
 
@@ -41,6 +40,8 @@
 
 lint := LINTFLAGS += -ux
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/eqn/eqn.d/Makefile	Tue Jan  8 12:31:56 2019
+++ new/usr/src/cmd/eqn/eqn.d/Makefile	Tue Jan  8 12:31:56 2019
@@ -2,6 +2,8 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
 include		../../Makefile.cmd
 
@@ -35,6 +37,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all :		$(PROG) 
--- old/usr/src/cmd/eqn/neqn.d/Makefile	Tue Jan  8 12:31:57 2019
+++ new/usr/src/cmd/eqn/neqn.d/Makefile	Tue Jan  8 12:31:57 2019
@@ -2,6 +2,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../../Makefile.cmd
 
@@ -30,6 +31,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 #
 # for message catalog
 #
--- old/usr/src/cmd/etdump/Makefile	Tue Jan  8 12:31:58 2019
+++ new/usr/src/cmd/etdump/Makefile	Tue Jan  8 12:31:58 2019
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2018 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2019, Joyent, Inc.
 #
 
 PROG=	etdump
@@ -19,6 +20,9 @@
 
 include ../Makefile.cmd
 
+# comes from FreeBSD upstream
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/expand/Makefile	Tue Jan  8 12:31:58 2019
+++ new/usr/src/cmd/expand/Makefile	Tue Jan  8 12:31:58 2019
@@ -23,8 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/expand/Makefile 
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		expand  unexpand
 SRCS=		$(PROG:=.c)
@@ -37,9 +36,11 @@
 
 CLOBBERFILES += expand_cmd.c
 
+SMOFF += signed
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
--- old/usr/src/cmd/expr/Makefile	Tue Jan  8 12:31:59 2019
+++ new/usr/src/cmd/expr/Makefile	Tue Jan  8 12:31:59 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= expr
 XPG4PROG= expr
@@ -38,6 +39,8 @@
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-extra
+# "missing type for func"
+SMATCH=off
 $(XPG4) := CFLAGS += -DXPG4
 $(XPG6) := CFLAGS += -DXPG6
 
--- old/usr/src/cmd/exstr/Makefile	Tue Jan  8 12:32:00 2019
+++ new/usr/src/cmd/exstr/Makefile	Tue Jan  8 12:32:00 2019
@@ -21,6 +21,7 @@
 #
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG= exstr
@@ -29,9 +30,12 @@
 
 CERRWARN += -_gcc=-Wno-extra
 
+# "missing type for func"
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
--- old/usr/src/cmd/factor/Makefile	Tue Jan  8 12:32:01 2019
+++ new/usr/src/cmd/factor/Makefile	Tue Jan  8 12:32:01 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= factor
 
@@ -30,6 +31,9 @@
 LDLIBS += -lm
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
--- old/usr/src/cmd/fcinfo/Makefile	Tue Jan  8 12:32:01 2019
+++ new/usr/src/cmd/fcinfo/Makefile	Tue Jan  8 12:32:01 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 COMMONBASE = ../../common
 
@@ -49,6 +49,9 @@
 
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 ROOTMANIFESTDIR=	$(ROOTSVCNETWORK)
 
 LDLIBS += -lHBAAPI
--- old/usr/src/cmd/fdformat/Makefile	Tue Jan  8 12:32:02 2019
+++ new/usr/src/cmd/fdformat/Makefile	Tue Jan  8 12:32:02 2019
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fdformat/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= fdformat
 
@@ -32,6 +31,9 @@
 LDLIBS +=	-lvolmgt
 LINTFLAGS +=    -um
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 #
@@ -39,7 +41,7 @@
 #
 $(ROOTPROG) := FILEMODE = 04555
 
-all: $(PROG) 
+all: $(PROG)
 
 fdformat: fdformat.c
 	$(LINK.c) -o $@ ./fdformat.c $(LDLIBS)
--- old/usr/src/cmd/fdisk/Makefile	Tue Jan  8 12:32:03 2019
+++ new/usr/src/cmd/fdisk/Makefile	Tue Jan  8 12:32:03 2019
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 #       Makefile for fdisk
 
@@ -34,6 +34,9 @@
 
 CPPFLAGS += -D_FILE_OFFSET_BITS=64
 
+# not linted
+SMATCH=off
+
 LDLIBS_i386= -lfdisk
 LDLIBS_sparc=
 LDLIBS += -ladm -lefi $(LDLIBS_$(MACH))
--- old/usr/src/cmd/ficl/Makefile.com	Tue Jan  8 12:32:05 2019
+++ new/usr/src/cmd/ficl/Makefile.com	Tue Jan  8 12:32:05 2019
@@ -12,6 +12,7 @@
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= ficl-sys
 OBJS= main.o
@@ -23,6 +24,8 @@
 LDLIBS += -lficl-sys -ltecla -lumem
 CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I$(SRC)/common/ficl
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/file/Makefile	Tue Jan  8 12:32:06 2019
+++ new/usr/src/cmd/file/Makefile	Tue Jan  8 12:32:06 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= file
 XPG4PROG= file
@@ -43,6 +44,9 @@
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-type-limits
 
+# not linted
+SMATCH=off
+
 POFILE= file_all.po
 POFILES= $(SRCS:%.c=%.po)
 
--- old/usr/src/cmd/filesync/Makefile	Tue Jan  8 12:32:07 2019
+++ new/usr/src/cmd/filesync/Makefile	Tue Jan  8 12:32:08 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= filesync
 
@@ -35,6 +36,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 FILEMODE= 0555
 
 .KEEP_STATE:
--- old/usr/src/cmd/flowstat/Makefile	Tue Jan  8 12:32:09 2019
+++ new/usr/src/cmd/flowstat/Makefile	Tue Jan  8 12:32:09 2019
@@ -22,6 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=flowstat
 
@@ -38,6 +39,9 @@
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 ROOTCFGDIR=	$(ROOTETC)/dladm
 
 .KEEP_STATE:
--- old/usr/src/cmd/fm/eversholt/Makefile.esc.com	Tue Jan  8 12:32:12 2019
+++ new/usr/src/cmd/fm/eversholt/Makefile.esc.com	Tue Jan  8 12:32:12 2019
@@ -17,12 +17,12 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
-# 
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Copyright 2018 RackTop Systems.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 FMADIR = $(SRC)/cmd/fm
@@ -51,6 +51,8 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-switch
 
+SMOFF += all_func_returns
+
 CTFCONVO = $(CTFCONVERT_O)
 CTFMRG = $(CTFMERGE) -L VERSION -o $@ $(OBJS)
 
--- old/usr/src/cmd/fm/fmd/Makefile.fmd	Tue Jan  8 12:32:14 2019
+++ new/usr/src/cmd/fm/fmd/Makefile.fmd	Tue Jan  8 12:32:14 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015 RackTop Systems.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 .KEEP_STATE:
@@ -123,6 +124,9 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 $(PROG) := LDFLAGS += -R/usr/lib/fm
 $(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo -ldiagcode -lsysevent -lsmbios \
 		-luuid -lnvpair -lexacct -lnsl -lumem -ldevinfo -lfmd_msg
--- old/usr/src/cmd/fm/fmstat/Makefile.com	Tue Jan  8 12:32:15 2019
+++ new/usr/src/cmd/fm/fmstat/Makefile.com	Tue Jan  8 12:32:15 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 .KEEP_STATE:
 .SUFFIXES:
@@ -47,6 +48,8 @@
 LDFLAGS += -R/usr/lib/fm
 LINTFLAGS += -mnu
 
+SMOFF += signed
+
 .NO_PARALLEL:
 .PARALLEL: $(OBJS) $(LINTFILES)
 
--- old/usr/src/cmd/fm/fmtopo/Makefile.com	Tue Jan  8 12:32:18 2019
+++ new/usr/src/cmd/fm/fmtopo/Makefile.com	Tue Jan  8 12:32:18 2019
@@ -24,7 +24,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2018, Joyent, Inc.
 
 .KEEP_STATE:
 .SUFFIXES:
@@ -45,6 +45,9 @@
 LDFLAGS += -R/usr/lib/fm
 LINTFLAGS += -mnu
 
+# not linted
+SMATCH=off
+
 .NO_PARALLEL:
 .PARALLEL: $(OBJS) $(LINTFILES)
 
--- old/usr/src/cmd/fm/modules/common/disk-monitor/Makefile	Tue Jan  8 12:32:20 2019
+++ new/usr/src/cmd/fm/modules/common/disk-monitor/Makefile	Tue Jan  8 12:32:20 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MODULE = disk-monitor
 CLASS = common
@@ -35,3 +36,6 @@
 LDLIBS += -lsysevent -lnvpair -lsmbios -lcfgadm -ltopo -luutil -lipmi
 LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
 CERRWARN += -_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
--- old/usr/src/cmd/fm/modules/common/eversholt/Makefile	Tue Jan  8 12:32:22 2019
+++ new/usr/src/cmd/fm/modules/common/eversholt/Makefile	Tue Jan  8 12:32:22 2019
@@ -25,6 +25,7 @@
 #
 # eft.so (the eversholt DE)
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 .KEEP_STATE:
 
@@ -49,6 +50,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 $(PROG) := LDFLAGS += -R/usr/lib/fm
 $(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo
 
--- old/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile	Tue Jan  8 12:32:25 2019
+++ new/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile	Tue Jan  8 12:32:25 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MODULE = fabric-xlate
 CLASS = common
@@ -41,3 +42,6 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
--- old/usr/src/cmd/fm/modules/common/ip-transport/Makefile	Tue Jan  8 12:32:27 2019
+++ new/usr/src/cmd/fm/modules/common/ip-transport/Makefile	Tue Jan  8 12:32:27 2019
@@ -24,6 +24,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MODULE = ip-transport
 CLASS = common
@@ -33,3 +34,6 @@
 
 LDLIBS += -lsocket -lnsl
 CERRWARN += -_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
--- old/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile	Tue Jan  8 12:32:29 2019
+++ new/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile	Tue Jan  8 12:32:29 2019
@@ -21,8 +21,8 @@
 #
 #Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
-   	
 MODULE = ses-log-transport
 CLASS = common
 SRCS = ses_log_transport.c
@@ -33,3 +33,6 @@
 LINTFLAGS += $(INCS)
 LDLIBS += -L$(ROOTLIB)/fm -ltopo -lseslog
 LDFLAGS += -R/usr/lib/fm
+
+# not linted
+SMATCH=off
--- old/usr/src/cmd/fmt/Makefile	Tue Jan  8 12:32:30 2019
+++ new/usr/src/cmd/fmt/Makefile	Tue Jan  8 12:32:31 2019
@@ -23,7 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fmt/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= fmt
 
@@ -37,6 +37,9 @@
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/fold/Makefile	Tue Jan  8 12:32:32 2019
+++ new/usr/src/cmd/fold/Makefile	Tue Jan  8 12:32:32 2019
@@ -19,12 +19,10 @@
 #
 # CDDL HEADER END
 #
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= fold
 
@@ -32,9 +30,11 @@
 
 CFLAGS  += $(CCVERBOSE)
 
+SMOFF += index_overflow
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
--- old/usr/src/cmd/format/Makefile	Tue Jan  8 12:32:33 2019
+++ new/usr/src/cmd/format/Makefile	Tue Jan  8 12:32:33 2019
@@ -23,7 +23,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= format
 
@@ -51,6 +51,9 @@
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 SRCS= $(OBJS:.o=.c)
 
 ROOTSYMLINK= $(ROOTETCPROG)
--- old/usr/src/cmd/fs.d/Makefile	Tue Jan  8 12:32:35 2019
+++ new/usr/src/cmd/fs.d/Makefile	Tue Jan  8 12:32:35 2019
@@ -19,6 +19,7 @@
 # CDDL HEADER END
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
 #
 
@@ -87,6 +88,9 @@
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 $(DFPROG) :=	LDLIBS += -lcmdutils
 $(SPPROG) :=	LDLIBS += -lkstat
 
--- old/usr/src/cmd/fs.d/autofs/Makefile	Tue Jan  8 12:32:37 2019
+++ new/usr/src/cmd/fs.d/autofs/Makefile	Tue Jan  8 12:32:37 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015 RackTop Systems.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 FSTYPE=		autofs
@@ -98,6 +99,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 OBJS=		$(AUTOOBJS) $(MOUNTOBJS) $(TYPEOBJS) \
 		$(SHAREOBJS) $(UNSHAREOBJS)
 
--- old/usr/src/cmd/fs.d/hsfs/labelit/Makefile	Tue Jan  8 12:32:38 2019
+++ new/usr/src/cmd/fs.d/hsfs/labelit/Makefile	Tue Jan  8 12:32:38 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		hsfs
 LIBPROG=	labelit
@@ -33,6 +34,9 @@
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 lint := PROG = $(LIBPROG)
 
 lint:	lint_PROG
--- old/usr/src/cmd/fs.d/hsfs/mount/Makefile	Tue Jan  8 12:32:40 2019
+++ new/usr/src/cmd/fs.d/hsfs/mount/Makefile	Tue Jan  8 12:32:40 2019
@@ -23,6 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		hsfs
 LIBPROG=	mount
@@ -40,3 +41,6 @@
 include		../../Makefile.mount.targ
 
 CERRWARN +=	-_gcc=-Wno-unused-variable
+
+# not linted
+SMATCH=off
--- old/usr/src/cmd/fs.d/nfs/clear_locks/Makefile	Tue Jan  8 12:32:43 2019
+++ new/usr/src/cmd/fs.d/nfs/clear_locks/Makefile	Tue Jan  8 12:32:43 2019
@@ -20,11 +20,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= clear_locks
 
@@ -52,9 +51,12 @@
 
 CFLAGS		+=	$(CCVERBOSE)
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 
--- old/usr/src/cmd/fs.d/nfs/dfmounts/Makefile	Tue Jan  8 12:32:44 2019
+++ new/usr/src/cmd/fs.d/nfs/dfmounts/Makefile	Tue Jan  8 12:32:44 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 LIBPROG=	dfmounts
@@ -43,6 +44,9 @@
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# unknown type for func
+SMATCH =	off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
--- old/usr/src/cmd/fs.d/nfs/dfshares/Makefile	Tue Jan  8 12:32:45 2019
+++ new/usr/src/cmd/fs.d/nfs/dfshares/Makefile	Tue Jan  8 12:32:45 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 LIBPROG=	dfshares
@@ -37,6 +38,10 @@
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
--- old/usr/src/cmd/fs.d/nfs/lockd/Makefile	Tue Jan  8 12:32:45 2019
+++ new/usr/src/cmd/fs.d/nfs/lockd/Makefile	Tue Jan  8 12:32:45 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 FSTYPE	  =	nfs
@@ -45,6 +46,10 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
+
 $(TYPEPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
--- old/usr/src/cmd/fs.d/nfs/mount/Makefile	Tue Jan  8 12:32:46 2019
+++ new/usr/src/cmd/fs.d/nfs/mount/Makefile	Tue Jan  8 12:32:46 2019
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2017, Joyent, Inc. All rights reserved.
+# Copyright 2018, Joyent, Inc. All rights reserved.
 #
 # cmd/fs.d/nfs/mount/Makefile
 
@@ -50,6 +50,9 @@
 CERRWARN += -_gcc=-Wno-address
 CERRWARN += -_gcc=-Wno-unused-function
 
+# unknown type for func
+SMATCH=off
+
 #
 # Message catalog
 #
--- old/usr/src/cmd/fs.d/nfs/mountd/Makefile	Tue Jan  8 12:32:49 2019
+++ new/usr/src/cmd/fs.d/nfs/mountd/Makefile	Tue Jan  8 12:32:49 2019
@@ -23,6 +23,7 @@
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE	  =	nfs
 TYPEPROG  =	mountd
@@ -44,6 +45,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 $(TYPEPROG):	$(OBJS)
 		$(COMPILE.d) -s $(DSRC) -o $(DOBJ) $(OBJS)
 		$(LINK.c) -o $@ $(DOBJ) $(OBJS) $(LDLIBS)
--- old/usr/src/cmd/fs.d/nfs/nfs4cbd/Makefile	Tue Jan  8 12:32:52 2019
+++ new/usr/src/cmd/fs.d/nfs/nfs4cbd/Makefile	Tue Jan  8 12:32:52 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 TYPEPROG=	nfs4cbd
@@ -40,6 +41,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-extra
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:	$(TYPEPROG)
--- old/usr/src/cmd/fs.d/nfs/nfsd/Makefile	Tue Jan  8 12:32:55 2019
+++ new/usr/src/cmd/fs.d/nfs/nfsd/Makefile	Tue Jan  8 12:32:55 2019
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 TYPEPROG=	nfsd
@@ -42,6 +42,9 @@
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-extra
 
+# not linted
+SMATCH=off
+
 $(TYPEPROG):	$(OBJS)
 		$(CC) -o $@ $(OBJS) $(LDFLAGS) $(LDLIBS)
 		$(POST_PROCESS)
--- old/usr/src/cmd/fs.d/nfs/nfslog/Makefile	Tue Jan  8 12:32:57 2019
+++ new/usr/src/cmd/fs.d/nfs/nfslog/Makefile	Tue Jan  8 12:32:57 2019
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 TYPEPROG=	nfslogd
@@ -42,6 +43,10 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-type-limits
+
+# not linted
+SMATCH=off
+
 CPPFLAGS += 	-D_FILE_OFFSET_BITS=64
 
 #
--- old/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile	Tue Jan  8 12:33:00 2019
+++ new/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile	Tue Jan  8 12:33:00 2019
@@ -22,7 +22,9 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
+
 FSTYPE	  =	nfs
 TYPEPROG  =	nfsmapid
 TESTPROG  =	nfsmapid_test
@@ -44,6 +46,9 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 all:		$(TYPEPROG) $(TESTPROG)
 
 $(TYPEPROG):	$(OBJS) $(DSRC)
--- old/usr/src/cmd/fs.d/nfs/nfsref/Makefile	Tue Jan  8 12:33:03 2019
+++ new/usr/src/cmd/fs.d/nfs/nfsref/Makefile	Tue Jan  8 12:33:03 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/nfs/nfsref/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		nfsref
 
@@ -36,6 +36,9 @@
 
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lreparse -lnvpair -lnsl -lumem
 
 $(PROG):	$(OBJS)
--- old/usr/src/cmd/fs.d/nfs/nfsstat/Makefile	Tue Jan  8 12:33:06 2019
+++ new/usr/src/cmd/fs.d/nfs/nfsstat/Makefile	Tue Jan  8 12:33:06 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/nfs/nfsstat/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		nfsstat
 
@@ -42,6 +42,10 @@
 
 CPPFLAGS += -I$(STATCOMMONDIR)
 CERRWARN += -_gcc=-Wno-parentheses
+
+# not linted
+SMATCH=off
+
 LDLIBS += -lkstat -lnsl
 
 $(PROG):	$(OBJS)
--- old/usr/src/cmd/fs.d/nfs/rp_basic/Makefile.com	Tue Jan  8 12:33:08 2019
+++ new/usr/src/cmd/fs.d/nfs/rp_basic/Makefile.com	Tue Jan  8 12:33:08 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libnfs_basic.a
 VERS =		.1
@@ -44,6 +45,9 @@
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -I$(SRC)/cmd/fs.d/nfs/lib
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
--- old/usr/src/cmd/fs.d/nfs/rquotad/Makefile	Tue Jan  8 12:33:11 2019
+++ new/usr/src/cmd/fs.d/nfs/rquotad/Makefile	Tue Jan  8 12:33:11 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 TYPEPROG=	rquotad
@@ -38,6 +39,9 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 LDLIBS += -lnsl
 
+# unknown type for func
+SMATCH=off
+
 $(TYPEPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(LDLIBS) $(OBJS)
 		$(POST_PROCESS)
--- old/usr/src/cmd/fs.d/nfs/showmount/Makefile	Tue Jan  8 12:33:15 2019
+++ new/usr/src/cmd/fs.d/nfs/showmount/Makefile	Tue Jan  8 12:33:15 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 LIBPROG=	showmount
@@ -47,6 +48,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
--- old/usr/src/cmd/fs.d/nfs/statd/Makefile	Tue Jan  8 12:33:18 2019
+++ new/usr/src/cmd/fs.d/nfs/statd/Makefile	Tue Jan  8 12:33:18 2019
@@ -30,6 +30,7 @@
 #
 # Copyright (c) 2016 by Delphix. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 TYPEPROG=	statd
@@ -43,6 +44,9 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LOCAL=		sm_svc.o sm_proc.o sm_statd.o
 OBJS=		$(LOCAL) selfcheck.o daemon.o smfcfg.o
 
--- old/usr/src/cmd/fs.d/nfs/tests/Makefile	Tue Jan  8 12:33:20 2019
+++ new/usr/src/cmd/fs.d/nfs/tests/Makefile	Tue Jan  8 12:33:20 2019
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/nfs/tests/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 LIBPROG=	test_svc_tp_create
@@ -35,6 +35,9 @@
 
 CFLAGS += $(CCVERBOSE)
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lnsl -lsocket
 
 # message catalog
--- old/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile	Tue Jan  8 12:33:22 2019
+++ new/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile	Tue Jan  8 12:33:22 2019
@@ -22,11 +22,8 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
-#
-# cmd/fs.d/smbclnt/smbiod-svc/Makefile
-#
-
 FSTYPE=		smbfs
 TYPEPROG=	smbiod-svc
 
@@ -42,6 +39,9 @@
 CPPFLAGS += -I$(SRC)/lib/libsmbfs \
 	-I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common
 
+# not linted
+SMATCH=off
+
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
 
--- old/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile	Tue Jan  8 12:33:24 2019
+++ new/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile	Tue Jan  8 12:33:24 2019
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 #
@@ -39,13 +40,14 @@
 CFLAGS += $(CCVERBOSE)
 CSTD= $(CSTD_GNU99)
 
-# This is a multi-thread program but Nevada
-# no longer needs -lthread
 LDLIBS += -lsmbfs -lumem
 
 CPPFLAGS += -I$(SRC)/lib/libsmbfs \
 	-I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common
 
+# not linted
+SMATCH=off
+
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
 
--- old/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile	Tue Jan  8 12:33:26 2019
+++ new/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile	Tue Jan  8 12:33:26 2019
@@ -24,6 +24,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 #
@@ -52,6 +53,9 @@
 CPPFLAGS += -I$(SRC)/lib/libsmbfs \
 	-I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common
 
+# not linted
+SMATCH=off
+
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
 
--- old/usr/src/cmd/fs.d/udfs/fsck/Makefile	Tue Jan  8 12:33:28 2019
+++ new/usr/src/cmd/fs.d/udfs/fsck/Makefile	Tue Jan  8 12:33:28 2019
@@ -23,6 +23,7 @@
 # Copyright (c) 1999 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		udfs
 LIBPROG=	fsck
@@ -40,6 +41,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 OBJS=		$(FSCKOBJS) $(UDFSOBJS)
 SRCS=		$(FSCKSRCS) $(UDFSSRCS) ../mkfs/udfslib.c
 
--- old/usr/src/cmd/fs.d/udfs/fsdb/Makefile	Tue Jan  8 12:33:30 2019
+++ new/usr/src/cmd/fs.d/udfs/fsdb/Makefile	Tue Jan  8 12:33:30 2019
@@ -22,7 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright 2017, Joyent Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 FSTYPE=		udfs
@@ -51,6 +51,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 SRCS=	fsdb.c ud_lib.c
 
 fsdb : fsdb_yacc.o fsdb_lex.o ud_lib.o fsdb.o $(MAPFILES)
--- old/usr/src/cmd/fs.d/udfs/mkfs/Makefile	Tue Jan  8 12:33:31 2019
+++ new/usr/src/cmd/fs.d/udfs/mkfs/Makefile	Tue Jan  8 12:33:32 2019
@@ -23,6 +23,7 @@
 # Copyright (c) 1999,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		udfs
 LIBPROG=	mkfs
@@ -48,6 +49,9 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 OBJS=		$(MKFSOBJS) $(UDFSOBJS)
 SRCS=		$(OBJS:%.o=%.c)
 
--- old/usr/src/cmd/fs.d/ufs/df/Makefile	Tue Jan  8 12:33:34 2019
+++ new/usr/src/cmd/fs.d/ufs/df/Makefile	Tue Jan  8 12:33:34 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	df
@@ -40,6 +41,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 # for messaging catalogue file
 #
 POFILE= df.po
--- old/usr/src/cmd/fs.d/ufs/edquota/Makefile	Tue Jan  8 12:33:36 2019
+++ new/usr/src/cmd/fs.d/ufs/edquota/Makefile	Tue Jan  8 12:33:36 2019
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	edquota
@@ -37,5 +38,8 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 lint:		lint_PROG
 
+# not linted
+SMATCH=off
+
 $(ROOTUSRSBIN)/$(LIBPROG):
 		-$(RM) $@; $(SYMLINK) $(LINKVALUE) $@
--- old/usr/src/cmd/fs.d/ufs/ff/Makefile	Tue Jan  8 12:33:37 2019
+++ new/usr/src/cmd/fs.d/ufs/ff/Makefile	Tue Jan  8 12:33:37 2019
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	ff
@@ -41,6 +42,9 @@
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
--- old/usr/src/cmd/fs.d/ufs/fsck/Makefile	Tue Jan  8 12:33:40 2019
+++ new/usr/src/cmd/fs.d/ufs/fsck/Makefile	Tue Jan  8 12:33:40 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	fsck
@@ -51,6 +52,9 @@
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(CTFMERGE_HOOK)
 		$(POST_PROCESS)
--- old/usr/src/cmd/fs.d/ufs/fsdb/Makefile	Tue Jan  8 12:33:41 2019
+++ new/usr/src/cmd/fs.d/ufs/fsdb/Makefile	Tue Jan  8 12:33:41 2019
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	fsdb
@@ -37,6 +38,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 SRCS=	$(LIBPROG).c
 
 lint:	lint_SRCS
--- old/usr/src/cmd/fs.d/ufs/fssnap/Makefile	Tue Jan  8 12:33:41 2019
+++ new/usr/src/cmd/fs.d/ufs/fssnap/Makefile	Tue Jan  8 12:33:41 2019
@@ -21,8 +21,9 @@
 #
 #
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms. 
+# Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	fssnap
@@ -43,6 +44,10 @@
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lkstat -ldevinfo
 
 # message catalog
--- old/usr/src/cmd/fs.d/ufs/labelit/Makefile	Tue Jan  8 12:33:42 2019
+++ new/usr/src/cmd/fs.d/ufs/labelit/Makefile	Tue Jan  8 12:33:42 2019
@@ -20,12 +20,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1989,1996,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# cmd/fs.d/ufs/labelit/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	labelit
@@ -35,6 +33,9 @@
 
 CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 
+# not linted
+SMATCH=off
+
 lint :=		PROG=$(LIBPROG)
 
 lint:		lint_PROG
--- old/usr/src/cmd/fs.d/ufs/lockfs/Makefile	Tue Jan  8 12:33:42 2019
+++ new/usr/src/cmd/fs.d/ufs/lockfs/Makefile	Tue Jan  8 12:33:42 2019
@@ -20,12 +20,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1991,1996,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# cmd/fs.d/ufs/lockfs/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	lockfs
@@ -38,6 +36,8 @@
 
 CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 
+SMOFF += all_func_returns
+
 lint:		lint_PROG
 
 $(ROOTUSRSBIN)/$(LIBPROG):
--- old/usr/src/cmd/fs.d/ufs/newfs/Makefile	Tue Jan  8 12:33:43 2019
+++ new/usr/src/cmd/fs.d/ufs/newfs/Makefile	Tue Jan  8 12:33:43 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	newfs
@@ -38,6 +39,9 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 OBJS=		$(LIBPROG).o $(FSLIB)
 SRCS=		$(LIBPROG).c $(FSLIBSRC)
 
--- old/usr/src/cmd/fs.d/ufs/quot/Makefile	Tue Jan  8 12:33:44 2019
+++ new/usr/src/cmd/fs.d/ufs/quot/Makefile	Tue Jan  8 12:33:44 2019
@@ -20,12 +20,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/ufs/quot/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	quot
@@ -40,6 +38,9 @@
 CFLAGS	+=	$(CCVERBOSE)
 LDLIBS	+=	-ladm
 
+# not linted
+SMATCH=off
+
 lint		:=	PROG= $(LIBPROG)
 
 lint:		lint_PROG
--- old/usr/src/cmd/fs.d/ufs/quota/Makefile	Tue Jan  8 12:33:45 2019
+++ new/usr/src/cmd/fs.d/ufs/quota/Makefile	Tue Jan  8 12:33:45 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/ufs/quota/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	quota
@@ -43,6 +43,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 FILEMODE= 04555
 
 $(LIBPROG):	$(OBJS)
--- old/usr/src/cmd/fs.d/ufs/quotacheck/Makefile	Tue Jan  8 12:33:45 2019
+++ new/usr/src/cmd/fs.d/ufs/quotacheck/Makefile	Tue Jan  8 12:33:45 2019
@@ -23,6 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	quotacheck
@@ -42,6 +43,9 @@
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-type-limits
 
+# not linted
+SMATCH=off
+
 lint:		lint_PROG
 
 $(FSOBJS): $(FSSRCS)
--- old/usr/src/cmd/fs.d/ufs/quotaon/Makefile	Tue Jan  8 12:33:46 2019
+++ new/usr/src/cmd/fs.d/ufs/quotaon/Makefile	Tue Jan  8 12:33:46 2019
@@ -22,7 +22,7 @@
 # Use is subject to license terms.
 # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
 #
-# cmd/fs.d/ufs/quotaon/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	quotaon
@@ -43,6 +43,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 lint:		lint_PROG
 
 $(ROOTLIBFSTYPE)/$(QUOTAOFF):	$(ROOTLIBFSTYPE)/$(LIBPROG) 
--- old/usr/src/cmd/fs.d/ufs/repquota/Makefile	Tue Jan  8 12:33:47 2019
+++ new/usr/src/cmd/fs.d/ufs/repquota/Makefile	Tue Jan  8 12:33:47 2019
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	repquota
@@ -38,6 +39,9 @@
 CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 lint:		lint_PROG
 
 $(ROOTUSRSBIN)/$(LIBPROG):
--- old/usr/src/cmd/fs.d/ufs/tunefs/Makefile	Tue Jan  8 12:33:48 2019
+++ new/usr/src/cmd/fs.d/ufs/tunefs/Makefile	Tue Jan  8 12:33:48 2019
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996, by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	tunefs
@@ -39,6 +40,9 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 lint:		lint_PROG
 
 $(ROOTUSRSBIN)/$(LIBPROG):	FRC
--- old/usr/src/cmd/fs.d/ufs/volcopy/Makefile	Tue Jan  8 12:33:49 2019
+++ new/usr/src/cmd/fs.d/ufs/volcopy/Makefile	Tue Jan  8 12:33:49 2019
@@ -23,6 +23,7 @@
 # Copyright 1989,2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	volcopy
@@ -34,6 +35,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS += 	-lmapmalloc
 
 # for messaging catalog
--- old/usr/src/cmd/fwflash/Makefile.com	Tue Jan  8 12:33:53 2019
+++ new/usr/src/cmd/fwflash/Makefile.com	Tue Jan  8 12:33:53 2019
@@ -21,9 +21,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fwflash/Makefile.com
+# Copyright (c) 2018, Joyent, Inc.
 #
-#
 # common rules for $SRC/cmd/fwflash
 
 CLOSED=			$(SRC)/../closed
@@ -32,6 +31,9 @@
 CERRWARN +=		-_gcc=-Wno-uninitialized
 CERRWARN +=		-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 ROOTUSR=                $(ROOT)/usr
 ROOTUSRINCLD=		$(ROOTUSR)/include
 ROOTUSRINCLDFWFLASH=	$(ROOTUSRINCLD)/fwflash
--- old/usr/src/cmd/gencat/Makefile	Tue Jan  8 12:33:55 2019
+++ new/usr/src/cmd/gencat/Makefile	Tue Jan  8 12:33:55 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= gencat
 
@@ -33,6 +34,9 @@
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-value
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
--- old/usr/src/cmd/grpck/Makefile	Tue Jan  8 12:33:57 2019
+++ new/usr/src/cmd/grpck/Makefile	Tue Jan  8 12:33:57 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1990 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= grpck
 
@@ -29,6 +30,9 @@
 
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 RELUSRSBIN=	../usr/sbin
 ROOTSYMLINK=	$(ROOTETC)/$(PROG)
 
--- old/usr/src/cmd/gss/gsscred/Makefile	Tue Jan  8 12:34:00 2019
+++ new/usr/src/cmd/gss/gsscred/Makefile	Tue Jan  8 12:34:00 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SBINPROG = gsscred
 
@@ -46,9 +47,12 @@
 
 COPTFLAG += $(XESS) $(INCDIRS) $(LIBPATH)
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lgss
 
-$(GPROGS) := CPPFLAGS += -DSYSV -DSunOS=50 
+$(GPROGS) := CPPFLAGS += -DSYSV -DSunOS=50
 
 .KEEP_STATE:
 
--- old/usr/src/cmd/gss/gssd/Makefile	Tue Jan  8 12:34:01 2019
+++ new/usr/src/cmd/gss/gssd/Makefile	Tue Jan  8 12:34:01 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 TESTPROG = gssdtest
 
@@ -37,7 +38,7 @@
 
 GD_OBJS	= gssd_svc.o
 GC_OBJS	= gssd_clnt.o
-G_OBJS	= gssd_xdr.o 
+G_OBJS	= gssd_xdr.o
 GSSDOBJS = $(GSSD_BASEOBJS) $(GD_OBJS) $(G_OBJS)
 GSSCOBJS = $(GSSC_BASEOBJS) $(GC_OBJS) $(G_OBJS)
 
@@ -68,7 +69,7 @@
 DIRS=	$(ROOTLIB)
 
 CPPFLAGS += -I$(SRC)/uts/common/gssapi/include
-COPTFLAG += $(XESS) #-I$(KINCDIR) 
+COPTFLAG += $(XESS) #-I$(KINCDIR)
 
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
@@ -75,6 +76,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lgss -lnsl
 
 gssd :=	MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB)
--- old/usr/src/cmd/iconv/Makefile	Tue Jan  8 12:34:04 2019
+++ new/usr/src/cmd/iconv/Makefile	Tue Jan  8 12:34:04 2019
@@ -11,7 +11,7 @@
 
 #
 # Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
-# Copyright 2017 Joyent Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=iconv
@@ -31,6 +31,9 @@
 
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 CLEANFILES	= $(OBJS) parser.tab.c parser.tab.h
 CLOBBERFILES	= $(PROG) $(POFILE)
 PIFILES		= $(OBJS:%.o=%.i)
--- old/usr/src/cmd/idmap/idmap/Makefile	Tue Jan  8 12:34:04 2019
+++ new/usr/src/cmd/idmap/idmap/Makefile	Tue Jan  8 12:34:05 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		idmap
 CLIENTOBJS =	idmap.o idmap_engine.o namemaps.o
@@ -41,6 +42,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 POFILE = 	$(PROG)_all.po
 LDLIBS +=	-lidmap -ladutils -lsldap -lldap
 FILEMODE =	0555
--- old/usr/src/cmd/idmap/idmapd/Makefile	Tue Jan  8 12:34:05 2019
+++ new/usr/src/cmd/idmap/idmapd/Makefile	Tue Jan  8 12:34:05 2019
@@ -22,6 +22,7 @@
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		idmapd
 MANIFEST =	idmap.xml
@@ -63,6 +64,9 @@
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 TEXT_DOMAIN =	SUNW_OST_OSLIB
 XGETTEXT =	$(GNUXGETTEXT)
 XGETFLAGS =	--foreign-user --strict -n -E --width=72 \
--- old/usr/src/cmd/init/Makefile	Tue Jan  8 12:34:06 2019
+++ new/usr/src/cmd/init/Makefile	Tue Jan  8 12:34:06 2019
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= init 
 ROOTFS_PROG= $(PROG)
@@ -38,6 +39,9 @@
 LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
 CLOBBERFILES= $(STATIC)
 
+# needs work
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(ROOTFS_PROG)
--- old/usr/src/cmd/ipf/Makefile.ipf	Tue Jan  8 12:34:06 2019
+++ new/usr/src/cmd/ipf/Makefile.ipf	Tue Jan  8 12:34:06 2019
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#cmd/ipf/Makefile.ipf
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 
 LIBIPF=		../../lib/$(MACH)/libipf.a
@@ -41,3 +40,7 @@
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-unused-function
 CERRWARN	+= -_gcc=-Wno-empty-body
+
+# not linted
+SMATCH=off
+
--- old/usr/src/cmd/iscsiadm/Makefile	Tue Jan  8 12:34:07 2019
+++ new/usr/src/cmd/iscsiadm/Makefile	Tue Jan  8 12:34:07 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = iscsiadm
 OBJS = cmdparse.o sun_ima.o iscsiadm_main.o
@@ -43,6 +43,9 @@
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 FILEMODE= 0555
 
 .KEEP_STATE:
--- old/usr/src/cmd/isns/isnsadm/Makefile	Tue Jan  8 12:34:07 2019
+++ new/usr/src/cmd/isns/isnsadm/Makefile	Tue Jan  8 12:34:07 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = isnsadm
 SRCS = cmdparse.c isnsadm.c isnsadm_msg.c
@@ -40,6 +41,12 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/isns/isnsd/Makefile	Tue Jan  8 12:34:08 2019
+++ new/usr/src/cmd/isns/isnsd/Makefile	Tue Jan  8 12:34:08 2019
@@ -25,7 +25,7 @@
 
 #
 # Copyright (c) 2012 by Delphix. All rights reserved.
-# Copyright 2017 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG = isns
@@ -64,6 +64,9 @@
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 CLOBBERFILES += $(DTRACE_HEADER)
 
 obj.o := CERRWARN += -erroff=E_CONST_OBJ_SHOULD_HAVE_INITIZR
--- old/usr/src/cmd/keyserv/Makefile	Tue Jan  8 12:34:09 2019
+++ new/usr/src/cmd/keyserv/Makefile	Tue Jan  8 12:34:09 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SBINPROG = keyserv newkey
 BINPROG	= keylogout keylogin domainname chkey
@@ -74,6 +75,9 @@
 CERRWARN +=	-_gcc=-Wno-address
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lnsl
 chkey :=	LDLIBS += -lsldap
 keyserv :=	LDLIBS += -lmp
--- old/usr/src/cmd/krb5/kadmin/cli/Makefile	Tue Jan  8 12:34:10 2019
+++ new/usr/src/cmd/krb5/kadmin/cli/Makefile	Tue Jan  8 12:34:10 2019
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kadmin kadmin.local
 SHFILES= k5srvutil
@@ -37,6 +38,8 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-variable
 
+SMATCH=off
+
 COPTFLAG += $(XESS) #-I$(KINCDIR) 
 
 SHAREDLIBS = -lmech_krb5 -lss
--- old/usr/src/cmd/krb5/kadmin/dbutil/Makefile	Tue Jan  8 12:34:11 2019
+++ new/usr/src/cmd/krb5/kadmin/dbutil/Makefile	Tue Jan  8 12:34:11 2019
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kdb5_util
 
@@ -40,6 +41,9 @@
 CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L $(ROOT_KLIBDIR) -L $(KRB5LIB) -lkadm5srv -lkdb \
 	-lmech_krb5 -lnsl
--- old/usr/src/cmd/krb5/kadmin/kclient/Makefile	Tue Jan  8 12:34:12 2019
+++ new/usr/src/cmd/krb5/kadmin/kclient/Makefile	Tue Jan  8 12:34:12 2019
@@ -22,6 +22,7 @@
 #
 # Makefile for Kerberos client-install utility.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		ksetpw \
 		kdyndns \
@@ -64,6 +65,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 ksetpw:=	LDFLAGS += $(KRUNPATH)
 kdyndns:=	LDFLAGS += -R/usr/lib/smbsrv
 ksmb:=		LDFLAGS += -R/usr/lib/smbsrv
--- old/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile	Tue Jan  8 12:34:14 2019
+++ new/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile	Tue Jan  8 12:34:14 2019
@@ -21,6 +21,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	kdcmgr
 KLPROG=	klookup
@@ -37,6 +38,9 @@
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS	+=	-lresolv -lnsl
 
 CLOBBERFILES +=	$(KLPROG)
--- old/usr/src/cmd/krb5/kadmin/kpasswd/Makefile	Tue Jan  8 12:34:15 2019
+++ new/usr/src/cmd/krb5/kadmin/kpasswd/Makefile	Tue Jan  8 12:34:15 2019
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kpasswd
 
@@ -35,6 +36,9 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L $(KRB5LIBDIR)
 LDLIBS += $(KMECHLIB) $(KCLNTLIB)
--- old/usr/src/cmd/krb5/kadmin/ktutil/Makefile	Tue Jan  8 12:34:16 2019
+++ new/usr/src/cmd/krb5/kadmin/ktutil/Makefile	Tue Jan  8 12:34:16 2019
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= ktutil
 
@@ -28,6 +29,9 @@
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += $(KMECHLIB) $(ROOT)$(KERBLIBDIR)/libss.so
 
--- old/usr/src/cmd/krb5/kadmin/server/Makefile	Tue Jan  8 12:34:17 2019
+++ new/usr/src/cmd/krb5/kadmin/server/Makefile	Tue Jan  8 12:34:17 2019
@@ -2,6 +2,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kadmind
 MANIFEST=	kadmin.xml
@@ -47,6 +48,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -lgss -L$(KRB5LIB) \
 	-lmech_krb5 -lkadm5srv -lkdb -lnsl -lresolv -lbsm -lpam -lsocket
--- old/usr/src/cmd/krb5/kdestroy/Makefile	Tue Jan  8 12:34:18 2019
+++ new/usr/src/cmd/krb5/kdestroy/Makefile	Tue Jan  8 12:34:18 2019
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kdestroy
 
@@ -15,6 +16,9 @@
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 POFILE = kdestroy.po 
 POFILES = generic.po 
 
--- old/usr/src/cmd/krb5/kinit/Makefile	Tue Jan  8 12:34:19 2019
+++ new/usr/src/cmd/krb5/kinit/Makefile	Tue Jan  8 12:34:19 2019
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kinit
 
@@ -17,6 +18,9 @@
 CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 POFILE = kinit.po
 POFILES = generic.po
 
--- old/usr/src/cmd/krb5/klist/Makefile	Tue Jan  8 12:34:20 2019
+++ new/usr/src/cmd/krb5/klist/Makefile	Tue Jan  8 12:34:20 2019
@@ -2,7 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= klist
 
@@ -28,6 +28,9 @@
 LDLIBS += $(KMECHLIB)
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 $(GPROGS) := CPPFLAGS += -DSYSV -DSunOS=50 
 
 .KEEP_STATE:
--- old/usr/src/cmd/krb5/kproplog/Makefile	Tue Jan  8 12:34:21 2019
+++ new/usr/src/cmd/krb5/kproplog/Makefile	Tue Jan  8 12:34:21 2019
@@ -2,6 +2,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG		=	kproplog
 
@@ -37,6 +38,9 @@
 CERRWARN	+=	-_gcc=-Wno-unused-function
 CERRWARN	+=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 all:		$(PROG)
 
 $(PROG):	$(OBJS) $(DERIVED_OBJS)
--- old/usr/src/cmd/krb5/krb5kdc/Makefile	Tue Jan  8 12:34:23 2019
+++ new/usr/src/cmd/krb5/krb5kdc/Makefile	Tue Jan  8 12:34:23 2019
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= krb5kdc
 MANIFEST=	krb5kdc.xml
@@ -56,6 +57,9 @@
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L$(ROOT_KLIBDIR) -L$(KRB5LIB) \
 	  -lmech_krb5 -lkdb -lkadm5srv -lnsl -lsocket -lbsm -lc
--- old/usr/src/cmd/krb5/kwarn/Makefile	Tue Jan  8 12:34:23 2019
+++ new/usr/src/cmd/krb5/kwarn/Makefile	Tue Jan  8 12:34:23 2019
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 TESTPROG = kwarndtest 
 
@@ -56,6 +57,9 @@
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 CPPFLAGS += -I../../lib/gss_mechs/mech_krb5/include \
                  -I$(SRC)/lib/gss_mechs/mech_krb5 \
                  -I$(SRC)/lib/gss_mechs/mech_krb5/include \
--- old/usr/src/cmd/krb5/ldap_util/Makefile	Tue Jan  8 12:34:25 2019
+++ new/usr/src/cmd/krb5/ldap_util/Makefile	Tue Jan  8 12:34:25 2019
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kdb5_ldap_util
 
@@ -65,6 +66,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L $(ROOT_KLIBDIR) -L $(KRB5LIB) -lkadm5srv -lkdb -lkdb_ldap \
 	-lmech_krb5
--- old/usr/src/cmd/krb5/slave/Makefile	Tue Jan  8 12:34:26 2019
+++ new/usr/src/cmd/krb5/slave/Makefile	Tue Jan  8 12:34:26 2019
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG1=kprop
 PROG2=kpropd
@@ -63,6 +64,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 LDFLAGS +=	$(KRUNPATH) $(KERBRUNPATH)
 LDLIBS +=	-lmech_krb5 -lsocket
 $(PROG1) :=	LDLIBS += -L$(KRB5LIB) -lkadm5srv
--- old/usr/src/cmd/ksh/Makefile.com	Tue Jan  8 12:34:27 2019
+++ new/usr/src/cmd/ksh/Makefile.com	Tue Jan  8 12:34:27 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SHELL=/usr/bin/ksh93
 
@@ -62,6 +63,9 @@
 pmain.o	:= CERRWARN += -_gcc=-Wno-implicit-function-declaration
 pmain.o	:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 %.o:	$(LIBSHELLSRC)/%.c
--- old/usr/src/cmd/ksh/builtins/Makefile	Tue Jan  8 12:34:28 2019
+++ new/usr/src/cmd/ksh/builtins/Makefile	Tue Jan  8 12:34:28 2019
@@ -23,10 +23,10 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-
-#
 # Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
 PROG= alias
 ALIASPROG= \
@@ -93,6 +93,9 @@
 FILEMODE= 555
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/last/Makefile	Tue Jan  8 12:34:29 2019
+++ new/usr/src/cmd/last/Makefile	Tue Jan  8 12:34:29 2019
@@ -21,8 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/last/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= last
 UTMPS= wtmpx
@@ -33,6 +32,9 @@
 
 include ../Makefile.cmd
 
+# not linted
+SMATCH=off
+
 $(ROOTUTMPS):= FILEMODE= 644
 
 $(ROOTADM)/%: %
--- old/usr/src/cmd/ldap/Makefile.com	Tue Jan  8 12:34:30 2019
+++ new/usr/src/cmd/ldap/Makefile.com	Tue Jan  8 12:34:30 2019
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 # cmd/ldap/Makefile.com
 # Native LDAP II commands (makestyle clean).
@@ -89,6 +90,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 all:=           TARGET= all
 install:=       TARGET= install
 clean:=         TARGET= clean
--- old/usr/src/cmd/ldapcachemgr/Makefile	Tue Jan  8 12:34:31 2019
+++ new/usr/src/cmd/ldapcachemgr/Makefile	Tue Jan  8 12:34:31 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	ldap_cachemgr
 
@@ -55,6 +56,9 @@
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 # Message files
 POFILE=		ldap_cachemgr.po
 POFILES=	${OBJS:%.o=%.po}
--- old/usr/src/cmd/listen/Makefile	Tue Jan  8 12:34:32 2019
+++ new/usr/src/cmd/listen/Makefile	Tue Jan  8 12:34:32 2019
@@ -23,6 +23,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+
 PROG= listen nlps_server
 
 DBGOBJ	= doprnt.o
@@ -63,6 +65,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(LIBSAFD)/% : %
 	$(INS.file)
 
--- old/usr/src/cmd/loadkeys/Makefile	Tue Jan  8 12:34:32 2019
+++ new/usr/src/cmd/loadkeys/Makefile	Tue Jan  8 12:34:32 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= loadkeys dumpkeys
 sparc_SUBDIRS= type_4 type_6 type_101
@@ -42,6 +43,9 @@
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CLOBBERFILES = $(PROG) loadkeys.c
 
 .KEEP_STATE:
--- old/usr/src/cmd/lockstat/Makefile.com	Tue Jan  8 12:34:33 2019
+++ new/usr/src/cmd/lockstat/Makefile.com	Tue Jan  8 12:34:33 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= lockstat
 OBJS= lockstat.o sym.o
@@ -33,6 +34,9 @@
 CFLAGS += $(CCVERBOSE)
 CFLAGS64 += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-uninitialized
+
+SMOFF += index_overflow
+
 LINTFLAGS += -xerroff=E_SEC_SPRINTF_UNBOUNDED_COPY
 LINTFLAGS64 += -xerroff=E_SEC_SPRINTF_UNBOUNDED_COPY
 
--- old/usr/src/cmd/lofiadm/Makefile	Tue Jan  8 12:34:34 2019
+++ new/usr/src/cmd/lofiadm/Makefile	Tue Jan  8 12:34:34 2019
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= lofiadm
 OBJS= main.o utils.o
@@ -30,7 +31,7 @@
 
 SRCS= $(OBJS:%.o=%.c)
 
-POFILES= $(OBJS:%.o=%.po) 
+POFILES= $(OBJS:%.o=%.po)
 
 include ../Makefile.cmd
 
@@ -40,6 +41,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
 
 .KEEP_STATE:
--- old/usr/src/cmd/look/Makefile	Tue Jan  8 12:34:36 2019
+++ new/usr/src/cmd/look/Makefile	Tue Jan  8 12:34:36 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= look
 DATADIR= dict
@@ -37,6 +38,9 @@
 
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 FILEMODE=	755
 
 $(ROOTDATADIR)/$(DATA):= FILEMODE=444
--- old/usr/src/cmd/lp/Makefile.lp	Tue Jan  8 12:34:38 2019
+++ new/usr/src/cmd/lp/Makefile.lp	Tue Jan  8 12:34:38 2019
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # cmd/lp/Makefile.lp
@@ -97,6 +98,9 @@
 CERRWARN +=	-_gcc=-Wno-extra
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 all:=		TARGET= all
 install:=	TARGET= install
 clean:=		TARGET= clean
--- old/usr/src/cmd/lp/lib/filters/Makefile	Tue Jan  8 12:34:39 2019
+++ new/usr/src/cmd/lp/lib/filters/Makefile	Tue Jan  8 12:34:39 2019
@@ -23,6 +23,7 @@
 # Copyright 1990-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY	=	liblpflt.a
 
@@ -52,6 +53,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 POFILE =	lp_lib_filters.po
 
 .KEEP_STATE:
--- old/usr/src/cmd/lp/lib/oam/Makefile	Tue Jan  8 12:34:42 2019
+++ new/usr/src/cmd/lp/lib/oam/Makefile	Tue Jan  8 12:34:42 2019
@@ -23,10 +23,8 @@
 # Copyright 1990-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/lp/lib/oam/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
+
 include         ../../Makefile.lp
 
 LIBRARY =		liblpoam.a
@@ -71,6 +69,9 @@
 
 CPPFLAGS =		-I$(LPINC) $(CPPFLAGS.master)
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all install :		$(TXTFILES) $(LIBS)
--- old/usr/src/cmd/luxadm/Makefile	Tue Jan  8 12:34:45 2019
+++ new/usr/src/cmd/luxadm/Makefile	Tue Jan  8 12:34:45 2019
@@ -22,11 +22,12 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = luxadm
 
 COBJS = adm.o fchba.o lux_util.o fabric_conf.o
-OBJS_sparc= g_adm.o diag.o fcalupdate.o hotplug.o qlgcupdate.o setboot.o 
+OBJS_sparc= g_adm.o diag.o fcalupdate.o hotplug.o qlgcupdate.o setboot.o
 OBJS_i386 = x86_adm.o errormsgs.o
 OBJS = $(OBJS_$(MACH)) $(COBJS)
 
@@ -42,6 +43,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 sparc_LDLIBS = -la5k -lg_fc -ldevid -lkstat -ldevinfo
 i386_LDLIBS =
 LDLIBS += $($(MACH)_LDLIBS)
--- old/usr/src/cmd/mail/Makefile	Tue Jan  8 12:34:46 2019
+++ new/usr/src/cmd/mail/Makefile	Tue Jan  8 12:34:46 2019
@@ -22,10 +22,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
+BINPROG=	mail
 
-BINPROG=	mail 
-
 PROG= 	       $(BINPROG)
 
 GREP=		grep
@@ -76,6 +77,9 @@
 CERRWARN +=	-_gcc=-Wno-clobbered
 CERRWARN +=	-_gcc=-Wno-extra
 
+# missing type declarations for old-style functions
+SMATCH =	off
+
 LDLIBS +=	-lmail -lsocket
 
 # mail defines its own delete() - reduce symbols to locals to remove name clash.
@@ -104,7 +108,7 @@
 
 .PARALLEL: $(MAILOBJS) $(OBJS)
 
-all:		$(PROG) 
+all:		$(PROG)
 
 mail: 		$(MAILOBJS)
 	$(LINK.c) -o $@ $(MAILOBJS) $(LDLIBS)
@@ -117,7 +121,7 @@
 $(ROOTBIN)/rmail:
 	$(RM) $@; $(SYMLINK) mail $@
 
-lint: 
+lint:
 	$(LINT.c) $(MAILSRC)
 
 clean:
--- old/usr/src/cmd/mailwrapper/Makefile	Tue Jan  8 12:34:49 2019
+++ new/usr/src/cmd/mailwrapper/Makefile	Tue Jan  8 12:34:49 2019
@@ -12,10 +12,11 @@
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Copyright 2014 Alexander Pyhalov
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 
-LIBPROG=	mailwrapper 
+LIBPROG=	mailwrapper
 
 PROG= 	       $(LIBPROG)
 
@@ -49,6 +50,8 @@
 
 LINTFLAGS	+= -erroff=E_FUNC_RET_ALWAYS_IGNOR2
 
+SMOFF += all_func_returns
+
 # conditional assignments
 #
 all:=		TARGET= all
@@ -65,7 +68,7 @@
 
 .PARALLEL: $(MWOBJS) $(OBJS)
 
-all:		$(PROG) 
+all:		$(PROG)
 
 mailwrapper:	$(MWOBJS)
 	$(LINK.c) -o $@ $(MWOBJS) $(LDLIBS)
@@ -75,7 +78,7 @@
 
 # ROOTSYMLINKS
 #
-$(ROOTBIN)/mailq: 
+$(ROOTBIN)/mailq:
 	$(RM) $@; $(SYMLINK) ../lib/mailwrapper $@
 
 $(ROOTLIB)/sendmail:
@@ -90,7 +93,7 @@
 $(ROOTETCMAIL)/%:  %
 	$(INS.file)
 
-lint: 
+lint:
 	$(LINT.c) $(SRCS)
 
 clean:
--- old/usr/src/cmd/mailx/Makefile	Tue Jan  8 12:34:51 2019
+++ new/usr/src/cmd/mailx/Makefile	Tue Jan  8 12:34:52 2019
@@ -68,6 +68,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-clobbered
+# not linted
+SMATCH=off
+
 LINTFLAGS=	-hb
 LDLIBS +=	-lmail -lcustr
 LDFLAGS +=	$(MAPFILE.NGB:%=-M%)
--- old/usr/src/cmd/mandoc/Makefile.common	Tue Jan  8 12:34:54 2019
+++ new/usr/src/cmd/mandoc/Makefile.common	Tue Jan  8 12:34:54 2019
@@ -79,6 +79,9 @@
 # XXX gcc 4.4.4 false positive
 roff.o :=	CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CFLAGS +=	$(CC_VERBOSE)
 CSTD=		$(CSTD_GNU99)
 
--- old/usr/src/cmd/mdb/Makefile.mdb	Tue Jan  8 12:34:57 2019
+++ new/usr/src/cmd/mdb/Makefile.mdb	Tue Jan  8 12:34:57 2019
@@ -109,6 +109,8 @@
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-unused-variable
 
+SMOFF += all_func_returns
+
 #
 # -erroff=E_INCONS_ARG_DECL2 works around a problem where lint gets confused
 # about how struct mdb_tgt_gregset is used in mdb_tgt_stack_f() and
--- old/usr/src/cmd/mdb/Makefile.module	Tue Jan  8 12:34:59 2019
+++ new/usr/src/cmd/mdb/Makefile.module	Tue Jan  8 12:34:59 2019
@@ -23,7 +23,7 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2013 by Delphix. All rights reserved.
-# Copyright 2015, Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 .KEEP_STATE:
@@ -123,6 +123,8 @@
 ASFLAGS			+= -P
 AS_CPPFLAGS		+= -D_ASM
 
+SMOFF += all_func_returns,index_overflow
+
 # Module type-specific compiler flags
 $(MODOBJS) :=			CFLAGS += $(C_BIGPICFLAGS) $(XREGSFLAG)
 $(MODOBJS) :=			CFLAGS64 += $(C_BIGPICFLAGS) $(XREGSFLAG)
--- old/usr/src/cmd/mdb/intel/amd64/ip/Makefile	Tue Jan  8 12:34:59 2019
+++ new/usr/src/cmd/mdb/intel/amd64/ip/Makefile	Tue Jan  8 12:34:59 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MODULE = ip.so
 MDBTGT = kvm
@@ -34,3 +35,6 @@
 include ../../../Makefile.module
 
 CPPFLAGS += -I$(SRC)/uts/common/inet
+
+# needs work
+SMOFF += shift_to_zero
--- old/usr/src/cmd/mdb/intel/ia32/libpython/Makefile	Tue Jan  8 12:35:00 2019
+++ new/usr/src/cmd/mdb/intel/ia32/libpython/Makefile	Tue Jan  8 12:35:00 2019
@@ -22,6 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/Makefile.master
 
@@ -39,8 +40,17 @@
 
 %.o := CPPFLAGS += $(PYCPPFLAGS)
 %.ln := CPPFLAGS += $(PYLNFLAGS)
+
+#
+# Why these? Well, the pyconfig.h header hard-codes _FILE_OFFSET_BITS
+# to 64, regardless of what we have set here.  GCC quietens this complaint via
+# use of -isystem, but neither lint nor smatch can do that.
+#
 LINTFLAGS += -erroff=E_MACRO_REDEFINED
 
+# not linted
+SMATCH=off
+
 dmod/$(MODULE) := LDLIBS += -lproc
 
 %.o: $(MODSRCS_DIR)/%.c
--- old/usr/src/cmd/mkmsgs/Makefile	Tue Jan  8 12:35:01 2019
+++ new/usr/src/cmd/mkmsgs/Makefile	Tue Jan  8 12:35:01 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= mkmsgs
 
@@ -30,9 +31,12 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
--- old/usr/src/cmd/modload/Makefile.com	Tue Jan  8 12:35:02 2019
+++ new/usr/src/cmd/modload/Makefile.com	Tue Jan  8 12:35:02 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/modload/Makefile.com
+# Copyright (c) 2018, Joyent, Inc.
 #
 # makefile for loadable module utilities
 
@@ -61,6 +61,9 @@
 
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 # install specifics
 
 $(ROOTDRVPROG) := FILEMODE = 0555
--- old/usr/src/cmd/more/Makefile	Tue Jan  8 12:35:03 2019
+++ new/usr/src/cmd/more/Makefile	Tue Jan  8 12:35:03 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= more
 DATA= more.help
@@ -41,9 +42,12 @@
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) $(DATA) 
+all: $(PROG) $(DATA)
 
 install: all $(ROOTPROG) $(ROOTLIBDATA)
 	$(RM) $(ROOTBIN)/page
--- old/usr/src/cmd/mpathadm/Makefile	Tue Jan  8 12:35:04 2019
+++ new/usr/src/cmd/mpathadm/Makefile	Tue Jan  8 12:35:04 2019
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/mpathadm/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 include ../Makefile.cmd
 
@@ -37,9 +37,12 @@
 
 LINTFLAGS += -xerroff=E_BAD_FORMAT_STR2
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 $(PROG): $(OBJS)
 	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
--- old/usr/src/cmd/ndmpd/Makefile	Tue Jan  8 12:35:05 2019
+++ new/usr/src/cmd/ndmpd/Makefile	Tue Jan  8 12:35:05 2019
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 #
@@ -51,6 +52,9 @@
 CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DDEBUG
 CPPFLAGS += -I. -Iinclude
 
+# not linted
+SMATCH=off
+
 CSTD = $(CSTD_GNU99)
 
 # lint does not like unused _umem_*_init
--- old/usr/src/cmd/ndmpstat/Makefile	Tue Jan  8 12:35:05 2019
+++ new/usr/src/cmd/ndmpstat/Makefile	Tue Jan  8 12:35:05 2019
@@ -2,6 +2,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
 #
 # BSD 3 Clause License
@@ -47,6 +49,8 @@
 
 LDLIBS += -lndmp
 
+SMOFF += signed
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/news/Makefile	Tue Jan  8 12:35:06 2019
+++ new/usr/src/cmd/news/Makefile	Tue Jan  8 12:35:06 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= news 
 
@@ -32,6 +33,9 @@
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
--- old/usr/src/cmd/nl/Makefile	Tue Jan  8 12:35:07 2019
+++ new/usr/src/cmd/nl/Makefile	Tue Jan  8 12:35:07 2019
@@ -22,6 +22,8 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 # Message catalog requires no special processing because messages
 # only occur in ./nl.c, not in ../expr/compile.c.
 
@@ -40,6 +42,10 @@
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-variable
+
+# not linted
+SMATCH=off
+
 $(XPG4):= CPPFLAGS += -DXPG4
 
 MAPFILE.INT =	../expr/mapfile-intf
--- old/usr/src/cmd/nlsadmin/Makefile	Tue Jan  8 12:35:08 2019
+++ new/usr/src/cmd/nlsadmin/Makefile	Tue Jan  8 12:35:08 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= nlsadmin
 
@@ -31,6 +32,9 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
--- old/usr/src/cmd/nscd/Makefile	Tue Jan  8 12:35:09 2019
+++ new/usr/src/cmd/nscd/Makefile	Tue Jan  8 12:35:09 2019
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 # Makefile for name service cache daemon
 #
@@ -63,6 +64,9 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-type-limits
 
+# not linted
+SMATCH=off
+
 # nscd interposes on many symbols, and must export others for its own dlsym()
 # use, and dlsym() calls from libc.  Itemizing the interfaces within a mapfile
 # is error-prone, so establish the whole object as an interposer.
--- old/usr/src/cmd/nvmeadm/Makefile	Tue Jan  8 12:35:10 2019
+++ new/usr/src/cmd/nvmeadm/Makefile	Tue Jan  8 12:35:10 2019
@@ -29,6 +29,9 @@
 LDLIBS +=	-ldevinfo
 CSTD=	$(CSTD_GNU99)
 
+# error: cannot size expression
+SMATCH=off
+
 all: $(PROG)
 
 $(PROG): $(OBJS)
--- old/usr/src/cmd/oamuser/group/Makefile	Tue Jan  8 12:35:10 2019
+++ new/usr/src/cmd/oamuser/group/Makefile	Tue Jan  8 12:35:11 2019
@@ -23,8 +23,7 @@
 #
 # Copyright (c) 2013 RackTop Systems.
 #
-# cmd/oamuser/group/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include ../../Makefile.cmd
 
@@ -54,6 +53,9 @@
 CPPFLAGS=	-I$(HERE) -I$(LOCAL) $(CPPFLAGS.master)
 FILEMODE= 	0555
 
+# not linted
+SMATCH=off
+
 $(GROUPADD) :=	OBJS = $(ADD_OBJ)
 $(GROUPADD) :=	LDLIBS += $(LIBUSRGRP) -lcmdutils
 
--- old/usr/src/cmd/oamuser/lib/Makefile	Tue Jan  8 12:35:11 2019
+++ new/usr/src/cmd/oamuser/lib/Makefile	Tue Jan  8 12:35:12 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= 	lib.a
 
@@ -66,6 +67,9 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-unused-variable
+# not linted
+SMATCH=off
+
 ARFLAGS=	cr
 AROBJS=		`$(LORDER) $(OBJS) | $(TSORT)`
 LINTFLAGS=	-u
--- old/usr/src/cmd/oamuser/user/Makefile	Tue Jan  8 12:35:13 2019
+++ new/usr/src/cmd/oamuser/user/Makefile	Tue Jan  8 12:35:13 2019
@@ -23,8 +23,7 @@
 # Copyright (c) 2013 RackTop Systems.
 # Copyright (c) 2013 Gary Mills
 #
-# cmd/oamuser/user/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 DEFAULTFILES= useradd.dfl
 
@@ -76,6 +75,9 @@
 CPPFLAGS=	-I$(HERE) -I$(LOCAL) $(CPPFLAGS.master)
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 $(INSSBINPROG)  := FILEMODE = 0555
 $(INSSYSADMPROG):= FILEMODE = 0500
 $(INSSKELFILE)  := FILEMODE = 0644
--- old/usr/src/cmd/oawk/Makefile	Tue Jan  8 12:35:14 2019
+++ new/usr/src/cmd/oawk/Makefile	Tue Jan  8 12:35:14 2019
@@ -23,6 +23,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.cmd
 
@@ -69,6 +70,9 @@
 CERRWARN +=	-_gcc=-Wno-extra
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# missing type declarations
+SMATCH =	off
+
 .KEEP_STATE :
 
 all :		$(PROG) $(TXTS)
--- old/usr/src/cmd/passmgmt/Makefile	Tue Jan  8 12:35:14 2019
+++ new/usr/src/cmd/passmgmt/Makefile	Tue Jan  8 12:35:14 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 
 PROG= 		passmgmt
@@ -42,6 +43,9 @@
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 all: $(PROG) $(TXTS)
 
 XGETFLAGS= -a -x $(PROG).xcl 
--- old/usr/src/cmd/perl/Makefile.targ	Tue Jan  8 12:35:15 2019
+++ new/usr/src/cmd/perl/Makefile.targ	Tue Jan  8 12:35:15 2019
@@ -11,7 +11,7 @@
 #
 # Copyright (c) 2014 Racktop Systems.
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 # Link against libc as perl solaris specs
 $(PERLEXT):= LDLIBS += -lc
@@ -26,6 +26,8 @@
 PCFLAGS= -DPERL_EUPXS_ALWAYS_EXPORT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
 	-DPERL_USE_SAFE_PUTENV -D_TS_ERRNO
 
+SMATCH=off
+
 $(MACH):
 	$(INS.dir)
 
--- old/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com	Tue Jan  8 12:35:16 2019
+++ new/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com	Tue Jan  8 12:35:16 2019
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libpicld_pluginutil.a
 VERS=		.1
@@ -53,6 +54,9 @@
 CPPFLAGS +=	-I.. -I$(SRC)/lib/libpicl -I$(SRC)/lib/libpicltree
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+SMOFF += all_func_returns
+
 CPPFLAGS +=	-D_REENTRANT
 DYNFLAGS +=	$(ZNOLAZYLOAD)
 LDLIBS +=	-L$(SRC)/lib/libpicltree/$(MACH)
--- old/usr/src/cmd/pools/poolcfg/Makefile	Tue Jan  8 12:35:18 2019
+++ new/usr/src/cmd/pools/poolcfg/Makefile	Tue Jan  8 12:35:18 2019
@@ -22,9 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/pools/poolbind/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		poolcfg
 OBJS =		poolcfg_lex.o poolcfg_grammar.o
@@ -49,6 +47,9 @@
 XGETFLAGS =	-a
 CLOBBERFILES +=	poolcfg_lex.c poolcfg_grammar.c poolcfg_grammar.h
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/pools/poold/Makefile	Tue Jan  8 12:35:19 2019
+++ new/usr/src/cmd/pools/poold/Makefile	Tue Jan  8 12:35:19 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/pools/poold/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		poold
 OBJS =		poold.o
@@ -87,6 +87,9 @@
 $(BLD_JAVA_8)LINTFLAGS64 += -erroff=E_NAME_USED_NOT_DEF2
 LINTLIBS +=	-L$(LIBPOOL_PATH) -lpool
 
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	$(INCS)
 ROOTCMDDIR =	$(ROOT)/usr/lib/pool
 
--- old/usr/src/cmd/pools/poold/libjkstat/Makefile.com	Tue Jan  8 12:35:20 2019
+++ new/usr/src/cmd/pools/poold/libjkstat/Makefile.com	Tue Jan  8 12:35:20 2019
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libjkstat.a
 VERS =		.1
@@ -42,6 +41,9 @@
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
 
+# not linted
+SMATCH=off
+
 all: $(LIBS)
 
 lint: lintcheck
--- old/usr/src/cmd/pools/poold/libjlgrp/Makefile.com	Tue Jan  8 12:35:21 2019
+++ new/usr/src/cmd/pools/poold/libjlgrp/Makefile.com	Tue Jan  8 12:35:21 2019
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libjlgrp.a
 VERS =		.1
@@ -42,6 +41,9 @@
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
 
+# not linted
+SMATCH=off
+
 all: $(LIBS)
 
 lint: lintcheck
--- old/usr/src/cmd/pools/poold/libjpool/Makefile.com	Tue Jan  8 12:35:21 2019
+++ new/usr/src/cmd/pools/poold/libjpool/Makefile.com	Tue Jan  8 12:35:21 2019
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libjpool.a
 VERS =		.1
@@ -42,6 +41,9 @@
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
 
+# not linted
+SMATCH=off
+
 all: $(LIBS)
 
 lint: lintcheck
--- old/usr/src/cmd/pools/poold/libjsyslog/Makefile.com	Tue Jan  8 12:35:22 2019
+++ new/usr/src/cmd/pools/poold/libjsyslog/Makefile.com	Tue Jan  8 12:35:22 2019
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libjsyslog.a
 VERS =		.1
@@ -42,6 +41,9 @@
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
 
+# not linted
+SMATCH=off
+
 all: $(LIBS)
 
 lint: lintcheck
--- old/usr/src/cmd/power/Makefile	Tue Jan  8 12:35:22 2019
+++ new/usr/src/cmd/power/Makefile	Tue Jan  8 12:35:22 2019
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/power/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 DAEMON_SRCS =	powerd.c sysstat.c
 DAEMON_OBJS =	$(DAEMON_SRCS:%.c=%.o)
@@ -75,8 +74,8 @@
 $(ROOTLIBPOWER) := FILEMODE= 755
 $(ROOTLIBPOWERDAEMON) := FILEMODE= 555
 
-ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%) 
-$(ROOTETCFILES) := FILEMODE= 644 
+ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%)
+$(ROOTETCFILES) := FILEMODE= 644
 
 #
 # lint pass one enforcement
@@ -83,6 +82,8 @@
 #
 CFLAGS += $(CCVERBOSE)
 
+SMOFF += signed
+
 .PARALLEL: $(OBJS)
 
 .KEEP_STATE:
--- old/usr/src/cmd/powertop/Makefile.com	Tue Jan  8 12:35:22 2019
+++ new/usr/src/cmd/powertop/Makefile.com	Tue Jan  8 12:35:22 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = powertop
 
@@ -43,6 +44,9 @@
 CFLAGS64	+= $(CCVERBOSE)
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-uninitialized
+
+SMOFF += free
+
 LDLIBS		+= -lcurses -ldtrace -lkstat
 
 FILEMODE	= 0555
--- old/usr/src/cmd/pr/Makefile	Tue Jan  8 12:35:22 2019
+++ new/usr/src/cmd/pr/Makefile	Tue Jan  8 12:35:22 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= pr
 XPG4PROG= pr
@@ -33,6 +34,8 @@
 
 CERRWARN += -_gcc=-Wno-parentheses
 
+SMOFF += indenting
+
 $(XPG4):= CPPFLAGS += -DXPG4
 $(POFILE) := XGETFLAGS += -a -x pr.xcl
 
--- old/usr/src/cmd/praudit/Makefile	Tue Jan  8 12:35:23 2019
+++ new/usr/src/cmd/praudit/Makefile	Tue Jan  8 12:35:23 2019
@@ -24,7 +24,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 XLATEDIR = $(SRC)/lib/libbsm/common
 
@@ -45,6 +45,8 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += signed
+
 LDLIBS += -lbsm -lnsl -lpam -ltsol
 
 .KEEP_STATE:
--- old/usr/src/cmd/prctl/Makefile.com	Tue Jan  8 12:35:23 2019
+++ new/usr/src/cmd/prctl/Makefile.com	Tue Jan  8 12:35:23 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	prctl
 
@@ -36,6 +37,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS	+= -lproc -lproject
 
 # Adding this flag to LINTFLAGS did not do anything.  I'm adding this flag
--- old/usr/src/cmd/print/bsd-sysv-commands/Makefile	Tue Jan  8 12:35:23 2019
+++ new/usr/src/cmd/print/bsd-sysv-commands/Makefile	Tue Jan  8 12:35:23 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.sp
 
@@ -67,6 +67,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 all:	$(BINPROGS) $(SBINPROGS)
 
 #	each program needs common.o as well
--- old/usr/src/cmd/print/conv_fix/Makefile	Tue Jan  8 12:35:23 2019
+++ new/usr/src/cmd/print/conv_fix/Makefile	Tue Jan  8 12:35:23 2019
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/lp/client/conv_fix/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include 	../Makefile.sp
 
@@ -41,11 +40,14 @@
 
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:		$(PROG)
 
-install:	all $(ROOTLIBPRINTPROG) 
+install:	all $(ROOTLIBPRINTPROG)
 
 $(ROOTLIBPRINT)/%: %
 	$(INS.file)
--- old/usr/src/cmd/print/lpset/Makefile	Tue Jan  8 12:35:24 2019
+++ new/usr/src/cmd/print/lpset/Makefile	Tue Jan  8 12:35:24 2019
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/lp/client/lpset/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include 	../Makefile.sp
 
@@ -39,6 +38,10 @@
 
 CPPFLAGS +=	-I$(NPRTINC)
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
+
+# not linted
+SMATCH=off
+
 LDLIBS +=	$(LIBNPRT) -lsecdb
 
 .KEEP_STATE:
@@ -45,7 +48,7 @@
 
 all:		$(PROG)
 
-install:	all $(ROOTBIN) $(ROOTBINPROG) 
+install:	all $(ROOTBIN) $(ROOTBINPROG)
 
 $(ROOTBIN):
 	$(INS.dir)
--- old/usr/src/cmd/print/printer-info/Makefile	Tue Jan  8 12:35:25 2019
+++ new/usr/src/cmd/print/printer-info/Makefile	Tue Jan  8 12:35:25 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.sp
 
@@ -34,8 +35,6 @@
 ROOTPROG=	$(PROG:%=$(ROOTLIBLPBIN)/%)
 $(ROOTPROG)	:= FILEMODE=555
 
-CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
-
 .KEEP_STATE:
 
 all:		$(PROG)
@@ -46,13 +45,13 @@
 $(ROOTLIBLPBIN)/%:	%
 	$(INS.file)
 
-install:	all $(ROOTLIBLPBIN) $(ROOTPROG) 
+install:	all $(ROOTLIBLPBIN) $(ROOTPROG)
 
 $(PROGRAM):	$(OBJECTS)
 	$(CC) $(CFLAGS) -o $@ $(OBJECTS)
 
 clean:
-	$(RM) $(PROG) *.o 
+	$(RM) $(PROG) *.o
 
 cstyle:
 	cstyle $(SRCS)
--- old/usr/src/cmd/print/printer-info/printer-info.c	Tue Jan  8 12:35:27 2019
+++ new/usr/src/cmd/print/printer-info/printer-info.c	Tue Jan  8 12:35:27 2019
@@ -24,9 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/ioctl.h>
--- old/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile	Tue Jan  8 12:35:28 2019
+++ new/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile	Tue Jan  8 12:35:28 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # Makefile for Java Print Manager server
@@ -86,6 +87,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lprint -lnsl -lsocket -lc
 
 CLEANFILES=	*.class $(LINTLIB) $(LINTOUT)
--- old/usr/src/cmd/prtvtoc/Makefile	Tue Jan  8 12:35:29 2019
+++ new/usr/src/cmd/prtvtoc/Makefile	Tue Jan  8 12:35:29 2019
@@ -21,10 +21,9 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/prtvtoc/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
-PROG= prtvtoc 
+PROG= prtvtoc
 
 include ../Makefile.cmd
 
@@ -35,9 +34,12 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG) $(ROOTSYMLINK)
 
--- old/usr/src/cmd/ps/Makefile.com	Tue Jan  8 12:35:30 2019
+++ new/usr/src/cmd/ps/Makefile.com	Tue Jan  8 12:35:30 2019
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/ps/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	ps
 
@@ -36,6 +35,9 @@
 CFLAGS	+= $(CCVERBOSE)
 LDLIBS += -lproject
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 %.o:	../%.c
--- old/usr/src/cmd/ptools/Makefile.bld	Tue Jan  8 12:35:33 2019
+++ new/usr/src/cmd/ptools/Makefile.bld	Tue Jan  8 12:35:33 2019
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG:sh = basename `cd ..; pwd`
 
@@ -56,11 +57,15 @@
 LDLIBS += $(LDLIBS_$(PROG))
 
 CERRWARN_plgrp	+= -_gcc=-Wno-parentheses
+CERRWARN_plgrp	+= -_smatch=off
 
+CERRWARN_pmadvise += -_smatch=off
+
 CERRWARN_ppriv	+= -_gcc=-Wno-parentheses
 CERRWARN_ppriv	+= -_gcc=-Wno-uninitialized
 
 CERRWARN_ptree	+= -_gcc=-Wno-parentheses
+CERRWARN_ptree	+= -_smatch=off
 
 CERRWARN_pstack	+= -_gcc=-Wno-uninitialized
 CERRWARN_pstack	+= -_gcc=-Wno-clobbered
@@ -68,6 +73,8 @@
 CERRWARN_pargs	+= -_gcc=-Wno-clobbered
 CERRWARN_pargs	+= -_gcc=-Wno-type-limits
 
+CERRWARN_pwait	+= -_smatch=off
+
 CERRWARN += $(CERRWARN_$(PROG))
 
 # pargs depends on ../../common/elfcap components
--- old/usr/src/cmd/pwconv/Makefile	Tue Jan  8 12:35:35 2019
+++ new/usr/src/cmd/pwconv/Makefile	Tue Jan  8 12:35:35 2019
@@ -21,8 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/pwconv/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=           pwconv
 
@@ -32,9 +31,11 @@
 FILEMODE=       0555
 RELSBIN=        ../sbin
 
+SMOFF += indenting
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG) $(ROOTPROG)
 
@@ -44,5 +45,5 @@
 clean:
 
 lint:   lint_PROG
- 
+
 include ../Makefile.targ
--- old/usr/src/cmd/rcap/Makefile.com	Tue Jan  8 12:35:37 2019
+++ new/usr/src/cmd/rcap/Makefile.com	Tue Jan  8 12:35:37 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # Definitions for targets shared by some subdirs, which have
@@ -35,6 +36,8 @@
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-parentheses
 
+SMOFF += strcpy_overflow
+
 %.o: $(COMMON_DIR)/%.c
 	$(COMPILE.c) $<
 %.po: $(COMMON_DIR)/%.c
--- old/usr/src/cmd/rcm_daemon/Makefile.com	Tue Jan  8 12:35:41 2019
+++ new/usr/src/cmd/rcm_daemon/Makefile.com	Tue Jan  8 12:35:41 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 include ../../Makefile.cmd
@@ -124,6 +125,9 @@
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB)
 rcm_daemon := LDFLAGS += $(MAPFILES:%=-M%)
 
--- old/usr/src/cmd/refer/Makefile	Tue Jan  8 12:35:43 2019
+++ new/usr/src/cmd/refer/Makefile	Tue Jan  8 12:35:43 2019
@@ -23,6 +23,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.cmd
 
@@ -50,6 +51,9 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CLOBBERFILES += $(PROG3)
 
 addbib.po :=	XGETFLAGS += -a -x addbib.xcl
--- old/usr/src/cmd/regcmp/Makefile	Tue Jan  8 12:35:44 2019
+++ new/usr/src/cmd/regcmp/Makefile	Tue Jan  8 12:35:44 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= regcmp 
 
@@ -29,6 +30,8 @@
 
 CERRWARN += -_gcc=-Wno-parentheses
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/rmformat/Makefile	Tue Jan  8 12:35:44 2019
+++ new/usr/src/cmd/rmformat/Makefile	Tue Jan  8 12:35:44 2019
@@ -23,6 +23,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= rmformat
 
@@ -36,6 +37,9 @@
 
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LINTFLAGS += -u
 CPPFLAGS += -D_FILE_OFFSET_BITS=64
 
@@ -49,7 +53,7 @@
 	$(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS)
 	$(POST_PROCESS)
 
-install: all $(ROOTPROG) 
+install: all $(ROOTPROG)
 
 clean:
 	$(RM) $(OBJS)
--- old/usr/src/cmd/rmmount/Makefile	Tue Jan  8 12:35:44 2019
+++ new/usr/src/cmd/rmmount/Makefile	Tue Jan  8 12:35:44 2019
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		rmmount
 LOCAL_OBJS =	rmmount.o
@@ -47,6 +48,9 @@
 CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/rmvolmgr/Makefile	Tue Jan  8 12:35:47 2019
+++ new/usr/src/cmd/rmvolmgr/Makefile	Tue Jan  8 12:35:47 2019
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		rmvolmgr
 OBJS =		rmm_common.o rmvolmgr.o vold.o
@@ -48,6 +49,9 @@
 CERRWARN += 	-_gcc=-Wno-parentheses
 CERRWARN += 	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 ROOTCMDDIR =		$(ROOTLIB)
 ROOTMANIFESTDIR =	$(ROOTSVCSYSTEMFILESYSTEM)
 $(ROOTMANIFEST) :=	FILEMODE = 444
--- old/usr/src/cmd/rpcbind/Makefile	Tue Jan  8 12:35:49 2019
+++ new/usr/src/cmd/rpcbind/Makefile	Tue Jan  8 12:35:49 2019
@@ -24,6 +24,7 @@
 #
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		rpcbind
 MANIFEST=	bind.xml
@@ -46,6 +47,9 @@
 $(RELEASE_BUILD)CPPFLAGS += -DNDEBUG
 LDLIBS += -lsocket -lnsl -lwrap -lscf -lumem
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) $(SVCMETHOD)
--- old/usr/src/cmd/rpcsvc/Makefile	Tue Jan  8 12:35:51 2019
+++ new/usr/src/cmd/rpcsvc/Makefile	Tue Jan  8 12:35:51 2019
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# cmd/rpcsvc/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROTOCOL_DIR= $(ROOT)/usr/include/rpcsvc
 
@@ -64,6 +63,10 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-extra
 CERRWARN += -_gcc=-Wno-unused-function
+
+# not linted
+SMATCH=off
+
 LDLIBS += -lnsl
 rusers :=	CFLAGS += $(CCVERBOSE)
 $(BINPROG) :=	LDLIBS += -lrpcsvc
--- old/usr/src/cmd/sa/Makefile	Tue Jan  8 12:35:54 2019
+++ new/usr/src/cmd/sa/Makefile	Tue Jan  8 12:35:54 2019
@@ -23,8 +23,7 @@
 # Use is subject to license terms.
 # Copyright (c) 2013 Andrew Stormont.  All rights reserved.
 #
-# cmd/sa/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 MANIFEST =	sar.xml
 SVCMETHOD =	svc-sar
@@ -36,6 +35,8 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += all_func_returns
+
 GREP=		grep
 
 SADC= 		sadc
--- old/usr/src/cmd/saf/Makefile	Tue Jan  8 12:35:54 2019
+++ new/usr/src/cmd/saf/Makefile	Tue Jan  8 12:35:54 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= sac sacadm pmadm
 
@@ -61,6 +62,9 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-extra
 
+# too many untyped funcs
+SMATCH=off
+
 util1.o := CPPFLAGS += -DSAC
 util2.o := CPPFLAGS += -USAC
 
--- old/usr/src/cmd/sasinfo/Makefile	Tue Jan  8 12:35:55 2019
+++ new/usr/src/cmd/sasinfo/Makefile	Tue Jan  8 12:35:55 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include ../Makefile.cmd
 
@@ -47,6 +47,8 @@
 
 CERRWARN += -_gcc=-Wno-unused-value
 
+SMOFF += indenting
+
 INCS += -I.
 INCS += -I$(SRC)/lib/smhba/common
 INCS += -I$(SRC)/lib/hbaapi/common
--- old/usr/src/cmd/savecore/Makefile.com	Tue Jan  8 12:35:56 2019
+++ new/usr/src/cmd/savecore/Makefile.com	Tue Jan  8 12:35:56 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= savecore
 SRCS= ../savecore.c ../../../uts/common/os/compress.c
@@ -34,6 +35,9 @@
 CFLAGS64 += $(CCVERBOSE)
 CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -DBZ_NO_STDIO -I$(SRC)/uts/common
 
+# not linted
+SMATCH=off
+
 #
 # savecore is compiled with bits from $(SRC)/common/bzip2 and some function
 # symbols there are defined as weak; if you leave them out of
--- old/usr/src/cmd/script/Makefile	Tue Jan  8 12:35:56 2019
+++ new/usr/src/cmd/script/Makefile	Tue Jan  8 12:35:56 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= script
 
@@ -30,9 +31,11 @@
 
 CERRWARN += -_gcc=-Wno-unused-variable
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
--- old/usr/src/cmd/setfacl/Makefile	Tue Jan  8 12:35:57 2019
+++ new/usr/src/cmd/setfacl/Makefile	Tue Jan  8 12:35:57 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1993 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= setfacl
 
@@ -31,11 +32,14 @@
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lsec
 
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
--- old/usr/src/cmd/sgs/ar/Makefile.com	Tue Jan  8 12:35:57 2019
+++ new/usr/src/cmd/sgs/ar/Makefile.com	Tue Jan  8 12:35:57 2019
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=		ar
@@ -42,6 +43,9 @@
 CSTD=	$(CSTD_GNU99)
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+SMOFF += signed
+
 LDLIBS +=	-lelf $(CONVLIBDIR) $(CONV_LIB) -lsendfile
 LINTFLAGS=	-x
 LINTFLAGS64=	-x
--- old/usr/src/cmd/sgs/crle/Makefile.com	Tue Jan  8 12:35:57 2019
+++ new/usr/src/cmd/sgs/crle/Makefile.com	Tue Jan  8 12:35:57 2019
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		crle
 
@@ -39,6 +40,9 @@
 MAPFILE=	$(MAPFILE.NGB)
 MAPOPT=		$(MAPFILE:%=-M%)
 
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-I$(SRC)/common/sgsrtcid -I$(SRCBASE)/uts/$(ARCH)/sys \
 		-D__EXTENSIONS__
 LLDFLAGS =	'-R$$ORIGIN/../lib'
--- old/usr/src/cmd/sgs/dump/Makefile.com	Tue Jan  8 12:35:58 2019
+++ new/usr/src/cmd/sgs/dump/Makefile.com	Tue Jan  8 12:35:58 2019
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		dump
 
@@ -43,6 +44,8 @@
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += indenting
+
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
 LINTFLAGS +=	-x
 LINTSRCS =	$(SRCS)
--- old/usr/src/cmd/sgs/elfdump/Makefile.com	Tue Jan  8 12:35:58 2019
+++ new/usr/src/cmd/sgs/elfdump/Makefile.com	Tue Jan  8 12:35:58 2019
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=		elfdump
@@ -60,6 +61,9 @@
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 BLTDEFS =	msg.h
 BLTDATA =	msg.c
 BLTMESG =	$(SGSMSGDIR)/elfdump
--- old/usr/src/cmd/sgs/error/i386/Makefile	Tue Jan  8 12:36:01 2019
+++ new/usr/src/cmd/sgs/error/i386/Makefile	Tue Jan  8 12:36:01 2019
@@ -24,6 +24,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		error
 
@@ -43,6 +44,8 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+SMOFF += no_if_block,indenting
+
 CLEANFILES +=	$(LINTOUT)
 
 %.o:		../common/%.c
--- old/usr/src/cmd/sgs/gprof/Makefile.com	Tue Jan  8 12:36:04 2019
+++ new/usr/src/cmd/sgs/gprof/Makefile.com	Tue Jan  8 12:36:04 2019
@@ -22,8 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/sgs/gprof/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		gprof
 
@@ -46,6 +45,10 @@
 LINTSRCS =	$(SRCS)
 LINTFLAGS +=	-x
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 CLEANFILES +=	$(LINTOUTS)
 
 ROOTLIBBLURB=	$(BLURBS:%=$(ROOTSHLIBCCS)/%)
--- old/usr/src/cmd/sgs/ldd/Makefile.com	Tue Jan  8 12:36:07 2019
+++ new/usr/src/cmd/sgs/ldd/Makefile.com	Tue Jan  8 12:36:07 2019
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		ldd
 
@@ -48,6 +49,8 @@
 LINTFLAGS +=	-x
 LINTFLAGS64 +=	-x
 
+SMOFF += or_vs_and
+
 BLTDEFS=        msg.h
 BLTDATA=        msg.c
 BLTMESG=        $(SGSMSGDIR)/ldd
--- old/usr/src/cmd/sgs/ldprof/Makefile.com	Tue Jan  8 12:36:08 2019
+++ new/usr/src/cmd/sgs/ldprof/Makefile.com	Tue Jan  8 12:36:08 2019
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY=	ldprof.a
@@ -47,6 +48,8 @@
 		$(CPPFLAGS.master) -I$(ELFCAP)
 CFLAGS +=	$(C_PICFLAGS)
 
+SMOFF += indenting
+
 lint :=		ZRECORD =
 LDLIBS +=	$(ZRECORD) -lmapmalloc -lc $(DLLIB)
 
--- old/usr/src/cmd/sgs/libconv/Makefile.com	Tue Jan  8 12:36:08 2019
+++ new/usr/src/cmd/sgs/libconv/Makefile.com	Tue Jan  8 12:36:08 2019
@@ -91,6 +91,9 @@
 CERRWARN	+= -_gcc=-Wno-type-limits
 CERRWARN	+= -_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 CTFCONVERT_O=
 
 README_REVISION=../../packages/common/readme_revision
--- old/usr/src/cmd/sgs/libelf/Makefile.com	Tue Jan  8 12:36:09 2019
+++ new/usr/src/cmd/sgs/libelf/Makefile.com	Tue Jan  8 12:36:09 2019
@@ -21,6 +21,7 @@
 #
 # Copyright 2015 Gary Mills
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY=	libelf.a
@@ -71,6 +72,8 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += indenting
+
 BUILD.AR=	$(RM) $@ ; \
 		$(AR) q $@ `$(LORDER) $(OBJECTS:%=$(DIR)/%)| $(TSORT)`
 		$(POST_PROCESS_A)
--- old/usr/src/cmd/sgs/libld/Makefile.com	Tue Jan  8 12:36:09 2019
+++ new/usr/src/cmd/sgs/libld/Makefile.com	Tue Jan  8 12:36:09 2019
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libld.a
 VERS =		.4
@@ -94,6 +95,8 @@
 CERRWARN += -_gcc=-Wno-char-subscripts
 CERRWARN += -_gcc=-Wno-type-limits
 
+SMOFF += no_if_block
+
 # Location of the shared relocation engines maintained under usr/src/uts.
 #
 KRTLD_I386 = $(SRCBASE)/uts/$(VAR_PLAT_i386)/krtld
--- old/usr/src/cmd/sgs/nm/amd64/Makefile	Tue Jan  8 12:36:09 2019
+++ new/usr/src/cmd/sgs/nm/amd64/Makefile	Tue Jan  8 12:36:09 2019
@@ -22,6 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		nm
 
@@ -43,6 +44,8 @@
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += precedence,indenting
+
 LDLIBS +=	$(CONVLIBDIR64) $(CONV_LIB) $(ELFLIBDIR) -lelf
 LINTFLAGS64 +=	-x $(LDLIBS) -m64
 LINTSRCS=	$(SRCS)
--- old/usr/src/cmd/sgs/nm/i386/Makefile	Tue Jan  8 12:36:10 2019
+++ new/usr/src/cmd/sgs/nm/i386/Makefile	Tue Jan  8 12:36:10 2019
@@ -21,8 +21,7 @@
 #
 # Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# cmd/sgs/nm/i386/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		nm
 XPG4PROG=	nm
@@ -47,6 +46,8 @@
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += precedence,indenting
+
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
 LINTFLAGS +=	-x $(LDLIBS)
 LINTSRCS=	$(SRCS)
--- old/usr/src/cmd/sgs/prof/Makefile.com	Tue Jan  8 12:36:10 2019
+++ new/usr/src/cmd/sgs/prof/Makefile.com	Tue Jan  8 12:36:10 2019
@@ -22,8 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/sgs/prof/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		prof
 
@@ -43,6 +42,10 @@
 CFLAGS +=	$(CCVERBOSE)
 CSTD=	$(CSTD_GNU99)
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
 LINTSRCS =	$(SRCS)
 LINTFLAGS +=	-x
--- old/usr/src/cmd/sgs/pvs/Makefile.com	Tue Jan  8 12:36:10 2019
+++ new/usr/src/cmd/sgs/pvs/Makefile.com	Tue Jan  8 12:36:10 2019
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		pvs
 
@@ -48,6 +49,9 @@
 LINTFLAGS +=	-x
 LINTFLAGS64 +=	-x
 
+# not linted
+SMATCH=off
+
 BLTDEFS=	msg.h
 BLTDATA=	msg.c
 BLTMESG=	$(SGSMSGDIR)/pvs
--- old/usr/src/cmd/sgs/rtld/Makefile.com	Tue Jan  8 12:36:11 2019
+++ new/usr/src/cmd/sgs/rtld/Makefile.com	Tue Jan  8 12:36:11 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 RTLD=		ld.so.1
 
@@ -89,6 +90,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 # These definitions require that libc be built in the same workspace
 # as the run-time linker and before the run-time linker is built.
 # This is required for the system's self-consistency in any case.
@@ -100,7 +104,7 @@
 		$(CPICLIB) $(CLIB) \
 		$(LDDBGLIBDIR) $(LDDBG_LIB) \
 		$(RTLDLIB) -lrtld \
-		$(LDLIB) $(LD_LIB) 
+		$(LDLIB) $(LD_LIB)
 
 DYNFLAGS +=	-i -e _rt_boot $(VERSREF) $(ZNODLOPEN) \
 		$(ZINTERPOSE) -zdtrace=dtrace_data '-R$$ORIGIN'
--- old/usr/src/cmd/sgs/tools/Makefile.com	Tue Jan  8 12:36:11 2019
+++ new/usr/src/cmd/sgs/tools/Makefile.com	Tue Jan  8 12:36:11 2019
@@ -18,6 +18,7 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
@@ -66,3 +67,6 @@
 ROOTPROGS=	$(PROGS:%=$(ROOTDIR)/bin/%)
 
 FILEMODE=	0755
+
+# not linted
+SMATCH=off
--- old/usr/src/cmd/sgs/yacc/Makefile.com	Tue Jan  8 12:36:12 2019
+++ new/usr/src/cmd/sgs/yacc/Makefile.com	Tue Jan  8 12:36:12 2019
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		yacc
 
@@ -74,6 +75,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(ROOTPROG):= FILEMODE = 0555
 
 ROOTYACCPAR=	$(YACCPAR:%=$(ROOTSHLIBCCS)/%)
--- old/usr/src/cmd/sh/Makefile	Tue Jan  8 12:36:12 2019
+++ new/usr/src/cmd/sh/Makefile	Tue Jan  8 12:36:12 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		sh
 USR_PROG =	$(PROG)
@@ -45,6 +46,10 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-extra
 CERRWARN += -_gcc=-Wno-unused-variable
+
+# unknown type for func
+SMATCH=off
+
 MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB)
 LDFLAGS += $(MAPFILES:%=-M%)
 LDLIBS += -lgen
--- old/usr/src/cmd/shcomp/Makefile	Tue Jan  8 12:36:14 2019
+++ new/usr/src/cmd/shcomp/Makefile	Tue Jan  8 12:36:14 2019
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SHELL=/usr/bin/ksh93
 
@@ -63,6 +64,8 @@
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+SMOFF +=	all_func_returns
+
 ROOTCMDDIR=$(ROOT)/usr/bin
 
 PROG= shcomp
--- old/usr/src/cmd/smbsrv/smbadm/Makefile	Tue Jan  8 12:36:15 2019
+++ new/usr/src/cmd/smbsrv/smbadm/Makefile	Tue Jan  8 12:36:15 2019
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=	smbadm
@@ -38,6 +39,8 @@
 
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += free
+
 all:		$(PROG)
 
 clean:
--- old/usr/src/cmd/smserverd/Makefile	Tue Jan  8 12:36:15 2019
+++ new/usr/src/cmd/smserverd/Makefile	Tue Jan  8 12:36:15 2019
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =	rpc.smserverd
 OBJS =	smediad.o smediad_err.o myaudit.o smed_svc.o smed_xdr.o
@@ -47,6 +48,10 @@
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-variable
+
+# not linted
+SMATCH=off
+
 LINTFLAGS += -u
 
 .KEEP_STATE:
--- old/usr/src/cmd/soelim/Makefile	Tue Jan  8 12:36:16 2019
+++ new/usr/src/cmd/soelim/Makefile	Tue Jan  8 12:36:16 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.cmd
 
@@ -33,6 +34,9 @@
 
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 all :		$(PROG)
 
 $(PROG) :	soelim.o
--- old/usr/src/cmd/sort/Makefile.com	Tue Jan  8 12:36:16 2019
+++ new/usr/src/cmd/sort/Makefile.com	Tue Jan  8 12:36:16 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # Debugging targets
@@ -88,6 +89,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 $(XPG4)	:=	CFLAGS += -DXPG4
 
 debug :=	SORT_DEBUG = -g -DDEBUG $(ILDOFF)
--- old/usr/src/cmd/sqlite/Makefile	Tue Jan  8 12:36:17 2019
+++ new/usr/src/cmd/sqlite/Makefile	Tue Jan  8 12:36:17 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		sqlite
 
@@ -40,6 +41,9 @@
 
 CERRWARN +=	-_gcc=-Wno-empty-body
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lsqlite-sys
 
 .KEEP_STATE:
--- old/usr/src/cmd/ssh/etc/Makefile	Tue Jan  8 12:36:19 2019
+++ new/usr/src/cmd/ssh/etc/Makefile	Tue Jan  8 12:36:19 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MANIFEST = ssh.xml
 SVCMETHOD = sshd
@@ -46,6 +47,8 @@
 
 $(POFILE):
 
+SMOFF += signed
+
 all lint clean clobber _msg:
 
 install: all $(DIRS) $(ETCSSHFILES) $(ROOTMANIFEST) $(ROOTSVCMETHOD)
--- old/usr/src/cmd/stat/fsstat/Makefile	Tue Jan  8 12:36:19 2019
+++ new/usr/src/cmd/stat/fsstat/Makefile	Tue Jan  8 12:36:19 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = fsstat
 OBJS = fsstat.o
@@ -40,6 +41,8 @@
 
 lint := LINTFLAGS = -muxs -I$(STATCOMMONDIR)
 
+SMOFF += signed
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/stat/vmstat/Makefile	Tue Jan  8 12:36:19 2019
+++ new/usr/src/cmd/stat/vmstat/Makefile	Tue Jan  8 12:36:19 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = vmstat
 OBJS = vmstat.o
@@ -35,6 +36,9 @@
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-parentheses
+
+SMOFF += signed
+
 FILEMODE= 0555
 
 lint := LINTFLAGS = -muxs -I$(STATCOMMONDIR)
--- old/usr/src/cmd/streams/log/Makefile	Tue Jan  8 12:36:21 2019
+++ new/usr/src/cmd/streams/log/Makefile	Tue Jan  8 12:36:21 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	strace strerr strclean
 
@@ -29,11 +30,13 @@
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-unused-variable
 
+SMOFF += all_func_returns
+
 FILEMODE= 0555
 
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 	-$(RM) $(ROOTBIN)/strace
--- old/usr/src/cmd/sulogin/Makefile	Tue Jan  8 12:36:21 2019
+++ new/usr/src/cmd/sulogin/Makefile	Tue Jan  8 12:36:22 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		sulogin
 ROOTFS_PROG =	$(PROG)
@@ -32,6 +33,9 @@
 
 FILEMODE =	0555
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:		$(ROOTFS_PROG)
--- old/usr/src/cmd/sunpc/other/Makefile	Tue Jan  8 12:36:22 2019
+++ new/usr/src/cmd/sunpc/other/Makefile	Tue Jan  8 12:36:22 2019
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
-# cmd/sunpc/other/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= dos2unix unix2dos
 SRCS= ${PROG:%=%.c}
@@ -33,6 +33,9 @@
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/svc/startd/Makefile	Tue Jan  8 12:36:23 2019
+++ new/usr/src/cmd/svc/startd/Makefile	Tue Jan  8 12:36:24 2019
@@ -22,6 +22,7 @@
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Milan Jurik. All rights reserved.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG = svc.startd
@@ -72,6 +73,9 @@
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# these look like real bugs here, but ...
+SMOFF += impossible_mask,signed_integer_overflow_check
+
 $(OBJS) := CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_REENTRANT
 
 proc.o := CPPFLAGS += -D_REENTRANT
--- old/usr/src/cmd/svc/svccfg/Makefile	Tue Jan  8 12:36:24 2019
+++ new/usr/src/cmd/svc/svccfg/Makefile	Tue Jan  8 12:36:24 2019
@@ -21,7 +21,7 @@
 
 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2017 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 MYPROG =	svccfg
@@ -81,6 +81,9 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 LFLAGS = -t
 YFLAGS = -d
 
--- old/usr/src/cmd/svr4pkg/Makefile.svr4pkg	Tue Jan  8 12:36:25 2019
+++ new/usr/src/cmd/svr4pkg/Makefile.svr4pkg	Tue Jan  8 12:36:25 2019
@@ -24,6 +24,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -38,6 +39,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-address
 
+# multiple issues in this old code
+SMATCH=off
+
 LIBINST =       $(SRC)/cmd/svr4pkg/libinst/libinst.a
 
 SRCS=           $(OBJS:.o=.c)
--- old/usr/src/cmd/svr4pkg/libinst/Makefile	Tue Jan  8 12:36:26 2019
+++ new/usr/src/cmd/svr4pkg/libinst/Makefile	Tue Jan  8 12:36:26 2019
@@ -24,6 +24,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= libinst.a
 
@@ -68,6 +69,9 @@
 CERRWARN += -_gcc=-Wno-clobbered
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# too many issues
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/swap/Makefile.com	Tue Jan  8 12:36:27 2019
+++ new/usr/src/cmd/swap/Makefile.com	Tue Jan  8 12:36:27 2019
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/swap/Makefile.com
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	swap
 OBJS=	$(PROG).o
@@ -35,6 +35,9 @@
 CFLAGS64 +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 FILEMODE=02555
 
 CLEANFILES += $(OBJS)
--- old/usr/src/cmd/sysdef/Makefile.com	Tue Jan  8 12:36:28 2019
+++ new/usr/src/cmd/sysdef/Makefile.com	Tue Jan  8 12:36:28 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	sysdef
 OBJS=	$(PROG).o sdevinfo.o
@@ -32,6 +33,9 @@
 LDLIBS	+= -ldevinfo -lelf
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 FILEMODE= 02555
 
 CLEANFILES += $(OBJS)
--- old/usr/src/cmd/syslogd/Makefile.com	Tue Jan  8 12:36:30 2019
+++ new/usr/src/cmd/syslogd/Makefile.com	Tue Jan  8 12:36:30 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= 		syslogd
 ROTATESCRIPT=	newsyslog
@@ -35,6 +36,10 @@
 
 $(PROG) lint 	:= LDLIBS += -lscf -lnsl
 CERRWARN	+= -_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 CPPFLAGS	+= -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
 CFLAGS		+= -DNDEBUG
 
--- old/usr/src/cmd/tabs/Makefile	Tue Jan  8 12:36:31 2019
+++ new/usr/src/cmd/tabs/Makefile	Tue Jan  8 12:36:31 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= tabs
 
@@ -33,6 +34,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/tail/Makefile	Tue Jan  8 12:36:32 2019
+++ new/usr/src/cmd/tail/Makefile	Tue Jan  8 12:36:32 2019
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2010 Chris Love.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 
@@ -29,6 +30,8 @@
 C99LMODE=	-Xc99=%all
 LINTFLAGS +=	-I. -erroff=E_CONSTANT_CONDITION
 
+SMOFF += leaks
+
 # install rules
 $(ROOTINC)/% : %
 	$(INS.file)
@@ -37,7 +40,7 @@
 
 .PARALLEL: $(OBJS)
 
-all:		$(PROG) 
+all:		$(PROG)
 
 $(PROG):	$(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
--- old/usr/src/cmd/tar/Makefile	Tue Jan  8 12:36:33 2019
+++ new/usr/src/cmd/tar/Makefile	Tue Jan  8 12:36:33 2019
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG= tar
@@ -39,6 +40,9 @@
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CPPFLAGS += -DEUC
 
 ROOTSYMLINK=	$(ROOTPROG)
--- old/usr/src/cmd/tbl/Makefile	Tue Jan  8 12:36:35 2019
+++ new/usr/src/cmd/tbl/Makefile	Tue Jan  8 12:36:35 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.cmd
 
@@ -41,6 +42,9 @@
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-char-subscripts
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE :
 
 all :		$(PROG)
--- old/usr/src/cmd/tcopy/Makefile	Tue Jan  8 12:36:35 2019
+++ new/usr/src/cmd/tcopy/Makefile	Tue Jan  8 12:36:35 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1990 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		tcopy
 
@@ -32,6 +33,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-extra
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE :
 
 all:		$(PROG) 
--- old/usr/src/cmd/tcpd/Makefile	Tue Jan  8 12:36:36 2019
+++ new/usr/src/cmd/tcpd/Makefile	Tue Jan  8 12:36:36 2019
@@ -4,6 +4,7 @@
 #
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		safe_finger tcpd tcpdchk tcpdmatch try-from
 
@@ -29,6 +30,9 @@
 CERRWARN +=	-_gcc=-Wno-return-type
 CERRWARN +=	-_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 # Various components must export interfaces, but also contain name-space
 # clashes with system libraries.
 MAPFILE.INT.D=	$(MAPFILE.NGB) mapfile-intf-tcpdchk
--- old/usr/src/cmd/tnf/prex/Makefile.com	Tue Jan  8 12:36:37 2019
+++ new/usr/src/cmd/tnf/prex/Makefile.com	Tue Jan  8 12:36:37 2019
@@ -24,8 +24,7 @@
 # Copyright 1989,2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/tnf/prex/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		prex
 
@@ -72,6 +71,9 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL: $(OBJS)
--- old/usr/src/cmd/tnf/tnfxtract/Makefile.com	Tue Jan  8 12:36:39 2019
+++ new/usr/src/cmd/tnf/tnfxtract/Makefile.com	Tue Jan  8 12:36:39 2019
@@ -23,6 +23,7 @@
 # Copyright 1994, 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		tnfxtract
 
@@ -38,6 +39,9 @@
 LDLIBS +=	-lkvm
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/tput/Makefile	Tue Jan  8 12:36:41 2019
+++ new/usr/src/cmd/tput/Makefile	Tue Jan  8 12:36:41 2019
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= tput
 
@@ -35,6 +36,9 @@
 XGETFLAGS += -a -x tput.xcl
 LDLIBS +=  -lcurses
 
+# not linted
+SMATCH=off
+
 all: $(PROG)
 
 install: all $(ROOTPROG)
--- old/usr/src/cmd/truss/Makefile.com	Tue Jan  8 12:36:42 2019
+++ new/usr/src/cmd/truss/Makefile.com	Tue Jan  8 12:36:42 2019
@@ -23,9 +23,8 @@
 # Copyright (c) 2016 by Delphix. All rights reserved.
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright (c) 2018, Joyent, Inc.
 #
-# cmd/truss/Makefile.com
-#
 
 PROG=	truss
 
@@ -42,6 +41,9 @@
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 CSTD=	$(CSTD_GNU99)
 
 LDLIBS	+= -lproc -lrtld_db -lc_db -lnsl -lsocket -ltsol -lnvpair
--- old/usr/src/cmd/tsol/tnd/Makefile	Tue Jan  8 12:36:44 2019
+++ new/usr/src/cmd/tsol/tnd/Makefile	Tue Jan  8 12:36:44 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= tnd
 OBJS= tnd.o
@@ -47,6 +48,8 @@
 CERRWARN += -_gcc=-Wno-unused-value
 CERRWARN += -_gcc=-Wno-parentheses
 
+SMOFF += no_if_block
+
 .KEEP_STATE:
 
 all:	$(PROG)
--- old/usr/src/cmd/ttymon/Makefile	Tue Jan  8 12:36:45 2019
+++ new/usr/src/cmd/ttymon/Makefile	Tue Jan  8 12:36:45 2019
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= stty ttymon ttyadm sttydefs
 XPG4PROG= stty
@@ -78,6 +79,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-extra
 
+# not linted
+SMATCH=off
+
 #
 # Message catalog
 #
--- old/usr/src/cmd/units/Makefile	Tue Jan  8 12:36:47 2019
+++ new/usr/src/cmd/units/Makefile	Tue Jan  8 12:36:47 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= units
 UNITTAB=unittab
@@ -31,6 +32,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 LIBUNITTAB= $(UNITTAB:%=$(ROOTSHLIB)/%)
 $(LIBUNITTAB) :=	FILEMODE =	$(LIBFILEMODE)
 
--- old/usr/src/cmd/unlink/Makefile	Tue Jan  8 12:36:49 2019
+++ new/usr/src/cmd/unlink/Makefile	Tue Jan  8 12:36:49 2019
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= unlink
 
@@ -30,9 +31,12 @@
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 	-$(RM) $(ROOTETCPROG)
--- old/usr/src/cmd/utmpd/Makefile	Tue Jan  8 12:36:53 2019
+++ new/usr/src/cmd/utmpd/Makefile	Tue Jan  8 12:36:53 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= utmpd
 DEFAULTFILES= utmpd.dfl
@@ -34,6 +35,8 @@
 
 FILEMODE = 555
 
+SMOFF += signed
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/vgrind/Makefile	Tue Jan  8 12:36:56 2019
+++ new/usr/src/cmd/vgrind/Makefile	Tue Jan  8 12:36:56 2019
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/vgrind/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # These are the objects associated with the overall vgrind command.
@@ -66,6 +66,9 @@
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 #
 # Message catalog
 #
--- old/usr/src/cmd/vi/misc/Makefile	Tue Jan  8 12:36:59 2019
+++ new/usr/src/cmd/vi/misc/Makefile	Tue Jan  8 12:36:59 2019
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 CFLAGS += v
 
@@ -36,7 +37,7 @@
 POFILES= $(SRCS:%.c=%.po)
 
 include ../../Makefile.cmd
-$(XPG4) := CFLAGS += -DXPG4 
+$(XPG4) := CFLAGS += -DXPG4
 
 CERRWARN += -_gcc=-Wno-char-subscripts
 CERRWARN += -_gcc=-Wno-parentheses
@@ -44,6 +45,9 @@
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# way too old
+SMATCH=off
+
 POFILE= misc.po
 
 CLOBBERFILES += $(OTHERPROGS)
--- old/usr/src/cmd/vi/port/Makefile	Tue Jan  8 12:37:02 2019
+++ new/usr/src/cmd/vi/port/Makefile	Tue Jan  8 12:37:02 2019
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 # cmd/vi/port/Makefile
 
@@ -61,6 +62,9 @@
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-address
 
+# way too old
+SMATCH=off
+
 #
 # For message catalogue files
 #
--- old/usr/src/cmd/volcheck/Makefile	Tue Jan  8 12:37:05 2019
+++ new/usr/src/cmd/volcheck/Makefile	Tue Jan  8 12:37:05 2019
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		volcheck
 LOCAL_OBJS =	volcheck.o
@@ -47,6 +48,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/volrmmount/Makefile	Tue Jan  8 12:37:07 2019
+++ new/usr/src/cmd/volrmmount/Makefile	Tue Jan  8 12:37:07 2019
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		volrmmount
 LOCAL_OBJS =	volrmmount.o
@@ -47,6 +48,9 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/vscan/vscand/Makefile	Tue Jan  8 12:37:09 2019
+++ new/usr/src/cmd/vscan/vscand/Makefile	Tue Jan  8 12:37:09 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = vscand
 SRCS =	vs_main.c	\
@@ -46,6 +47,9 @@
 
 CERRWARN += -_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 LINTFLAGS += -mu
 CSTD =       $(CSTD_GNU99)
 C99LMODE =      -Xc99=%all
--- old/usr/src/cmd/wall/Makefile	Tue Jan  8 12:37:11 2019
+++ new/usr/src/cmd/wall/Makefile	Tue Jan  8 12:37:11 2019
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright 2012 Joyent, Inc. All Rights Reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG= wall
@@ -34,9 +34,11 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += leaks
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 	-$(RM) $(ROOTETCPROG)
--- old/usr/src/cmd/whodo/amd64/Makefile	Tue Jan  8 12:37:13 2019
+++ new/usr/src/cmd/whodo/amd64/Makefile	Tue Jan  8 12:37:13 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	whodo
 
@@ -35,6 +36,8 @@
 CFLAGS64	+= $(CCVERBOSE)
 CERRWARN	+= -_gcc=-Wno-parentheses
 
+SMOFF += strcpy_overflow
+
 FILEMODE= 04555
 
 .KEEP_STATE:
--- old/usr/src/cmd/write/Makefile	Tue Jan  8 12:37:15 2019
+++ new/usr/src/cmd/write/Makefile	Tue Jan  8 12:37:15 2019
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/write/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= write
 
@@ -38,6 +38,8 @@
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-unused-variable
 
+SMOFF += all_func_returns
+
 all: $(PROG)
 
 install: all $(ROOTPROG)
--- old/usr/src/cmd/xargs/Makefile	Tue Jan  8 12:37:18 2019
+++ new/usr/src/cmd/xargs/Makefile	Tue Jan  8 12:37:18 2019
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= 			xargs
 # /usr/xpg6/bin/xargs is a symlink to /usr/bin/xargs
@@ -38,6 +39,9 @@
 
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/ypcmd/Makefile	Tue Jan  8 12:37:20 2019
+++ new/usr/src/cmd/ypcmd/Makefile	Tue Jan  8 12:37:20 2019
@@ -22,6 +22,7 @@
 # Copyright 2015 Gary Mills
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 BINPROG = ypmatch ypwhich ypcat
@@ -153,6 +154,9 @@
 CERRWARN +=	-_gcc=-Wno-address
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# too many unknown types
+SMATCH =	off
+
 #conditional assignments
 ypalias.o :=	CPPFLAGS= -DMAIN $(CPPFLAGS.master)
 makedbm.o :=	CPPFLAGS= $(CPPFLAGS.master)
--- old/usr/src/cmd/ypcmd/mknetid/Makefile	Tue Jan  8 12:37:22 2019
+++ new/usr/src/cmd/ypcmd/mknetid/Makefile	Tue Jan  8 12:37:22 2019
@@ -23,6 +23,7 @@
 # Copyright 1994, 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = mknetid
 
@@ -37,6 +38,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
--- old/usr/src/cmd/ypcmd/revnetgroup/Makefile	Tue Jan  8 12:37:24 2019
+++ new/usr/src/cmd/ypcmd/revnetgroup/Makefile	Tue Jan  8 12:37:24 2019
@@ -23,6 +23,7 @@
 # Copyright 1996, 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = revnetgroup
 
@@ -36,6 +37,9 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
@@ -46,7 +50,7 @@
 
 install: all $(ROOTUSRSBINPROG)
 
-clean: 
+clean:
 	$(RM) $(OBJS)
 
 lint:
--- old/usr/src/cmd/ypcmd/yppasswd/Makefile	Tue Jan  8 12:37:27 2019
+++ new/usr/src/cmd/ypcmd/yppasswd/Makefile	Tue Jan  8 12:37:27 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 NETYPPROG =	rpc.yppasswdd
 DEFAULTFILES =	yppasswdd.dfl
@@ -60,6 +61,9 @@
 CERRWARN +=		-_gcc=-Wno-parentheses
 CERRWARN +=		-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 #
 # Objects shared between all the major components
 #
--- old/usr/src/cmd/ypcmd/ypupdated/Makefile	Tue Jan  8 12:37:29 2019
+++ new/usr/src/cmd/ypcmd/ypupdated/Makefile	Tue Jan  8 12:37:29 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 NETYPPROG =	rpc.ypupdated
 PROG =		$(NETYPPROG)
@@ -55,6 +56,9 @@
 CERRWARN +=		-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=		-_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 CLOBBERFILES += ypupdated_prot.h
 
 #conditional assignments
--- old/usr/src/cmd/zdb/Makefile.com	Tue Jan  8 12:37:32 2019
+++ new/usr/src/cmd/zdb/Makefile.com	Tue Jan  8 12:37:32 2019
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright (c) 2012 by Delphix. All rights reserved.
-# Copyright 2017 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 # Copyright 2017 RackTop Systems.
 #
 
@@ -54,6 +54,8 @@
 CERRWARN += -_gcc=-Wsign-compare
 CERRWARN += -_gcc=-Wmissing-field-initializers
 
+SMOFF += 64bit_shift,all_func_returns
+
 # lint complains about unused _umem_* functions
 LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
 LINTFLAGS64 += -xerroff=E_NAME_DEF_NOT_USED2
--- old/usr/src/cmd/zlogin/Makefile	Tue Jan  8 12:37:33 2019
+++ new/usr/src/cmd/zlogin/Makefile	Tue Jan  8 12:37:33 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = zlogin
 
@@ -33,6 +34,9 @@
 
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
--- old/usr/src/cmd/zonecfg/Makefile	Tue Jan  8 12:37:36 2019
+++ new/usr/src/cmd/zonecfg/Makefile	Tue Jan  8 12:37:36 2019
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	zonecfg
 OBJS=	zonecfg.o zonecfg_lex.o zonecfg_grammar.tab.o
@@ -46,6 +47,8 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+SMOFF += all_func_returns
+
 CLOBBERFILES += $(PROG).ln
 
 .KEEP_STATE:
--- old/usr/src/cmd/zonestat/zonestat/Makefile	Tue Jan  8 12:37:39 2019
+++ new/usr/src/cmd/zonestat/zonestat/Makefile	Tue Jan  8 12:37:39 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		zonestat
 SRCS =		zonestat.c
@@ -33,6 +34,9 @@
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL:
--- old/usr/src/cmd/zonestat/zonestatd/Makefile	Tue Jan  8 12:37:42 2019
+++ new/usr/src/cmd/zonestat/zonestatd/Makefile	Tue Jan  8 12:37:42 2019
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MANIFEST =	zonestat.xml
 SVCMETHOD =	svc-zonestat
@@ -42,6 +43,9 @@
 CERRWARN 	+= -_gcc=-Wno-unused-label
 CERRWARN 	+= -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 OBJS =		$(SRCS:%.c=%.o)
 
 .KEEP_STATE:
--- old/usr/src/cmd/zstreamdump/Makefile	Tue Jan  8 12:37:45 2019
+++ new/usr/src/cmd/zstreamdump/Makefile	Tue Jan  8 12:37:45 2019
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		zstreamdump
 OBJS=		zstreamdump.o
@@ -47,6 +48,9 @@
 
 CERRWARN += -_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL:
--- old/usr/src/cmd/ztest/Makefile.com	Tue Jan  8 12:37:48 2019
+++ new/usr/src/cmd/ztest/Makefile.com	Tue Jan  8 12:37:48 2019
@@ -22,7 +22,7 @@
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2017 RackTop Systems.
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= ztest
 OBJS= $(PROG).o
@@ -57,6 +57,9 @@
 
 CERRWARN += -_gcc=-Wno-switch
 
+# false positive
+SMOFF += signed
+
 .KEEP_STATE:
 
 all: $(PROG)
