Mon Sep 30 02:50:34 PDT 2013

2 files changed, 106 insertions, 15 deletions

diff --git a/extra/wget/PKGBUILD b/extra/wget/PKGBUILD
index 9b1244031..ef7eb62b1 100644
--- a/extra/wget/PKGBUILD
+++ b/extra/wget/PKGBUILD
@@ -1,36 +1,46 @@
-# $Id: PKGBUILD 169712 2012-10-27 01:52:51Z stephane $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 195268 2013-09-29 17:27:18Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wget
 pkgver=1.14
-pkgrel=2
+pkgrel=3
 pkgdesc="A network utility to retrieve files from the Web"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/wget/wget.html"
 license=('GPL3')
-depends=('openssl' 'libidn' 'pcre' 'util-linux')
+depends=('openssl' 'libidn' 'util-linux')
+checkdepends=('perl-http-daemon' 'perl-io-socket-ssl')
 optdepends=('ca-certificates: HTTPS downloads')
 backup=('etc/wgetrc')
 install=wget.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('316f6f59292c9098ad81fd54f658c579'
-         '3e121933d69f32fa58776bff76bcebd0')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
+        wget-pod-fixes.patch)
+sha1sums=('cfa0906e6f72c1c902c29b52d140c22ecdcd617e'
+          'SKIP'
+          'aae4be72657c7a8e9dbedb7109cd2d8562a325d2')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/wget-pod-fixes.patch"
+  cat >> doc/sample.wgetrc <<EOF
+
+# default root certs location
+ca_certificate=/etc/ssl/certs/ca-certificates.crt
+EOF
+}
 
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc --enable-nls
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  cat >> "$pkgdir/etc/wgetrc" <<EOF
-
-# default root certs location
-ca_certificate=/etc/ssl/certs/ca-certificates.crt
-EOF
 }
diff --git a/extra/wget/wget-pod-fixes.patch b/extra/wget/wget-pod-fixes.patch
new file mode 100644
index 000000000..54e985624
--- /dev/null
+++ b/extra/wget/wget-pod-fixes.patch
@@ -0,0 +1,81 @@
+diff -Naur wget-1.14.orig/doc/wget.texi wget-1.14.new/doc/wget.texi
+--- wget-1.14.orig/doc/wget.texi	2012-08-04 02:41:52.000000000 -0600
++++ wget-1.14.new/doc/wget.texi	2013-05-26 11:18:52.986107183 -0600
+@@ -876,7 +876,7 @@
+ actions of one.
+ 
+ @cindex proxy
+-@itemx --no-proxy
++@item --no-proxy
+ Don't use proxies, even if the appropriate @code{*_proxy} environment
+ variable is defined.
+ 
+@@ -977,7 +977,7 @@
+ whose encoding does not match the one used locally.
+ 
+ @cindex IPv6
+-@itemx -4
++@item -4
+ @itemx --inet4-only
+ @itemx -6
+ @itemx --inet6-only
+@@ -2106,32 +2106,32 @@
+ 
+ 
+ @table @asis
+-@item 0
++@item C<0>
+ No problems occurred.
+ 
+-@item 1
++@item C<1>
+ Generic error code.
+ 
+-@item 2
++@item C<2>
+ Parse error---for instance, when parsing command-line options, the
+ @samp{.wgetrc} or @samp{.netrc}...
+ 
+-@item 3
++@item C<3>
+ File I/O error.
+ 
+-@item 4
++@item C<4>
+ Network failure.
+ 
+-@item 5
++@item C<5>
+ SSL verification failure.
+ 
+-@item 6
++@item C<6>
+ Username/password authentication failure.
+ 
+-@item 7
++@item C<7>
+ Protocol errors.
+ 
+-@item 8
++@item C<8>
+ Server issued an error response.
+ @end table
+ 
+@@ -3094,7 +3094,7 @@
+ Change setting of passive @sc{ftp}, equivalent to the
+ @samp{--passive-ftp} option.
+ 
+-@itemx password = @var{string}
++@item password = @var{string}
+ Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. 
+ This command can be overridden using the @samp{ftp_password} and 
+ @samp{http_password} command for @sc{ftp} and @sc{http} respectively.
+@@ -3605,7 +3605,7 @@
+ may be specified from within Wget itself.
+ 
+ @table @samp
+-@itemx --no-proxy
++@item --no-proxy
+ @itemx proxy = on/off
+ This option and the corresponding command may be used to suppress the
+ use of proxy, even if the appropriate environment variables are set.