OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Nov-2007 10:04:28
Branch: HEAD Handle: 2007111709042601
Modified files:
openpkg-src/less less.patch less.spec
Log:
upgrading package: less 409 -> 415
Summary:
Revision Changes Path
1.7 +106 -92 openpkg-src/less/less.patch
1.60 +2 -2 openpkg-src/less/less.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/less/less.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 less.patch
--- openpkg-src/less/less.patch 24 Aug 2007 18:45:22 -0000 1.6
+++ openpkg-src/less/less.patch 17 Nov 2007 09:04:26 -0000 1.7
@@ -1,6 +1,6 @@
Index: main.c
---- main.c.orig 2007-06-17 18:56:04 +0200
-+++ main.c 2007-08-24 20:34:29 +0200
+--- main.c.orig 2007-11-15 01:15:56 +0100
++++ main.c 2007-11-17 09:59:06 +0100
@@ -57,6 +57,7 @@
extern int missing_cap;
@@ -44,13 +44,26 @@
remove the ncurses dependency from the package, too. -- rse
Index: configure.ac
---- configure.ac.orig 2007-03-30 17:54:26 +0200
-+++ configure.ac 2007-05-27 13:10:50 +0200
-@@ -50,11 +50,10 @@
- fi
+--- configure.ac.orig 2007-11-15 18:43:30 +0100
++++ configure.ac 2007-11-17 10:01:08 +0100
+@@ -53,10 +53,10 @@
+
+ if test $curses_broken = 0; then
+
+-# -- Try tinfo.
++# -- Try termcap.
+ if test "x$TERMLIBS" = x; then
+- if test $have_tinfo = yes; then
+- TERMLIBS="-ltinfo"
++ if test $have_termcap = yes; then
++ TERMLIBS="-ltermcap"
+ SAVE_LIBS=$LIBS
+ LIBS="$LIBS $TERMLIBS"
+ AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
+@@ -66,10 +66,10 @@
+ fi
fi
--if test $curses_broken = 0; then
-# -- Try xcurses.
+# -- Try termlib.
if test "x$TERMLIBS" = x; then
@@ -61,101 +74,108 @@
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
-@@ -77,10 +76,10 @@
+@@ -79,10 +79,10 @@
fi
fi
--# -- Try ncurses.
-+# -- Try termcap.
+-# -- Try ncursesw.
++# -- Try tinfo.
if test "x$TERMLIBS" = x; then
-- if test $have_ncurses = yes; then
-- TERMLIBS="-lncurses"
-+ if test $have_termcap = yes; then
-+ TERMLIBS="-ltermcap"
+- if test $have_ncursesw = yes; then
+- TERMLIBS="-lncursesw"
++ if test $have_tinfo = yes; then
++ TERMLIBS="-ltinfo"
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
-@@ -90,10 +89,12 @@
+@@ -92,10 +92,10 @@
fi
fi
--# -- Try curses.
-+if test $curses_broken = 0; then
-+# -- Try curses & termcap.
+-# -- Try ncurses.
++# -- Try ncursesw.
if test "x$TERMLIBS" = x; then
- if test $have_curses = yes; then
-- TERMLIBS="-lcurses"
-+ if test $have_termcap = yes; then
-+ TERMLIBS="-lcurses -ltermcap"
+- if test $have_ncurses = yes; then
+- TERMLIBS="-lncurses"
++ if test $have_ncursesw = yes; then
++ TERMLIBS="-lncursesw"
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
-@@ -101,13 +102,13 @@
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
+@@ -105,10 +105,10 @@
fi
-+ fi
fi
--# -- Try curses & termcap.
-+# -- Try xcurses.
+-# -- Try curses.
++# -- Try ncurses.
if test "x$TERMLIBS" = x; then
- if test $have_curses = yes; then
-- if test $have_termcap = yes; then
-- TERMLIBS="-lcurses -ltermcap"
-+ if test $have_xcurses = yes; then
-+ TERMLIBS="-lxcurses"
+- TERMLIBS="-lcurses"
++ if test $have_ncurses = yes; then
++ TERMLIBS="-lncurses"
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
-@@ -115,14 +116,12 @@
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
+@@ -132,12 +132,11 @@
+ fi
fi
-- fi
--fi
fi
+-fi
-# -- Try termcap.
-+# -- Try ncurses.
++# -- Try curses.
if test "x$TERMLIBS" = x; then
- if test $have_termcap = yes; then
- TERMLIBS="-ltermcap"
-+ if test $have_ncurses = yes; then
-+ TERMLIBS="-lncurses"
++ if test $have_curses = yes; then
++ TERMLIBS="-lcurses"
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
-@@ -132,10 +131,10 @@
+@@ -147,10 +146,10 @@
fi
fi
-# -- Try termlib.
-+# -- Try curses.
++# -- Try xcurses.
if test "x$TERMLIBS" = x; then
- if test $have_termlib = yes; then
- TERMLIBS="-lcurses -ltermlib"
-+ if test $have_curses = yes; then
-+ TERMLIBS="-lcurses"
++ if test $have_xcurses = yes; then
++ TERMLIBS="-lxcurses"
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
-@@ -144,6 +143,7 @@
- if test $termok = no; then TERMLIBS=""; fi
+@@ -160,6 +159,8 @@
fi
fi
-+fi
++fi
++
if test "x$TERMLIBS" = x; then
AC_MSG_RESULT(Cannot find terminal libraries - configure failed)
+ exit 1
Index: configure
---- configure.orig 2007-03-30 17:54:41 +0200
-+++ configure 2007-05-27 13:11:06 +0200
-@@ -4245,11 +4245,10 @@
- fi
+--- configure.orig 2007-11-15 18:45:57 +0100
++++ configure 2007-11-17 10:02:03 +0100
+@@ -4314,10 +4314,10 @@
+
+ if test $curses_broken = 0; then
+
+-# -- Try tinfo.
++# -- Try termcap.
+ if test "x$TERMLIBS" = x; then
+- if test $have_tinfo = yes; then
+- TERMLIBS="-ltinfo"
++ if test $have_termcap = yes; then
++ TERMLIBS="-ltermcap"
+ SAVE_LIBS=$LIBS
+ LIBS="$LIBS $TERMLIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4368,10 +4368,10 @@
+ fi
fi
--if test $curses_broken = 0; then
-# -- Try xcurses.
+# -- Try termlib.
if test "x$TERMLIBS" = x; then
@@ -166,90 +186,84 @@
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
cat >conftest.$ac_ext <<_ACEOF
-@@ -4354,10 +4353,10 @@
+@@ -4422,10 +4422,10 @@
fi
fi
--# -- Try ncurses.
-+# -- Try termcap.
+-# -- Try ncursesw.
++# -- Try tinfo.
if test "x$TERMLIBS" = x; then
-- if test $have_ncurses = yes; then
-- TERMLIBS="-lncurses"
-+ if test $have_termcap = yes; then
-+ TERMLIBS="-ltermcap"
+- if test $have_ncursesw = yes; then
+- TERMLIBS="-lncursesw"
++ if test $have_tinfo = yes; then
++ TERMLIBS="-ltinfo"
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
cat >conftest.$ac_ext <<_ACEOF
-@@ -4408,10 +4407,12 @@
+@@ -4476,10 +4476,10 @@
fi
fi
--# -- Try curses.
-+if test $curses_broken = 0; then
-+# -- Try curses & termcap.
+-# -- Try ncurses.
++# -- Try ncursesw.
if test "x$TERMLIBS" = x; then
- if test $have_curses = yes; then
-- TERMLIBS="-lcurses"
-+ if test $have_termcap = yes; then
-+ TERMLIBS="-lcurses -ltermcap"
+- if test $have_ncurses = yes; then
+- TERMLIBS="-lncurses"
++ if test $have_ncursesw = yes; then
++ TERMLIBS="-lncursesw"
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
cat >conftest.$ac_ext <<_ACEOF
-@@ -4460,13 +4461,13 @@
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
+@@ -4530,10 +4530,10 @@
fi
-+ fi
fi
--# -- Try curses & termcap.
-+# -- Try xcurses.
+-# -- Try curses.
++# -- Try ncurses.
if test "x$TERMLIBS" = x; then
- if test $have_curses = yes; then
-- if test $have_termcap = yes; then
-- TERMLIBS="-lcurses -ltermcap"
-+ if test $have_xcurses = yes; then
-+ TERMLIBS="-lxcurses"
+- TERMLIBS="-lcurses"
++ if test $have_ncurses = yes; then
++ TERMLIBS="-lncurses"
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
cat >conftest.$ac_ext <<_ACEOF
-@@ -4515,14 +4516,12 @@
- LIBS=$SAVE_LIBS
- if test $termok = no; then TERMLIBS=""; fi
+@@ -4639,12 +4639,11 @@
+ fi
fi
-- fi
--fi
fi
+-fi
-# -- Try termcap.
-+# -- Try ncurses.
++# -- Try curses.
if test "x$TERMLIBS" = x; then
- if test $have_termcap = yes; then
- TERMLIBS="-ltermcap"
-+ if test $have_ncurses = yes; then
-+ TERMLIBS="-lncurses"
++ if test $have_curses = yes; then
++ TERMLIBS="-lcurses"
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
cat >conftest.$ac_ext <<_ACEOF
-@@ -4573,10 +4572,10 @@
+@@ -4695,10 +4694,10 @@
fi
fi
-# -- Try termlib.
-+# -- Try curses.
++# -- Try xcurses.
if test "x$TERMLIBS" = x; then
- if test $have_termlib = yes; then
- TERMLIBS="-lcurses -ltermlib"
-+ if test $have_curses = yes; then
-+ TERMLIBS="-lcurses"
++ if test $have_xcurses = yes; then
++ TERMLIBS="-lxcurses"
SAVE_LIBS=$LIBS
LIBS="$LIBS $TERMLIBS"
cat >conftest.$ac_ext <<_ACEOF
-@@ -4626,6 +4625,7 @@
- if test $termok = no; then TERMLIBS=""; fi
+@@ -4749,6 +4748,8 @@
fi
fi
-+fi
++fi
++
if test "x$TERMLIBS" = x; then
{ echo "$as_me:$LINENO: result: Cannot find terminal libraries -
configure failed" >&5
+ echo "${ECHO_T}Cannot find terminal libraries - configure failed" >&6; }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/less/less.spec
============================================================================
$ cvs diff -u -r1.59 -r1.60 less.spec
--- openpkg-src/less/less.spec 12 Oct 2007 19:28:02 -0000 1.59
+++ openpkg-src/less/less.spec 17 Nov 2007 09:04:27 -0000 1.60
@@ -32,8 +32,8 @@
Class: BASE
Group: ShellUtils
License: GPL
-Version: 409
-Release: 20071012
+Version: 415
+Release: 20071117
# list of sources
Source0: http://www.greenwoodsoftware.com/less/less-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
