SOURCES: less-libtinfo.patch, less-multilib.patch - updated for 418

[qboosh]

Author: qboosh                       Date: Tue Jan 22 20:27:28 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 418

---- Files affected:
SOURCES:
   less-libtinfo.patch (1.4 -> 1.5) , less-multilib.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/less-libtinfo.patch
diff -u SOURCES/less-libtinfo.patch:1.4 SOURCES/less-libtinfo.patch:1.5
--- SOURCES/less-libtinfo.patch:1.4	Sat Feb 25 19:16:22 2006
+++ SOURCES/less-libtinfo.patch	Tue Jan 22 21:27:23 2008
@@ -1,44 +1,19 @@
---- less-394/configure.ac.orig	2005-10-21 18:21:55.000000000 +0200
-+++ less-394/configure.ac	2006-02-25 19:02:39.151141750 +0100
-@@ -23,10 +23,12 @@
+--- less-418/configure.ac.orig	2007-11-15 18:43:30.000000000 +0100
++++ less-418/configure.ac	2008-01-22 21:04:46.715325810 +0100
+@@ -23,6 +23,7 @@
  AC_SYS_LARGEFILE
  
  # Checks for general libraries.
--AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no])
--AC_CHECK_LIB(ncursesw, initscr, [have_ncursesw=yes], [have_ncursesw=no])
--AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
--AC_CHECK_LIB(curses, initscr, [have_curses=yes], [have_curses=no])
-+AC_CHECK_LIB(xcurses, tgetent, [have_xcurses=yes], [have_xcurses=no])
-+AC_CHECK_LIB(tinfow, tgetent, [have_tinfow=yes], [have_tinfow=no])
-+AC_CHECK_LIB(ncursesw, tgetent, [have_ncursesw=yes], [have_ncursesw=no])
-+AC_CHECK_LIB(tinfo, tgetent, [have_tinfo=yes], [have_tinfo=no])
-+AC_CHECK_LIB(ncurses, tgetent, [have_ncurses=yes], [have_ncurses=no])
-+AC_CHECK_LIB(curses, tgetent, [have_curses=yes], [have_curses=no])
- AC_CHECK_LIB(termcap, tgetent, [have_termcap=yes], [have_termcap=no])
- AC_CHECK_LIB(termlib, tgetent, [have_termlib=yes], [have_termlib=no])
- # Regular expressions (regcmp) are in -lgen on Solaris 2,
-@@ -51,10 +53,10 @@
- fi
++AC_CHECK_LIB(tinfow, tgoto, [have_tinfow=yes], [have_tinfow=no])
+ AC_CHECK_LIB(tinfo, tgoto, [have_tinfo=yes], [have_tinfo=no])
+ AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no])
+ AC_CHECK_LIB(ncursesw, initscr, [have_ncursesw=yes], [have_ncursesw=no])
+@@ -55,6 +56,18 @@
  
- if test $curses_broken = 0; then
--# -- Try xcurses.
-+dnl -- Try tinfow.
+ # -- Try tinfo.
  if test "x$TERMLIBS" = x; then
--  if test $have_xcurses = yes; then
--    TERMLIBS="-lxcurses"
 +  if test $have_tinfow = yes; then
 +    TERMLIBS="-ltinfow"
-     SAVE_LIBS=$LIBS
-     LIBS="$LIBS $TERMLIBS"
-     AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
-@@ -77,6 +79,19 @@
-   fi
- fi
- 
-+dnl -- Try tinfo.
-+if test "x$TERMLIBS" = x; then
-+  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);],
@@ -48,26 +23,7 @@
 +  fi
 +fi
 +
- # -- Try ncurses.
- if test "x$TERMLIBS" = x; then
-   if test $have_ncurses = yes; then
-@@ -90,6 +105,19 @@
-   fi
- fi
- 
-+# -- Try xcurses.
 +if test "x$TERMLIBS" = x; then
-+  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);],
-+      [termok=yes], [termok=no])
-+    LIBS=$SAVE_LIBS
-+    if test $termok = no; then TERMLIBS=""; fi
-+  fi
-+fi
-+
- # -- Try curses.
- if test "x$TERMLIBS" = x; then
-   if test $have_curses = yes; then
+   if test $have_tinfo = yes; then
+     TERMLIBS="-ltinfo"
+     SAVE_LIBS=$LIBS

================================================================
Index: SOURCES/less-multilib.patch
diff -u SOURCES/less-multilib.patch:1.1 SOURCES/less-multilib.patch:1.2
--- SOURCES/less-multilib.patch:1.1	Fri Mar  2 18:37:43 2007
+++ SOURCES/less-multilib.patch	Tue Jan 22 21:27:23 2008
@@ -1,17 +1,17 @@
---- less-394/Makefile.in.orig	2007-03-02 17:40:55.000000000 +0100
-+++ less-394/Makefile.in	2007-03-02 17:41:38.000000000 +0100
-@@ -51,13 +51,13 @@
- all: less lesskey lessecho
+--- less-418/Makefile.in.orig	2007-11-29 00:06:43.000000000 +0100
++++ less-418/Makefile.in	2008-01-22 20:49:05.929713493 +0100
+@@ -53,13 +53,13 @@
+ all: less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT)
  
- less: ${OBJ}
+ less$(EXEEXT): ${OBJ}
 -	${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
 +	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
  
- lesskey: lesskey.${O} version.${O}
+ lesskey$(EXEEXT): lesskey.${O} version.${O}
 -	${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O}
 +	${CC} ${CFLAGS} ${LDFLAGS} -o $@ lesskey.${O} version.${O}
  
- lessecho: lessecho.${O} version.${O}
+ lessecho$(EXEEXT): lessecho.${O} version.${O}
 -	${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
 +	${CC} ${CFLAGS} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/less-libtinfo.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/less-multilib.patch?r1=1.1&r2=1.2&f=u