[arch-commits] Commit in wget/trunk (PKGBUILD wget-pod-fixes.patch)

[Eric Bélanger]

    Date: Sunday, January 19, 2014 @ 21:55:47
  Author: eric
Revision: 204438

upgpkg: wget 1.15-1

Upstream update, Remove old patch

Modified:
  wget/trunk/PKGBUILD
Deleted:
  wget/trunk/wget-pod-fixes.patch

----------------------+
 PKGBUILD             |   21 +++++-------
 wget-pod-fixes.patch |   81 -------------------------------------------------
 2 files changed, 9 insertions(+), 93 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-19 20:29:23 UTC (rev 204437)
+++ PKGBUILD	2014-01-19 20:55:47 UTC (rev 204438)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=wget
-pkgver=1.14
-pkgrel=3
+pkgver=1.15
+pkgrel=1
 pkgdesc="A network utility to retrieve files from the Web"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/wget/wget.html"
@@ -13,15 +13,12 @@
 optdepends=('ca-certificates: HTTPS downloads')
 backup=('etc/wgetrc')
 install=wget.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
-        wget-pod-fixes.patch)
-sha1sums=('cfa0906e6f72c1c902c29b52d140c22ecdcd617e'
-          'SKIP'
-          'aae4be72657c7a8e9dbedb7109cd2d8562a325d2')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+sha1sums=('e9fb1d25fa04f9c69e74e656a3174dca02700ba1'
+          'SKIP')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/wget-pod-fixes.patch"
   cat >> doc/sample.wgetrc <<EOF
 
 # default root certs location
@@ -30,17 +27,17 @@
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc --enable-nls
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-nls --with-ssl=openssl
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }

Deleted: wget-pod-fixes.patch
===================================================================
--- wget-pod-fixes.patch	2014-01-19 20:29:23 UTC (rev 204437)
+++ wget-pod-fixes.patch	2014-01-19 20:55:47 UTC (rev 204438)
@@ -1,81 +0,0 @@
-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
-- at itemx --no-proxy
-+ at 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
-- at itemx -4
-+ at item -4
- @itemx --inet4-only
- @itemx -6
- @itemx --inet6-only
-@@ -2106,32 +2106,32 @@
- 
- 
- @table @asis
-- at item 0
-+ at item C<0>
- No problems occurred.
- 
-- at item 1
-+ at item C<1>
- Generic error code.
- 
-- at item 2
-+ at item C<2>
- Parse error---for instance, when parsing command-line options, the
- @samp{.wgetrc} or @samp{.netrc}...
- 
-- at item 3
-+ at item C<3>
- File I/O error.
- 
-- at item 4
-+ at item C<4>
- Network failure.
- 
-- at item 5
-+ at item C<5>
- SSL verification failure.
- 
-- at item 6
-+ at item C<6>
- Username/password authentication failure.
- 
-- at item 7
-+ at item C<7>
- Protocol errors.
- 
-- at item 8
-+ at 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.
- 
-- at itemx password = @var{string}
-+ at 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
-- at itemx --no-proxy
-+ at 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.