[illumos-gate merge]

commit bfe5cd09d00f1b1e72fbe64036f3f80b73bd2738
    2408 CJK character width handled incorrectly in terminal emulators (missing widths-2.txt)
commit 2da1cd3a39e2d3da7f9d15071ea9462919c011ac
    2408 CJK character width handled incorrectly in terminal emulators
    3019 localedef(1) manpage is pretty out of date
commit 03fc868668dd42b1b163d1fb8af3968f7283a7eb
    672 xargs doesn't support -0
    3356 xargs needlessly duplicates stdio buffering
commit 03d446db9be5b68e630562c8b6b14aa7c8a0f4dc
    4075 nscd spuriously thinks all databases are privileged
commit ab823b7f933f787dbdf7a0bb790639210c583869
    3965 find does not support -delete option
commit a81df0a5d715363cc1841810a87818dfa95675c0
    3933 contract adoption can race
commit cf746768a898264fa491791a8252865e5338dc67
    1974 pages_pp_maximum/lotsfree discrepancy leads to mlock() failure
commit b6805bf78d2bbbeeaea8909a05623587b42d58b3
    4072 make clobber leaves trash
commit a9478106a12424322498e53cf7cd75bd8a4d6004
    3600 edit(1) is a bad .so reference
commit 5253393b09789ec67bec153b866d7285a1cf1645
    4082 zfs receive gets EFBIG from dmu_tx_hold_free()

Conflicts:
	usr/src/man/man7fs/Makefile (copyright)
	usr/src/man/man3xnet/Makefile (ntohll/htonll)
	usr/src/man/man3socket/Makefile (get/freeifaddrs)
	usr/src/man/man1m/Makefile (ipdadm)
	usr/src/cmd/localedef/Makefile (euro)
	usr/src/cmd/ipf/tools/Makefile.tools (copyright)
	.gitignore
	usr/src/cmd/lp/filter/postscript/postreverse/Makefile (deleted)
	usr/src/lib/libshell/Makefile.doc (deleted)
	usr/src/lib/print/libpapi-lpd/Makefile.com (deleted)
	usr/src/pkg/manifests/library-print-open-printing-ipp.mf (deleted)
	usr/src/pkg/manifests/print-lp-print-client-commands.mf (deleted)

