--- a/usr/src/Targetdirs	Sat Apr 23 12:09:15 2011 -0700
+++ b/usr/src/Targetdirs	Sat Apr 23 14:19:34 2011 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Targetdirs	1.266	11/03/22 SMI"
+# ident	"@(#)Targetdirs	1.267	11/03/31 SMI"
 #
 
 #
@@ -177,13 +177,10 @@
         /usr/grails \
         /usr/grails/1.0.3 \
 	/usr/include \
-	/usr/include/autoopts \
 	/usr/include/brevity \
 	/usr/include/cimple \
 	/usr/include/curl \
 	/usr/include/gmp \
-	/usr/include/gutenprint \
-	/usr/include/gutenprintui2 \
 	/usr/include/guile \
 	/usr/include/guile/srfi \
 	/usr/include/idn \
@@ -195,14 +192,9 @@
 	/usr/include/libguile \
 	/usr/include/libmemcached \
 	/usr/include/libnet \
-	/usr/include/libxml2 \
-	/usr/include/libxml2/libxml \
-	/usr/include/libexslt \
-	/usr/include/libxslt \
 	/usr/include/memcached \
 	/usr/include/mpfr \
 	/usr/include/odbc \
-	/usr/include/OpenEXR \
 	/usr/include/openldap \
 	/usr/include/openwsman \
 	/usr/include/openwsman/cim \
@@ -245,8 +237,6 @@
 	/usr/jruby/1.1.3 \
 	/usr/lib \
 	/usr/lib/$(MACH32) \
-	/usr/lib/7z \
-	/usr/lib/7z/Codecs \
 	/usr/lib/awstats \
 	/usr/lib/awstats/tools \
 	/usr/lib/awstats/tools/webmin \
@@ -264,10 +254,6 @@
 	/usr/lib/emacs/23.1 \
 	/usr/lib/ejabberd \
 	/usr/lib/erlang \
-	/usr/lib/git-core \
-	/usr/lib/gutenprint \
-	/usr/lib/gutenprint/5.2 \
-	/usr/lib/gutenprint/5.2/modules \
 	/usr/lib/help \
 	/usr/lib/help/auths \
 	/usr/lib/help/auths/locale \
@@ -314,11 +300,8 @@
 	/usr/lib/python2.6/vendor-packages/pylint/reporters \
 	/usr/lib/python2.6/vendor-packages/pylint/checkers \
 	/usr/lib/python2.6/vendor-packages/pylint-0.18.0-py2.6.egg-info \
-	/usr/lib/python2.6/vendor-packages/radialnet \
 	/usr/lib/python2.6/vendor-packages/rdiff_backup \
 	/usr/lib/python2.6/vendor-packages/svn \
-	/usr/lib/python2.6/vendor-packages/zenmapCore \
-	/usr/lib/python2.6/vendor-packages/zenmapGUI \
 	/usr/lib/quilt \
 	/usr/lib/samba \
 	/usr/lib/sane \
@@ -740,7 +723,6 @@
 	/usr/share/areca/icons/big \
 	/usr/share/areca/translations \
 	/usr/share/areca/license \
-	/usr/share/autogen \
 	/usr/share/applications \
 	/usr/share/awstats \
 	/usr/share/awstats/cgi-bin \
@@ -796,7 +778,6 @@
 	/usr/share/doc/fftw3/html \
 	/usr/share/doc/gmp \
 	/usr/share/doc/gmp/html \
-	/usr/share/doc/gperf \
 	/usr/share/doc/idn \
 	/usr/share/doc/idn/html \
 	/usr/share/doc/idn/java \
@@ -837,8 +818,6 @@
 	/usr/share/doc/ntp/icons \
 	/usr/share/doc/ntp/pic \
 	/usr/share/doc/ntp/scripts \
-	/usr/share/doc/openexr-1.6.1 \
-	/usr/share/doc/openexr-1.6.1/examples \
 	/usr/share/doc/openusb \
 	/usr/share/doc/openldap \
 	/usr/share/doc/openldap/admin24 \
@@ -935,20 +914,6 @@
 	/usr/share/emacs/23.1/lisp/url \
 	/usr/share/emacs/23.1/site-lisp \
 	/usr/share/emacs/site-lisp \
-	/usr/share/gutenprint \
-	/usr/share/gutenprint/5.2 \
-	/usr/share/gutenprint/5.2/xml \
-	/usr/share/gutenprint/5.2/xml/escp2 \
-	/usr/share/gutenprint/5.2/xml/escp2/qualitypresets \
-	/usr/share/gutenprint/5.2/xml/escp2/inputslots \
-	/usr/share/gutenprint/5.2/xml/escp2/mediasizes \
-	/usr/share/gutenprint/5.2/xml/escp2/weaves \
-	/usr/share/gutenprint/5.2/xml/escp2/model \
-	/usr/share/gutenprint/5.2/xml/escp2/inks \
-	/usr/share/gutenprint/5.2/xml/escp2/media \
-	/usr/share/gutenprint/doc \
-	/usr/share/gutenprint/doc/reference-html \
-	/usr/share/gutenprint/samples \
 	/usr/share/gnome \
 	/usr/share/gnome/help \
 	/usr/share/gnome/help/meld \
@@ -1044,10 +1009,6 @@
 	/usr/share/meld/ui \
 	/usr/share/man/man8oldap \
 	/usr/share/nano \
-	/usr/share/ncat \
-	/usr/share/nmap \
-	/usr/share/nmap/nselib \
-	/usr/share/nmap/scripts \
 	/usr/share/omf \
 	/usr/share/omf/meld \
 	/usr/share/octave \
@@ -1092,8 +1053,6 @@
 	/usr/share/vim/vimfiles \
 	/usr/share/vim/vimfiles/after \
 	/usr/share/vim/vimfiles/after/syntax \
-	/usr/share/zenmap \
-	/usr/share/zenmap/pixmaps \
 	/usr/squid \
 	/usr/squid/bin \
 	/usr/squid/libexec \
@@ -1136,7 +1095,6 @@
 	/usr/squid/share/errors/Ukrainian-koi8-u \
 	/usr/squid/share/errors/Ukrainian-utf8 \
 	/usr/squid/share/icons \
-	/usr/tomcat6 \
 	/var/apache2 \
 	/var/apache2/2.2 \
 	/var/ejabberd \
@@ -1172,7 +1130,6 @@
 	/var/squid \
 	/var/squid/cache \
 	/var/squid/logs \
-	/var/tomcat6 \
 	/var/mysql \
 	/var/mysql/5.0	\
 	/var/mysql/5.0/data	\

--- a/usr/src/cmd/ImageMagick/Makefile.sfw	Sat Apr 23 12:09:15 2011 -0700
+++ b/usr/src/cmd/ImageMagick/Makefile.sfw	Sat Apr 23 14:19:34 2011 -0700
@@ -19,9 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.18	10/09/03 SMI"
+#ident	"@(#)Makefile.sfw	1.19	11/03/31 SMI"
 
 VER=ImageMagick-6.3.4
 VER64=$(VER)-64
@@ -31,7 +31,6 @@
 
 SFW_PATH="$(SPRO_VROOT)/bin:/usr/sfw/bin:$(PATH)"
 
-CPPFLAGS += -I$(ROOT)/usr/include/libxml2
 CPPFLAGS += -I/usr/sfw/include
 CPPFLAGS += -I/usr/include/libxml2
 CPPFLAGS += -I/usr/include/freetype2
@@ -112,7 +111,7 @@
 	    INSTALL="$(SRC)/tools/install-proto" \
 	    CFLAGS="${CFLAGS}" \
 	    CXXFLAGS="-xO3" \
-	    CPPFLAGS="-I${ROOT}/usr/sfw/include -I${ROOT}/usr/include/libxml2 -I/usr/sfw/include -I/usr/include/libxml2 -I/usr/include/freetype2 -I/usr/sfw/include/freetype2 -I/usr/X/include/X11" \
+	    CPPFLAGS="-I${ROOT}/usr/sfw/include -I/usr/sfw/include -I/usr/include/libxml2 -I/usr/include/freetype2 -I/usr/sfw/include/freetype2 -I/usr/X/include/X11" \
 	    LDFLAGS="-L${ROOT}/usr/lib -L${ROOT}/usr/sfw/lib -L/usr/sfw/lib -L/usr/X/lib -R/usr/sfw/lib:/usr/X/lib" \
 	    MAKE=$(CCSMAKE) \
 	    ./configure \

