diff options
Diffstat (limited to 'misc/screen')
-rw-r--r-- | misc/screen/Makefile | 4 | ||||
-rw-r--r-- | misc/screen/distinfo | 6 | ||||
-rw-r--r-- | misc/screen/patches/patch-aj | 17 | ||||
-rw-r--r-- | misc/screen/patches/patch-ak | 18 |
4 files changed, 34 insertions, 11 deletions
diff --git a/misc/screen/Makefile b/misc/screen/Makefile index 21f775eee62..84d1cdd7b91 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.74 2008/03/17 19:03:35 jlam Exp $ +# $NetBSD: Makefile,v 1.75 2008/04/04 21:09:16 tonnerre Exp $ DISTNAME= screen-4.0.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc shells MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \ http://komquats.com/distfiles/ \ diff --git a/misc/screen/distinfo b/misc/screen/distinfo index c3db2ea8d9e..b6bc424c8c9 100644 --- a/misc/screen/distinfo +++ b/misc/screen/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2006/10/29 15:08:27 tron Exp $ +$NetBSD: distinfo,v 1.29 2008/04/04 21:09:16 tonnerre Exp $ SHA1 (screen-4.0.3.tar.gz) = 7bc6e2f0959ffaae6f52d698c26c774e7dec3545 RMD160 (screen-4.0.3.tar.gz) = 8c3903c1642ae30fd9d5706298919428552f7754 @@ -8,8 +8,8 @@ SHA1 (patch-ab) = f4fc914ad9c48cb83cf3633630cb83e4a8e90ff5 SHA1 (patch-ac) = 4eb492cd7cf9cf0df11337e91dc8f55f440de761 SHA1 (patch-ae) = dcdbb1ca08e36308f5659a90a5b6f31fb3a45691 SHA1 (patch-ai) = 6d01c6c5bebfefc5c2cd4d3c642205eedbc6b155 -SHA1 (patch-aj) = d3a2a0170d92c06b25598ee2b5f288f0ef37f41f -SHA1 (patch-ak) = 20254505d621a994befc2e1bfef56c9291d09fe6 +SHA1 (patch-aj) = 7cb56d912aa40a4840a9a690394dcf50b0dd319d +SHA1 (patch-ak) = 5b2fe45dc82f9ed36256b06f27bffafe3071769d SHA1 (patch-al) = 6ee93058847f3894a886346676e4a613c0bd134e SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9 SHA1 (patch-an) = 79d84b0caaad6044cf81c0fcfc1cd8470c9378d8 diff --git a/misc/screen/patches/patch-aj b/misc/screen/patches/patch-aj index b537141a3a7..c4b5214402d 100644 --- a/misc/screen/patches/patch-aj +++ b/misc/screen/patches/patch-aj @@ -1,10 +1,21 @@ -$NetBSD: patch-aj,v 1.4 2005/09/28 19:35:36 rillig Exp $ +$NetBSD: patch-aj,v 1.5 2008/04/04 21:09:16 tonnerre Exp $ Detect getutent correctly on NetBSD with utmpx. +Include curses header when testing tgetent in order to prevent +crash on 64-bit architectures. --- configure.in.orig 2003-06-03 07:58:24.000000000 -0400 +++ configure.in 2004-06-16 16:11:55.000000000 -0400 -@@ -815,9 +815,15 @@ +@@ -664,6 +664,8 @@ + AC_MSG_ERROR(!!! no tgetent - no screen)))))) + + AC_TRY_RUN([ ++#include <curses.h> ++ + main() + { + exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); +@@ -815,9 +817,15 @@ AC_TRY_LINK([ #include <time.h> /* to get time_t on SCO */ #include <sys/types.h> @@ -21,7 +32,7 @@ Detect getutent correctly on NetBSD with utmpx. #else #include <utmp.h> #endif -@@ -1209,6 +1215,7 @@ +@@ -1209,6 +1217,7 @@ AC_TRY_LINK(,[vsprintf(0,0,0);], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no)) AC_HEADER_DIRENT diff --git a/misc/screen/patches/patch-ak b/misc/screen/patches/patch-ak index 37f91156241..cb5b24060cb 100644 --- a/misc/screen/patches/patch-ak +++ b/misc/screen/patches/patch-ak @@ -1,8 +1,20 @@ -$NetBSD: patch-ak,v 1.3 2004/06/16 21:35:00 christos Exp $ +$NetBSD: patch-ak,v 1.4 2008/04/04 21:09:16 tonnerre Exp $ + +Include curses header when testing tgetent in order to prevent +crash on 64-bit architectures. --- configure.orig 2003-12-05 08:46:53.000000000 -0500 +++ configure 2004-06-16 16:12:06.000000000 -0400 -@@ -5572,9 +5572,15 @@ +@@ -4925,6 +4925,8 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + ++#include <curses.h> ++ + main() + { + exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); +@@ -5572,9 +5574,15 @@ #include <time.h> /* to get time_t on SCO */ #include <sys/types.h> @@ -19,7 +31,7 @@ $NetBSD: patch-ak,v 1.3 2004/06/16 21:35:00 christos Exp $ #else #include <utmp.h> #endif -@@ -7502,6 +7508,148 @@ +@@ -7502,6 +7510,148 @@ fi |