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

[Andrea Scarpino]

    Date: Thursday, March 6, 2014 @ 12:24:27
  Author: andrea
Revision: 206930

upgpkg: ncftp 3.2.5-3

Fix build + rebuild old package

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

-----------------+
 PKGBUILD        |   21 ++++++++++++++-------
 fix-build.patch |   10 ++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-06 10:57:48 UTC (rev 206929)
+++ PKGBUILD	2014-03-06 11:24:27 UTC (rev 206930)
@@ -6,25 +6,32 @@
 
 pkgname=ncftp
 pkgver=3.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A set of free application programs implementing FTP"
 url="http://www.ncftp.com/"
 arch=('i686' 'x86_64')
 license=('custom')
 depends=('ncurses')
-source=("ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.bz2")
-md5sums=('b05c7a6d5269c04891f02f43d4312b30')
+makedepends=('inetutils')
+source=("ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.bz2"
+        'fix-build.patch')
+md5sums=('b05c7a6d5269c04891f02f43d4312b30'
+         'f85fd4cc66b66952d67f864137f44029')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-build.patch
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
+  cd ${pkgname}-${pkgver}
+  CPP=/usr/bin/cpp ./configure --prefix=/usr \
     --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   install -d "${pkgdir}/usr/share"
   make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man" install
 

Added: fix-build.patch
===================================================================
--- fix-build.patch	                        (rev 0)
+++ fix-build.patch	2014-03-06 11:24:27 UTC (rev 206930)
@@ -0,0 +1,10 @@
+--- 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;