This commit was manufactured by cvs2svn to create tag 'RELEASE_4_6_1'.release/4.6.1

7 files changed, 0 insertions, 213 deletions

diff --git a/sysutils/screen/files/patch-aa b/sysutils/screen/files/patch-aa
deleted file mode 100644
index 66d9aa54793e..000000000000
--- a/sysutils/screen/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig	Thu Feb 14 22:36:33 2002
-+++ Makefile.in	Tue Feb 19 13:18:38 2002
-@@ -71,14 +71,8 @@
- 	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
- 
- install_bin: .version screen
--	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
--		then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
--	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
--	-chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
--# This doesn't work if $(bindir)/screen is a symlink
--	-if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
--	rm -f $(DESTDIR)$(bindir)/screen
--	(cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
-+	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen
-+	-chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen
- 	cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
- 
- ###############################################################################
diff --git a/sysutils/screen/files/patch-ab b/sysutils/screen/files/patch-ab
deleted file mode 100644
index ff1673015a5a..000000000000
--- a/sysutils/screen/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	Fri May 25 18:50:55 2001
-+++ doc/Makefile.in	Mon Jun 25 08:42:08 2001
-@@ -27,7 +27,7 @@
- 
- info screen.info: screen.texinfo
- 	@rm -f screen.info*
--	$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
-+	$(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
- 
- install: installdirs
- 	$(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
-@@ -36,7 +36,7 @@
- 	if test -f $$d/screen.info; then \
- 	for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \
- 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
--	  install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \
-+	  install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \
- 	else true; fi; \
- 	fi
- 
diff --git a/sysutils/screen/files/patch-ac b/sysutils/screen/files/patch-ac
deleted file mode 100644
index 38964d4e1753..000000000000
--- a/sysutils/screen/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/screen.texinfo.orig	Wed Feb 13 19:37:42 2002
-+++ doc/screen.texinfo	Tue Feb 19 13:20:28 2002
-@@ -4,6 +4,9 @@
- @setfilename screen.info
- @settitle Screen User's Manual
- @dircategory General Commands
-+@direntry
-+* Screen: (screen).             Full-screen window manager.
-+@end direntry
- @finalout
- @setchapternewpage odd
- @c %**end of header
diff --git a/sysutils/screen/files/patch-ad b/sysutils/screen/files/patch-ad
deleted file mode 100644
index 9d8e59470cc5..000000000000
--- a/sysutils/screen/files/patch-ad
+++ /dev/null
@@ -1,87 +0,0 @@
---- configure.orig	Thu Feb 14 22:11:21 2002
-+++ configure	Tue Feb 19 13:26:23 2002
-@@ -3502,43 +3502,6 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- olibs="$LIBS"
--LIBS="-lcurses $olibs"
--{ echo "$as_me:3506: checking libcurses..." >&5
--echo "$as_me: checking libcurses..." >&6;}
--cat >conftest.$ac_ext <<_ACEOF
--#line 3509 "configure"
--#include "confdefs.h"
--
--int
--main ()
--{
--
--#ifdef __hpux
--__sorry_hpux_libcurses_is_totally_broken_in_10_10();
--#else
--tgetent((char *)0, (char *)0);
--#endif
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3527: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:3530: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3533: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:3536: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
- LIBS="-ltermcap $olibs"
- { echo "$as_me:3543: checking libtermcap..." >&5
- echo "$as_me: checking libtermcap..." >&6;}
-@@ -3643,8 +3606,6 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- if test "$cross_compiling" = yes; then
-   { { echo "$as_me:3650: error: cannot run test program while cross compiling" >&5
-@@ -3657,7 +3618,7 @@
- 
- main()
- {
-- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
-+ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1);
- }
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -3861,18 +3822,15 @@
- fi
- rm -f conftest*
- 
--if test "$ptys" != "$pdir/pty??" ; then
--p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
--p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g'  | sort -u | tr -d '\012'`
-+# XXX: hardcoded, since port must be devfs and various setups independent
-+
- cat >>confdefs.h <<EOF
--#define PTYRANGE0 "$p0"
-+#define PTYRANGE0 "pqrsPQRS"
- EOF
- 
- cat >>confdefs.h <<EOF
--#define PTYRANGE1 "$p1"
-+#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv"
- EOF
--
--fi
- 
- { echo "$as_me:3877: checking default tty permissions/group..." >&5
- echo "$as_me: checking default tty permissions/group..." >&6;}
diff --git a/sysutils/screen/files/patch-af b/sysutils/screen/files/patch-af
deleted file mode 100644
index 426bb1516fd6..000000000000
--- a/sysutils/screen/files/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
---- termcap.c.orig	Wed Jul  5 16:33:30 2000
-+++ termcap.c	Wed Oct 11 05:40:12 2000
-@@ -355,11 +355,7 @@
-   if (D_CG0)
-     {
-       if (D_CS0 == 0)
--#ifdef TERMINFO
--        D_CS0 = "\033(%p1%c";
--#else
--        D_CS0 = "\033(%.";
--#endif
-+	D_CS0 = "\033(%p1%c"; /* Old ncurses can't handle %. */
-       if (D_CE0 == 0)
-         D_CE0 = "\033(B";
-       D_AC = 0;
diff --git a/sysutils/screen/files/patch-ah b/sysutils/screen/files/patch-ah
deleted file mode 100644
index a63bd227918b..000000000000
--- a/sysutils/screen/files/patch-ah
+++ /dev/null
@@ -1,49 +0,0 @@
---- ./display.c.orig	Fri Feb 22 12:56:57 2002
-+++ ./display.c	Fri Feb 22 13:02:10 2002
-@@ -3371,7 +3371,7 @@
- 	    {
- 	      int font = 0;
- 	      j += EncodeChar(buf2 + j, c, D_forecv->c_layer->l_encoding, &font);
--	      j += EncodeChar(buf2 + j, 0, D_forecv->c_layer->l_encoding, &font);
-+	      j += EncodeChar(buf2 + j, -1, D_forecv->c_layer->l_encoding, &font);
- 	    }
- 	  else
- 	    j += EncodeChar(buf2 + j, c, D_forecv->c_layer->l_encoding, 0);
---- ./encoding.c.orig	Fri Feb 22 12:57:46 2002
-+++ ./encoding.c	Fri Feb 22 13:01:30 2002
-@@ -1032,7 +1032,7 @@
-   int t, f, l;
- 
-   debug2("Encoding char %02x for encoding %d\n", c, encoding);
--  if (c == 0 && fontp)
-+  if (c == -1 && fontp)
-     {
-       if (*fontp == 0)
- 	return 0;
-@@ -1297,7 +1297,7 @@
- 	continue;
-       j += EncodeChar(tbuf ? (char *)tbuf + j : 0, c, tenc, &font);
-     }
--  j += EncodeChar(tbuf ? (char *)tbuf + j : 0, 0, tenc, &font);
-+  j += EncodeChar(tbuf ? (char *)tbuf + j : 0, -1, tenc, &font);
-   return j;
- }
- 
-@@ -1456,7 +1456,7 @@
- int *fontp;
- {
-   int f, l;
--  f = c >> 16;
-+  f = (c == -1) ? 0 : c >> 16;
-   l = 0;
-   if (fontp && f != *fontp)
-     {
-@@ -1486,7 +1486,7 @@
- 	  l += 3;
- 	}
-     }
--  if (c == 0)
-+  if (c == -1)
-     return l;
-   if (c & 0xff00)
-     {
diff --git a/sysutils/screen/files/patch-osdef.h.in b/sysutils/screen/files/patch-osdef.h.in
deleted file mode 100644
index 72435743c0eb..000000000000
--- a/sysutils/screen/files/patch-osdef.h.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- osdef.h.in.orig	Sat Apr 28 22:26:43 2001
-+++ osdef.h.in	Tue Apr  9 10:24:18 2002
-@@ -111,7 +111,7 @@
- extern int   setpgid __P((int, int));
- extern int   tcsetpgrp __P((int, int));
- #endif
--extern int   ioctl __P((int, int, char *));
-+extern int   ioctl __P((int, unsigned long, ...));
- 
- extern int   kill __P((int, int));
-