diff --git a/misc/screen/Makefile b/misc/screen/Makefile index dd538d384c5..1de7d517972 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.51 2003/12/04 23:27:07 margarida Exp $ +# $OpenBSD: Makefile,v 1.52 2004/01/17 05:34:28 brad Exp $ COMMENT= "multi-screen window manager" -VERSION= 4.0.1 +VERSION= 4.0.2 DISTNAME= screen-${VERSION} -PKGNAME= ${DISTNAME}p2 CATEGORIES= misc MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ @@ -20,6 +19,8 @@ PERMIT_DISTFILES_FTP= Yes SUBST_VARS= VERSION +CFLAGS+= -Wall + CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-sys-screenrc="${SYSCONFDIR}/screenrc" diff --git a/misc/screen/distinfo b/misc/screen/distinfo index f01563392dd..9806d5c85d7 100644 --- a/misc/screen/distinfo +++ b/misc/screen/distinfo @@ -1,3 +1,3 @@ -MD5 (screen-4.0.1.tar.gz) = 2f674d5a7a299abf085d0b69c90de4f8 -RMD160 (screen-4.0.1.tar.gz) = 95f27185a0031fc6d5606d72f86ad75789f890ec -SHA1 (screen-4.0.1.tar.gz) = 61f24b18c56b5862c769345d204f57b1e7f222ab +MD5 (screen-4.0.2.tar.gz) = ed68ea9b43d9fba0972cb017a24940a1 +RMD160 (screen-4.0.2.tar.gz) = 42aea3d27ed25104f2a48606ea73234b715e480f +SHA1 (screen-4.0.2.tar.gz) = 461eb9d5edc211e1480d7b5e94d89c4d9ba3643f diff --git a/misc/screen/patches/patch-ansi_c b/misc/screen/patches/patch-ansi_c deleted file mode 100644 index d376568c893..00000000000 --- a/misc/screen/patches/patch-ansi_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-ansi_c,v 1.1 2003/12/04 23:27:07 margarida Exp $ ---- ansi.c.orig 2003-11-28 00:27:43.000000000 +0000 -+++ ansi.c 2003-11-28 00:28:29.000000000 +0000 -@@ -559,7 +559,7 @@ register int len; - { - 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/patches/patch-etc_etcscreenrc b/misc/screen/patches/patch-etc_etcscreenrc deleted file mode 100644 index baf14c18a44..00000000000 --- a/misc/screen/patches/patch-etc_etcscreenrc +++ /dev/null @@ -1,25 +0,0 @@ -$OpenBSD: patch-etc_etcscreenrc,v 1.1 2003/09/29 11:08:02 naddy Exp $ ---- etc/etcscreenrc.orig 2003-09-29 01:41:45.000000000 +0200 -+++ etc/etcscreenrc 2003-09-29 01:42:04.000000000 +0200 -@@ -82,13 +82,13 @@ termcap wy75-42 nx:xo:Z0=\E[?3h\E[31h:Z1 - terminfo wy75-42 nx:xo:Z0=\E[?3h\E[31h:Z1=\E[?3l\E[31h - - #remove some stupid / dangerous key bindings --bind '^k' --#bind 'L' --bind '^\' -+bind ^k -+#bind L -+bind ^\ - #make them better --bind '\\' quit --bind 'K' kill --bind 'I' login on --bind 'O' login off --bind '}' history -+bind \\ quit -+bind K kill -+bind I login on -+bind O login off -+bind } history - diff --git a/misc/screen/patches/patch-resize_c b/misc/screen/patches/patch-resize_c deleted file mode 100644 index dba57810415..00000000000 --- a/misc/screen/patches/patch-resize_c +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-resize_c,v 1.1 2003/12/04 23:27:07 margarida Exp $ ---- resize.c.orig 2003-11-28 00:28:47.000000000 +0000 -+++ resize.c 2003-11-28 00:30:19.000000000 +0000 -@@ -682,6 +682,18 @@ int wi, he, hi; - 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");