--- a/usr/src/cmd/Makefile	Sat Apr 23 12:09:15 2011 -0700
+++ b/usr/src/cmd/Makefile	Sat Apr 23 14:19:34 2011 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile	1.201	11/03/21 SMI"
+# ident	"@(#)Makefile	1.202	11/03/31 SMI"
 #
 
 #
@@ -47,7 +47,6 @@
 	apache2 \
 	apache2-modperl \
 	areca \
-	autogen \
 	awstats \
 	bcc \
 	beanshell \
@@ -79,15 +78,12 @@
 	foomatic-ppd \
 	freeipmi \
 	guile \
-	gutenprint \
 	flex \
 	fping \
 	gdb \
 	gettext \
 	grails \
 	ghostscript \
-	git \
-	gnu-gperf \
 	gnupg \
 	gnuplot \
 	gocr \
@@ -127,13 +123,11 @@
 	ncftp \
 	nethack \
 	net-snmp \
-	nmap \
 	ntpd \
 	ocaml \
 	ofusr \
 	openldap \
 	openwsman \
-	p7zip \
 	patchutils \
 	pconsole \
 	pdsh \
@@ -145,7 +139,6 @@
 	powerman \
 	privoxy \
 	procmail \
-	psutils \
 	pv \
 	pycups \
 	pylint \
@@ -174,7 +167,6 @@
 	sysbench \
 	texinfo \
 	texi2html \
-	tomcat \
 	tor \
 	tree \
 	unrar \
@@ -208,13 +200,11 @@
 
 
 foomatic-filters:	cups
-gutenprint:	cups
 hplip:		cups ghostscript
 ghostscript:	cups
 samba:		cups
 pycups:		cups
 hal-cups-utils:		cups pycups
-foomatic-ppd:	gutenprint
 foomatic-db-engine:	foomatic-db
 apr-util/apr-util-1.3: apr/apr-1.3 mysql-5-1
 apache2: apr-util/apr-util-1.3

--- a/usr/src/cmd/apache2/modules/apxs-security2.ksh93	Sat Apr 23 12:09:15 2011 -0700
+++ b/usr/src/cmd/apache2/modules/apxs-security2.ksh93	Sat Apr 23 14:19:34 2011 -0700
@@ -19,10 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)apxs-security2.ksh93	1.4	09/03/16 SMI"
+# ident	"@(#)apxs-security2.ksh93	1.5	11/03/31 SMI"
 #
 
 set -o errexit
@@ -42,7 +41,7 @@
     apache2/acmp.c apache2/msc_release.c \
     apache2/pdf_protect.c apache2/msc_geo.c apache2/msc_lua.c"
 
-INCLUDES="-I. -I ${ROOT}/usr/include/pcre -I ${ROOT}/usr/include/libxml2"
+INCLUDES="-I. -I${ROOT}/usr/include/pcre -I/usr/include/libxml2"
 
 LIBS="-L ${ROOT}/usr/lib/${LIBP} -lpcre -lxml2"
 

--- a/usr/src/cmd/autogen/METADATA	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-NAME:		autogen
-VERSION:	5.9
-DESCRIPTION:	automated text file generator
-LICENSE:	GPLv2
-PACKAGE:        SUNWautogen
-PROJECT_URL:	http://www.gnu.org/software/autogen
-SOURCE_DOWNLOAD:	http://ftp.gnu.org/gnu/autogen/rel5.9/autogen-5.9.tar.gz
-SUPPORT:	C
-BUGTRAQ:	solaris/utility/autogen
-OSR:		8464
-COMMENTS:
-

--- a/usr/src/cmd/autogen/Makefile.sfw	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-# ident	"@(#)Makefile.sfw	1.3	11/03/01 SMI"
-#
-
-VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
-TARBALL=$(VER).tar.gz
-CONFIGURE_OPTIONS +="--with-libguile-link='-L$(ROOTLIB)'"
-
-include ../Makefile.cmd
-
-all: $(VER)/config.status
-	(cd $(VER); env - \
-	    LD_OPTIONS="-M $(SRC)/cmd/mapfile_noexstk" \
-	    ROOTBIN=$(ROOTBIN) \
-            GUILE_LOAD_PATH=$(ROOT)$(CFGPREFIX)/share/guile/1.8 \
-            PATH="$(ROOTBIN):$(ROOT)$(CFGPREFIX)/share:$(SFW_PATH)" \
-	    MAKE=$(CCSMAKE) \
-	    $(CCSMAKE) )
-
-install: all
-	# install the bits in the proto area
-	(cd $(VER); env - SRC=$(SRC) \
-	    DESTDIR=$(ROOT) \
-	    BINDIR=$(ROOT)/usr/bin \
-	    PERL=/usr/perl5/bin/perl \
-	    INSTALL="$(SRC)/tools/install-proto -c -m 0555" \
-	    ROOTBIN=$(ROOTBIN) \
-            GUILE_LOAD_PATH=$(ROOT)$(CFGPREFIX)/share/guile/1.8 \
-            PATH="$(ROOTBIN):$(ROOT)$(CFGPREFIX)/share:$(SFW_PATH)" \
-	    $(CCSMAKE) install)
-	# perform a few post-install fixups
-	PKGVERS=$(VER) $(SHELL) ./install-sfw
-	# fix the proto area
-	$(SRC)/tools/protofix --pkg $(COMPONENT_PACKAGES:sh) --perm
-
-$(VER)/config.status: $(VER)/configure
-	(cd $(VER); env - \
-	    CC=$(GCC) \
-	    ROOTBIN=$(ROOTBIN) \
-	    GUILE_LOAD_PATH=$(ROOT)$(CFGPREFIX)/share/guile/1.8 \
-	    INSTALL=/usr/bin/ginstall \
-	    PATH="$(ROOTBIN):$(ROOT)$(CFGPREFIX)/share:$(SFW_PATH)" \
-	    MAKE=$(CCSMAKE) \
-            CPPFLAGS="-I$(ROOTINCLUDE) -I$(ROOTINCLUDE)/libguile \
-		 -I$(ROOTINCLUDE)/guile -I$(ROOTINCLUDE)/gmp" \
-	    ./configure $(CONFIGURE_OPTIONS)) 
-
-$(VER)/configure: $(TARBALL)
-	/usr/bin/gzip -dc $(TARBALL) | tar xpf -
-	touch $(VER)/configure
-
-clean:
-	-rm -rf $(VER)
-
-include ../Makefile.targ
-

Binary file usr/src/cmd/autogen/autogen-5.9.tar.gz has changed

--- a/usr/src/cmd/autogen/install-sfw	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#! /usr/bin/ksh93
-# 
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"@(#)install-sfw	1.1	09/06/23 SMI"
-#
-
-set -o errexit
-PREFIX=${ROOT}/usr
-INFODIR=${PREFIX}/share/info
-MANDIR=${PREFIX}/share/man
-
-MANSCRIPT=../sunman-stability
-source  ${SRC}/tools/install.subr
-
-# remove unused installed file
-yes |rm -f ${INFORDIR}/dir
-yes |rm ${PREFIX}/share/autogen/libopts-28.0.3.tar.gz
-
-
-cd ${PKGVERS}
-
-for dir in columns xml2ag getdefs; do 
-	_install M $dir/$dir.1 ${MANDIR}/man1/$dir.1 444
-done
-
-_install M autoopts/autoopts-config.1 ${MANDIR}/man1/autoopts-config.1 444
-_install M agen5/autogen.1 ${MANDIR}/man1/autogen.1 444
-
-for file in `ls autoopts | grep \.3$`; do
-	_install M autoopts/$file ${MANDIR}/man3/$file 444
-done
-
-
-exit 0
-

--- a/usr/src/cmd/autogen/sunman-stability	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Sun update\
-.SH ATTRIBUTES\
-See\
-.BR attributes (5)\
-for descriptions of the following attributes:\
-.sp\
-.TS\
-box;\
-cbp-1 | cbp-1\
-l | l .\
-ATTRIBUTE TYPE	ATTRIBUTE VALUE\
-=\
-Availability	developer/build/autogen \
-=\
-Interface Stability	Uncommitted \
-.TE \
-.PP\
-.SH NOTES\
-Source for autogen is available on http://opensolaris.org.\
-\.\\" End Sun update
-

