4 files changed, 43 insertions, 13 deletions

diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index e926ecd5e605..e7581fed2d5e 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lftp
-PORTVERSION=	2.6.6
-PORTREVISION=	1
+PORTVERSION=	2.6.7
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/ \
 		ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/old/ \
diff --git a/ftp/lftp/distinfo b/ftp/lftp/distinfo
index 8bb8b145ae99..ba95cf682945 100644
--- a/ftp/lftp/distinfo
+++ b/ftp/lftp/distinfo
@@ -1 +1 @@
-MD5 (lftp-2.6.6.tar.bz2) = fec9d5c2a4ec65eb37fa33d21b869c81
+MD5 (lftp-2.6.7.tar.bz2) = 31092e7f94b80f8f79c5e71fc7ba636f
diff --git a/ftp/lftp/files/patch-src::readline_configure b/ftp/lftp/files/patch-src::readline_configure
new file mode 100644
index 000000000000..5ac5ef087484
--- /dev/null
+++ b/ftp/lftp/files/patch-src::readline_configure
@@ -0,0 +1,31 @@
+--- readline-4.3/configure.orig	Tue Sep 16 14:58:09 2003
++++ readline-4.3/configure	Tue Sep 16 14:59:08 2003
+@@ -1288,7 +1288,7 @@
+ 
+ 
+ ac_aux_dir=
+-for ac_dir in ./support $srcdir/./support; do
++for ac_dir in ./.. $srcdir/./..; do
+   if test -f $ac_dir/install-sh; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install-sh -c"
+@@ -1304,8 +1304,8 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ./support $srcdir/./support" >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in ./support $srcdir/./support" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ./.. $srcdir/./.." >&5
++echo "$as_me: error: cannot find install-sh or install.sh in ./.. $srcdir/./.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+@@ -6331,7 +6331,7 @@
+ 
+ 
+ 
+-                                        ac_config_files="$ac_config_files Makefile doc/Makefile examples/Makefile shlib/Makefile"
++                                        ac_config_files="$ac_config_files Makefile"
+           ac_config_commands="$ac_config_commands default"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
diff --git a/ftp/lftp/pkg-plist b/ftp/lftp/pkg-plist
index e25a13e0d789..59751e114745 100644
--- a/ftp/lftp/pkg-plist
+++ b/ftp/lftp/pkg-plist
@@ -3,15 +3,15 @@ bin/lftpget
 @unexec if cmp -s %D/etc/lftp.conf %D/etc/lftp.conf.sample; then rm -f %D/etc/lftp.conf; fi
 etc/lftp.conf.sample
 @exec if [ ! -f %D/etc/lftp.conf ]; then cp %B/%f %D/etc/lftp.conf; fi
-%%PORTDOCS%%share/doc/lftp/COPYING
-%%PORTDOCS%%share/doc/lftp/FAQ
-%%PORTDOCS%%share/doc/lftp/NEWS
-%%PORTDOCS%%share/doc/lftp/README
-%%PORTDOCS%%share/doc/lftp/README.debug-levels
-%%PORTDOCS%%share/doc/lftp/README.modules
-%%PORTDOCS%%share/doc/lftp/THANKS
-%%PORTDOCS%%share/doc/lftp/TODO
-%%PORTDOCS%%share/doc/lftp/FEATURES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.debug-levels
+%%PORTDOCS%%%%DOCSDIR%%/README.modules
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/FEATURES
 share/lftp/import-ncftp
 share/lftp/import-netscape
 share/locale/de/LC_MESSAGES/lftp.mo
@@ -25,5 +25,5 @@ share/locale/pt_BR/LC_MESSAGES/lftp.mo
 share/locale/ru/LC_MESSAGES/lftp.mo
 share/locale/zh_CN/LC_MESSAGES/lftp.mo
 share/locale/zh_TW/LC_MESSAGES/lftp.mo
-%%PORTDOCS%%@dirrm share/doc/lftp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/lftp