--- a/components/wget/Makefile	Wed Aug 05 10:48:38 2015 -0700
+++ b/components/wget/Makefile	Fri Jun 05 05:22:16 2015 -0700
@@ -23,21 +23,30 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wget
-COMPONENT_VERSION=	1.16
+COMPONENT_VERSION=	1.16.3
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/wget/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:9261dd090a17687b6dc0682a257e90a926def15624b650e8f799af57e5c8b0e7
+    sha256:67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37	
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/wget/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/wget
 
-TPNO=			19782
+TPNO=			22235	
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+# Keep just the final test report
+COMPONENT_TEST_TRANSFORMS += '-ne "/^PASS/p" '
+COMPONENT_TEST_TRANSFORMS += '-ne "/^FAIL/p" '
+COMPONENT_TEST_TRANSFORMS += '-ne "/^===/p" '
+COMPONENT_TEST_TRANSFORMS += '-ne "/^\# /p" '
+COMPONENT_TEST_TRANSFORMS += '-ne "/^Testsuite/p" '
+COMPONENT_TEST_TRANSFORMS += '-ne "/^See/p" '
+COMPONENT_TEST_TRANSFORMS += '-ne "/^Please/p" '
+
 # Enforce wget binary to standard path
 CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
 
@@ -89,6 +98,7 @@
 
 
 REQUIRED_PACKAGES += library/libidn
+REQUIRED_PACKAGES += library/pcre
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += system/library

--- a/components/wget/patches/wgetrc.patch	Wed Aug 05 10:48:38 2015 -0700
+++ b/components/wget/patches/wgetrc.patch	Fri Jun 05 05:22:16 2015 -0700
@@ -1,15 +1,21 @@
---- wget-1.12/doc/sample.wgetrc.orig	Mon Sep 21 19:53:58 2009
-+++ wget-1.12/doc/sample.wgetrc	Wed Sep 30 07:42:08 2009
-@@ -7,7 +7,7 @@
- ## not contain a comprehensive list of commands -- look at the manual
- ## to find out what you can put into this file.
+Default location of wgetrc is in /usr/local/etc. However, we configure
+wget with option --sysconfdir=/etc, so the default location of wgetrc is
+in /etc. sample.wgetrc, sample.wgetrc.munged_for_texi_inclusion and 
+wget.texi shall be updated with this change. As this is Solaris specific
+patch it will not be pushed upstream.
+
+--- wget-1.16.3/doc/sample.wgetrc.orig	Fri Jun  5 07:33:36 2015
++++ wget-1.16.3/doc/sample.wgetrc	Fri Jun  5 07:36:22 2015
+@@ -10,7 +10,7 @@
+ ## Or online here:
+ ##   https://www.gnu.org/software/wget/manual/wget.html#Startup-File
  ##
 -## Wget initialization file can reside in /usr/local/etc/wgetrc
 +## Wget initialization file can reside in /etc/wgetrc
  ## (global, for all users) or $HOME/.wgetrc (for a single user).
  ##
  ## To use the settings in this file, you will have to uncomment them,
-@@ -16,7 +16,7 @@
+@@ -22,7 +22,7 @@
  
  
  ##
@@ -18,8 +24,8 @@
  ## Think well before you change them, since they may reduce wget's
  ## functionality, and make it behave contrary to the documentation:
  ##
