SOURCES: less-DESTDIR.patch, less-shell.patch, less-libtinfo.patch...
glen
glen at pld-linux.org
Thu Feb 23 01:05:24 CET 2006
Author: glen Date: Thu Feb 23 00:05:24 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 394
---- Files affected:
SOURCES:
less-DESTDIR.patch (1.2 -> 1.3) , less-shell.patch (1.2 -> 1.3) , less-libtinfo.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/less-DESTDIR.patch
diff -u SOURCES/less-DESTDIR.patch:1.2 SOURCES/less-DESTDIR.patch:1.3
--- SOURCES/less-DESTDIR.patch:1.2 Thu Dec 30 06:12:09 1999
+++ SOURCES/less-DESTDIR.patch Thu Feb 23 01:05:18 2006
@@ -10,33 +10,37 @@
#### End of system configuration section. ####
SHELL = /bin/sh
-@@ -58,21 +60,21 @@
+--- less-394/Makefile.in~ 2006-02-23 01:47:09.000000000 +0200
++++ less-394/Makefile.in 2006-02-23 01:48:38.000000000 +0200
+@@ -62,22 +62,22 @@
${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h
- install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro installdirs
+ install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro ${srcdir}/lessecho.nro installdirs
- ${INSTALL_PROGRAM} less ${bindir}/${binprefix}less
- ${INSTALL_PROGRAM} lesskey ${bindir}/${binprefix}lesskey
- ${INSTALL_PROGRAM} lessecho ${bindir}/${binprefix}lessecho
- ${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/man${manext}/${manprefix}less.${manext}
- ${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/man${manext}/${manprefix}lesskey.${manext}
-+ ${INSTALL_PROGRAM} less $(DESTDIR)$(bindir)/${binprefix}less
-+ ${INSTALL_PROGRAM} lesskey $(DESTDIR)$(bindir)/${binprefix}lesskey
-+ ${INSTALL_PROGRAM} lessecho $(DESTDIR)$(bindir)/${binprefix}lessecho
-+ ${INSTALL_DATA} ${srcdir}/less.nro $(DESTDIR)$(mandir)/man${manext}/${manprefix}less.${manext}
-+ ${INSTALL_DATA} ${srcdir}/lesskey.nro $(DESTDIR)$(mandir)/man${manext}/${manprefix}lesskey.${manext}
+- ${INSTALL_DATA} ${srcdir}/lessecho.nro ${mandir}/man${manext}/${manprefix}lessecho.${manext}
++ ${INSTALL_PROGRAM} less $(DESTDIR)${bindir}/${binprefix}less
++ ${INSTALL_PROGRAM} lesskey $(DESTDIR)${bindir}/${binprefix}lesskey
++ ${INSTALL_PROGRAM} lessecho $(DESTDIR)${bindir}/${binprefix}lessecho
++ ${INSTALL_DATA} ${srcdir}/less.nro $(DESTDIR)${mandir}/man${manext}/${manprefix}less.${manext}
++ ${INSTALL_DATA} ${srcdir}/lesskey.nro $(DESTDIR)${mandir}/man${manext}/${manprefix}lesskey.${manext}
++ ${INSTALL_DATA} ${srcdir}/lessecho.nro $(DESTDIR)${mandir}/man${manext}/${manprefix}lessecho.${manext}
install-strip:
${MAKE} INSTALL_PROGRAM='${INSTALL_PROGRAM} -s' install
installdirs: mkinstalldirs
- ${srcdir}/mkinstalldirs ${bindir} ${mandir}/man${manext}
-+ ${srcdir}/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man${manext}
++ ${srcdir}/mkinstalldirs $(DESTDIR)${bindir} $(DESTDIR)${mandir}/man${manext}
uninstall:
- rm -f ${bindir}/${binprefix}less ${bindir}/${binprefix}lesskey ${bindir}/${binprefix}lessecho
- rm -f ${mandir}/man${manext}/${manprefix}less.${manext} ${mandir}/man${manext}/${manprefix}lesskey.${manext}
-+ rm -f $(DESTDIR)$(bindir)/${binprefix}less $(DESTDIR)$(bindir)/${binprefix}lesskey $(DESTDIR)$(bindir)/${binprefix}lessecho
-+ rm -f $(DESTDIR)$(mandir)/man${manext}/${manprefix}less.${manext} $(DESTDIR)$(mandir)/man${manext}/${manprefix}lesskey.${manext}
++ rm -f $(DESTDIR)${bindir}/${binprefix}less $(DESTDIR)${bindir}/${binprefix}lesskey $(DESTDIR)${bindir}/${binprefix}lessecho
++ rm -f $(DESTDIR)${mandir}/man${manext}/${manprefix}less.${manext} $(DESTDIR)${mandir}/man${manext}/${manprefix}lesskey.${manext}
info:
install-info:
================================================================
Index: SOURCES/less-shell.patch
diff -u SOURCES/less-shell.patch:1.2 SOURCES/less-shell.patch:1.3
--- SOURCES/less-shell.patch:1.2 Wed Mar 6 18:56:11 2002
+++ SOURCES/less-shell.patch Thu Feb 23 01:05:18 2006
@@ -1,6 +1,6 @@
---- less-374/filename.c~ Wed Mar 6 14:54:12 2002
-+++ less-374/filename.c Wed Mar 6 14:56:58 2002
-@@ -550,37 +550,7 @@
+--- less-394/filename.c~ 2006-02-23 01:49:12.000000000 +0200
++++ less-394/filename.c 2006-02-23 01:50:36.000000000 +0200
+@@ -557,37 +557,7 @@
{
FILE *fd;
@@ -23,9 +23,9 @@
- fd = popen(cmd, "r");
- } else
- {
-- scmd = (char *) ecalloc(strlen(shell) + strlen(esccmd) + 5,
-- sizeof(char));
-- sprintf(scmd, "%s %s %s", shell, shell_coption(), esccmd);
+- int len = strlen(shell) + strlen(esccmd) + 5;
+- scmd = (char *) ecalloc(len, sizeof(char));
+- SNPRINTF3(scmd, len, "%s %s %s", shell, shell_coption(), esccmd);
- free(esccmd);
- fd = popen(scmd, "r");
- free(scmd);
================================================================
Index: SOURCES/less-libtinfo.patch
diff -u SOURCES/less-libtinfo.patch:1.2 SOURCES/less-libtinfo.patch:1.3
--- SOURCES/less-libtinfo.patch:1.2 Sun Feb 16 22:32:24 2003
+++ SOURCES/less-libtinfo.patch Thu Feb 23 01:05:18 2006
@@ -1,13 +1,15 @@
---- lesso/configure.ac Sat Jan 18 05:55:15 2003
-+++ less/configure.ac Sun Feb 16 22:28:19 2003
-@@ -23,9 +23,9 @@
+--- less-394/configure.ac~ 2006-02-23 01:51:08.000000000 +0200
++++ less-394/configure.ac 2006-02-23 01:51:54.000000000 +0200
+@@ -23,10 +23,10 @@
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(ncursesw, tgetent, [have_ncursesw=yes], [have_ncursesw=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])
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/less-DESTDIR.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/less-shell.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/less-libtinfo.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list