Update to latest release 4.0.2.

Use DATADIR macro.

Approved by:	cy (maintainer)

5 files changed, 39 insertions, 64 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index dcff32bc96b3..d067e4e915c1 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	screen
-PORTVERSION=	4.0.1
-PORTREVISION=	2
+PORTVERSION=	4.0.2
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		${MASTER_SITE_GNU}
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index a0f104f0b086..c642390b80b1 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1 +1 @@
-MD5 (screen-4.0.1.tar.gz) = 2f674d5a7a299abf085d0b69c90de4f8
+MD5 (screen-4.0.2.tar.gz) = ed68ea9b43d9fba0972cb017a24940a1
diff --git a/misc/screen/files/patch-ad b/misc/screen/files/patch-ad
index 1a3901f91644..8e5a4af1448b 100644
--- a/misc/screen/files/patch-ad
+++ b/misc/screen/files/patch-ad
@@ -1,22 +1,20 @@
---- configure.orig	Mon Aug 12 07:34:23 2002
-+++ configure	Mon Sep  2 07:03:25 2002
-@@ -4358,49 +4358,6 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
+--- 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"
--#include "confdefs.h"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
 -int
 -main ()
 -{
@@ -46,11 +44,12 @@
 -  :
 -else
 -  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
  LIBS="-ltermcap $olibs"
  { echo "$as_me:$LINENO: checking libtermcap..." >&5
  echo "$as_me: checking libtermcap..." >&6;}
-@@ -4523,8 +4480,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
@@ -58,8 +57,8 @@
 -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" >&5
-@@ -4537,7 +4492,7 @@
+   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+@@ -4927,7 +4883,7 @@
  
  main()
  {
@@ -68,7 +67,7 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
-@@ -4762,18 +4717,15 @@
+@@ -5314,18 +5270,15 @@
  fi
  rm -f conftest*
  
@@ -89,5 +88,5 @@
 -
 -fi
  
- { echo "$as_me:$LINENO: checking default tty permissions/group..." >&5
- echo "$as_me: checking default tty permissions/group..." >&6;}
+ 
+ # Check whether --with-pty-mode or --without-pty-mode was given.
diff --git a/misc/screen/files/patch-etc::etcscreenrc b/misc/screen/files/patch-etc::etcscreenrc
deleted file mode 100644
index a06aa089d5f0..000000000000
--- a/misc/screen/files/patch-etc::etcscreenrc
+++ /dev/null
@@ -1,23 +0,0 @@
---- etc/etcscreenrc.orig	Sat Apr 28 08:25:34 2001
-+++ etc/etcscreenrc	Mon Oct 13 02:47:20 2003
-@@ -82,13 +82,13 @@
- terminfo wy75-42 nx:xo:Z0=\E[?3h\E[31h:Z1=\E[?3l\E[31h
- 
- #remove some stupid / dangerous key bindings
--bind '^k'
-+bind ^k
- #bind 'L'
--bind '^\'
-+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/pkg-plist b/misc/screen/pkg-plist
index d26c3df5c58b..5bb876cf63a9 100644
--- a/misc/screen/pkg-plist
+++ b/misc/screen/pkg-plist
@@ -1,23 +1,23 @@
 bin/screen
-share/screen/utf8encodings/01
-share/screen/utf8encodings/02
-share/screen/utf8encodings/03
-share/screen/utf8encodings/04
-share/screen/utf8encodings/18
-share/screen/utf8encodings/19
-share/screen/utf8encodings/a1
-share/screen/utf8encodings/bf
-share/screen/utf8encodings/c2
-share/screen/utf8encodings/c3
-share/screen/utf8encodings/c4
-share/screen/utf8encodings/c6
-share/screen/utf8encodings/c7
-share/screen/utf8encodings/c8
-share/screen/utf8encodings/cc
-share/screen/utf8encodings/cd
-share/screen/utf8encodings/d6
+%%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/etc/screenrc.sample; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi
 etc/screenrc.sample
 @exec [ -f %B/screenrc ] || cp %B/%f %B/screenrc
-@dirrm share/screen/utf8encodings
-@dirrm share/screen
+@dirrm %%DATADIR%%/utf8encodings
+@dirrm %%DATADIR%%