--- a/usr/src/cmd/cups/Makefile.sfw	Sat Apr 23 12:09:15 2011 -0700
+++ b/usr/src/cmd/cups/Makefile.sfw	Sat Apr 23 14:19:34 2011 -0700
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.15	11/01/11 SMI"
+#ident	"@(#)Makefile.sfw	1.16	11/04/07 SMI"
 
 include ../Makefile.cmd
 
@@ -73,6 +73,7 @@
 install:=	TARGET_ENV +=	MANSCRIPT="$(COMPONENT_TOP)/sunman-stability"
 install:=	TARGET_ENV += 	PATH="$(SRC)/tools:$(SFW_PATH)"
 install:=	TARGET_ENV += 	MAKE="$(CCSMAKE)"
+install:=	TARGET_ENV += 	LD_LIBRARY_PATH="$(ROOT)/usr/lib"
 
 #
 #  Hopefully you will not need to make changes below this point

--- a/usr/src/cmd/git/METADATA	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME:             git
-VERSION:          1.7.3.2
-DESCRIPTION:      GIT source management system
-LICENSE:          GPLv2
-PACKAGE:          SUNWgit
-PROJECT_URL:      http://git-scm.com/
-SOURCE_DOWNLOAD:  http://kernel.org/pub/software/scm/git/git-1.7.3.2.tar.bz2
-SUPPORT:          C
-BUGTRAQ:          solaris/utility/git
-OSR:              8586
-COMMENTS:         

