[arch-commits] Commit in ncftp/trunk (PKGBUILD fix-build.patch)

[Lukas Fleischer]

    Date: Wednesday, November 30, 2016 @ 20:41:39
  Author: lfleischer
Revision: 282390

upgpkg: ncftp 3.2.6-1

Upstream update.

Modified:
  ncftp/trunk/PKGBUILD
Deleted:
  ncftp/trunk/fix-build.patch

-----------------+
 PKGBUILD        |   32 +++++++++++---------------------
 fix-build.patch |   10 ----------
 2 files changed, 11 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-30 18:13:14 UTC (rev 282389)
+++ PKGBUILD	2016-11-30 20:41:39 UTC (rev 282390)
@@ -1,12 +1,11 @@
-# $Id$
-# Maintainer:
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Paul Mattal <paul at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=ncftp
-pkgver=3.2.5
-pkgrel=6
+pkgver=3.2.6
+pkgrel=1
 pkgdesc="A set of free application programs implementing FTP"
 url="http://www.ncftp.com/"
 arch=('i686' 'x86_64')
@@ -13,32 +12,23 @@
 license=('custom')
 depends=('ncurses')
 makedepends=('inetutils')
-source=("ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.bz2"
-        'fix-build.patch')
-md5sums=('b05c7a6d5269c04891f02f43d4312b30'
-         'f85fd4cc66b66952d67f864137f44029')
+source=("ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.xz")
+md5sums=('9e42d4696754ed49e002b8f719f07d92')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-build.patch
-}
+build() {
+  cd "${pkgname}-${pkgver}"
 
-build() {
   # FS#39211
   unset CPPFLAGS
 
-  cd ${pkgname}-${pkgver}
-  CPP=/usr/bin/cpp ./configure --prefix=/usr \
-    --sysconfdir=/etc
+  CPP=/usr/bin/cpp ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "${pkgname}-${pkgver}"
+
   install -d "${pkgdir}/usr/share"
   make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man" install
-
-  # Install license
-  install -Dm644 doc/LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 doc/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2016-11-30 18:13:14 UTC (rev 282389)
+++ fix-build.patch	2016-11-30 20:41:39 UTC (rev 282390)
@@ -1,10 +0,0 @@
---- ncftp-3.2.5/ncftp/main.c~	2014-03-06 11:20:05.006777392 +0000
-+++ ncftp-3.2.5/ncftp/main.c	2014-03-06 11:20:25.739974714 +0000
-@@ -21,6 +21,7 @@
- #include "log.h"
- #include "spool.h"
- #include "util.h"
-+#include "locale.h"
- 
- int gStartupUrlParameterGiven = 0;
- int gIsTTY, gIsTTYr;