Manifests (scripted replacement):
	usr/src/pkg/manifests/SUNWcs.man1.inc
	usr/src/pkg/manifests/SUNWcs.man1m.inc
	usr/src/pkg/manifests/SUNWcs.man4.inc
	usr/src/pkg/manifests/SUNWcs.man5.inc
	usr/src/pkg/manifests/compatibility-ucb.mf
	usr/src/pkg/manifests/developer-tnf.mf
	usr/src/pkg/manifests/diagnostic-cpu-counters.mf
	usr/src/pkg/manifests/driver-firewire.mf
	usr/src/pkg/manifests/driver-usb.mf
	usr/src/pkg/manifests/library-libtecla.mf
	usr/src/pkg/manifests/library-print-open-printing-ipp.mf
	usr/src/pkg/manifests/library-security-tcp-wrapper.mf
	usr/src/pkg/manifests/naming-ldap.mf
	usr/src/pkg/manifests/network-iscsi-target.mf
	usr/src/pkg/manifests/print-lp-print-client-commands.mf
	usr/src/pkg/manifests/service-hal.mf
	usr/src/pkg/manifests/service-network-dns-mdns.mf
	usr/src/pkg/manifests/service-network-ftp.mf
	usr/src/pkg/manifests/service-network-network-clients.mf
	usr/src/pkg/manifests/service-network-network-servers.mf
	usr/src/pkg/manifests/service-network-nis.mf
	usr/src/pkg/manifests/service-network-smtp-sendmail.mf
	usr/src/pkg/manifests/service-network-telnet.mf
	usr/src/pkg/manifests/service-network-tftp.mf
	usr/src/pkg/manifests/service-network-uucp.mf
	usr/src/pkg/manifests/service-picl.mf
	usr/src/pkg/manifests/service-resource-pools.mf
	usr/src/pkg/manifests/service-security-gss.mf
	usr/src/pkg/manifests/service-storage-media-volume-manager.mf
	usr/src/pkg/manifests/storage-metassist.mf
	usr/src/pkg/manifests/storage-stmf.mf
	usr/src/pkg/manifests/storage-svm.mf
	usr/src/pkg/manifests/system-accounting-legacy.mf
	usr/src/pkg/manifests/system-boot-network.mf
	usr/src/pkg/manifests/system-extended-system-utilities.mf
	usr/src/pkg/manifests/system-file-system-smb.mf
	usr/src/pkg/manifests/system-header.mf
	usr/src/pkg/manifests/system-kernel-platform.mf
	usr/src/pkg/manifests/system-kernel-ultra-wideband.mf
	usr/src/pkg/manifests/system-kernel.man2.inc
	usr/src/pkg/manifests/system-kernel.man4.inc
	usr/src/pkg/manifests/system-kernel.man7.inc
	usr/src/pkg/manifests/system-kernel.man7d.inc
	usr/src/pkg/manifests/system-kernel.man7fs.inc
	usr/src/pkg/manifests/system-kernel.man7m.inc
	usr/src/pkg/manifests/system-kernel.man7p.inc
	usr/src/pkg/manifests/system-kernel.man9.inc
	usr/src/pkg/manifests/system-kernel.man9e.inc
	usr/src/pkg/manifests/system-kernel.man9f.inc
	usr/src/pkg/manifests/system-kernel.man9p.inc
	usr/src/pkg/manifests/system-kernel.man9s.inc
	usr/src/pkg/manifests/system-library-security-libsasl.mf
	usr/src/pkg/manifests/system-library-storage-libmpapi.mf
	usr/src/pkg/manifests/system-library.man3.inc
	usr/src/pkg/manifests/system-library.man3bsm.inc
	usr/src/pkg/manifests/system-library.man3c.inc
	usr/src/pkg/manifests/system-library.man3c_db.inc
	usr/src/pkg/manifests/system-library.man3cfgadm.inc
	usr/src/pkg/manifests/system-library.man3commputil.inc
	usr/src/pkg/manifests/system-library.man3contract.inc
	usr/src/pkg/manifests/system-library.man3curses.inc
	usr/src/pkg/manifests/system-library.man3devid.inc
	usr/src/pkg/manifests/system-library.man3devinfo.inc
	usr/src/pkg/manifests/system-library.man3dlpi.inc
	usr/src/pkg/manifests/system-library.man3elf.inc
	usr/src/pkg/manifests/system-library.man3exacct.inc
	usr/src/pkg/manifests/system-library.man3ext.inc
	usr/src/pkg/manifests/system-library.man3fstyp.inc
	usr/src/pkg/manifests/system-library.man3gen.inc
	usr/src/pkg/manifests/system-library.man3kstat.inc
	usr/src/pkg/manifests/system-library.man3kvm.inc
	usr/src/pkg/manifests/system-library.man3ldap.inc
	usr/src/pkg/manifests/system-library.man3lgrp.inc
	usr/src/pkg/manifests/system-library.man3lib.inc
	usr/src/pkg/manifests/system-library.man3mail.inc
	usr/src/pkg/manifests/system-library.man3malloc.inc
	usr/src/pkg/manifests/system-library.man3mp.inc
	usr/src/pkg/manifests/system-library.man3nsl.inc
	usr/src/pkg/manifests/system-library.man3nvpair.inc
	usr/src/pkg/manifests/system-library.man3pam.inc
	usr/src/pkg/manifests/system-library.man3scf.inc
	usr/src/pkg/manifests/system-library.man3sec.inc
	usr/src/pkg/manifests/system-library.man3secdb.inc
	usr/src/pkg/manifests/system-library.man3sip.inc
	usr/src/pkg/manifests/system-library.man3socket.inc
	usr/src/pkg/manifests/system-library.man3tsol.inc
	usr/src/pkg/manifests/system-library.man3uuid.inc
	usr/src/pkg/manifests/system-library.man3volmgt.inc
	usr/src/pkg/manifests/system-library.man3xcurses.inc
	usr/src/pkg/manifests/system-library.man3xnet.inc
	usr/src/pkg/manifests/system-library.man5.inc
	usr/src/pkg/manifests/system-network-http-cache-accelerator.mf
	usr/src/pkg/manifests/system-network-nis.mf
	usr/src/pkg/manifests/system-network-routing.mf
	usr/src/pkg/manifests/system-remote-shared-memory.mf
	usr/src/pkg/manifests/system-security-kerberos-5.mf
	usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf
	usr/src/pkg/manifests/system-storage-sasinfo.mf
	usr/src/pkg/manifests/text-doctools.mf

3 files changed, 31 insertions, 10 deletions

