From 97467d7022609d1c650584a51148b3a93d615381 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 24 Aug 2007 13:24:58 +0000 Subject: less: update to 406 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2553 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/less/less-382/configure.patch | 249 ---------------------------- meta/packages/less/less_382.bb | 22 --- meta/packages/less/less_406.bb | 20 +++ 3 files changed, 20 insertions(+), 271 deletions(-) delete mode 100644 meta/packages/less/less-382/configure.patch delete mode 100644 meta/packages/less/less_382.bb create mode 100644 meta/packages/less/less_406.bb (limited to 'meta/packages') diff --git a/meta/packages/less/less-382/configure.patch b/meta/packages/less/less-382/configure.patch deleted file mode 100644 index 9ae5bda7b8..0000000000 --- a/meta/packages/less/less-382/configure.patch +++ /dev/null @@ -1,249 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- - configure.ac | 100 +++++++++++++++++++++-------------------------------------- - 1 file changed, 37 insertions(+), 63 deletions(-) - -Index: less-382/configure.ac -=================================================================== ---- less-382.orig/configure.ac 2004-02-04 04:52:26.000000000 +0000 -+++ less-382/configure.ac 2007-03-26 23:35:29.000000000 +0100 -@@ -9,7 +9,7 @@ - # contact the author, see the README file. - - # Autoconf initialization. --AC_INIT(less, 1) -+AC_INIT([less],[1]) - AC_CONFIG_SRCDIR([forwback.c]) - AC_CONFIG_HEADER([defines.h]) - -@@ -56,8 +56,7 @@ if test "x$TERMLIBS" = x; then - TERMLIBS="-lxcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -69,8 +68,7 @@ if test "x$TERMLIBS" = x; then - TERMLIBS="-lncurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -82,8 +80,7 @@ if test "x$TERMLIBS" = x; then - TERMLIBS="-lcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -96,8 +93,7 @@ if test "x$TERMLIBS" = x; then - TERMLIBS="-lcurses -ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -111,8 +107,7 @@ if test "x$TERMLIBS" = x; then - TERMLIBS="-ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -124,8 +119,7 @@ if test "x$TERMLIBS" = x; then - TERMLIBS="-lcurses -ltermlib" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -200,14 +194,11 @@ AH_TEMPLATE([EDIT_PGM], - # Checks for identifiers. - AC_TYPE_OFF_T - AC_MSG_CHECKING(for void) --AC_TRY_COMPILE(, [void *foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void *foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for const) --AC_TRY_COMPILE(, [const int foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[const int foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for time_t) --AC_TRY_COMPILE([#include ], [time_t t = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[time_t t = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)],[AC_MSG_RESULT(no)]) - - # Checks for library functions. - AC_TYPE_SIGNAL -@@ -217,14 +208,13 @@ AC_CHECK_FUNCS([fsync memcpy popen _setj - AC_CHECK_FUNC(tcgetattr, AC_DEFINE(HAVE_TERMIOS_FUNCS)) - - AC_MSG_CHECKING(for fileno) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_STDIO_H - #include --#endif], [static int x; x = fileno(stdin);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)], [AC_MSG_RESULT(no)]) -+#endif]], [[static int x; x = fileno(stdin);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for strerror) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_STDIO_H - #include - #endif -@@ -233,68 +223,56 @@ AC_TRY_LINK([ - #endif - #if HAVE_ERRNO_H - #include --#endif], [static char *x; x = strerror(0);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)]) -+#endif]], [[static char *x; x = strerror(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sys_errlist) --AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char *sys_errlist[]; static char **x; x = sys_errlist;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sigset_t) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include --], [sigset_t s; s = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)], [AC_MSG_RESULT(no)]) -+]], [[sigset_t s; s = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sigemptyset) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include --], [sigset_t s; sigemptyset(&s);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)], [AC_MSG_RESULT(no)]) -+]], [[sigset_t s; sigemptyset(&s);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)],[AC_MSG_RESULT(no)]) - - have_errno=no - AC_MSG_CHECKING(for errno) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_ERRNO_H - #include --#endif], [static int x; x = errno;], -- [AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes]) -+#endif]], [[static int x; x = errno;]])],[AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes],[]) - if test $have_errno = no; then --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_ERRNO_H - #include --#endif], [extern int errno; static int x; x = errno;], -- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)], -- [AC_MSG_RESULT(no)]) -+#endif]], [[extern int errno; static int x; x = errno;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)],[AC_MSG_RESULT(no)]) - fi - - AC_MSG_CHECKING(for locale) --AC_TRY_LINK([#include --#include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include -+#include ]], [[setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for ctype functions) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_CTYPE_H - #include --#endif], [static int x; x = isupper(x); x = tolower(x); x = toupper(x);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)], [AC_MSG_RESULT(no)]) -+#endif]], [[static int x; x = isupper(x); x = tolower(x); x = toupper(x);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)],[AC_MSG_RESULT(no)]) - - # Checks for external variable ospeed in the termcap library. - have_ospeed=no - AC_MSG_CHECKING(termcap for ospeed) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include - #if HAVE_TERMIOS_H - #include - #endif - #if HAVE_TERMCAP_H - #include --#endif], [ospeed = 0;], --[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes]) -+#endif]], [[ospeed = 0;]])],[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes],[]) - if test $have_ospeed = no; then --AC_TRY_LINK(, [extern short ospeed; ospeed = 0;], -- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)], -- [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern short ospeed; ospeed = 0;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)],[AC_MSG_RESULT(no)]) - fi - - # Checks for regular expression functions. -@@ -311,7 +289,7 @@ if test $have_regex = no; then - if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then - # Some versions of Solaris have a regcomp() function, but it doesn't work! - # So we run a test program. If we're cross-compiling, do it the old way. --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - main() { regex_t r; regmatch_t rm; char *text = "xabcy"; -@@ -322,19 +300,16 @@ if (rm.rm_so != 1) exit(1); /* check for - #else - if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */ - #endif --exit(0); }], -- have_posix_regex=yes, have_posix_regex=no, have_posix_regex=unknown) -+exit(0); }]])],[have_posix_regex=yes],[have_posix_regex=no],[have_posix_regex=unknown]) - if test $have_posix_regex = yes; then - AC_MSG_RESULT(using POSIX regcomp) - AC_DEFINE(HAVE_POSIX_REGCOMP) - have_regex=yes - elif test $have_posix_regex = unknown; then -- AC_TRY_LINK([ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include --#include ], -- [regex_t *r; regfree(r);], -- AC_MSG_RESULT(using POSIX regcomp) -- AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes) -+#include ]], [[regex_t *r; regfree(r);]])],[AC_MSG_RESULT(using POSIX regcomp) -+ AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes],[]) - else - AC_MSG_RESULT(no) - fi -@@ -357,9 +332,8 @@ fi - - if test $have_regex = no; then - if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then --AC_TRY_LINK([ --#include "regexp.h"], [regcomp("");], --AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -+#include "regexp.h"]], [[regcomp("");]])],[AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes],[]) - fi - fi - diff --git a/meta/packages/less/less_382.bb b/meta/packages/less/less_382.bb deleted file mode 100644 index f336a59ad6..0000000000 --- a/meta/packages/less/less_382.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Less is a program similar to more, i.e. a terminal \ -based program for viewing text files and the output from other \ -programs. Less offers many features beyond those that more does." -HOMEPAGE = "http://www.greenwoodsoftware.com/" -SECTION = "console/utils" -LICENSE = "BSD" -DEPENDS = "ncurses" -PR = "r1" - -SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz \ - file://configure.patch;patch=1" - -inherit autotools update-alternatives - -do_install () { - oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install - mv ${D}${bindir}/less ${D}${bindir}/less.${PN} -} - -ALTERNATIVE_NAME = "less" -ALTERNATIVE_PATH = "less.${PN}" -ALTERNATIVE_PRIORITY = "100" diff --git a/meta/packages/less/less_406.bb b/meta/packages/less/less_406.bb new file mode 100644 index 0000000000..c8ef2fc6e6 --- /dev/null +++ b/meta/packages/less/less_406.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Less is a program similar to more, i.e. a terminal \ +based program for viewing text files and the output from other \ +programs. Less offers many features beyond those that more does." +HOMEPAGE = "http://www.greenwoodsoftware.com/" +SECTION = "console/utils" +LICENSE = "BSD" +DEPENDS = "ncurses" + +SRC_URI = "http://www.greenwoodsoftware.com/less/less-406.tar.gz " + +inherit autotools update-alternatives + +do_install () { + oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install + mv ${D}${bindir}/less ${D}${bindir}/less.${PN} +} + +ALTERNATIVE_NAME = "less" +ALTERNATIVE_PATH = "less.${PN}" +ALTERNATIVE_PRIORITY = "100" -- cgit v1.2.3