Changeset 40607


Ignore:
Timestamp:
2014-04-30T23:08:05+02:00 (4 years ago)
Author:
hauke
Message:

screen: Update to version 4.2.1

This patch updates screen to version 4.2.1, released 2014/04/27.

Signed-off-by: Luis Dallos <ld@…>

Location:
packages/utils/screen
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/screen/Makefile

    r29199 r40607  
    11# 
    2 # Copyright (C) 2006-2011 OpenWrt.org 
     2# Copyright (C) 2006-2014 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=screen 
    11 PKG_VERSION:=4.0.3 
    12 PKG_RELEASE:=3 
     11PKG_VERSION:=4.2.1 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    15 PKG_SOURCE_URL:=ftp://ftp.uni-erlangen.de/pub/utilities/screen \ 
    16         @GNU/screen 
    17 PKG_MD5SUM:=8506fd205028a96c741e4037de6e3c42 
     15PKG_SOURCE_URL:=@GNU/screen 
     16PKG_MD5SUM:=419a0594e2b25039239af8b90eda7d92 
    1817 
    1918include $(INCLUDE_DIR)/package.mk 
     
    3433define Build/Configure 
    3534        $(call Build/Configure/Default,\ 
    36                 --with-sys-screenrc=/etc/screenrc,\ 
    37                 LIBS="-lcrypt" \ 
     35                --with-sys-screenrc=/etc/screenrc \ 
    3836        ) 
     37        # XXX: memmove() works well with overlapped memory areas 
     38        echo "#define USEMEMMOVE 1" >>$(PKG_BUILD_DIR)/config.h 
    3939endef 
    4040 
  • packages/utils/screen/patches/100-cross_compile_fix.patch

    r15247 r40607  
    1 Binary files screen-4.0.2.old/.configure.swp and screen-4.0.2.dev/.configure.swp differ 
    2 diff -urN screen-4.0.2.old/configure screen-4.0.2.dev/configure 
    3 --- screen-4.0.2.old/configure  2003-12-05 14:46:53.000000000 +0100 
    4 +++ screen-4.0.2.dev/configure  2005-05-05 12:13:03.000000000 +0200 
    5 @@ -124,7 +124,7 @@ 
     1--- a/configure 
     2+++ b/configure 
     3@@ -414,7 +414,7 @@ as_fn_error () 
     4     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 
    65   fi 
    7    if test ! -f "$as_myself"; then 
    8      { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 
    9 -   { (exit 1); exit 1; }; } 
    10 +    } 
     6   $as_echo "$as_me: error: $2" >&2 
     7-  as_fn_exit $as_status 
     8+  # as_fn_exit $as_status 
     9 } # as_fn_error 
     10  
     11 if expr a : '\(a\)' >/dev/null 2>&1 && 
     12@@ -5941,8 +5941,6 @@ else 
     13 fi 
     14 rm -f core conftest.err conftest.$ac_objext \ 
     15     conftest$ac_exeext conftest.$ac_ext 
     16-test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec" 
     17-test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow" 
     18 oldlibs="$LIBS" 
     19 LIBS="$LIBS -lsun" 
     20 { $as_echo "$as_me:${as_lineno-$LINENO}: checking IRIX sun library..." >&5 
     21@@ -7023,7 +7021,7 @@ as_fn_error () 
     22     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 
    1123   fi 
    12    case $CONFIG_SHELL in 
    13    '') 
    14 @@ -174,7 +174,7 @@ 
    15      ' >$as_me.lineno && 
    16    chmod +x $as_me.lineno || 
    17      { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 
    18 -   { (exit 1); exit 1; }; } 
    19 +    } 
    20   
    21    # Don't try to exec as it changes $[0], causing all sort of problems 
    22    # (the dirname of $[0] is not the place where we might find the 
    23 @@ -397,7 +397,7 @@ 
    24      # Reject names that are not valid shell variable names. 
    25      expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && 
    26        { echo "$as_me: error: invalid feature name: $ac_feature" >&2 
    27 -   { (exit 1); exit 1; }; } 
    28 +    } 
    29      ac_feature=`echo $ac_feature | sed 's/-/_/g'` 
    30      eval "enable_$ac_feature=no" ;; 
    31   
    32 @@ -406,7 +406,7 @@ 
    33      # Reject names that are not valid shell variable names. 
    34      expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && 
    35        { echo "$as_me: error: invalid feature name: $ac_feature" >&2 
    36 -   { (exit 1); exit 1; }; } 
    37 +    } 
    38      ac_feature=`echo $ac_feature | sed 's/-/_/g'` 
    39      case $ac_option in 
    40        *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; 
    41 @@ -588,7 +588,7 @@ 
    42      # Reject names that are not valid shell variable names. 
    43      expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && 
    44        { echo "$as_me: error: invalid package name: $ac_package" >&2 
    45 -   { (exit 1); exit 1; }; } 
    46 +    } 
    47      ac_package=`echo $ac_package| sed 's/-/_/g'` 
    48      case $ac_option in 
    49        *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; 
    50 @@ -601,7 +601,7 @@ 
    51      # Reject names that are not valid shell variable names. 
    52      expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && 
    53        { echo "$as_me: error: invalid package name: $ac_package" >&2 
    54 -   { (exit 1); exit 1; }; } 
    55 +    } 
    56      ac_package=`echo $ac_package | sed 's/-/_/g'` 
    57      eval "with_$ac_package=no" ;; 
    58   
    59 @@ -625,7 +625,7 @@ 
    60   
    61    -*) { echo "$as_me: error: unrecognized option: $ac_option 
    62  Try \`$0 --help' for more information." >&2 
    63 -   { (exit 1); exit 1; }; } 
    64 +    } 
    65      ;; 
    66   
    67    *=*) 
    68 @@ -633,7 +633,7 @@ 
    69      # Reject names that are not valid shell variable names. 
    70      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && 
    71        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 
    72 -   { (exit 1); exit 1; }; } 
    73 +    } 
    74      ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` 
    75      eval "$ac_envvar='$ac_optarg'" 
    76      export $ac_envvar ;; 
    77 @@ -652,7 +652,7 @@ 
    78  if test -n "$ac_prev"; then 
    79    ac_option=--`echo $ac_prev | sed 's/_/-/g'` 
    80    { echo "$as_me: error: missing argument to $ac_option" >&2 
    81 -   { (exit 1); exit 1; }; } 
    82 +    } 
    83  fi 
    84   
    85  # Be sure to have absolute paths. 
    86 @@ -662,7 +662,7 @@ 
    87    case $ac_val in 
    88      [\\/$]* | ?:[\\/]* | NONE | '' ) ;; 
    89      *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 
    90 -   { (exit 1); exit 1; }; };; 
    91 +    };; 
    92    esac 
    93  done 
    94   
    95 @@ -674,7 +674,7 @@ 
    96    case $ac_val in 
    97      [\\/$]* | ?:[\\/]* ) ;; 
    98      *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 
    99 -   { (exit 1); exit 1; }; };; 
    100 +    };; 
    101    esac 
    102  done 
    103   
    104 @@ -728,15 +728,15 @@ 
    105  if test ! -r $srcdir/$ac_unique_file; then 
    106    if test "$ac_srcdir_defaulted" = yes; then 
    107      { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 
    108 -   { (exit 1); exit 1; }; } 
    109 +    } 
    110    else 
    111      { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 
    112 -   { (exit 1); exit 1; }; } 
    113 +    } 
    114    fi 
    115  fi 
    116  (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || 
    117    { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 
    118 -   { (exit 1); exit 1; }; } 
    119 +    } 
    120  srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` 
    121  ac_env_build_alias_set=${build_alias+set} 
    122  ac_env_build_alias_value=$build_alias 
    123 @@ -1243,7 +1243,7 @@ 
    124  echo "$as_me: error: changes in the environment can compromise the build" >&2;} 
    125    { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 
    126  echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} 
    127 -   { (exit 1); exit 1; }; } 
    128 +    } 
    129  fi 
    130   
    131  ac_ext=c 
    132 @@ -1734,7 +1734,7 @@ 
    133  See \`config.log' for more details." >&5 
    134  echo "$as_me: error: no acceptable C compiler found in \$PATH 
    135  See \`config.log' for more details." >&2;} 
    136 -   { (exit 1); exit 1; }; } 
    137 +    } 
    138   
    139  # Provide some information about the compiler. 
    140  echo "$as_me:$LINENO:" \ 
    141 @@ -1856,7 +1856,7 @@ 
    142  echo "$as_me: error: cannot run C compiled programs. 
    143  If you meant to cross compile, use \`--host'. 
    144  See \`config.log' for more details." >&2;} 
    145 -   { (exit 1); exit 1; }; } 
    146 +    } 
    147      fi 
    148    fi 
    149  fi 
    150 @@ -1898,7 +1898,7 @@ 
    151  See \`config.log' for more details." >&5 
    152  echo "$as_me: error: cannot compute suffix of executables: cannot compile and link 
    153  See \`config.log' for more details." >&2;} 
    154 -   { (exit 1); exit 1; }; } 
    155 +    } 
    156  fi 
    157   
    158  rm -f conftest$ac_cv_exeext 
    159 @@ -1950,7 +1950,7 @@ 
    160  See \`config.log' for more details." >&5 
    161  echo "$as_me: error: cannot compute suffix of object files: cannot compile 
    162  See \`config.log' for more details." >&2;} 
    163 -   { (exit 1); exit 1; }; } 
    164 +    } 
    165  fi 
    166   
    167  rm -f conftest.$ac_cv_objext conftest.$ac_ext 
    168 @@ -2514,7 +2514,7 @@ 
    169  See \`config.log' for more details." >&5 
    170  echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check 
    171  See \`config.log' for more details." >&2;} 
    172 -   { (exit 1); exit 1; }; } 
    173 +    } 
    174  fi 
    175   
    176  ac_ext=c 
    177 @@ -2704,7 +2704,7 @@ 
    178  See \`config.log' for more details." >&5 
    179  echo "$as_me: error: cannot run test program while cross compiling 
    180  See \`config.log' for more details." >&2;} 
    181 -   { (exit 1); exit 1; }; } 
    182 +    } 
    183  else 
    184    cat >conftest.$ac_ext <<_ACEOF 
    185  #line $LINENO "configure" 
    186 @@ -2753,7 +2753,7 @@ 
    187  See \`config.log' for more details." >&5 
    188  echo "$as_me: error: cannot run test program while cross compiling 
    189  See \`config.log' for more details." >&2;} 
    190 -   { (exit 1); exit 1; }; } 
    191 +  } 
    192  else 
    193    cat >conftest.$ac_ext <<_ACEOF 
    194  #line $LINENO "configure" 
    195 @@ -2790,7 +2790,7 @@ 
    196   
    197  { { echo "$as_me:$LINENO: error: Can't run the compiler - sorry" >&5 
    198  echo "$as_me: error: Can't run the compiler - sorry" >&2;} 
    199 -   { (exit 1); exit 1; }; } 
    200 +    } 
    201  fi 
    202  rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 
    203  fi 
    204 @@ -2800,7 +2800,7 @@ 
    205  See \`config.log' for more details." >&5 
    206  echo "$as_me: error: cannot run test program while cross compiling 
    207  See \`config.log' for more details." >&2;} 
    208 -   { (exit 1); exit 1; }; } 
    209 +  } 
    210  else 
    211    cat >conftest.$ac_ext <<_ACEOF 
    212  #line $LINENO "configure" 
    213 @@ -2830,7 +2830,7 @@ 
    214    (exit $ac_status); }; }; then 
    215    { { echo "$as_me:$LINENO: error: Your compiler does not set the exit status - sorry" >&5 
    216  echo "$as_me: error: Your compiler does not set the exit status - sorry" >&2;} 
    217 -   { (exit 1); exit 1; }; } 
    218 +    } 
    219  else 
    220    echo "$as_me: program exited with status $ac_status" >&5 
    221  echo "$as_me: failed program was:" >&5 
    222 @@ -2900,7 +2900,7 @@ 
    223  if test -z "$ac_aux_dir"; then 
    224    { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 
    225  echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} 
    226 -   { (exit 1); exit 1; }; } 
    227 +    } 
    228  fi 
    229  ac_config_guess="$SHELL $ac_aux_dir/config.guess" 
    230  ac_config_sub="$SHELL $ac_aux_dir/config.sub" 
    231 @@ -4149,7 +4149,7 @@ 
    232   
    233  { { echo "$as_me:$LINENO: error: !!! no select - no screen" >&5 
    234  echo "$as_me: error: !!! no select - no screen" >&2;} 
    235 -   { (exit 1); exit 1; }; } 
    236 +    } 
    237  fi 
    238  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 
    239   
    240 @@ -4163,7 +4163,7 @@ 
    241  See \`config.log' for more details." >&5 
    242  echo "$as_me: error: cannot run test program while cross compiling 
    243  See \`config.log' for more details." >&2;} 
    244 -   { (exit 1); exit 1; }; } 
    245 +  } 
    246  else 
    247    cat >conftest.$ac_ext <<_ACEOF 
    248  #line $LINENO "configure" 
    249 @@ -4272,7 +4272,7 @@ 
    250  See \`config.log' for more details." >&5 
    251  echo "$as_me: error: cannot run test program while cross compiling 
    252  See \`config.log' for more details." >&2;} 
    253 -   { (exit 1); exit 1; }; } 
    254 +  } 
    255  else 
    256    cat >conftest.$ac_ext <<_ACEOF 
    257  #line $LINENO "configure" 
    258 @@ -4365,7 +4365,7 @@ 
    259  See \`config.log' for more details." >&5 
    260  echo "$as_me: error: cannot run test program while cross compiling 
    261  See \`config.log' for more details." >&2;} 
    262 -   { (exit 1); exit 1; }; } 
    263 +  } 
    264  else 
    265    cat >conftest.$ac_ext <<_ACEOF 
    266  #line $LINENO "configure" 
    267 @@ -4460,7 +4460,7 @@ 
    268  See \`config.log' for more details." >&5 
    269  echo "$as_me: error: cannot run test program while cross compiling 
    270  See \`config.log' for more details." >&2;} 
    271 -   { (exit 1); exit 1; }; } 
    272 +  } 
    273  else 
    274    cat >conftest.$ac_ext <<_ACEOF 
    275  #line $LINENO "configure" 
    276 @@ -4562,7 +4562,7 @@ 
    277  else 
    278    { { echo "$as_me:$LINENO: error: you have neither usable sockets nor usable pipes -> no screen" >&5 
    279  echo "$as_me: error: you have neither usable sockets nor usable pipes -> no screen" >&2;} 
    280 -   { (exit 1); exit 1; }; } 
    281 +    } 
    282  fi 
     24   $as_echo "$as_me: error: $2" >&2 
     25-  as_fn_exit $as_status 
     26+  # as_fn_exit $as_status 
     27 } # as_fn_error 
    28328  
    28429  
    285 @@ -4573,7 +4573,7 @@ 
    286  See \`config.log' for more details." >&5 
    287  echo "$as_me: error: cannot run test program while cross compiling 
    288  See \`config.log' for more details." >&2;} 
    289 -   { (exit 1); exit 1; }; } 
    290 +    } 
    291  else 
    292    cat >conftest.$ac_ext <<_ACEOF 
    293  #line $LINENO "configure" 
    294 @@ -4898,7 +4898,7 @@ 
    295   
    296  { { echo "$as_me:$LINENO: error: !!! no tgetent - no screen" >&5 
    297  echo "$as_me: error: !!! no tgetent - no screen" >&2;} 
    298 -   { (exit 1); exit 1; }; } 
    299 +    } 
    300  fi 
    301  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 
    302  fi 
    303 @@ -4915,7 +4915,7 @@ 
    304  See \`config.log' for more details." >&5 
    305  echo "$as_me: error: cannot run test program while cross compiling 
    306  See \`config.log' for more details." >&2;} 
    307 -   { (exit 1); exit 1; }; } 
    308 +    } 
    309  else 
    310    cat >conftest.$ac_ext <<_ACEOF 
    311  #line $LINENO "configure" 
    312 @@ -5359,7 +5356,7 @@ 
    313  See \`config.log' for more details." >&5 
    314  echo "$as_me: error: cannot run test program while cross compiling 
    315  See \`config.log' for more details." >&2;} 
    316 -   { (exit 1); exit 1; }; } 
    317 +    } 
    318  else 
    319    cat >conftest.$ac_ext <<_ACEOF 
    320  #line $LINENO "configure" 
    321 @@ -6206,7 +6203,7 @@ 
    322  See \`config.log' for more details." >&5 
    323  echo "$as_me: error: cannot run test program while cross compiling 
    324  See \`config.log' for more details." >&2;} 
    325 -   { (exit 1); exit 1; }; } 
    326 +    } 
    327  else 
    328    cat >conftest.$ac_ext <<_ACEOF 
    329  #line $LINENO "configure" 
    330 @@ -6482,7 +6479,7 @@ 
    331  See \`config.log' for more details." >&5 
    332  echo "$as_me: error: cannot run test program while cross compiling 
    333  See \`config.log' for more details." >&2;} 
    334 -   { (exit 1); exit 1; }; } 
    335 +    } 
    336  else 
    337    cat >conftest.$ac_ext <<_ACEOF 
    338  #line $LINENO "configure" 
    339 @@ -7004,7 +7001,7 @@ 
    340  See \`config.log' for more details." >&5 
    341  echo "$as_me: error: cannot run test program while cross compiling 
    342  See \`config.log' for more details." >&2;} 
    343 -   { (exit 1); exit 1; }; } 
    344 +    } 
    345  else 
    346    cat >conftest.$ac_ext <<_ACEOF 
    347  #line $LINENO "configure" 
    348 @@ -7056,7 +7053,7 @@ 
    349  See \`config.log' for more details." >&5 
    350  echo "$as_me: error: cannot run test program while cross compiling 
    351  See \`config.log' for more details." >&2;} 
    352 -   { (exit 1); exit 1; }; } 
    353 +    } 
    354  else 
    355    cat >conftest.$ac_ext <<_ACEOF 
    356  #line $LINENO "configure" 
    357 @@ -7110,7 +7107,7 @@ 
    358  See \`config.log' for more details." >&5 
    359  echo "$as_me: error: cannot run test program while cross compiling 
    360  See \`config.log' for more details." >&2;} 
    361 -   { (exit 1); exit 1; }; } 
    362 +    } 
    363  else 
    364    cat >conftest.$ac_ext <<_ACEOF 
    365  #line $LINENO "configure" 
    366 @@ -7951,7 +7948,7 @@ 
    367  See \`config.log' for more details." >&5 
    368  echo "$as_me: error: cannot run test program while cross compiling 
    369  See \`config.log' for more details." >&2;} 
    370 -   { (exit 1); exit 1; }; } 
    371 +    } 
    372  else 
    373    cat >conftest.$ac_ext <<_ACEOF 
    374  #line $LINENO "configure" 
    375 @@ -7982,7 +7979,7 @@ 
    376  ( exit $ac_status ) 
    377  { { echo "$as_me:$LINENO: error: Can't run the compiler - internal error. Sorry." >&5 
    378  echo "$as_me: error: Can't run the compiler - internal error. Sorry." >&2;} 
    379 -   { (exit 1); exit 1; }; } 
    380 +    } 
    381  fi 
    382  rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 
    383  fi 
    384 @@ -8251,7 +8248,7 @@ 
    385    if test ! -f "$as_myself"; then 
    386      { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 
    387  echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} 
    388 -   { (exit 1); exit 1; }; } 
    389 +    } 
    390    fi 
    391    case $CONFIG_SHELL in 
    392    '') 
    393 @@ -8302,7 +8299,7 @@ 
    394    chmod +x $as_me.lineno || 
    395      { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 
    396  echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} 
    397 -   { (exit 1); exit 1; }; } 
    398 +    } 
    399   
    400    # Don't try to exec as it changes $[0], causing all sort of problems 
    401    # (the dirname of $[0] is not the place where we might find the 
    402 @@ -8494,7 +8491,7 @@ 
    403  Try \`$0 --help' for more information." >&5 
    404  echo "$as_me: error: ambiguous option: $1 
    405  Try \`$0 --help' for more information." >&2;} 
    406 -   { (exit 1); exit 1; }; };; 
    407 +    };; 
    408    --help | --hel | -h ) 
    409      echo "$ac_cs_usage"; exit 0 ;; 
    410    --debug | --d* | -d ) 
    411 @@ -8516,7 +8513,7 @@ 
    412  Try \`$0 --help' for more information." >&5 
    413  echo "$as_me: error: unrecognized option: $1 
    414  Try \`$0 --help' for more information." >&2;} 
    415 -   { (exit 1); exit 1; }; } ;; 
    416 +    } ;; 
    417   
    418    *) ac_config_targets="$ac_config_targets $1" ;; 
    419   
    420 @@ -8555,7 +8552,7 @@ 
    421    "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; 
    422    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 
    423  echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 
    424 -   { (exit 1); exit 1; }; };; 
    425 +    };; 
    426    esac 
    427  done 
    428   
    429 @@ -8750,7 +8747,7 @@ 
    430      test ! -n "$as_dirs" || mkdir $as_dirs 
    431    fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 
    432  echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} 
    433 -   { (exit 1); exit 1; }; }; } 
    434 +    }; } 
    435   
    436    ac_builddir=. 
    437   
    438 @@ -8816,7 +8813,7 @@ 
    439           # Absolute (can't be DOS-style, as IFS=:) 
    440           test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 
    441  echo "$as_me: error: cannot find input file: $f" >&2;} 
    442 -   { (exit 1); exit 1; }; } 
    443 +    } 
    444           echo $f;; 
    445        *) # Relative 
    446           if test -f "$f"; then 
    447 @@ -8829,7 +8826,7 @@ 
    448             # /dev/null tree 
    449             { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 
    450  echo "$as_me: error: cannot find input file: $f" >&2;} 
    451 -   { (exit 1); exit 1; }; } 
    452 +    } 
    453           fi;; 
    454        esac 
    455      done` || { (exit 1); exit 1; } 
    456 @@ -8907,7 +8904,7 @@ 
    457           # Absolute (can't be DOS-style, as IFS=:) 
    458           test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 
    459  echo "$as_me: error: cannot find input file: $f" >&2;} 
    460 -   { (exit 1); exit 1; }; } 
    461 +    } 
    462           echo $f;; 
    463        *) # Relative 
    464           if test -f "$f"; then 
    465 @@ -8920,7 +8917,7 @@ 
    466             # /dev/null tree 
    467             { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 
    468  echo "$as_me: error: cannot find input file: $f" >&2;} 
    469 -   { (exit 1); exit 1; }; } 
    470 +    } 
    471           fi;; 
    472        esac 
    473      done` || { (exit 1); exit 1; } 
    474 @@ -9073,7 +9070,7 @@ 
    475      test ! -n "$as_dirs" || mkdir $as_dirs 
    476    fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 
    477  echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} 
    478 -   { (exit 1); exit 1; }; }; } 
    479 +    }; } 
    480   
    481        rm -f $ac_file 
    482        mv $tmp/config.h $ac_file 
    483 diff -urN screen-4.0.2.old/pty.c screen-4.0.2.dev/pty.c 
    484 --- screen-4.0.2.old/pty.c      2003-09-08 16:26:18.000000000 +0200 
    485 +++ screen-4.0.2.dev/pty.c      2005-05-05 12:32:20.000000000 +0200 
    486 @@ -34,9 +34,9 @@ 
     30--- a/pty.c 
     31+++ b/pty.c 
     32@@ -39,9 +39,9 @@ 
    48733 #endif 
    48834  
    48935 /* for solaris 2.1, Unixware (SVR4.2) and possibly others */ 
    490 -#ifdef HAVE_SVR4_PTYS 
     36-#ifdef HAVE_STROPTS_H 
    49137-# include <sys/stropts.h> 
    49238-#endif 
    493 +//#ifdef HAVE_SVR4_PTYS 
     39+//#ifdef HAVE_STROPTS_H 
    49440+//# include <sys/stropts.h> 
    49541+//#endif 
     
    49743 #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL) 
    49844 # include <sys/ttold.h> 
    499 --- screen-4.0.2/configure.old  2005-05-24 18:49:30.000000000 +0200 
    500 +++ screen-4.0.2/configure      2005-05-24 18:49:54.000000000 +0200 
    501 @@ -6598,8 +6598,6 @@ 
    502  LIBS="$oldlibs" 
    503  fi 
    504  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 
    505 -test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec" 
    506 -test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow" 
    507  oldlibs="$LIBS" 
    508  LIBS="$LIBS -lsun" 
    509  { echo "$as_me:$LINENO: checking IRIX sun library..." >&5 
    510 diff -ur screen.old/sched.h screen.dev/sched.h 
    511 --- screen.old/sched.h  2002-01-08 16:42:43.000000000 +0100 
    512 +++ screen.dev/sched.h  2007-03-02 17:03:48.475830776 +0100 
    513 @@ -22,6 +22,11 @@ 
    514   * $Id: 100-cross_compile_fix.patch 6458 2007-03-02 16:12:30Z nbd $ FAU 
     45--- a/sched.h 
     46+++ b/sched.h 
     47@@ -27,6 +27,11 @@ 
     48  * $Id$ GNU 
    51549  */ 
    51650  
     
    52357 { 
    52458   struct event *next; 
    525 @@ -41,3 +46,5 @@ 
     59@@ -46,3 +51,5 @@ struct event 
    52660 #define EV_READ                1 
    52761 #define EV_WRITE       2 
Note: See TracChangeset for help on using the changeset viewer.