---- wget-1.14/doc/wget.texi	Sat Aug  4 01:41:52 2012
-+++ wget-1.14/doc/wget.texi	Thu Feb  7 02:34:48 2013
+--- wget-1.16.3/doc/wget.texi.orig	Fri Jun  5 08:00:14 2015
++++ wget-1.16.3/doc/wget.texi	Fri Jun  5 08:07:16 2015
 @@ -190,7 +190,7 @@
  Most of the features are fully configurable, either through command line
  options, or via the initialization file @file{.wgetrc} (@pxref{Startup
@@ -38,18 +44,17 @@
  Default location of the @dfn{global} startup file.
  
  @item .wgetrc
-@@ -2746,8 +2746,8 @@
+@@ -2872,8 +2872,7 @@
  @cindex location of wgetrc
  
  When initializing, Wget will look for a @dfn{global} startup file,
 -@file{/usr/local/etc/wgetrc} by default (or some prefix other than
 -@file{/usr/local}, if Wget was not installed there) and read commands
-+@file{/etc/wgetrc} by default
-+and read commands
++@file{/etc/wgetrc} by default and read commands
  from there, if it exists.
  
  Then it will look for the user's file.  If the environmental variable
-@@ -2758,7 +2758,7 @@
+@@ -2884,7 +2883,7 @@
  
  The fact that user's settings are loaded after the system-wide ones
  means that in case of collision user's wgetrc @emph{overrides} the
@@ -58,3 +63,23 @@
  Fascist admins, away!
  
  @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File
+--- wget-1.16.3/doc/sample.wgetrc.munged_for_texi_inclusion.orig	Mon Jun  8 07:16:15 2015
++++ wget-1.16.3/doc/sample.wgetrc.munged_for_texi_inclusion	Mon Jun  8 07:18:17 2015
+@@ -10,7 +10,7 @@
+ ## Or online here:
+ ##   https://www.gnu.org/software/wget/manual/wget.html#Startup-File
+ ##
+-## Wget initialization file can reside in /usr/local/etc/wgetrc
++## Wget initialization file can reside in /etc/wgetrc
+ ## (global, for all users) or $HOME/.wgetrc (for a single user).
+ ##
+ ## To use the settings in this file, you will have to uncomment them,
+@@ -22,7 +22,7 @@
+ 
+ 
+ ##
+-## Global settings (useful for setting up in /usr/local/etc/wgetrc).
++## Global settings (useful for setting up in /etc/wgetrc).
+ ## Think well before you change them, since they may reduce wget's
+ ## functionality, and make it behave contrary to the documentation:
+ ##

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/wget/test/results-64.master	Fri Jun 05 05:22:16 2015 -0700
@@ -0,0 +1,98 @@
+PASS: ./unit-tests
+FAIL: Test-auth-basic.px
+FAIL: Test-auth-no-challenge.px
+FAIL: Test-auth-no-challenge-url.px
+FAIL: Test-auth-with-content-disposition.px
+FAIL: Test-auth-retcode.px
+FAIL: Test-c-full.px
+FAIL: Test-c-partial.px
+FAIL: Test-c.px
+FAIL: Test-c-shorter.px
+FAIL: Test-cookies.px
+FAIL: Test-cookies-401.px
+FAIL: Test-E-k-K.px
+FAIL: Test-E-k.px
+PASS: Test-ftp.px
+PASS: Test-ftp-pasv-fail.px
+PASS: Test-ftp-bad-list.px
+PASS: Test-ftp-recursive.px
+PASS: Test-ftp-iri.px
+PASS: Test-ftp-iri-fallback.px
+PASS: Test-ftp-iri-recursive.px
+PASS: Test-ftp-iri-disabled.px
+PASS: Test-ftp-list-Multinet.px
+PASS: Test-ftp-list-Unknown.px
+PASS: Test-ftp-list-Unknown-a.px
+PASS: Test-ftp-list-Unknown-hidden.px
+PASS: Test-ftp-list-Unknown-list-a-fails.px
+PASS: Test-ftp-list-UNIX-hidden.px
+PASS: Test-ftp--start-pos.px
+FAIL: Test-HTTP-Content-Disposition-1.px
+FAIL: Test-HTTP-Content-Disposition-2.px
+FAIL: Test-HTTP-Content-Disposition.px
+PASS: Test-i-ftp.px
+FAIL: Test-i-http.px
+FAIL: Test-idn-headers.px
+FAIL: Test-idn-meta.px
+FAIL: Test-idn-cmd.px
+FAIL: Test-idn-cmd-utf8.px
+FAIL: Test-idn-robots.px
+FAIL: Test-idn-robots-utf8.px
+FAIL: Test-iri.px
+FAIL: Test-iri-percent.px
+FAIL: Test-iri-disabled.px
+FAIL: Test-iri-forced-remote.px
+FAIL: Test-iri-list.px
+FAIL: Test-k.px
+FAIL: Test-meta-robots.px
+FAIL: Test-N-current.px
+FAIL: Test-N-HTTP-Content-Disposition.px
+FAIL: Test-N--no-content-disposition.px
+FAIL: Test-N--no-content-disposition-trivial.px
+FAIL: Test-N-no-info.px
+FAIL: Test--no-content-disposition.px
+FAIL: Test--no-content-disposition-trivial.px
+FAIL: Test-N-old.px
+FAIL: Test-nonexisting-quiet.px
+FAIL: Test-noop.px
+FAIL: Test-np.px
+FAIL: Test-N.px
+FAIL: Test-N-smaller.px
+FAIL: Test-O-HTTP-Content-Disposition.px
+FAIL: Test-O-nc.px
+FAIL: Test-O--no-content-disposition.px
+FAIL: Test-O--no-content-disposition-trivial.px
+FAIL: Test-O-nonexisting.px
+FAIL: Test-O.px
+FAIL: Test--post-file.px
+FAIL: Test-proxied-https-auth.px
+FAIL: Test-proxied-https-auth-keepalive.px
+FAIL: Test-proxy-auth-basic.px
+FAIL: Test-restrict-ascii.px
+FAIL: Test-Restrict-Lowercase.px
+FAIL: Test-Restrict-Uppercase.px
+FAIL: Test-stdouterr.px
+FAIL: Test--spider-fail.px
+FAIL: Test--spider.px
+FAIL: Test--spider-r-HTTP-Content-Disposition.px
+FAIL: Test--spider-r--no-content-disposition.px
+FAIL: Test--spider-r--no-content-disposition-trivial.px
+FAIL: Test--spider-r.px
+FAIL: Test--start-pos.px
+FAIL: Test--start-pos--continue.px
+FAIL: Test--httpsonly-r.px
+FAIL: Test-204.px
+============================================================================
+Testsuite summary for wget 1.16.3
+============================================================================
+# TOTAL: 84
+# PASS:  17
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  67
+# XPASS: 0
+# ERROR: 0
+============================================================================
+See tests/test-suite.log
+Please report to [email protected]
+============================================================================

--- a/components/wget/wget.license	Wed Aug 05 10:48:38 2015 -0700
+++ b/components/wget/wget.license	Fri Jun 05 05:22:16 2015 -0700
@@ -676,15 +676,14 @@
 =============================================================================
 
                 GNU Free Documentation License
-                  Version 1.2, November 2002
+                 Version 1.3, 3 November 2008
 
 
- Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+     <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-
 0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other
@@ -727,11 +726,11 @@
 
 A "Secondary Section" is a named appendix or a front-matter section of
 the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (Thus, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject.  (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.)  The relationship could be a matter of historical
 connection with the subject or with related matters, or of legal,
 commercial, philosophical, ethical or political position regarding
 them.
@@ -780,6 +779,9 @@
 the text near the most prominent appearance of the work's title,
 preceding the beginning of the body of the text.
 
+The "publisher" means any person or entity that distributes copies of
+the Document to the public.
+
 A section "Entitled XYZ" means a named subunit of the Document whose
 title either is precisely XYZ or contains XYZ in parentheses following
 text that translates XYZ in another language.  (Here XYZ stands for a
@@ -795,14 +797,13 @@
 implication that these Warranty Disclaimers may have is void and has
 no effect on the meaning of this License.
 
-
 2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either
 commercially or noncommercially, provided that this License, the
 copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
+to the Document are reproduced in all copies, and that you add no
+other conditions whatsoever to those of this License.  You may not use
 technical measures to obstruct or control the reading or further
 copying of the copies you make or distribute.  However, you may accept
 compensation in exchange for copies.  If you distribute a large enough
@@ -846,8 +847,9 @@
 edition to the public.
 
 It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
+Document well before redistributing any large number of copies, to
+give them a chance to provide you with an updated version of the
+Document.
 
 
 4. MODIFICATIONS
@@ -962,16 +964,18 @@
 
 6. COLLECTIONS OF DOCUMENTS
 
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
+You may make a collection consisting of the Document and other
+documents released under this License, and replace the individual
+copies of this License in the various documents with a single copy
+that is included in the collection, provided that you follow the rules
+of this License for verbatim copying of each of the documents in all
+other respects.
 
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
+You may extract a single document from such a collection, and
+distribute it individually under this License, provided you insert a
+copy of this License into the extracted document, and follow this
+License in all other respects regarding verbatim copying of that
+document.
 
 
 7. AGGREGATION WITH INDEPENDENT WORKS
@@ -1017,21 +1021,38 @@
 
 9. TERMINATION
 
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
+You may not copy, modify, sublicense, or distribute the Document
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense, or distribute it is void, and
+will automatically terminate your rights under this License.
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, receipt of a copy of some or all of the same material does
+not give you any rights to use it.
 
 
 10. FUTURE REVISIONS OF THIS LICENSE
 
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
+The Free Software Foundation may publish new, revised versions of the
+GNU Free Documentation License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.  See
 http://www.gnu.org/copyleft/.
 
 Each version of the License is given a distinguishing version number.
@@ -1041,7 +1062,39 @@
 of any later version that has been published (not as a draft) by the
 Free Software Foundation.  If the Document does not specify a version
 number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
+as a draft) by the Free Software Foundation.  If the Document
+specifies that a proxy can decide which future versions of this
+License can be used, that proxy's public statement of acceptance of a
+version permanently authorizes you to choose that version for the
+Document.
+
+11. RELICENSING
+
+"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
+World Wide Web server that publishes copyrightable works and also
+provides prominent facilities for anybody to edit those works.  A
+public wiki that anybody can edit is an example of such a server.  A
+"Massive Multiauthor Collaboration" (or "MMC") contained in the site
+means any set of copyrightable works thus published on the MMC site.
+
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 
+license published by Creative Commons Corporation, a not-for-profit 
+corporation with a principal place of business in San Francisco, 
+California, as well as future copyleft versions of that license 
+published by that same organization.
+
+"Incorporate" means to publish or republish a Document, in whole or in 
+part, as part of another Document.
+
+An MMC is "eligible for relicensing" if it is licensed under this 
+License, and if all works that were first published under this License 
+somewhere other than this MMC, and subsequently incorporated in whole or 
+in part into the MMC, (1) had no cover texts or invariant sections, and 
+(2) were thus incorporated prior to November 1, 2008.
+
+The operator of an MMC Site may republish an MMC contained in the site
+under CC-BY-SA on the same site at any time before August 1, 2009,
+provided the MMC is eligible for relicensing.
 
 
 ADDENDUM: How to use this License for your documents
@@ -1052,7 +1105,7 @@
 
     Copyright (c)  YEAR  YOUR NAME.
     Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.2
+    under the terms of the GNU Free Documentation License, Version 1.3
     or any later version published by the Free Software Foundation;
     with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
     A copy of the license is included in the section entitled "GNU
@@ -1072,3 +1125,4 @@
 recommend releasing these examples in parallel under your choice of
 free software license, such as the GNU General Public License,
 to permit their use in free software.
+

--- a/components/wget/wget.p5m	Wed Aug 05 10:48:38 2015 -0700
+++ b/components/wget/wget.p5m	Fri Jun 05 05:22:16 2015 -0700
@@ -82,4 +82,4 @@
 legacy pkg=SUNWwget \
     desc="GNU wget - a utility to retrieve files from the World Wide Web" \
     name="wget - GNU wget"
-license wget.license license="GPLv3, FDLv1.2"
+license wget.license license="GPLv3, FDLv1.3"