Move misc/screen to sysutils category after repocopy, since it's

more appropriate place for such kind of software.

PR:		ports/88497
Submitted by:	krion

19 files changed, 4 insertions, 325 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 9d322b80d5cb..7bee023caa83 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -11256,7 +11256,7 @@ scr2txt		ports/textproc/scr2txt
 scr_ipfm	ports/net/scr_ipfm
 screamer	ports/lang/screamer
 screem		ports/www/screem
-screen		ports/misc/screen
+screen		ports/sysutils/screen
 scriba		ports/lang/scriba
 scribus		ports/print/scribus
 script4rss	ports/www/script4rss
diff --git a/MOVED b/MOVED
index 79d2ae5a455a..d50ea414bd43 100644
--- a/MOVED
+++ b/MOVED
@@ -1724,3 +1724,4 @@ editors/abiword-devel|editors/abiword|2005-11-04|Has been merged into abiword
 editors/abiword-plugins-devel|editors/abiword-plugins|2005-11-04|Has been merged into abiword-plugins
 net/trafshow4|net/trafshow|2005-11-05|obsolete version, use net/trafshow instead
 games/p5-Games-Sequential|games/p5-Games-AlphaBeta|2005-11-05|has been merged into games/p5-Games-AlphaBeta
+misc/screen|sysutils/screen|2005-11-05|new category
diff --git a/misc/Makefile b/misc/Makefile
index 413e0e175380..17b46e36387a 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -385,7 +385,6 @@
     SUBDIR += rpl
     SUBDIR += rtfm
     SUBDIR += salias
