From a389ce304c66987177de76372c0204b8867744f6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 3 May 2013 01:17:15 +0200 Subject: [PATCH] Convert readline 6.2 recipe to an actual recipe Also create a new patch to fix library building and installation. --- sys-libs/readline/patches/readline-6.2.patch | 24 +++++++++ sys-libs/readline/readline-6.2.recipe | 55 +++++++++++++++----- 2 files changed, 65 insertions(+), 14 deletions(-) create mode 100644 sys-libs/readline/patches/readline-6.2.patch diff --git a/sys-libs/readline/patches/readline-6.2.patch b/sys-libs/readline/patches/readline-6.2.patch new file mode 100644 index 000000000..c3f005381 --- /dev/null +++ b/sys-libs/readline/patches/readline-6.2.patch @@ -0,0 +1,24 @@ +diff -ur orig/readline-6.2/support/shlib-install readline-6.2/support/shlib-install +--- orig/readline-6.2/support/shlib-install 2009-10-28 14:30:18.057409536 +0100 ++++ readline-6.2/support/shlib-install 2013-05-03 01:12:28.695468032 +0200 +@@ -117,7 +117,7 @@ + # Create symlinks to the installed library. This section is incomplete. + # + case "$host_os-$host_vendor" in +-*linux*|freebsd*-gentoo) ++*linux*|freebsd*-gentoo|haiku*) + # libname.so.M -> libname.so.M.N + ${echo} ${RM} ${INSTALLDIR}/$LINK2 + if [ -z "$uninstall" ]; then +diff -ur orig/readline-6.2/support/shobj-conf readline-6.2/support/shobj-conf +--- orig/readline-6.2/support/shobj-conf 2009-10-28 14:20:21.057147392 +0100 ++++ readline-6.2/support/shobj-conf 2013-05-03 01:12:38.631242752 +0200 +@@ -109,7 +109,7 @@ + ;; + + # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd. +-linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo) ++linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo|haiku*) + SHOBJ_CFLAGS=-fPIC + SHOBJ_LD='${CC}' + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe index f53a06d9e..65f9a3b21 100644 --- a/sys-libs/readline/readline-6.2.recipe +++ b/sys-libs/readline/readline-6.2.recipe @@ -1,29 +1,56 @@ -DESCRIPTION="readline" +SUMMARY="The GNU Readline library" +DESCRIPTION="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available. The Readline library includes additional functions to maintain a list of previously-entered command lines, to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands. + +The history facilites are also placed into a separate library, the History library, as part of the build process. The History library may be used without Readline in applications which desire its capabilities." HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +COPYRIGHT="1989-2011 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz" CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c" REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="readline-6.2.patch" + +PROVIDES=" + readline = $portVersion compat >= 6 + lib:libhistory = $portVersion compat >= 6 + lib:libreadline = $portVersion compat >= 6 + " +REQUIRES=" + haiku >= $haikuVersion + ncurses + " +BUILD_REQUIRES=" + $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd readline-6.2 libtoolize --force --copy --install aclocal autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make + runConfigure ./configure \ + --with-curses + make $jobArgs } INSTALL() { - cd readline-6.2 - make install DESTDIR="${DESTDIR}" + make --debug install + + prepareInstalledDevelLibs libhistory libreadline + rmdir $binDir } -LICENSE="GNU GPL v3" -COPYRIGHT="1989-2011 Free Software Foundation, Inc."