Upgrade to 3.9.11

Submitted by:	Jun Kuriyama <kuriyama@imgsrc.co.jp>
This commit is contained in:
Andrey A. Chernov 2002-02-24 12:03:39 +00:00
parent fd27bdf0d1
commit 3255e4761d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=55175
12 changed files with 150 additions and 88 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= screen
PORTVERSION= 3.9.10
PORTVERSION= 3.9.11
CATEGORIES= misc
MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
${MASTER_SITE_GNU}

View File

@ -1 +1 @@
MD5 (screen-3.9.10.tar.gz) = bbe271715d1dee038b3cd72d6d2f05fb
MD5 (screen-3.9.11.tar.gz) = 19572f92404995e7b2dea8117204dd67

View File

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri May 25 18:50:54 2001
+++ Makefile.in Mon Jun 25 08:31:36 2001
@@ -70,14 +70,8 @@
--- 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
@ -11,9 +11,9 @@
-# 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
- (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)
###############################################################################
install: installdirs install_bin

View File

@ -1,9 +1,9 @@
--- doc/screen.texinfo.orig Tue Nov 21 03:03:15 1995
+++ doc/screen.texinfo Mon Jun 16 15:16:36 1997
@@ -3,6 +3,9 @@
@c vi:set wm=5
--- 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

View File

@ -1,17 +1,19 @@
--- configure.orig Thu May 17 21:05:43 2001
+++ configure Mon Jun 25 08:48:53 2001
@@ -2158,29 +2158,6 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
olibs="$LIBS"
--- 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 "checking libcurses" 1>&6
-echo "configure:2164: checking libcurses" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2166 "configure"
-{ 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() {
-int
-main ()
-{
-
-#ifdef __hpux
-__sorry_hpux_libcurses_is_totally_broken_in_10_10();
@ -19,36 +21,48 @@
-tgetent((char *)0, (char *)0);
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ;
- 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 "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
LIBS="-ltermcap $olibs"
echo "checking libtermcap" 1>&6
echo "configure:2187: checking libtermcap" >&5
@@ -2241,8 +2218,6 @@
rm -f conftest*
- 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*
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f conftest*
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
@@ -2253,7 +2228,7 @@
{ { 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);
}
EOF
if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
@@ -2354,18 +2329,15 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -3861,18 +3822,15 @@
fi
rm -f conftest*
@ -57,17 +71,17 @@
-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
cat >>confdefs.h <<EOF
-#define PTYRANGE0 "$p0"
+#define PTYRANGE0 "pqrsPQRS"
EOF
cat >> confdefs.h <<EOF
cat >>confdefs.h <<EOF
-#define PTYRANGE1 "$p1"
+#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv"
EOF
-
-fi
echo "checking default tty permissions/group" 1>&6
echo "configure:2372: checking default tty permissions/group" >&5
{ echo "$as_me:3877: checking default tty permissions/group..." >&5
echo "$as_me: checking default tty permissions/group..." >&6;}

View File

@ -2,3 +2,20 @@ bin/screen
@unexec install-info --delete %D/info/screen.info %D/info/dir
info/screen.info
@exec install-info %D/info/screen.info %D/info/dir
share/screen/utf8encodings/01
share/screen/utf8encodings/02
share/screen/utf8encodings/03
share/screen/utf8encodings/04
share/screen/utf8encodings/18
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
@dirrm share/screen/utf8encodings

View File

@ -6,7 +6,7 @@
#
PORTNAME= screen
PORTVERSION= 3.9.10
PORTVERSION= 3.9.11
CATEGORIES= misc
MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
${MASTER_SITE_GNU}

View File

@ -1 +1 @@
MD5 (screen-3.9.10.tar.gz) = bbe271715d1dee038b3cd72d6d2f05fb
MD5 (screen-3.9.11.tar.gz) = 19572f92404995e7b2dea8117204dd67

View File

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri May 25 18:50:54 2001
+++ Makefile.in Mon Jun 25 08:31:36 2001
@@ -70,14 +70,8 @@
--- 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
@ -11,9 +11,9 @@
-# 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
- (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)
###############################################################################
install: installdirs install_bin

View File

@ -1,9 +1,9 @@
--- doc/screen.texinfo.orig Tue Nov 21 03:03:15 1995
+++ doc/screen.texinfo Mon Jun 16 15:16:36 1997
@@ -3,6 +3,9 @@
@c vi:set wm=5
--- 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

View File

@ -1,17 +1,19 @@
--- configure.orig Thu May 17 21:05:43 2001
+++ configure Mon Jun 25 08:48:53 2001
@@ -2158,29 +2158,6 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
olibs="$LIBS"
--- 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 "checking libcurses" 1>&6
-echo "configure:2164: checking libcurses" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2166 "configure"
-{ 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() {
-int
-main ()
-{
-
-#ifdef __hpux
-__sorry_hpux_libcurses_is_totally_broken_in_10_10();
@ -19,36 +21,48 @@
-tgetent((char *)0, (char *)0);
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ;
- 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 "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
LIBS="-ltermcap $olibs"
echo "checking libtermcap" 1>&6
echo "configure:2187: checking libtermcap" >&5
@@ -2241,8 +2218,6 @@
rm -f conftest*
- 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*
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f conftest*
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
@@ -2253,7 +2228,7 @@
{ { 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);
}
EOF
if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
@@ -2354,18 +2329,15 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -3861,18 +3822,15 @@
fi
rm -f conftest*
@ -57,17 +71,17 @@
-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
cat >>confdefs.h <<EOF
-#define PTYRANGE0 "$p0"
+#define PTYRANGE0 "pqrsPQRS"
EOF
cat >> confdefs.h <<EOF
cat >>confdefs.h <<EOF
-#define PTYRANGE1 "$p1"
+#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv"
EOF
-
-fi
echo "checking default tty permissions/group" 1>&6
echo "configure:2372: checking default tty permissions/group" >&5
{ echo "$as_me:3877: checking default tty permissions/group..." >&5
echo "$as_me: checking default tty permissions/group..." >&6;}

View File

@ -2,3 +2,20 @@ bin/screen
@unexec install-info --delete %D/info/screen.info %D/info/dir
info/screen.info
@exec install-info %D/info/screen.info %D/info/dir
share/screen/utf8encodings/01
share/screen/utf8encodings/02
share/screen/utf8encodings/03
share/screen/utf8encodings/04
share/screen/utf8encodings/18
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
@dirrm share/screen/utf8encodings