-    SUBDIR += screen
     SUBDIR += seizedesktop
     SUBDIR += seq2
     SUBDIR += shared-mime-info
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
deleted file mode 100644
index 883b99a9f814..000000000000
--- a/misc/screen/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# New ports collection makefile for:	screen
-# Date created:         25 Nov 1994
-# Whom:                 ache
-#
-# $FreeBSD$
-#
-
-PORTNAME=	screen
-PORTVERSION=	4.0.2
-PORTREVISION=	3
-CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
-		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	screen
-
-MAINTAINER=	cy@FreeBSD.org
-COMMENT=	A multi-screen window manager
-
-GNU_CONFIGURE=	yes
-MAN1=		screen.1
-INFO=		screen
-
-NO_PACKAGE=	Tends to loop using 100% CPU when used from package - perhaps it hard-codes information about the build host
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "alpha"
-CFLAGS+=	-O0
-.endif
-
-# Enables support for 256 colour xterm.  Note that you may need to
-# set up a custom termcap entry or .screenrc which modifies termcap
-# to contain the following: Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm
-#
-.if defined(WITH_XTERM_256)
-CFLAGS+=	-DCOLORS256
-.endif
-
-.if defined(WITHOUT_NETHACK)
-CFLAGS+=	-DNONETHACK
-.endif
-
-post-patch:
-	@${RM} ${WRKSRC}/doc/screen.info*
-
-post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} ${WRKSRC}/etc/etcscreenrc ${EXAMPLESDIR}/screenrc
-	@if [ ! -f ${PREFIX}/etc/screenrc ]; then \
-		${CP} ${EXAMPLESDIR}/screenrc ${PREFIX}/etc/screenrc ; \
-	fi
-
-.include <bsd.port.post.mk>
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
deleted file mode 100644
index e9873a2db16e..000000000000
--- a/misc/screen/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (screen-4.0.2.tar.gz) = ed68ea9b43d9fba0972cb017a24940a1
-SIZE (screen-4.0.2.tar.gz) = 840519
diff --git a/misc/screen/files/patch-aa b/misc/screen/files/patch-aa
deleted file mode 100644
index 66d9aa54793e..000000000000
--- a/misc/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/misc/screen/files/patch-ab b/misc/screen/files/patch-ab
deleted file mode 100644
index ff1673015a5a..000000000000
--- a/misc/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/misc/screen/files/patch-ad b/misc/screen/files/patch-ad
deleted file mode 100644
index 8e5a4af1448b..000000000000
--- a/misc/screen/files/patch-ad
+++ /dev/null
@@ -1,92 +0,0 @@
---- configure.orig	Mon Jan 26 15:55:18 2004
-+++ configure	Mon Jan 26 15:58:50 2004
-@@ -4746,48 +4746,6 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- olibs="$LIBS"
--LIBS="-lcurses $olibs"
--{ echo "$as_me:$LINENO: checking libcurses..." >&5
--echo "$as_me: checking libcurses..." >&6;}
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end 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:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- LIBS="-ltermcap $olibs"
- { echo "$as_me:$LINENO: checking libtermcap..." >&5
- echo "$as_me: checking libtermcap..." >&6;}
-@@ -4907,8 +4865,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:$LINENO: error: cannot run test program while cross compiling
-@@ -4927,7 +4883,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
-@@ -5314,18 +5270,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 <<_ACEOF
--#define PTYRANGE0 "$p0"
-+#define PTYRANGE0 "pqrsPQRS"
- _ACEOF
- 
- cat >>confdefs.h <<_ACEOF
--#define PTYRANGE1 "$p1"
-+#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv"
- _ACEOF
--
--fi
- 
- 
- # Check whether --with-pty-mode or --without-pty-mode was given.
diff --git a/misc/screen/files/patch-af b/misc/screen/files/patch-af
deleted file mode 100644
index 426bb1516fd6..000000000000
--- a/misc/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/misc/screen/files/patch-ansi.c b/misc/screen/files/patch-ansi.c
deleted file mode 100644
index dc5ba91b521a..000000000000
--- a/misc/screen/files/patch-ansi.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ansi.c.orig	Mon Sep  8 07:24:44 2003
-+++ ansi.c	Mon Dec  1 17:17:17 2003
-@@ -559,7 +559,7 @@
- 	    {
- 	    case '0': case '1': case '2': case '3': case '4':
- 	    case '5': case '6': case '7': case '8': case '9':
--	      if (curr->w_NumArgs < MAXARGS)
-+	      if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
- 		{
- 		  if (curr->w_args[curr->w_NumArgs] < 100000000)
- 		    curr->w_args[curr->w_NumArgs] =
diff --git a/misc/screen/files/patch-os.h b/misc/screen/files/patch-os.h
deleted file mode 100644
index 9103b278fa7d..000000000000
--- a/misc/screen/files/patch-os.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- os.h.orig	Tue Jan  8 07:42:33 2002
-+++ os.h	Tue Sep  9 17:39:58 2003
-@@ -161,7 +161,7 @@
- # define setregid(rgid, egid) setresgid(rgid, egid, -1)
- #endif
- 
--#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID)
-+#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && __FreeBSD_version < 500000
- # define USE_SETEUID
- #endif
- 
diff --git a/misc/screen/files/patch-osdef.h.in b/misc/screen/files/patch-osdef.h.in
deleted file mode 100644
index 72435743c0eb..000000000000
--- a/misc/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));
- 
diff --git a/misc/screen/files/patch-resize.c b/misc/screen/files/patch-resize.c
deleted file mode 100644
index a2af125f12ff..000000000000
--- a/misc/screen/files/patch-resize.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- resize.c.orig	Mon Sep  8 07:26:31 2003
-+++ resize.c	Mon Dec  1 17:16:29 2003
-@@ -682,6 +682,17 @@
-   if (wi == 0)
-     he = hi = 0;
- 
-+  if (wi > 1000)
-+    {
-+      Msg(0, "Window width too large, truncated");
-+      wi = 1000;
-+    }
-+  if (he > 1000)
-+    {
-+      Msg(0, "Window height too large, truncated");
-+      he = 1000;
-+    }
-+
-   if (p->w_width == wi && p->w_height == he && p->w_histheight == hi)
-     {
-       debug("ChangeWindowSize: No change.\n");
diff --git a/misc/screen/files/patch-terminfo::checktc.c b/misc/screen/files/patch-terminfo::checktc.c
deleted file mode 100644
index d4ffb75cc0c1..000000000000
--- a/misc/screen/files/patch-terminfo::checktc.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- terminfo/checktc.c.orig	Fri Sep 29 09:13:22 1995
-+++ terminfo/checktc.c	Tue Apr 22 20:37:18 2003
-@@ -171,6 +171,7 @@
-   fflush(stdout);
- }
- 
-+#ifndef __FreeBSD__
- void CPutStr(s, c)
- char *s;
- int c;
-@@ -178,6 +179,7 @@
-   tputs(tgoto(s, 0, c), 1, putcha);
-   fflush(stdout);
- }
-+#endif /* __FreeBSD__ */
- 
- void CCPutStr(s, x, y)
- char *s;
diff --git a/misc/screen/files/patch-utmp.c b/misc/screen/files/patch-utmp.c
deleted file mode 100644
index caedb6c1ec50..000000000000
--- a/misc/screen/files/patch-utmp.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- utmp.c.orig	Mon Sep  8 16:27:17 2003
-+++ utmp.c	Wed Oct 19 14:58:40 2005
-@@ -726,9 +728,12 @@
- char *line, *user;
- int pid;
- {
-+  time_t temp;
-+
-   strncpy(u->ut_line, line, sizeof(u->ut_line));
-   strncpy(u->ut_name, user, sizeof(u->ut_name));
--  (void)time((time_t *)&u->ut_time);
-+  (void)time(&temp);
-+  u->ut_time = temp;
- }
- 
- static slot_t
-
diff --git a/misc/screen/pkg-descr b/misc/screen/pkg-descr
deleted file mode 100644
index 36b1048e0a0a..000000000000
--- a/misc/screen/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Screen is a full-screen window manager that multiplexes a physical terminal
-between several processes (typically interactive shells).
-Each virtual terminal provides the functions of a DEC VT100 terminal and, in
-addition, several control functions from the ANSI X3.64 (ISO 6429) and ISO
-2022 standards (e.g. insert/delete line and support for multiple character
-sets). There is a scrollback history buffer for each virtual terminal and a 
-copy-and-paste mechanism that allows moving text regions between windows.
-
-WWW: http://www.gnu.org/software/screen/
diff --git a/misc/screen/pkg-plist b/misc/screen/pkg-plist
deleted file mode 100644
index 4bf7b39f7bc4..000000000000
--- a/misc/screen/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-bin/screen
-%%DATADIR%%/utf8encodings/01
-%%DATADIR%%/utf8encodings/02
-%%DATADIR%%/utf8encodings/03
-%%DATADIR%%/utf8encodings/04
-%%DATADIR%%/utf8encodings/18
-%%DATADIR%%/utf8encodings/19
-%%DATADIR%%/utf8encodings/a1
-%%DATADIR%%/utf8encodings/bf
-%%DATADIR%%/utf8encodings/c2
-%%DATADIR%%/utf8encodings/c3
-%%DATADIR%%/utf8encodings/c4
-%%DATADIR%%/utf8encodings/c6
-%%DATADIR%%/utf8encodings/c7
-%%DATADIR%%/utf8encodings/c8
-%%DATADIR%%/utf8encodings/cc
-%%DATADIR%%/utf8encodings/cd
-%%DATADIR%%/utf8encodings/d6
-@unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi
-%%EXAMPLESDIR%%/screenrc
-@exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%/utf8encodings
-@dirrm %%DATADIR%%
diff --git a/sysutils/Makefile b/sysutils/Makefile
index e378dc6a7f5b..9eb222d20b71 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -463,6 +463,7 @@
     SUBDIR += sb16config
     SUBDIR += sbniconfig
     SUBDIR += scan_ffs
+    SUBDIR += screen
     SUBDIR += sdd
     SUBDIR += sec
     SUBDIR += serpentine
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 883b99a9f814..0eb1dbd07b0c 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	screen
 PORTVERSION=	4.0.2
 PORTREVISION=	3
-CATEGORIES=	misc
+CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	screen