--- a/usr/src/cmd/git/Makefile.sfw	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# ident	"@(#)Makefile.sfw	1.5	10/11/18 SMI"
-
-DESTDIR=$(ROOT)
-PREFIX=$(CFGPREFIX)
-VER=git-1.7.3.2
-
-include ../Makefile.cmd
-C99MODE=$(C99_DISABLE) 
-
-SFW_PATH="$(ROOT)/bin:/usr/ccs/bin:/usr/bin:/usr/sfw/bin:$(PATH)"
-
-MANPAGES=git-manpages-1.7.3.2
-DOC=$(VER)/Documentation
-MANDIR=$(PREFIX)/share/man
-MAN1DIR=$(MANDIR)/man1
-MAN4DIR=$(MANDIR)/man4
-MAN5DIR=$(MANDIR)/man5
-INSTALL=install
-PERL_LIB:sh = /usr/perl5/5.10.0/bin/perl -MConfig -e 'print "$Config{installvendorarch}"'
-
-
-all: $(VER)/Makefile
-	(cd $(VER)/perl; \
-	    if [ ! -f Makefile.orig ]; then \
-		cp Makefile Makefile.orig ; \
-	    fi ; \
-	    rm -f Makefile ; \
-	    sed -e 's|$$(prefix)/lib|$(PERL_LIB)|' \
-	    -e '/15009/d' \
-	    Makefile.orig > Makefile )
-	(cd $(VER); env - \
-	    PATH=$(SFW_PATH) \
-	    CC="$(CC)" \
-	    ./configure \
-		--without-openssl \
-		--prefix=$(PREFIX) \
-		--libexecdir=/usr/lib \
-		--with-perl=/usr/perl5/5.10.0/bin/perl)
-	(cd $(VER); env - \
-	    MAKE=$(GMAKE) \
-	    PATH=$(SFW_PATH) \
-	    DESTDIR=$(ROOT) \
-	    NO_PERL_MAKEMAKER=1 \
-	    V=1 \
-	    CC="$(CC)" \
-	    $(GMAKE) prefix=$(PREFIX) all)
-	@find . -name core -exec rm -f {} \;
-
-install: install-protofix
-
-install-target: all .WAIT doc
-	(cd $(VER) ; env - CHOWN=$(CHOWN) CHGRP=$(CHGRP) \
-		MAKE=$(GMAKE) DESTDIR=$(ROOT) $(GMAKE) prefix=$(PREFIX) install )
-
-# apply the file attributes from the packaging
-install-protofix: install-target
-	for pkg in $(COMPONENT_PACKAGES:sh) ; do \
-		$(SRC)/tools/protofix --pkg $$pkg --perm ; \
-	done
-
-
-$(VER)/Makefile: $(VER).tar.bz2
-	bzip2 -dc $(VER).tar.bz2 | tar xopf -
-	touch $(VER)/Makefile
-
-sunman: $(MANPAGES).tar.bz2
-	$(MKDIR) -p sunman
-	mkdir -p tmp; bzip2 -dc $(MANPAGES).tar.bz2 | (cd tmp; tar xopf -)
-	mv tmp/man1/* sunman; rmdir tmp/man1
-	mv tmp/man5/* sunman; rmdir tmp/man5
-	mv tmp/man7/* sunman; rmdir tmp/man7; rmdir tmp
-
-doc: sunman-stability sunman
-	cd sunman; for manfile in *.1; \
-	do \
-		$(SED) -f ../sunman-stability $$manfile > ../$(DOC)/$$manfile; \
-	done
-	cd sunman; for manfile in *.5; \
-	do \
-		name=`echo $$manfile | \
-		awk '{split($$1,arr,".");printf("%s",arr[1]);}'`; \
-		newman=$$name".4"; \
-		$(SED) 's/"5"/"4"/' $$manfile | \
-		$(SED) -f ../sunman-stability  > ../$(DOC)/$$newman; \
-	done
-	cd sunman; for manfile in *.7; \
-	do \
-		name=`echo $$manfile | \
-		awk '{split($$1,arr,".");printf("%s",arr[1]);}'`; \
-		newman=$$name".5"; \
-		$(SED) 's/"7"/"5"/' $$manfile | $(SED) 's/(7)/(5)/' | \
-		$(SED) -f ../sunman-stability  > ../$(DOC)/$$newman; \
-	done
-	for i in ./$(DOC)/*.1 ; \
-	do \
-		rm -f $(DESTDIR)$(MAN1DIR)/`basename $$i` ; \
-		$(INSTALL) -f $(DESTDIR)$(MAN1DIR) -m 0444 $$i ; \
-	done
-	for i in ./$(DOC)/*.4 ; \
-	do \
-		rm -f $(DESTDIR)$(MAN4DIR)/`basename $$i` ; \
-		$(INSTALL) -f $(DESTDIR)$(MAN4DIR) -m 0444 $$i ; \
-	done
-	for i in ./$(DOC)/*.5 ; \
-	do \
-		rm -f $(DESTDIR)$(MAN5DIR)/`basename $$i` ; \
-		$(INSTALL) -f $(DESTDIR)$(MAN5DIR) -m 0444 $$i ; \
-	done
-
-clean:
-	-$(RM) -r $(VER) sunman
-
-include ../Makefile.targ
-

Binary file usr/src/cmd/git/git-1.7.3.2.tar.bz2 has changed

Binary file usr/src/cmd/git/git-manpages-1.7.3.2.tar.bz2 has changed

--- a/usr/src/cmd/git/sunman-stability	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Sun update\
-.SH ATTRIBUTES\
-See\
-.BR attributes (5)\
-for descriptions of the following attributes:\
-.sp\
-.TS\
-box;\
-cbp-1 | cbp-1\
-l | l .\
-ATTRIBUTE TYPE	ATTRIBUTE VALUE\
-=\
-Availability	developer/versioning/git \
-=\
-Interface Stability	Uncommitted \
-.TE \
-.PP\
-.SH NOTES\
-Source for git is available on http://opensolaris.org.\
-\.\\" End Sun update

--- a/usr/src/cmd/gnu-gperf/METADATA	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME:             gperf
-VERSION:          3.0.3
-DESCRIPTION:      GNU gperf
-LICENSE:          GPLv2
-PACKAGE:          SUNWgnu-gperf
-PROJECT_URL:      http://www.gnu.org/software/gperf
-SOURCE_DOWNLOAD:  http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.3.tar.gz
-SUPPORT:          C
-BUGTRAQ:          solaris/utility/gperf
-OSR:              8040
-COMMENTS:         

--- a/usr/src/cmd/gnu-gperf/Makefile.sfw	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"@(#)Makefile.sfw	1.1	08/04/11 SMI"
-#
-
-VER=gperf-3.0.3
-
-all: $(VER)/config.status
-	(cd $(VER); env \
-	    CC=$(CC) \
-	    "CFLAGS=$(CFLAGS)" \
-	    LD_OPTIONS="-M $(SRC)/cmd/mapfile_noexstk" \
-	    MAKE=$(CCSMAKE) \
-	    $(MAKE))
-	@find . -name core -exec rm -f {} \;
-
-include ../Makefile.cmd
-
-install: all
-	$(SH) ./install-sfw
-
-$(VER)/config.status: $(VER)/configure
-	(cd $(VER); env \
-	    CC=$(CC) \
-	    MAKE=$(CCSMAKE) \
-	./configure --prefix=/usr)
-
-$(VER)/configure: $(VER).tar.gz
-	gzip -dc $(VER).tar.gz | tar xopf -
-	touch $(VER)/configure
-
-clean:
-	-rm -rf $(VER)
-
-include ../Makefile.targ
-
-.SUFFIXES:
-
-FRC:

Binary file usr/src/cmd/gnu-gperf/gperf-3.0.3.tar.gz has changed

--- a/usr/src/cmd/gnu-gperf/install-sfw	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#! /usr/bin/sh -e
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2008 Sun Microsystems, Inc.   All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"@(#)install-sfw	1.1	08/04/11 SMI"
-#
-
-VERS=3.0.3
-PKGVERS=gperf-${VERS}
-PREFIX=${ROOT}/usr
-BINDIR=${PREFIX}/bin
-SHAREDIR=${PREFIX}/share
-GPERFDIR=${SHAREDIR}/doc/gperf
-INFODIR=${SHAREDIR}/info
-MAN1DIR=${SHAREDIR}/man/man1
-
-cd ${PKGVERS}/doc
-
-MANSCRIPT=../../sunman-stability
-. ${SRC}/tools/install.subr
-
-_install M gperf.1 ${MAN1DIR}/gperf.1 444
-_install N gperf.html ${GPERFDIR}/gperf.html 444
-_install N gperf.info ${INFODIR}/gperf.info 444
-
-cd ../src
-
-_install E gperf ${BINDIR}/gperf 555
-
-exit 0

--- a/usr/src/cmd/gnu-gperf/sunman-stability	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Sun update\
-.SH ATTRIBUTES\
-See\
-.BR attributes (5)\
-for descriptions of the following attributes:\
-.sp\
-.TS\
-box;\
-cbp-1 | cbp-1\
-l | l .\
-ATTRIBUTE TYPE	ATTRIBUTE VALUE\
-=\
-Availability	developer/gperf\
-=\
-Interface Stability	Uncommitted\
-.TE \
-.PP\
-.SH NOTES\
-Source for gperf is available on http://opensolaris.org.\
-\.\\" End Sun update

--- a/usr/src/cmd/gnupg/Makefile.sfw	Sat Apr 23 12:09:15 2011 -0700
+++ b/usr/src/cmd/gnupg/Makefile.sfw	Sat Apr 23 14:19:34 2011 -0700
@@ -20,7 +20,7 @@
 #
 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.5	11/01/31 SMI"
+#ident	"@(#)Makefile.sfw	1.6	11/04/07 SMI"
 #
 
 include ../Makefile.cmd
@@ -35,6 +35,7 @@
 
 LDFLAGS += \
 	-L$(ROOT)/usr/lib \
+	-B direct -z defs \
 	-M $(SRC)/cmd/mapfile_noexstk
 
 LIBS=-lnsl -lsocket

--- a/usr/src/cmd/gutenprint/METADATA	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME:             gutenprint
-VERSION:          5.2.4
-DESCRIPTION:      Gutenprint printer drivers
-LICENSE:          GPLv2
-PACKAGE:          SUNWgutenprint
-PROJECT_URL:      http://www.gutenprint.org
-SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/project/gimp-print/gutenprint-5.2/5.2.4/gutenprint-5.2.4.tar.bz2
-SUPPORT:          B
-BUGTRAQ:          solaris/print/other
-OSR:              12705
-COMMENTS:         

--- a/usr/src/cmd/gutenprint/Makefile.sfw	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"@(#)Makefile.sfw	1.13	09/10/22 SMI"
-#
-
-include ../Makefile.cmd
-
-VER =		$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
-TARBALL=$(VER).tar.bz2
-
-#	configure(1) options to use
-# a default --prefix and --mandir are set in Makefile.master
-CONFIGURE_OPTIONS +=	--infodir=$(CFGINFO)
-CONFIGURE_OPTIONS +=	--enable-escputil
-CONFIGURE_OPTIONS +=	--without-gimp2
-CONFIGURE_OPTIONS +=	--enable-cups-1_2-enhancements
-CONFIGURE_OPTIONS +=	--enable-shared
-CONFIGURE_OPTIONS +=	--disable-static-genppd
-CONFIGURE_OPTIONS +=	--enable-simplified-cups-ppds
-CONFIGURE_OPTIONS +=	--without-foomatic
-CONFIGURE_OPTIONS +=	--without-foomatic3
-CONFIGURE_OPTIONS +=	--without-readline
-CONFIGURE_OPTIONS +=	--disable-static
-
-TARGET_ENV += CC="$(CC)"
-TARGET_ENV += CXX="$(CCC)"
-TARGET_ENV += CPPFLAGS="$(CPPFLAGS)"
-TARGET_ENV += LD_OPTIONS="$(LDLIBS)"
-TARGET_ENV += CUPS_CONFIG="$(ROOTBIN)/cups-config"
-TARGET_ENV += LD_LIBRARY_PATH="$(ROOTLIB):$(ROOTSFWLIB):/usr/sfw/lib"
-TARGET_ENV += localedir="$(CFGLOCALE)"
-TARGET_ENV += INSTALL="$(INSTALL_PROTO)"
-TARGET_ENV += PATH="$(SFW_PATH)"
-TARGET_ENV += MAKE=$(CCSMAKE)
-
-all:=		TARGET = all
-install:=	TARGET = install
-install:=	TARGET_ENV += INSTALL="$(INSTALL_PROTO)"
-install:=	TARGET_ENV += DESTDIR=$(ROOT)
-install:=	TARGET_ENV += MANSCRIPT=$(MANSCRIPT)
-install:=	TARGET_ENV += localedir="$(CFGLOCALE)"
-install:=	TARGET_ENV += PATH="$(SRC)/tools:$(SFW_PATH)"
-install:=	TARGET_ENV += MAKE=$(CCSMAKE)
-
-all:    $(VER)/config.status
-	(cd $(VER) ; env $(TARGET_ENV) $(CCSMAKE) $(TARGET))
-
-install:	install-protofix
-
-install-target: all
-	(cd $(VER) ; env $(TARGET_ENV) $(CCSMAKE) $(TARGET))
-	# clean up the turds
-	$(RM) $(ROOTLIB)/libgutenprint.la $(ROOTLIB)/libgutenprint.a
-	$(RM) $(ROOTLIB)/libgutenprintui2.la $(ROOTLIB)/libgutenprintui2.a
-	$(RM) $(ROOTLIB)/gutenprint/5.2/modules/*.la
-	$(RM) $(ROOT)$(CFGLOCALE)/*/gutenprint_*.po
-
-
-install-protofix:	install-target
-	# apply the file attributes from the packaging
-	for pkg in $(COMPONENT_PACKAGES:sh) ; do \
-		$(SRC)/tools/protofix --pkg $$pkg --perm ; \
-	done
-
-$(VER)/config.status:   $(VER)/.patched
-	(cd $(VER) ; env $(TARGET_ENV) ./configure $(CONFIGURE_OPTIONS))
-
-clean:
-	-rm -rf $(VER)
-
-include ../Makefile.targ

Binary file usr/src/cmd/gutenprint/gutenprint-5.2.4.tar.bz2 has changed

--- a/usr/src/cmd/gutenprint/sunman-stability	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Sun update\
-.SH ATTRIBUTES\
-See\
-.BR attributes (5)\
-for descriptions of the following attributes:\
-.sp\
-.TS\
-box;\
-cbp-1 | cbp-1\
-l | l .\
-ATTRIBUTE TYPE	ATTRIBUTE VALUE\
-=\
-Availability	print/filter/gutenprint\
-=\
-Interface Stability	Volatile\
-.TE \
-.PP\
-.SH NOTES\
-Source for gutenprint is available on http://opensolaris.org.\
-\.\\" End Sun update

--- a/usr/src/cmd/nmap/METADATA	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME:             Nmap
-VERSION:          5.21
-DESCRIPTION:      Nmap Network Scanning
-LICENSE:          GPLv2
-PACKAGE:          SUNWnmap
-PROJECT_URL:      http://insecure.org/
-SOURCE_DOWNLOAD:  http://nmap.org/dist/nmap-5.21.tar.gz
-SUPPORT:          C
-BUGTRAQ:          solaris/network/nmap
-OSR:              5863
-COMMENTS:         

