commit: 1224a05ef18f8e30298366873ffc7d8065fae62a Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Mon Jan 27 10:15:13 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Mon Jan 27 10:21:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1224a05e
net-ftp/ncftp: Fix CFLAGS=-fno-common Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch | 68 ++++++++++++++++++++++++ net-ftp/ncftp/ncftp-3.2.6-r1.ebuild | 49 +++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch b/net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch new file mode 100644 index 00000000000..8b17b9b3986 --- /dev/null +++ b/net-ftp/ncftp/files/ncftp-3.2.6-fno-common.patch @@ -0,0 +1,68 @@ +--- a/ncftp/bookmark.h ++++ b/ncftp/bookmark.h +@@ -59,3 +59,5 @@ + void DefaultBookmarkName(char *, size_t, char *); + void DisposeBookmarkTable(void); + int AddNewItemToBookmarkTable(void); ++ ++extern Bookmark gBm; +--- a/ncftp/cmds.c ++++ b/ncftp/cmds.c +@@ -91,7 +91,6 @@ + extern char gOS[]; + extern int gAutoResume; + extern int gAutoSaveChangesToExistingBookmarks; +-extern Bookmark gBm; + extern int gLoadedBm, gConfirmClose, gSavePasswords, gScreenColumns; + extern char gLocalCWD[512], gPrevLocalCWD[512]; + extern int gMayCancelJmp; +--- a/ncftp/main.c ++++ b/ncftp/main.c +@@ -38,7 +38,6 @@ + char gLocalCWD[512], gPrevLocalCWD[512]; + + extern char gRemoteCWD[512], gPrevRemoteCWD[512]; +-extern Bookmark gBm; + extern int gLoadedBm; + extern int gFirewallType; + extern char gAutoAscii[]; +--- a/sh_util/gpshare.c ++++ b/sh_util/gpshare.c +@@ -28,7 +28,6 @@ + + static int gIsAtty1 = 1, gIsAtty2 = 1; + extern int gLoadedBm, gBookmarkMatchMode; +-Bookmark gBm; + + double + FileSize(double size, const char **uStr0, double *uMult0) +--- a/sh_util/ncftpget.c ++++ b/sh_util/ncftpget.c +@@ -40,7 +40,6 @@ + extern char gFirewallExceptionList[256]; + extern int gFwDataPortMode; + extern const char gOS[], gVersion[]; +-extern Bookmark gBm; + + static void + Usage(void) +--- a/sh_util/ncftpls.c ++++ b/sh_util/ncftpls.c +@@ -39,7 +39,6 @@ + extern char gFirewallExceptionList[256]; + extern int gFwDataPortMode; + extern const char gOS[], gVersion[]; +-extern Bookmark gBm; + + static int FTPRemoteRecursiveMList(FTPCIPtr cip, const char *const rdir, /* FTPFileInfoListPtr files, */ FTPLineListPtr lines); + +--- a/sh_util/ncftpput.c ++++ b/sh_util/ncftpput.c +@@ -41,7 +41,6 @@ + extern char gFirewallExceptionList[256]; + extern int gFwDataPortMode; + extern const char gOS[], gVersion[]; +-extern Bookmark gBm; + extern int gSendfileInProgress; + + static void diff --git a/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild new file mode 100644 index 00000000000..7c177b45e9f --- /dev/null +++ b/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools toolchain-funcs + +DESCRIPTION="An extremely configurable ftp client" +HOMEPAGE="http://www.ncftp.com/"; +SRC_URI=" + ftp://ftp.${PN}.com/${PN}/${P}-src.tar.xz -> ${P}.tar.xz +" + +LICENSE="Clarified-Artistic" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" +IUSE="pch" + +DEPEND=" + sys-libs/ncurses:* +" +RDEPEND=" + ${DEPEND} +" +PATCHES=( + "${FILESDIR}"/${PN}-3.2.6-fno-common.patch +) + +src_prepare() { + default + + AT_M4DIR=autoconf_local/ eautoreconf +} + +src_configure() { + tc-export CC + LC_ALL="C" \ + LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \ + econf \ + $(use_enable pch precomp) \ + --disable-ccdv \ + --disable-universal +} + +src_install() { + default + dodoc README.txt doc/*.txt + docinto html + dodoc doc/html/*.html +}
