--- a/components/wget/Makefile Wed Feb 20 20:58:17 2013 -0800
+++ b/components/wget/Makefile Thu Feb 21 02:20:51 2013 -0800
@@ -18,17 +18,17 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= wget
-COMPONENT_VERSION= 1.12
+COMPONENT_VERSION= 1.14
COMPONENT_PROJECT_URL= http://www.gnu.org/software/wget/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= \
- sha256:c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a
+ sha256:1761d7f7c6a2ad6c8d494d239c53f0c17126efb6449ada16dee3a66d87a4147b
COMPONENT_ARCHIVE_URL= http://ftp.gnu.org/gnu/wget/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/wget
@@ -36,15 +36,31 @@
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
+# Enforce openssl (--with-ssl=openssl) instead of default gnutls
+# (--with-ssl) as wget doesn't work for secure connections with gnutls.
# Set PATH to find /usr/perl5/bin/pod2man, so that the man page wget.1
# can be automatically generated
-
CONFIGURE_OPTIONS += --sysconfdir=/etc
-CONFIGURE_OPTIONS += --with-ssl
+CONFIGURE_OPTIONS += --with-ssl=openssl
CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += PATH="$(PATH):/usr/perl5/bin"
+# Wget test suite will skip majority of tests with few Perl modules
+# missing on system. By uncommenting following lines it will pass 68
+# tests out of 70 total tests (2 tests are skipped).
+#URI=URI-1.60
+#WWW=libwww-perl-5.837
+#COMPONENT_TEST_ENV = "http_proxy="
+#COMPONENT_PRE_TEST_ACTION = ( \
+ cd $(COMPONENT_SRC)/tests; \
+ wget http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$(URI).tar.gz; \
+ wget http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$(WWW).tar.gz; \
+ gtar --get $(URI)/URI $(URI)/URI.pm \
+ --strip-components=1 -f $(URI).tar.gz; \
+ gtar --get $(WWW)/lib/HTTP $(WWW)/lib/LWP $(WWW)/lib/LWP.pm \
+ --strip-components=2 -f $(WWW).tar.gz; )
+
build: $(BUILD_32)
install: $(INSTALL_32)