--- a/usr/src/cmd/nmap/Makefile.sfw	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident	"@(#)Makefile.sfw	1.11	10/04/26 SMI"
-
-RELNUM=$(COMPONENT_VERSION:sh)
-VER=nmap-$(RELNUM)
-ARCHIVE=$(VER).tar.gz
-
-include ../Makefile.cmd
-
-PREFIX = $(ROOT)/usr
-DESTDIR = $(SRC)/cmd/nmap/proto
-INSTALL = /usr/bin/ginstall -c
-OPENSSL_ROOT = /usr
-LDFLAGS_32 = -L$(ROOT)/usr/lib 
-LD_OPTIONS = -lsocket -lresolv -lnsl -lgen -lc -lm -z ignore
-PYTHON = $(PYTHON26)
-PYTHONPATH = /usr/lib/python2.6/vendor-packages:/usr/lib/python2.6/site-packages
-PKG_CONFIG_PATH_32 = $(PREFIX)/lib/pkgconfig:/usr/lib/pkgconfig
-CFLAGS = -m32 -fPIC -O2 
-CCFLAGS = -m32 -fPIC -O2
-LDFLAGS = -L/usr/sfw/lib -R/usr/sfw/lib -lgcc_s -lstdc++ -lpcap -lcrypto -lssl -lc -lm
-CPPFLAGS += -I/usr/sfw/include
-
-CONFIGURE_OPTIONS = \
-		    --prefix=$(CFGPREFIX) \
-		    --disable-shared \
-		    --enable-static \
-		    --disable-libtool-lock \
-		    --localstatedir=/var \
-		    --without-localdirs \
-		    --with-zenmap \
-		    --with-openssl=$(OPENSSL_ROOT) \
-		    --with-libpcap=$(PREFIX) \
-		    --with-libpcre=$(PREFIX) \
-		    --with-liblua=included \
-		    --with-ncat \
-		    --with-ndiff
-
-all: $(VER)/config.status
-	(cd $(VER); env - \
-	    CC="$(GCC)" \
-	    CXX="$(GCC)" \
-	    CFLAGS="$(CFLAGS)" \
-	    CXXFLAGS="$(CCFLAGS)" \
-	    CPPFLAGS="$(CPPFLAGS)" \
-	    LDFLAGS="$(LDFLAGS_32) $(LDFLAGS)" \
-	    PKG_CONFIG_PATH="$(PKG_CONFIG_PATH_32)" \
-	    LD_OPTIONS="$(LD_OPTIONS) -M $(SRC)/cmd/mapfile_noexstk" \
-	    PYTHON="$(PYTHON)" \
-	    PYTHONPATH="$(PYTHONPATH)" \
-	    INSTALL="$(INSTALL)" \
-	    MAKEFLAGS= \
-	    MAKE=$(GMAKE) \
-	    $(GMAKE) )
-	@find . -name core -exec rm -f {} \;
-
-test: # none available
-
-install: all
-	mkdir -p $(DESTDIR)
-	( cd $(VER) ; env - \
-	    CC="$(GCC)" \
-	    CXX="$(GCC)" \
-	    CFLAGS="$(CFLAGS)" \
-	    CXXFLAGS="$(CCFLAGS)" \
-	    CPPFLAGS="$(CPPFLAGS)" \
-	    LDFLAGS="$(LDFLAGS_32) $(LDFLAGS)" \
-	    PKG_CONFIG_PATH="$(PKG_CONFIG_PATH_32)" \
-	    LD_OPTIONS="$(LD_OPTIONS) -M $(SRC)/cmd/mapfile_noexstk" \
-	    PYTHON="$(PYTHON)" \
-	    PYTHONPATH="$(PYTHONPATH)" \
-	    INSTALL="$(INSTALL)" \
-	    MAKE=$(GMAKE) \
-	    DESTDIR=$(DESTDIR) \
-	    $(GMAKE) "DESTDIR=$(DESTDIR)" "INSTALL=$(INSTALL)" install )
-	env PYTHON=$(PYTHON) INSTDIR=$(DESTDIR) VERS=$(VER) $(SHELL) ./install-nmap
-
-$(VER)/config.status: $(VER)/configure
-	(cd $(VER); env - \
-	    CC="$(GCC)" \
-	    CXX="$(GCC)" \
-	    CFLAGS="$(CFLAGS)" \
-	    CXXFLAGS="$(CCFLAGS)" \
-	    CPPFLAGS="$(CPPFLAGS)" \
-	    LDFLAGS="$(LDFLAGS_32) $(LDFLAGS)" \
-	    PKG_CONFIG_PATH="$(PKG_CONFIG_PATH_32)" \
-	    LD_OPTIONS="$(LD_OPTIONS) -M $(SRC)/cmd/mapfile_noexstk" \
-	    PYTHON="$(PYTHON)" \
-	    PYTHONPATH="$(PYTHONPATH)" \
-	    INSTALL="$(INSTALL)" \
-	    CONFIGURE_OPTIONS="$(CONFIGURE_OPTIONS)" \
-	    MAKE=$(GMAKE) \
-	    ac_cv_dnet_linux_pf_packet=no \
-	    ./configure $(CONFIGURE_OPTIONS) )
-
-$(VER)/configure: $(ARCHIVE)
-	gzip -dc $(ARCHIVE) | tar xopf -
-	( cd $(VER) ; \
-	    gpatch -p0 <../Solaris/diffs/configure.0.diff ; \
-	    gpatch -p0 <../Solaris/diffs/Makefile.in.1.diff ; \
-	    gpatch -p0 <../Solaris/diffs/Makefile.in.2.diff ; \
-	    gpatch -p0 <../Solaris/diffs/Makefile.in.3.diff ; \
-	    gpatch -p0 <../Solaris/diffs/configure.3.diff ; \
-	    gpatch -p0 <../Solaris/diffs/configure.4.diff ; \
-	    gpatch -p0 <../Solaris/diffs/Makefile.4.diff ; \
-	    gpatch -p0 <../Solaris/diffs/configure.5.diff ; \
-	    gpatch -p0 <../Solaris/diffs/configure.6.diff ; \
-	    gpatch -p0 <../Solaris/diffs/Makefile.in.7.diff ; \
-	    gpatch -p0 <../Solaris/diffs/tcpip.cc.8.diff ; \
-	    gpatch -p0 <../Solaris/diffs/intf.c.9.diff ; \
-	    gpatch -p0 <../Solaris/diffs/setup.py.11.diff ; \
-	    find . -type f -name "configure" -exec chmod 0755 {} \; -print ; \
-	    find . -type f -name "configure" -exec touch -acm {} \; -print ; \
-	    find . -type f -name "setup.py" -exec chmod 0755 {} \; -print ; \
-	    cd .. )
-
-clean:
-	-rm -rf $(VER) $(DESTDIR)
-
-include ../Makefile.targ

--- a/usr/src/cmd/nmap/Solaris/diffs/Makefile.4.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
---- liblua/Makefile	2008-05-30 18:43:43.000000000 -0700
-+++ liblua/Makefile	2010-02-23 10:35:45.182118996 -0800
-@@ -2,17 +2,17 @@
- # see ../INSTALL for installation instructions
- # see ../Makefile and luaconf.h for further customization
- 
-+SHELL = /bin/bash
-+
- # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
- 
- # Your platform. See PLATS for possible values.
- PLAT= none
- 
--CC= gcc
--CFLAGS= -O2 -Wall $(MYCFLAGS)
- AR= ar rcu
- RANLIB= ranlib
- RM= rm -f
--LIBS= -lm $(MYLIBS)
-+LIBS= -lc -lm $(MYLIBS)
- 
- MYCFLAGS=
- MYLDFLAGS=
-@@ -52,16 +52,16 @@
- 	$(RANLIB) $@
- 
- $(LUA_T): $(LUA_O) $(LUA_A)
--	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
- 
- $(LUAC_T): $(LUAC_O) $(LUA_A)
--	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
- 
- clean:
- 	$(RM) $(ALL_T) $(ALL_O)
- 
- depend:
--	@$(CC) $(CFLAGS) -MM l*.c print.c
-+	@$(CC) $(CPPFLAGS) $(CFLAGS) -MM l*.c print.c
- 
- echo:
- 	@echo "PLAT = $(PLAT)"

