Add libedit dependency for openssh-5.5p1.

libedit only needs to be installed by the packager since it's linked in statically.  No need for an optional package.
This commit is contained in:
Chris Roberts
2010-04-29 22:24:04 +00:00
parent fdaf45134e
commit bc403862fc
2 changed files with 17 additions and 2 deletions

View File

@@ -3,11 +3,13 @@ HOMEPAGE="http://www.openssh.com/"
SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.5p1.tar.gz"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/openssl >= 1.0.0"
DEPEND="dev-libs/openssl >= 1.0.0
dev-libs/libedit >= 20090923"
CHECKSUM_MD5="88633408f4cb1eb11ec7e2ec58b519eb"
BUILD {
cp ../patches/pathnames-haiku.h openssh-5.5p1/pathnames.h
cd openssh-5.5p1
autoconf
mkdir -p m4
cp /boot/common/share/aclocal/libtool.m4 m4
cp /boot/common/share/aclocal/ltoptions.m4 m4
@@ -31,7 +33,8 @@ BUILD {
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \
--with-default-path=${PATH} \
--with-md5-passwords \
--disable-utmpx
--disable-utmpx \
--with-libedit
make
}

View File

@@ -0,0 +1,12 @@
diff -up openssh-5.5p1/configure.ac.orig openssh-5.5p1/configure.ac
--- openssh-5.5p1/configure.ac.orig 2010-04-29 16:14:57.805306368 -0600
+++ openssh-5.5p1/configure.ac 2010-04-29 16:15:01.181141504 -0600
@@ -1277,7 +1277,7 @@ AC_ARG_WITH(libedit,
LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
else
- LIBEDIT="-ledit -lcurses"
+ LIBEDIT="-ledit -lncurses"
fi
OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'`
AC_CHECK_LIB(edit, el_init,