diff --git a/usr/src/cmd/ipf/examples/Makefile b/usr/src/cmd/ipf/examples/Makefile
index aba12bbffc..078c7eef53 100644
--- a/usr/src/cmd/ipf/examples/Makefile
+++ b/usr/src/cmd/ipf/examples/Makefile
@@ -38,6 +38,8 @@ SHSRCS= $(SHPROG:%=%.sh)
 
 include ../../Makefile.cmd
 
+CLOBBERFILES =	$(SHPROG)
+
 SHAREIPF= $(ROOT)/usr/share/ipfilter
 SHAREIPFX= $(SHAREIPF)/examples
 
@@ -63,8 +65,6 @@ all:		$(SHPROG)
 
 clean:
 
-clobber:
-
 install:	all $(SHAREIPF) $(SHAREIPFX)  \
 		$(IPFEXAMPLES) $(IPFEXSHPROG)
 
diff --git a/usr/src/cmd/ipf/tools/Makefile b/usr/src/cmd/ipf/tools/Makefile
index 0562aca48e..03bb135de2 100644
--- a/usr/src/cmd/ipf/tools/Makefile
+++ b/usr/src/cmd/ipf/tools/Makefile
@@ -54,17 +54,13 @@ $(USRLIBIPF)/% : %
 
 .KEEP_STATE:
 
-all:		$(SUBDIRS) 
+all clean clobber lint: $(SUBDIRS)
 
-clean clobber lint: $(SUBDIRS)
+install: all $(SUBDIRS) install_local
 
-install:	all $(SUBDIRS) $(USRLIBIPF) \
-		$(USRLIBIPFLICENCE)
+install_local: $(USRLIBIPF) $(USRLIBIPFLICENCE)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET)
 
-
 FRC:
-
-include ../../Makefile.targ
diff --git a/usr/src/cmd/ipf/tools/Makefile.tools b/usr/src/cmd/ipf/tools/Makefile.tools
index ccc5bf3c93..ce0db79970 100644
--- a/usr/src/cmd/ipf/tools/Makefile.tools
+++ b/usr/src/cmd/ipf/tools/Makefile.tools
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 2012, Joyent Inc. All rights reserved.
 #
 
@@ -45,7 +46,7 @@ IPFTEST_OBJS=	ipftest.o ipfzone.o \
 		ip_pool.o radix.o
 
 OBJS=		$(IPF_OBJS) $(IPFS_OBJS) $(IPFSTAT_OBJS) \
-		$(IPMON_OBJS) $(IPNAT_OBJS) $(IPFTEST_OBJS)
+		$(IPMON_OBJS) $(IPNAT_OBJS) $(IPPOOL_OBJS) $(IPFTEST_OBJS)
 
 OBJSL=		$(IPF_OBJS) $(IPFS_OBJS) $(IPFSTAT_OBJS) \
 		$(IPMON_OBJS) $(IPNAT_OBJS)
@@ -71,6 +72,7 @@ ipnat		:=	LDLIBS += -lsocket -lnsl -lkvm -lelf
 ippool		:=	LDLIBS += -lsocket -lnsl -lkvm -lelf
 
 CLEANFILES	+= $(OBJS)
+CLOBBERFILES	+= $(IPFPROG)
 
 ROOTIPF=	$(ROOTLIB)/ipf
 ROOTIPF32=	$(ROOTIPF)/$(MACH32)
@@ -82,6 +84,8 @@ ROOTIPFPROG64=	$(IPFPROG:%=$(ROOTIPF64)/%)
 ROOTIPFLINKS=		$(IPFPROG:%=$(ROOTIPF)/%)
 ROOTUSRSBINLINKS=	$(PROG:%=$(ROOTUSRSBIN)/%)
 
+all:
+
 $(ROOTIPF32):
 	$(INS.dir)
 
@@ -120,6 +124,9 @@ ipf_y.o: ../ipf_y.c $(COMMONIPF)/netinet/ip_fil.h $(COMMONIPF)/ipf.h \
 	sed -e 's/yy/ipf_yy/g' -e 's/y.tab.h/ipf_y.h/' \
 	   ipf.tab.h > ../ipf_y.h
 
+CLEANFILES += ipf.tab.c ipf.tab.h
+CLEANFILES += ../ipf_y.c ../ipf_y.h
+
 ipf_l.o: ../ipf_l.c $(COMMONIPF)/netinet/ip_fil.h $(COMMONIPF)/ipf.h  \
 	 ../ipf_y.h ../ipf_l.h
 	$(COMPILE.c) ../ipf_l.c -o $@