--- a/usr/src/cmd/nmap/Solaris/diffs/Makefile.in.1.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
---- nbase/Makefile.in	2009-03-25 05:49:32.000000000 -0700
-+++ nbase/Makefile.in	2010-02-23 10:25:33.136566614 -0800
-@@ -6,7 +6,7 @@
- srcdir = @srcdir@
- 
- CC = @CC@
--AR = ar
-+CXX = @CXX@
- RANLIB = @RANLIB@
- CCOPT = 
- DEFS = @DEFS@
-@@ -14,12 +14,14 @@
- DEFS += -D_FORTIFY_SOURCE=2
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
-+CXXFLAGS = @CXXFLAGS@
- STATIC = 
- LDFLAGS = @LDFLAGS@ $(STATIC)
- LIBS =  @LIBS@ 
- SHTOOL = ./shtool
- INSTALL = $(SHTOOL) install 
- MAKEDEPEND = @MAKEDEPEND@
-+AR = /usr/ccs/bin/ar cq
- 
- TARGET = libnbase.a
- 
-@@ -30,7 +32,7 @@
- 
- $(TARGET): $(DEPS) $(OBJS)
- 	rm -f $@
--	$(AR) cr $@ $(OBJS)
-+	$(AR) $@ $(OBJS)
- 	$(RANLIB) $@
- 
- clean:
-@@ -51,8 +53,10 @@
- config.status: configure
- 	./config.status --recheck
- 
-+.c.o:
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
- .cc.o:
--	$(CC) -c $(CFLAGS) $*.cc
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< o $@
- 
- # DO NOT DELETE -- Needed by makedepend
- 

