merge of 1f4c2145f640e8561c02654dabbab8cdb20ba0ef

     and 4964eb1f2444138d2350558b495ecc4dc6b97f31

12 files changed, 18 insertions, 131 deletions

diff --git a/packages/gnutls/gnutls_1.0.23.bb b/packages/gnutls/gnutls_1.0.23.bb
index 1e22617806..76dd844db8 100644
--- a/packages/gnutls/gnutls_1.0.23.bb
+++ b/packages/gnutls/gnutls_1.0.23.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 DEPENDS = "zlib libgcrypt"
-PR = "r5"
+PR = "r6"
 
 LICENSE = "LGPL"
 
@@ -26,5 +26,8 @@ do_stage() {
 	oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
 	oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
 	autotools_stage_includes
+
+	install -d ${STAGING_DATADIR}/aclocal
+	cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
 }
 
diff --git a/packages/gnutls/gnutls_1.0.25.bb b/packages/gnutls/gnutls_1.0.25.bb
index 3b169317de..4b4b63c63c 100644
--- a/packages/gnutls/gnutls_1.0.25.bb
+++ b/packages/gnutls/gnutls_1.0.25.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 DEPENDS = "zlib libgcrypt"
+PR = "r2"
 
 LICENSE = "LGPL"
 
@@ -25,5 +26,8 @@ do_stage() {
 	oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
 	oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
 	autotools_stage_includes
+
+	install -d ${STAGING_DATADIR}/aclocal
+	cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
 }
 
diff --git a/packages/gnutls/gnutls_1.3.5.bb b/packages/gnutls/gnutls_1.3.5.bb
index df007739be..18b3b03ee2 100644
--- a/packages/gnutls/gnutls_1.3.5.bb
+++ b/packages/gnutls/gnutls_1.3.5.bb
@@ -3,7 +3,7 @@ DEPENDS = "zlib libgcrypt lzo"
 MAINTAINER = "Eric Shattow <lucent@gmail.com>"
 
 LICENSE = "LGPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/devel/gnutls-${PV}.tar.bz2 \
            file://gnutls-openssl.patch;patch=1 \
@@ -32,5 +32,8 @@ do_stage() {
 	oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
 	oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
 	autotools_stage_includes
+
+	install -d ${STAGING_DATADIR}/aclocal
+	cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
 }
 
diff --git a/packages/gnutls/gnutls_1.4.0.bb b/packages/gnutls/gnutls_1.4.0.bb
index 7a934a8131..a425c3498a 100644
--- a/packages/gnutls/gnutls_1.4.0.bb
+++ b/packages/gnutls/gnutls_1.4.0.bb
@@ -3,6 +3,7 @@ DEPENDS = "zlib libgcrypt lzo"
 MAINTAINER = "Eric Shattow <lucent@gmail.com>"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 LICENSE = "LGPL"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
            file://gnutls-openssl.patch;patch=1 \
@@ -31,5 +32,8 @@ do_stage() {
 	oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
 	oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
 	autotools_stage_includes
+
+	install -d ${STAGING_DATADIR}/aclocal
+	cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
 }
 
