summaryrefslogtreecommitdiff
path: root/net/ncftp2
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>1999-07-13 01:34:40 +0000
committerjlam <jlam@pkgsrc.org>1999-07-13 01:34:40 +0000
commit9fb419da79518f01e11dbe18e56b23fc6d319c09 (patch)
tree82b2d95e208c7b7bcb87e9ba5d48b295d8f8e809 /net/ncftp2
parent53124dc32ad979c1c312453780f25a6ca343d1fa (diff)
downloadpkgsrc-9fb419da79518f01e11dbe18e56b23fc6d319c09.tar.gz
* Use libedit's readline wrapper instead of readline when possible.
* Update readline dependency.
Diffstat (limited to 'net/ncftp2')
-rw-r--r--net/ncftp2/Makefile32
-rw-r--r--net/ncftp2/files/patch-sum7
-rw-r--r--net/ncftp2/patches/patch-ab20
-rw-r--r--net/ncftp2/patches/patch-ac38
-rw-r--r--net/ncftp2/patches/patch-ad20
5 files changed, 79 insertions, 38 deletions
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
index 759baf276c6..997e4075951 100644
--- a/net/ncftp2/Makefile
+++ b/net/ncftp2/Makefile
@@ -1,22 +1,32 @@
-# $NetBSD: Makefile,v 1.14 1999/07/06 08:06:48 jlam Exp $
+# $NetBSD: Makefile,v 1.15 1999/07/13 01:34:40 jlam Exp $
# FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp
#
-DISTNAME= ncftp-2.4.3
-CATEGORIES= net
-MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
+DISTNAME= ncftp-2.4.3
+CATEGORIES= net
+MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.ncftp.com/ncftp/
+MAINTAINER= packages@netbsd.org
+HOMEPAGE= http://www.ncftp.com/ncftp/
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-extra-dirs
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
-DEPENDS+= ncurses-4.2:../../devel/ncurses
+DEPENDS+= ncurses-4.2:../../devel/ncurses
+.endif
+
+.if exists(/usr/include/readline.h)
+CPPFLAGS+= -DHAVE_LIBREADLINE=1
+CPPFLAGS+= -DHAVE_FILENAME_COMPLETION_FUNCTION=1
+CPPFLAGS+= -DHAVE_READLINE_H=1 -DHAVE_HISTORY_H=1
+CONFIGURE_ARGS+= --disable-readline
+CONFIGURE_ENV+= LIBS="-ledit"
+.else
+DEPENDS+= readline-4.0:../../devel/readline
.endif
-DEPENDS+= readline-2.2:../../devel/readline
# Include SOCKS firewall support
.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
@@ -28,8 +38,8 @@ CONFIGURE_ARGS+= --enable-socks5
DEPENDS+= socks5-1.0.2:../../net/socks5
.endif
.endif
-CPPFLAGS+= -I${PREFIX}/include
-LDFLAGS+= -L${PREFIX}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
do-install:
diff --git a/net/ncftp2/files/patch-sum b/net/ncftp2/files/patch-sum
index ae23531d0a4..e35c0f715bf 100644
--- a/net/ncftp2/files/patch-sum
+++ b/net/ncftp2/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:23 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/07/13 01:34:41 jlam Exp $
MD5 (patch-aa) = 0e2196e1dfa6a64350b141c40949413a
-MD5 (patch-ab) = 60ddcdea46cb4c6e2da248d151ed4762
-MD5 (patch-ac) = 24dd2e4414150b255acd94b516124a08
+MD5 (patch-ab) = 291e0bc57f67fe9eb4a7e0a2d4f1709a
+MD5 (patch-ac) = abcbb854fad1ce93317ca4350e44b1ed
+MD5 (patch-ad) = 09c9e9f7ea6beba64b5aa5ae5982b82a
diff --git a/net/ncftp2/patches/patch-ab b/net/ncftp2/patches/patch-ab
index 3f6e086af18..f2f8f43df70 100644
--- a/net/ncftp2/patches/patch-ab
+++ b/net/ncftp2/patches/patch-ab
@@ -1,8 +1,20 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 11:10:48 agc Exp $
+$NetBSD: patch-ab,v 1.4 1999/07/13 01:34:42 jlam Exp $
---- Complete.c.orig Fri Oct 18 07:10:31 1996
-+++ Complete.c Fri Feb 20 14:47:06 1998
-@@ -241,7 +241,11 @@
+--- Complete.c.orig Fri Oct 18 01:10:31 1996
++++ Complete.c Thu Jul 8 15:33:42 1999
+@@ -52,7 +52,11 @@
+ typedef char * (*CompleteFunc)(char *, int);
+
+ #ifdef HAVE_LIBREADLINE
++#if HAVE_READLINE_H
++#include <readline.h>
++#else
+ #include <readline/readline.h>
++#endif
+
+ #ifdef HAVE_FILENAME_COMPLETION_FUNCTION
+ /* This should have been in your readline.h already, but some older
+@@ -241,7 +245,11 @@
static int
CompareStrings(char **a, char **b)
{
diff --git a/net/ncftp2/patches/patch-ac b/net/ncftp2/patches/patch-ac
index 5905e358c36..e50c232cc18 100644
--- a/net/ncftp2/patches/patch-ac
+++ b/net/ncftp2/patches/patch-ac
@@ -1,17 +1,24 @@
-$NetBSD: patch-ac,v 1.4 1999/05/22 22:32:04 tron Exp $
+$NetBSD: patch-ac,v 1.5 1999/07/13 01:34:42 jlam Exp $
---- configure.orig Sun Jun 8 07:25:04 1997
-+++ configure Sun May 23 00:25:56 1999
-@@ -1072,7 +1072,7 @@
+--- configure.orig Sun Jun 8 01:25:04 1997
++++ configure Wed Jul 7 00:05:26 1999
+@@ -1069,6 +1069,7 @@
+
+
+ # See if we should add -I/usr/local/include -L/usr/local/lib, etc.
++if test "$nc_cv_extra_dirs" = yes ; then
echo "checking for extra include and lib directories..." 1>&6
b1=`cd .. ; pwd`
b2=`cd ../.. ; pwd`
--exdirs="$HOME $j $b1 $b2 $prefix /usr/local /usr/ccs"
-+exdirs="$HOME $j $b1 $b2 $prefix"
+@@ -1128,6 +1129,7 @@
+ fi
+ done
+ done
++fi
+
- subexdirs="-"
- if test "$subexdirs" = "" ; then
-@@ -1766,7 +1766,7 @@
+ # Look for SunOS' /usr/5lib and 5include directories, because
+@@ -1766,7 +1768,7 @@
echo "$ac_t""no" 1>&6
fi
@@ -20,16 +27,7 @@ $NetBSD: patch-ac,v 1.4 1999/05/22 22:32:04 tron Exp $
nc_cv_socks=no
else
LIBS="$savelibs"
-@@ -2285,7 +2285,7 @@
- echo "checking for extra include and lib directories..." 1>&6
- b1=`cd .. ; pwd`
- b2=`cd ../.. ; pwd`
--exdirs="$HOME $j $b1 $b2 $prefix /usr/local /usr /usr/ccs"
-+exdirs="$HOME $j $b1 $b2 $prefix"
-
- subexdirs="ncurses"
- if test "$subexdirs" = "" ; then
-@@ -2345,7 +2345,7 @@
+@@ -2345,7 +2347,7 @@
# See if we should add -I/usr/local/ncurses
@@ -38,7 +36,7 @@ $NetBSD: patch-ac,v 1.4 1999/05/22 22:32:04 tron Exp $
if test -r $incdir ; then
case "$CPPFLAGS" in
*${incdir}*)
-@@ -2366,7 +2366,7 @@
+@@ -2366,7 +2368,7 @@
# Some people (me) have two versions of ncurses on
# the system. Use the one in /usr/local first.
case "$CPPFLAGS" in
diff --git a/net/ncftp2/patches/patch-ad b/net/ncftp2/patches/patch-ad
new file mode 100644
index 00000000000..e9373d249fa
--- /dev/null
+++ b/net/ncftp2/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 1999/07/13 01:34:42 jlam Exp $
+
+--- LGets.c.orig Fri Apr 7 23:28:00 1995
++++ LGets.c Thu Jul 8 15:38:00 1999
+@@ -5,11 +5,15 @@
+ #include "LGets.h"
+
+ #ifdef HAVE_LIBREADLINE
++#if HAVE_HISTORY_H
++# include <history.h>
++#else
+ # include <readline/readline.h>
+ # ifdef HAVE_READLINE_HISTORY_H
+ /* Required for version 2.0 of readline. */
+ # include <readline/history.h>
+ # endif
++#endif
+ #endif /* HAVE_LIBREADLINE */
+
+ #ifdef HAVE_LIBGETLINE