--- a/usr/src/cmd/nmap/Solaris/diffs/Makefile.in.2.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
---- nsock/src/Makefile.in	2009-08-07 10:53:50.000000000 -0700
-+++ nsock/src/Makefile.in	2010-02-23 11:27:25.487769258 -0800
-@@ -43,11 +43,11 @@
- 	$(AR) cr $@ $(OBJS)
- 	$(RANLIB) $@
- 
--$(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile
-+$(NBASEDIR)/libnbase.a:
- 	cd $(NBASEDIR) && $(MAKE)
- 
- clean:
--	rm -f $(OBJS) $(TARGET) makefile.dep
-+	rm -f $(OBJS) $(TARGET)
- 
- distclean: clean
- 	rm -f Makefile config.log config.status nsock_config.h
-@@ -75,6 +75,3 @@
- config.status: configure
- 	./config.status --recheck
- 
--makefile.dep:
--	$(CC) -MM $(CPPFLAGS) $(SRCS) > $@
--include makefile.dep

--- a/usr/src/cmd/nmap/Solaris/diffs/Makefile.in.3.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
---- ncat/Makefile.in	2010-01-11 11:41:56.000000000 -0800
-+++ ncat/Makefile.in	2010-03-12 08:44:44.631386263 -0800
-@@ -120,11 +120,11 @@
- 
- .PHONY: uninstall all clean distclean
- 
--$(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile
-+$(NBASEDIR)/libnbase.a:
- 	@echo Compiling libnbase;
- 	cd $(NBASEDIR) && $(MAKE)
- 
--$(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Makefile
-+$(NSOCKDIR)/libnsock.a:
- 	@echo Compiling libnsock;
- 	cd $(NSOCKDIR) && $(MAKE)
- 
-@@ -161,6 +161,6 @@
- .NOEXPORT:
- 
- makefile.dep:
--	$(CC) -MM $(CPPFLAGS) $(SRCS) > $@
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -MM $(SRCS) > $@
- include makefile.dep
- 

--- a/usr/src/cmd/nmap/Solaris/diffs/Makefile.in.7.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
---- Makefile.in	2009-12-12 12:26:15.000000000 -0800
-+++ Makefile.in	2010-02-23 11:34:57.694961587 -0800
-@@ -1,7 +1,9 @@
-+SHELL = /bin/bash
- # Extract the version string from nmap.h.
- export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
-+export TOPDIR=$(shell pwd)
- NMAP_NAME= Nmap
--NMAP_URL= http://nmap.org
-+NMAP_URL= http://nmap.org/
- NMAP_PLATFORM=@host@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-@@ -13,12 +15,12 @@
- deskdir = $(prefix)/share/applications
- NMAPDEVDIR=~/nmap-private-dev
- 
--export NBASEDIR=@NBASEDIR@
--export NSOCKDIR=@NSOCKDIR@
--export LIBLUADIR = @LIBLUADIR@
-+export NBASEDIR=$(TOPDIR)/@NBASEDIR@
-+export NSOCKDIR=$(TOPDIR)/@NSOCKDIR@
-+export LIBLUADIR=$(TOPDIR)/@LIBLUADIR@
- export NDIR=$(shell pwd)
--export LIBLUA_LIBS = @LIBLUA_LIBS@
--export NCATDIR=@NCATDIR@
-+export LIBLUA_LIBS=$(TOPDIR)/@LIBLUA_LIBS@
-+export NCATDIR=$(TOPDIR)/@NCATDIR@
- CC = @CC@
- CXX = @CXX@
- CCOPT = 
-@@ -26,9 +28,9 @@
- STRIP = @STRIP@
- LIBPCAPDIR = @libpcapdir@
- LIBPCREDIR = @LIBPCREDIR@
--export LIBDNETDIR = @LIBDNETDIR@
--ZENMAPDIR = zenmap
--NDIFFDIR = ndiff
-+export LIBDNETDIR=$(TOPDIR)/@LIBDNETDIR@
-+ZENMAPDIR=$(TOPDIR)/zenmap
-+NDIFFDIR=$(TOPDIR)/ndiff
- PYTHON = @PYTHON@
- DEFS = @DEFS@ -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
- # With GCC, add extra security checks to source code.
-@@ -39,13 +41,13 @@
- # For mtrace debugging -- see MTRACE define in main.cc for instructions
- # Should only be enabled during debugging and not in any real release.
- # DEFS += -DMTRACE=1
--CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS)
-+export CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS) $(INCLS)
-+export CFLAGS = @CFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS) $(INCLS)
- CPPFLAGS = @CPPFLAGS@
--export CFLAGS = $(CXXFLAGS)
- # CFLAGS = $(DEFS) $(INCLS)
- STATIC =
--LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC)
--LIBS =  @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_LIBS@ @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBS@ 
-+LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC) -z ignore
-+LIBS =  @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_LIBS@ @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBS@ -lsocket -lnsl -lgen
- # LIBS =  -lefence @LIBS@
- # LIBS =  -lrmalloc @LIBS@
- INSTALL = @INSTALL@
-@@ -95,7 +97,10 @@
- 
- # %.o : %.cc -- nope this is a GNU extension
- .cc.o:
--	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
-+
-+.c.o:
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
- 
- all: @LUA_BUILD@ @PCAP_BUILD@ @PCRE_BUILD@ @DNET_BUILD@ @NBASE_BUILD@ @NSOCK_BUILD@ @NCAT_BUILD@
- 	$(MAKE) $(TARGET) $(BUILDZENMAP) $(BUILDNDIFF)
-@@ -103,7 +108,7 @@
- $(TARGET): @LUA_DEPENDS@ @PCAP_DEPENDS@ @PCRE_DEPENDS@ @DNET_DEPENDS@ $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a $(OBJS)
- 	@echo Compiling nmap
- 	rm -f $@
--	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- 
- pcre_build: $(LIBPCREDIR)/Makefile
- 	@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
-@@ -207,7 +212,9 @@
- 	         config.cache config.log config.status
- 
- install-nmap: $(TARGET)
--	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
-+	$(INSTALL) -d $(DESTDIR)$(bindir)
-+	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
-+	$(INSTALL) -d $(DESTDIR)$(nmapdatadir)
- 	$(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
- # Use strip -x to avoid stripping dynamically loaded NSE functions. See
- # http://seclists.org/nmap-dev/2007/q4/0272.html.
-@@ -252,6 +259,8 @@
- 	cd $(ZENMAPDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
- 
- install-zenmap: $(ZENMAPDIR)/setup.py
-+	$(INSTALL) -d $(DESTDIR)$(bindir)
-+	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
- 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
- 	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
- 	$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
-@@ -337,7 +346,7 @@
- 	./config.status --recheck
- 
- makefile.dep:
--	$(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM $(CPPFLAGS) $(SRCS) | grep -v '/usr/gnu' | grep -v '/usr/include' | grep -v '/usr/sfw' | nawk 'NR>1 { if ($$0 ~ /^.*\.o:/ && line ~ /\\$$/ ) sub(/ \\$$/, "", line); print line }  { line = $$0 } END { sub(/ \\$$/, "", line); print line }' > $@
- include makefile.dep
- 
- # These the old names of scripts that have been renamed or deleted. Any

--- a/usr/src/cmd/nmap/Solaris/diffs/configure.0.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
---- nbase/configure	2009-08-13 14:54:55.000000000 -0700
-+++ nbase/configure	2010-02-23 11:03:32.469676825 -0800
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63.
- #
-@@ -10,6 +10,8 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
-+export LD_OPTIONS="-lsocket -lresolv -lnsl -lgen -z ignore"
-+
- # Be more Bourne compatible
- DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -589,7 +591,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME=
-@@ -657,7 +659,9 @@
- CPPFLAGS
- LDFLAGS
- CFLAGS
-+CXXFLAGS
- CC
-+CXX
- target_alias
- host_alias
- build_alias
-@@ -706,7 +710,9 @@
- host_alias
- target_alias
- CC
-+CXX
- CFLAGS
-+CXXFLAGS
- LDFLAGS
- LIBS
- CPPFLAGS
-@@ -748,7 +754,7 @@
- datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir='/var'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE}'
-@@ -3916,6 +3922,10 @@
- 
- 	#include <stdlib.h>
- 
-+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+#error "GNU __attribute__ extension not suported "
-+#endif
-+
- 	static void foo(void) __attribute__ ((noreturn));
- 
- 	static void

--- a/usr/src/cmd/nmap/Solaris/diffs/configure.3.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
---- libdnet-stripped/configure	2010-01-14 08:47:28.000000000 -0800
-+++ libdnet-stripped/configure	2010-03-09 20:33:25.547953751 -0800
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63.
- #
-@@ -10,6 +10,8 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
-+export LD_OPTIONS="-lsocket -lresolv -lnsl -lgen -z ignore"
-+
- # Be more Bourne compatible
- DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -573,7 +575,7 @@
- 
- 
- # Check that we are running under the correct shell.
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- case X$lt_ECHO in
- X*--fallback-echo)
-@@ -657,7 +659,7 @@
-       elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- 	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-         # If we have ksh, try running configure again with it.
--        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/bash}
-         export ORIGINAL_CONFIG_SHELL
-         CONFIG_SHELL=/bin/ksh
-         export CONFIG_SHELL
-@@ -699,7 +701,7 @@
- 	  if test "$prev" != 'sed 50q "$0"'; then
- 	    echo_test_string=`eval $prev`
- 	    export echo_test_string
--	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"$@"}
- 	  else
- 	    # Oops.  We lost completely, so just stick with echo.
- 	    ECHO=echo
-@@ -738,7 +740,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME=
-@@ -2318,7 +2320,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
--SHELL = /bin/sh
-+SHELL = /bin/bash
- all:
- 	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
-@@ -3298,7 +3300,7 @@
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-    ac_cv_prog_cc_g=no
--   CFLAGS="-g"
-+   CFLAGS="$CFLAGS"
-    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -3337,7 +3339,7 @@
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	CFLAGS=""
-+	CFLAGS="$CFLAGS"
-       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -3377,7 +3379,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_c_werror_flag=$ac_save_c_werror_flag
--	 CFLAGS="-g"
-+	 CFLAGS="$CFLAGS"
- 	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -3434,15 +3436,15 @@
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
-+    CFLAGS="$CFLAGS"
-   else
--    CFLAGS="-g"
-+    CFLAGS="$CFLAGS"
-   fi
- else
-   if test "$GCC" = yes; then
--    CFLAGS="-O2"
-+    CFLAGS="$CFLAGS"
-   else
--    CFLAGS=
-+    CFLAGS="$CFLAGS"
-   fi
- fi
- { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-@@ -3671,7 +3673,7 @@
-     for i in 1 2 3 4 5 6; do
-       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-       # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--      # Solaris 8's {/usr,}/bin/sh.
-+      # Solaris 8's {/usr,}/bin/bash.
-       touch sub/conftst$i.h
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -4576,7 +4578,7 @@
-       for i in 1 2 3 4 5 6 7 8 ; do
-         teststring=$teststring$teststring
-       done
--      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+      SHELL=${SHELL-${CONFIG_SHELL-/bin/bash}}
-       # If test is not a shell built-in, we'll probably end up computing a
-       # maximum length that is only half of the actual maximum length, but
-       # we can't tell.
-@@ -12025,13 +12027,13 @@
- 
-     # DLPI needs putmsg under HPUX so test for -lstr while we're at it
- 
--{ $as_echo "$as_me:$LINENO: checking for putmsg in -lstr" >&5
--$as_echo_n "checking for putmsg in -lstr... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for putmsg in -lc" >&5
-+$as_echo_n "checking for putmsg in -lc... " >&6; }
- if test "${ac_cv_lib_str_putmsg+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lstr  $LIBS"
-+LIBS=" -lc -lsocket -lresolv -lnsl -lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -12039,13 +12041,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char putmsg ();
-+#include <stropts.h>
-+#include <sys/types.h>
-+#include <net/if.h>
-+#include <sys/socket.h>
-+#include <sys/filio.h>
-+
- int
- main ()
- {
-@@ -12095,7 +12096,7 @@
- #define HAVE_LIBSTR 1
- _ACEOF
- 
--  LIBS="-lstr $LIBS"
-+  LIBS=" -lc -lsocket -lresolv -lnsl -lgen $LIBS"
- 
- fi
- 
-@@ -14380,15 +14381,8 @@
-     fi
- 	{ $as_echo "$as_me:$LINENO: checking for Linux PF_PACKET sockets" >&5
- $as_echo_n "checking for Linux PF_PACKET sockets... " >&6; }
--    if test "${ac_cv_dnet_linux_pf_packet+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  if test -f /usr/include/netpacket/packet.h ; then
--	    ac_cv_dnet_linux_pf_packet=yes
--	else
-+
- 	    ac_cv_dnet_linux_pf_packet=no
--	fi
--fi
- 
-     { $as_echo "$as_me:$LINENO: result: $ac_cv_dnet_linux_pf_packet" >&5
- $as_echo "$ac_cv_dnet_linux_pf_packet" >&6; }

--- a/usr/src/cmd/nmap/Solaris/diffs/configure.4.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- ncat/configure	2010-01-11 11:41:56.000000000 -0800
-+++ ncat/configure	2010-02-24 08:57:30.573120275 -0800
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63.
- #
-@@ -589,7 +589,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME=

--- a/usr/src/cmd/nmap/Solaris/diffs/configure.5.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- nsock/src/configure	2009-08-07 11:18:16.000000000 -0700
-+++ nsock/src/configure	2010-02-23 10:21:43.319013652 -0800
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63.
- #
-@@ -10,6 +10,8 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
-+export LD_OPTIONS="-lsocket -lresolv -lnsl -lgen -z ignore"
-+
- # Be more Bourne compatible
- DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -589,7 +591,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME=
-@@ -751,7 +753,7 @@
- datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir='/var'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE}'

--- a/usr/src/cmd/nmap/Solaris/diffs/configure.6.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
---- configure	2009-11-05 11:50:33.000000000 -0800
-+++ configure	2010-02-23 11:01:24.667473081 -0800
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63.
- #
-@@ -10,6 +10,8 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
-+export LD_OPTIONS="-lsocket -lresolv -lnsl -lgen -z ignore"
-+
- # Be more Bourne compatible
- DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -589,7 +591,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- # Identity of this package.
- PACKAGE_NAME=
-@@ -832,7 +834,7 @@
- datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir='/var'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE}'
-@@ -1939,7 +1941,7 @@
-      fi
-    if test -d /usr/local/include; then
-      CFLAGS="$CFLAGS -I/usr/local/include"
--     CXXFLAGS="$CFLAGS -I/usr/local/include"
-+     CXXFLAGS="$CXXFLAGS -I/usr/local/include"
-    fi
- fi
- 
-@@ -3973,7 +3975,7 @@
-   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-    ac_cxx_werror_flag=yes
-    ac_cv_prog_cxx_g=no
--   CXXFLAGS="-g"
-+   CXXFLAGS="$CXXFLAGS"
-    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -4012,7 +4014,7 @@
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	CXXFLAGS=""
-+	CXXFLAGS="$CXXFLAGS"
-       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -4052,7 +4054,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
--	 CXXFLAGS="-g"
-+	 CXXFLAGS="$CXXFLAGS"
- 	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -4109,15 +4111,15 @@
-   CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
-   if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
-+    CXXFLAGS="$CXXFLAGS"
-   else
--    CXXFLAGS="-g"
-+    CXXFLAGS="$CXXFLAGS"
-   fi
- else
-   if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
-+    CXXFLAGS="$CXXFLAGS"
-   else
--    CXXFLAGS=
-+    CXXFLAGS="$CXXFLAGS"
-   fi
- fi
- ac_ext=c
-@@ -4223,7 +4225,7 @@
- if test -n "$GXX"; then
-   # -fno-strict-aliasing disables strict-aliasing optimizations that assume
-   # that pointers of different types never point to the same object.
--  CXXFLAGS="$CXXFLAGS -Wall -fno-strict-aliasing"
-+  CXXFLAGS="$CXXFLAGS"
- fi
- 
- # Remember that all following tests will run with this CXXFLAGS by default
-@@ -6024,8 +6026,7 @@
-      else
-        am_py_prefix=$prefix
-      fi
--     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
--     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+     am_cv_python_pythondir="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"
-      case $am_cv_python_pythondir in
-      $am_py_prefix*)
-        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-@@ -6054,8 +6055,7 @@
-      else
-        am_py_exec_prefix=$exec_prefix
-      fi
--     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
--     echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+     am_cv_python_pyexecdir="$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"
-      case $am_cv_python_pyexecdir in
-      $am_py_exec_prefix*)
-        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
-@@ -6723,7 +6723,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <pcap.h>
-+#include <pcap/pcap.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
-@@ -6764,7 +6764,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <pcap.h>
-+#include <pcap/pcap.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- case "(($ac_try" in