@@ -131,6 +138,9 @@ ipf_l.o: ../ipf_l.c $(COMMONIPF)/netinet/ip_fil.h $(COMMONIPF)/ipf.h  \
 ../ipf_l.h: ../lexer.h
 	sed -e 's/yy/ipf_yy/g' ../lexer.h > $@
 
+CLEANFILES += ../ipf_l.c ../ipf_l.h
+
+
 ipfs:	$(IPFS_OBJS)
 	$(LINK.c) -o ipfs $(IPFS_OBJS) $(LDLIBS)
 	$(POST_PROCESS)
@@ -155,6 +165,9 @@ ipmon_y.o: ../ipmon_y.c $(COMMONIPF)/ipmon.h \
 	sed -e 's/yy/ipmon_yy/g' -e 's/y.tab.h/ipmon_y.h/' \
 	   ipmon.tab.h > ../ipmon_y.h
 
+CLEANFILES += ipmon.tab.c ipmon.tab.h
+CLEANFILES += ../ipmon_y.c ../ipmon_y.h
+
 ipmon_l.o: ../ipmon_l.c $(COMMONIPF)/ipmon.h ../ipmon_y.h ../ipmon_l.h
 	$(COMPILE.c) ../ipmon_l.c -o $@
 
@@ -165,6 +178,8 @@ ipmon_l.o: ../ipmon_l.c $(COMMONIPF)/ipmon.h ../ipmon_y.h ../ipmon_l.h
 ../ipmon_l.h: ../lexer.h
 	sed -e 's/yy/ipmon_yy/g' ../lexer.h > $@
 
+CLEANFILES += ../ipmon_l.c ../ipmon_l.h
+
 ipnat:	$(IPNAT_OBJS) $(LIBIPF) $(MAPFILE.NGB)
 	$(LINK.c) -o ipnat $(IPNAT_OBJS) $(LDLIBS)
 	$(POST_PROCESS)
@@ -181,6 +196,9 @@ ipnat_y.o: ../ipnat_y.c $(COMMONIPF)/netinet/ip_nat.h \
 	sed -e 's/yy/ipnat_yy/g' -e 's/y.tab.h/ipnat_y.h/' \
 	   ipnat.tab.h > ../ipnat_y.h
 
+CLEANFILES += ipnat.tab.c ipnat.tab.h
+CLEANFILES += ../ipnat_y.c ../ipnat_y.h
+
 ipnat_l.o: ../ipnat_l.c $(COMMONIPF)/netinet/ip_nat.h ../ipnat_l.h
 	$(COMPILE.c) ../ipnat_l.c -o $@
 
@@ -191,6 +209,8 @@ ipnat_l.o: ../ipnat_l.c $(COMMONIPF)/netinet/ip_nat.h ../ipnat_l.h
 ../ipnat_l.h: ../lexer.h
 	sed -e 's/yy/ipnat_yy/g' ../lexer.h > $@
 
+CLEANFILES += ../ipnat_l.c ../ipnat_l.h
+
 ippool:	$(IPPOOL_OBJS) $(LIBIPF) $(MAPFILE.NGB)
 	$(LINK.c) -o ippool $(IPPOOL_OBJS) $(LDLIBS)
 	$(POST_PROCESS)
@@ -207,6 +227,9 @@ ippool_y.o: ../ippool_y.c $(COMMONIPF)/netinet/ip_pool.h \
 	sed -e 's/yy/ippool_yy/g' -e 's/y.tab.h/ippool_y.h/' \
 	   ippool.tab.h > ../ippool_y.h
 
+CLEANFILES += ippool.tab.c ippool.tab.h
+CLEANFILES += ../ippool_y.c ../ippool_y.h
+
 ippool_l.o: ../ippool_l.c $(COMMONIPF)/netinet/ip_pool.h ../ippool_l.h
 	$(COMPILE.c) ../ippool_l.c -o $@
 
@@ -217,6 +240,8 @@ ippool_l.o: ../ippool_l.c $(COMMONIPF)/netinet/ip_pool.h ../ippool_l.h
 ../ippool_l.h: ../lexer.h
 	sed -e 's/yy/ippool_yy/g' ../lexer.h > $@
 
+CLEANFILES += ../ippool_l.c ../ippool_l.h
+
 ipftest:	$(IPFTEST_OBJS) $(LIBIPF) $(MAPFILE.NGB)
 	$(LINK.c) $(ZIGNORE) -o ipftest $(IPFTEST_OBJS) $(LDLIBS)  
 	$(POST_PROCESS)