diff --git a/packages/lftp/lftp-3.0.1/.mtn2git_empty b/packages/lftp/lftp-3.0.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/lftp/lftp-3.0.1/.mtn2git_empty
+++ /dev/null
diff --git a/packages/lftp/lftp-3.0.1/pty.patch b/packages/lftp/lftp-3.0.1/pty.patch
deleted file mode 100644
index 166b665f3f..0000000000
--- a/packages/lftp/lftp-3.0.1/pty.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- lftp-2.6.11/m4/pty.m4~pty
-+++ lftp-2.6.11/m4/pty.m4
-@@ -4,14 +4,20 @@
- *-*-sco3.2v4*)	no_dev_ptmx=1;;
- *-*-sco3.2v5*)	no_dev_ptmx=1;;
- esac
-+AC_SEARCH_LIBS(openpty,util,
-+   [
-+	AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function])
-+	no_dev_ptc=yes
-+	no_dev_ptmx=yes
-+   ])
-+AC_CHECK_FUNCS([_getpty])
- if test -z "$no_dev_ptmx" ; then
-    AC_CHECK_FILE("/dev/ptmx", [
-       AC_DEFINE(HAVE_DEV_PTMX,1,[define if you have /dev/ptmx device])])
- fi
-+if test -z "$no_dev_ptc" ; then
- AC_CHECK_FILE("/dev/ptc", [
-    AC_DEFINE(HAVE_DEV_PTS_AND_PTC,1,[define if you have /dev/ptc device])])
-+fi
- AC_CHECK_HEADERS([util.h sys/stropts.h pty.h])
--AC_SEARCH_LIBS(openpty,util,
--   [AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function])])
--AC_CHECK_FUNCS([_getpty])
- ])
diff --git a/packages/lftp/lftp-3.0.1/readline.patch b/packages/lftp/lftp-3.0.1/readline.patch
deleted file mode 100644
index eb90e21539..0000000000
--- a/packages/lftp/lftp-3.0.1/readline.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- lftp-3.0.1/configure.ac~readline.patch	2004-04-06 10:27:36.000000000 +0200
-+++ lftp-3.0.1/configure.ac	2004-04-06 23:39:01.000000000 +0200
-@@ -380,5 +378,5 @@
-    sysconfdir=/etc
- fi
- 
--AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile include/Makefile doc/Makefile readline-4.3/Makefile po/Makefile.in m4/Makefile contrib/Makefile])
-+AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile include/Makefile doc/Makefile po/Makefile.in m4/Makefile contrib/Makefile])
- AC_OUTPUT
---- lftp-3.0.1/Makefile.am~readline.patch	2003-12-19 15:16:31.000000000 +0100
-+++ lftp-3.0.1/Makefile.am	2004-04-06 23:40:17.000000000 +0200
-@@ -1,6 +1,6 @@
- EXTRA_DIST = config.rpath lftp.conf lftp.lsm FAQ acconfig.h README README.debug-levels\
-  README.modules MIRRORS BUGS FEATURES
--SUBDIRS = include readline-4.3 lib doc src po m4 contrib
-+SUBDIRS = include lib doc src po m4 contrib
- AUTOMAKE_OPTIONS = foreign
- ACLOCAL_AMFLAGS = -I m4
- 
diff --git a/packages/lftp/lftp-3.0.11/.mtn2git_empty b/packages/lftp/lftp-3.0.11/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/lftp/lftp-3.0.11/.mtn2git_empty
+++ /dev/null
diff --git a/packages/lftp/lftp-3.0.11/pty.patch b/packages/lftp/lftp-3.0.11/pty.patch
deleted file mode 100644
index 166b665f3f..0000000000
--- a/packages/lftp/lftp-3.0.11/pty.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- lftp-2.6.11/m4/pty.m4~pty
-+++ lftp-2.6.11/m4/pty.m4
-@@ -4,14 +4,20 @@
- *-*-sco3.2v4*)	no_dev_ptmx=1;;
- *-*-sco3.2v5*)	no_dev_ptmx=1;;
- esac
-+AC_SEARCH_LIBS(openpty,util,
-+   [
-+	AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function])
-+	no_dev_ptc=yes
-+	no_dev_ptmx=yes
-+   ])
-+AC_CHECK_FUNCS([_getpty])
- if test -z "$no_dev_ptmx" ; then
-    AC_CHECK_FILE("/dev/ptmx", [
-       AC_DEFINE(HAVE_DEV_PTMX,1,[define if you have /dev/ptmx device])])
- fi
-+if test -z "$no_dev_ptc" ; then
- AC_CHECK_FILE("/dev/ptc", [
-    AC_DEFINE(HAVE_DEV_PTS_AND_PTC,1,[define if you have /dev/ptc device])])
-+fi
- AC_CHECK_HEADERS([util.h sys/stropts.h pty.h])
--AC_SEARCH_LIBS(openpty,util,
--   [AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function])])
--AC_CHECK_FUNCS([_getpty])
- ])
diff --git a/packages/lftp/lftp-3.0.11/readline.patch b/packages/lftp/lftp-3.0.11/readline.patch
deleted file mode 100644
index eb90e21539..0000000000
--- a/packages/lftp/lftp-3.0.11/readline.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- lftp-3.0.1/configure.ac~readline.patch	2004-04-06 10:27:36.000000000 +0200
-+++ lftp-3.0.1/configure.ac	2004-04-06 23:39:01.000000000 +0200
-@@ -380,5 +378,5 @@
-    sysconfdir=/etc
- fi
- 
--AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile include/Makefile doc/Makefile readline-4.3/Makefile po/Makefile.in m4/Makefile contrib/Makefile])
-+AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile include/Makefile doc/Makefile po/Makefile.in m4/Makefile contrib/Makefile])
- AC_OUTPUT
---- lftp-3.0.1/Makefile.am~readline.patch	2003-12-19 15:16:31.000000000 +0100
-+++ lftp-3.0.1/Makefile.am	2004-04-06 23:40:17.000000000 +0200
-@@ -1,6 +1,6 @@
- EXTRA_DIST = config.rpath lftp.conf lftp.lsm FAQ acconfig.h README README.debug-levels\
-  README.modules MIRRORS BUGS FEATURES
--SUBDIRS = include readline-4.3 lib doc src po m4 contrib
-+SUBDIRS = include lib doc src po m4 contrib
- AUTOMAKE_OPTIONS = foreign
- ACLOCAL_AMFLAGS = -I m4
- 
diff --git a/packages/lftp/lftp_3.0.11.bb b/packages/lftp/lftp_3.0.11.bb
deleted file mode 100644
index ae62962343..0000000000
--- a/packages/lftp/lftp_3.0.11.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "lftp is a sophisticated command line based file \
-transfer program. Supported protocols include FTP, HTTP, \
-and FISH."
-HOMEPAGE = "http://lftp.yar.ru"
-SECTION = "console/network"
-DEPENDS = "readline"
-PR = "r1"
-
-SRC_URI = "http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/lftp-${PV}.tar.bz2 \
-	   file://pty.patch;patch=1"
-
-EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no"
-
-inherit autotools gettext
diff --git a/packages/lftp/lftp_3.0.1.bb b/packages/lftp/lftp_3.5.1.bb
index ae62962343..a45b75fe35 100644
--- a/packages/lftp/lftp_3.0.1.bb
+++ b/packages/lftp/lftp_3.5.1.bb
@@ -4,11 +4,9 @@ transfer program. Supported protocols include FTP, HTTP, \
 and FISH."
 HOMEPAGE = "http://lftp.yar.ru"
 SECTION = "console/network"
-DEPENDS = "readline"
-PR = "r1"
+DEPENDS = "readline gnutls"
 
-SRC_URI = "http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/lftp-${PV}.tar.bz2 \
-	   file://pty.patch;patch=1"
+SRC_URI = "http://www.ibiblio.org/pub/Linux/system/network/file-transfer/lftp-3.5.1.tar.gz"
 
 EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no"