--- a/usr/src/cmd/nmap/Solaris/diffs/intf.c.9.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- libdnet-stripped/src/intf.c	2009-08-06 17:11:57.000000000 -0700
-+++ libdnet-stripped/src/intf.c	2010-03-09 20:32:28.207885025 -0800
-@@ -323,7 +323,7 @@
- 	/* Set link-level address. */
- 	if (entry->intf_link_addr.addr_type == ADDR_TYPE_ETH &&
- 	    addr_cmp(&entry->intf_link_addr, &orig->intf_link_addr) != 0) {
--#if defined(SIOCSIFHWADDR)
-+#if defined(SIOCSIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun))
- 		if (addr_ntos(&entry->intf_link_addr, &ifr.ifr_hwaddr) < 0)
- 			return (-1);
- 		if (ioctl(intf->fd, SIOCSIFHWADDR, &ifr) < 0)

--- a/usr/src/cmd/nmap/Solaris/diffs/setup.py.11.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- zenmap/setup.py	2010-01-26 16:57:31.000000000 -0800
-+++ zenmap/setup.py	2010-02-24 10:12:10.652841785 -0800
-@@ -324,7 +324,6 @@
-             if not re_sys.match(line):
-                 break
-             uline += 1
--        ucontent.insert(uline, "\nimport sys\nsys.path.append(%s)\n" % repr(modules))
- 
-         ufile = open(app_file_name, "w")
-         ufile.writelines(ucontent)

--- a/usr/src/cmd/nmap/Solaris/diffs/tcpip.cc.8.diff	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- tcpip.cc	2010-01-14 19:55:23.000000000 -0800
-+++ tcpip.cc	2010-03-09 20:30:38.315876272 -0800
-@@ -3124,7 +3124,7 @@
-       devs[count].device_type = devt_ethernet;
- 
-       /* If the device type is ethernet, get the MAC address. */
--#ifdef SIOCGIFHWADDR
-+#if defined(SIOCGIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun__))
-       memcpy(&tmpifr.ifr_addr, sin, MIN(sizeof(tmpifr.ifr_addr), sizeof(*sin)));
-       rc = ioctl(sd, SIOCGIFHWADDR, &tmpifr);
-       if (rc < 0 && errno != EADDRNOTAVAIL)

--- a/usr/src/cmd/nmap/install-nmap	Sat Apr 23 12:09:15 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-#!/bin/bash
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# ident	"@(#)install-nmap	1.5	10/04/26 SMI"
-#
-
-PREFIX=${ROOT}/usr
-BINDIR=${PREFIX}/bin
-PYTHONLIBDIR=${PREFIX}/lib/python2.6/vendor-packages
-SHAREDIR=${PREFIX}/share
-LOCALEDIR=${SHAREDIR}/locale
-MAN1DIR=${SHAREDIR}/man/man1
-NMAPDIR=${SHAREDIR}/nmap
-APPDIR=${SHAREDIR}/applications
-PIXDIR=${SHAREDIR}/pixmaps
-NEWRUNPATH="/usr/lib/mps:/usr/sfw/lib:/usr/lib"
-TOP="`pwd`"
-
-MANSCRIPT=${SRC}/cmd/nmap/sunman-stability
-
-. ${SRC}/tools/install.subr
-
-cd ${SHAREDIR}/nmap
-find . -type f -exec chmod 0644 {} \; -print > /dev/null 2>&1
-
-cd ${SHAREDIR}/zenmap
-find . -type f -exec chmod 0644 {} \; -print > /dev/null 2>&1
-
-cd ${APPDIR}
-for file in \
-    zenmap-root.desktop \
-    zenmap.desktop
-do
-    if [ -f ${file} ] ; then
-	chmod 0644 ${file}
-    fi
-done
-
-cd ${INSTDIR}/usr/bin
-for file in \
-    ncat \
-    nmap
-do
-    /usr/ccs/bin/strip ${file}
-    /usr/ccs/bin/mcs -d ${file}
-    _install E ${file} ${BINDIR}/${file} 0755
-    /usr/bin/elfedit -e "dyn:runpath ${NEWRUNPATH}" ${BINDIR}/${file}
-    chmod 0755 ${BINDIR}/${file}
-done
-
-_install P ndiff ${BINDIR}/ndiff 0755
-_install P zenmap ${BINDIR}/zenmap 0755
-
-cd ${BINDIR}
-_install L zenmap nmapfe
-_install L zenmap xnmap
-
-cd ${INSTDIR}/usr/lib/python2.6/site-packages
-for d in `find radialnet zenmapCore zenmapGUI -type d` ; do
-    mkdir -p ${PYTHONLIBDIR}/${d}
-done
-for f in `find radialnet zenmapCore zenmapGUI -type f` ; do
-    _install P ${f} ${PYTHONLIBDIR}/${f} 0644
-done
-
-cd ${INSTDIR}/usr/share/applications
-for file in \
-    zenmap-root.desktop \
-    zenmap.desktop
-do
-    _install N ${file} ${APPDIR}/${file} 0444
-done
-
-cd ${INSTDIR}/usr/share
-for d in \
-    ncat \
-    nmap \
-    zenmap
-do
-    /usr/bin/cp -rP ${d} ${SHAREDIR}
-done
-
-cd ${TOP}
-
-for l in \
-    fr \
-    hr \
-    pt_BR \
-    de \
-    ru
-do
-    _install N ${INSTDIR}/usr/share/zenmap/locale/${l}/LC_MESSAGES/zenmap.mo ${LOCALEDIR}/${l}/LC_MESSAGES/zenmap.mo 0644
-done
-
-rm -rf ${SHAREDIR}/zenmap/locale
-
-cd ${INSTDIR}/usr/share/man/man1
-_install M nmap.1 ${MAN1DIR}/nmap.1 444
-_install M ncat.1 ${MAN1DIR}/ncat.1 444
-_install M ndiff.1 ${MAN1DIR}/ndiff.1 444
-_install M zenmap.1 ${MAN1DIR}/zenmap.1 444
-
-cd ${SHAREDIR}/nmap
-find . -type f -exec chmod 0444 {} \; -print > /dev/null 2>&1
-
-cd ${SHAREDIR}/zenmap
-find . -type f -exec chmod 0444 {} \; -print > /dev/null 2>&1
-chmod 0755 su-to-zenmap.sh
-
-_install N ${SRC}/cmd/nmap/nmapfe.png ${PIXDIR}/nmapfe.png 0444
-_install N ${SRC}/cmd/nmap/nmapfe.desktop ${APPDIR}/nmapfe.desktop 0444
-
-cd ${MAN1DIR}
-ln -sf zenmap.1 xnmap.1
-ln -sf zenmap.1 nmapfe.1
-
-cd ${TOP}
-
-exit 0
-