From af986b5e0acbfddd143d62f150ae39b032bb79e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20=C5=BDivkovi=C4=87?= Date: Sat, 31 Jan 2004 22:57:24 +0000 Subject: [PATCH] updated to ncftp-3.1.7 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@1740 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- basicnet/netprogs/ncftp/ncftp-config.xml | 2 +- basicnet/netprogs/ncftp/ncftp-desc.xml | 5 +++-- basicnet/netprogs/ncftp/ncftp-exp.xml | 10 +++++----- basicnet/netprogs/ncftp/ncftp-inst.xml | 13 +++++-------- basicnet/netprogs/ncftp/ncftp.ent | 8 ++++---- introduction/welcome/changelog.xml | 2 +- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/basicnet/netprogs/ncftp/ncftp-config.xml b/basicnet/netprogs/ncftp/ncftp-config.xml index 36e44724ff..b9536632e1 100644 --- a/basicnet/netprogs/ncftp/ncftp-config.xml +++ b/basicnet/netprogs/ncftp/ncftp-config.xml @@ -2,7 +2,7 @@ Configuring <application>Nc<acronym>FTP</acronym></application> Config files -~/.ncftp/*; especially +~/.ncftp/*; especially ~/.ncftp/prefs_v3 diff --git a/basicnet/netprogs/ncftp/ncftp-desc.xml b/basicnet/netprogs/ncftp/ncftp-desc.xml index 7e9261d669..25e4b44f81 100644 --- a/basicnet/netprogs/ncftp/ncftp-desc.xml +++ b/basicnet/netprogs/ncftp/ncftp-desc.xml @@ -1,7 +1,9 @@ Contents -The NcFTP package contains ncftp, ncftpbatch +The NcFTP package +contains libncftp, +ncftp, ncftpbatch , ncftpbookmarks, ncftpget, ncftpls, ncftpput and ncftpspooler. @@ -32,4 +34,3 @@ Global batch FTP job processor daemon. - diff --git a/basicnet/netprogs/ncftp/ncftp-exp.xml b/basicnet/netprogs/ncftp/ncftp-exp.xml index 1c20f9bcd1..ff3cfa93cf 100644 --- a/basicnet/netprogs/ncftp/ncftp-exp.xml +++ b/basicnet/netprogs/ncftp/ncftp-exp.xml @@ -1,10 +1,10 @@ Command explanations -cd libncftp && -make shared && -make soinstall -These commands make and install the dynamic library libncftp which is then used to link against when compiling the main program. +make -C libncftp shared && +make -C libncftp soinstall +These commands make and install the dynamic library libncftp which is then used to link +against when compiling the main program. - diff --git a/basicnet/netprogs/ncftp/ncftp-inst.xml b/basicnet/netprogs/ncftp/ncftp-inst.xml index 4e4e69a9f7..0fc047d53a 100644 --- a/basicnet/netprogs/ncftp/ncftp-inst.xml +++ b/basicnet/netprogs/ncftp/ncftp-inst.xml @@ -2,13 +2,13 @@ Installation of <application>Nc<acronym>FTP</acronym></application> There are two ways to build NcFTP. The first -(and optimal) way, builds most of the functionality as a shared library and +(and optimal) way builds most of the functionality as a shared library and then builds and installs the program linked against this library. The second method simply links all of the functionality into the binary statically. This doesn't make the dynamic library available for linking by other applications. You need to choose which method best suits you. Note that the second method does not create an entirely -statically linked binary; only the libncftp parts are +statically linked binary; only the libncftp parts are statically linked in, in this case. Be aware that building and using the shared library is covered by the Clarified Artistic License; however, developing applications that utilize the shared library is subject to a different license. @@ -18,15 +18,13 @@ applications that utilize the shared library is subject to a different license. method, run the following commands: ./configure --prefix=/usr && -cd libncftp && -make shared && -make soinstall && -cd .. && +make -C libncftp shared && +make -C libncftp soinstall && make && make install To install NcFTP using the second method (with -the libncftp functionality linked in statically) run the +the libncftp functionality linked in statically) run the following commands: ./configure --prefix=/usr && @@ -34,4 +32,3 @@ make && make install - diff --git a/basicnet/netprogs/ncftp/ncftp.ent b/basicnet/netprogs/ncftp/ncftp.ent index a85430df67..02b4122504 100644 --- a/basicnet/netprogs/ncftp/ncftp.ent +++ b/basicnet/netprogs/ncftp/ncftp.ent @@ -4,9 +4,9 @@ - - + + - + - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 3efbcff007..c637911d04 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -12,7 +12,7 @@ who wrote what. January 31st, 2004 [igor]: Updated to -GnuPG-1.2.4. +GnuPG-1.2.4 and NcFTP-3.1.7. January 30th, 2004 [igor]: Updated to XSane-0.92.