Index: head/misc/screen/Makefile =================================================================== --- head/misc/screen/Makefile (revision 99201) +++ head/misc/screen/Makefile (revision 99202) @@ -1,38 +1,37 @@ # New ports collection makefile for: screen # Date created: 25 Nov 1994 # Whom: ache # # $FreeBSD$ # 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} MASTER_SITE_SUBDIR= screen MAINTAINER= cy@FreeBSD.org COMMENT= A multi-screen window manager GNU_CONFIGURE= yes MAN1= screen.1 INFO= screen .include .if ${ARCH} == "alpha" CFLAGS+= -O0 .endif post-patch: @${RM} ${WRKSRC}/doc/screen.info* post-install: @${CP} ${WRKSRC}/etc/etcscreenrc ${PREFIX}/etc/screenrc.sample @if [ ! -f ${PREFIX}/etc/screenrc ]; then \ ${CP} ${PREFIX}/etc/screenrc.sample ${PREFIX}/etc/screenrc ; \ fi .include Property changes on: head/misc/screen/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.53 \ No newline at end of property +1.54 \ No newline at end of property Index: head/misc/screen/distinfo =================================================================== --- head/misc/screen/distinfo (revision 99201) +++ head/misc/screen/distinfo (revision 99202) @@ -1 +1 @@ -MD5 (screen-4.0.1.tar.gz) = 2f674d5a7a299abf085d0b69c90de4f8 +MD5 (screen-4.0.2.tar.gz) = ed68ea9b43d9fba0972cb017a24940a1 Property changes on: head/misc/screen/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/misc/screen/files/patch-etc::etcscreenrc =================================================================== --- head/misc/screen/files/patch-etc::etcscreenrc (revision 99201) +++ head/misc/screen/files/patch-etc::etcscreenrc (nonexistent) @@ -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 - Property changes on: head/misc/screen/files/patch-etc::etcscreenrc ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/misc/screen/files/patch-ad =================================================================== --- head/misc/screen/files/patch-ad (revision 99201) +++ head/misc/screen/files/patch-ad (revision 99202) @@ -1,93 +1,92 @@ ---- 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 () -{ - -#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 --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 -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" >&5 -@@ -4537,7 +4492,7 @@ + { { 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 -@@ -4762,18 +4717,15 @@ +@@ -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 - { 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. Property changes on: head/misc/screen/files/patch-ad ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/misc/screen/pkg-plist =================================================================== --- head/misc/screen/pkg-plist (revision 99201) +++ head/misc/screen/pkg-plist (revision 99202) @@ -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%% Property changes on: head/misc/screen/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.26 \ No newline at end of property +1.27 \ No newline at end of property Index: head/sysutils/screen/Makefile =================================================================== --- head/sysutils/screen/Makefile (revision 99201) +++ head/sysutils/screen/Makefile (revision 99202) @@ -1,38 +1,37 @@ # New ports collection makefile for: screen # Date created: 25 Nov 1994 # Whom: ache # # $FreeBSD$ # 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} MASTER_SITE_SUBDIR= screen MAINTAINER= cy@FreeBSD.org COMMENT= A multi-screen window manager GNU_CONFIGURE= yes MAN1= screen.1 INFO= screen .include .if ${ARCH} == "alpha" CFLAGS+= -O0 .endif post-patch: @${RM} ${WRKSRC}/doc/screen.info* post-install: @${CP} ${WRKSRC}/etc/etcscreenrc ${PREFIX}/etc/screenrc.sample @if [ ! -f ${PREFIX}/etc/screenrc ]; then \ ${CP} ${PREFIX}/etc/screenrc.sample ${PREFIX}/etc/screenrc ; \ fi .include Property changes on: head/sysutils/screen/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.53 \ No newline at end of property +1.54 \ No newline at end of property Index: head/sysutils/screen/distinfo =================================================================== --- head/sysutils/screen/distinfo (revision 99201) +++ head/sysutils/screen/distinfo (revision 99202) @@ -1 +1 @@ -MD5 (screen-4.0.1.tar.gz) = 2f674d5a7a299abf085d0b69c90de4f8 +MD5 (screen-4.0.2.tar.gz) = ed68ea9b43d9fba0972cb017a24940a1 Property changes on: head/sysutils/screen/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/sysutils/screen/files/patch-etc::etcscreenrc =================================================================== --- head/sysutils/screen/files/patch-etc::etcscreenrc (revision 99201) +++ head/sysutils/screen/files/patch-etc::etcscreenrc (nonexistent) @@ -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 - Property changes on: head/sysutils/screen/files/patch-etc::etcscreenrc ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/screen/files/patch-ad =================================================================== --- head/sysutils/screen/files/patch-ad (revision 99201) +++ head/sysutils/screen/files/patch-ad (revision 99202) @@ -1,93 +1,92 @@ ---- 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 () -{ - -#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 --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 -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" >&5 -@@ -4537,7 +4492,7 @@ + { { 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 -@@ -4762,18 +4717,15 @@ +@@ -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 - { 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. Property changes on: head/sysutils/screen/files/patch-ad ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/sysutils/screen/pkg-plist =================================================================== --- head/sysutils/screen/pkg-plist (revision 99201) +++ head/sysutils/screen/pkg-plist (revision 99202) @@ -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%% Property changes on: head/sysutils/screen/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.26 \ No newline at end of property +1.27 \ No newline at end of property