nano 2.0.6 update to 2.0.7, enable more features (adds only 16K), remove 1.2.1. closes #1101

7 files changed, 3 insertions, 1328 deletions

diff --git a/packages/nano/nano-1.2.1/.mtn2git_empty b/packages/nano/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nano/nano-1.2.1/.mtn2git_empty
+++ b/packages/nano/files/.mtn2git_empty
diff --git a/packages/nano/nano-1.2.1/glib.m4 b/packages/nano/files/glib.m4
index b8094bbfe0..b8094bbfe0 100644
--- a/packages/nano/nano-1.2.1/glib.m4
+++ b/packages/nano/files/glib.m4
diff --git a/packages/nano/nano-1.2.1/configure.patch b/packages/nano/nano-1.2.1/configure.patch
deleted file mode 100644
index c8008221a0..0000000000
--- a/packages/nano/nano-1.2.1/configure.patch
+++ /dev/null
@@ -1,1116 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- nano-1.2.1/configure.ac~configure
-+++ nano-1.2.1/configure.ac
-@@ -19,12 +19,12 @@
- #
- # $Id: configure.ac,v 1.44 2003/03/11 03:50:39 astyanax Exp $
- 
--AC_INIT([GNU Nano], [1.2.1], [nano-devel@gnu.org], [nano])
-+AC_INIT([GNU Nano],[1.2.1],[nano-devel@gnu.org],[nano])
- AC_CONFIG_SRCDIR([nano.c])
- AM_INIT_AUTOMAKE
- AM_CONFIG_HEADER([config.h:config.h.in])
- 
--AC_PREREQ(2.52)
-+AC_PREREQ(2.57)
- 
- dnl Checks for programs.
- AC_PROG_CC
-@@ -38,14 +38,15 @@
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS(fcntl.h getopt.h libintl.h limits.h regex.h termio.h termios.h unistd.h)
-+
- AC_CHECK_HEADER(regex.h,
--    AC_MSG_CHECKING([for broken regexec])
--    AC_TRY_RUN([
-+    AC_CACHE_CHECK([for broken regexec],
-+            ac_cv_regexec_segfault_emptystr,
-+            AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <sys/types.h>
- #include <regex.h>
--int main() { regex_t reg; size_t n; regmatch_t r; regcomp(&reg, ".", 0); regexec(&reg, "", n, &r, 0); return 0; }],
--	AC_MSG_RESULT(no),
--	AC_MSG_RESULT(yes); AC_DEFINE(BROKEN_REGEXEC, 1, [Define this if your regexec() function segfaults when passed an empty string.])
-+int main() { regex_t reg; size_t n; regmatch_t r; regcomp(&reg, ".", 0); regexec(&reg, "", n, &r, 0); return 0; }]])],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(yes); AC_DEFINE(BROKEN_REGEXEC, 1, Define this if your regexec() function segfaults when passed an empty string.)
-+            ],[])
-     )
- )
- 
-@@ -198,11 +199,10 @@
- 	    AC_MSG_CHECKING([for SLtt_initialize in -lslang])
- 	    _libs=$LIBS
- 	    LIBS="$LIBS -lslang"
--	    AC_TRY_RUN([
-+	    AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- #include <slcurses.h>
--int main () { SLtt_initialize (NULL); return 0; }],
--		[AC_MSG_RESULT(yes)
-+int main () { SLtt_initialize (NULL); return 0; }]])],[AC_MSG_RESULT(yes)
- 		AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
- 		slang_support=yes
- 		if test "$with_slang" != "yes"; then
-@@ -210,7 +210,7 @@
- 		else
- 		    CURSES_LIB="-lslang"
- 		fi
--		CURSES_LIB_NAME=slang], [
-+		CURSES_LIB_NAME=slang],[
- 		AC_MSG_RESULT(no)
- 		# We might need the term library
- 		for termlib in ncurses curses termcap terminfo termlib; do
-@@ -220,7 +220,7 @@
- 
- 		AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap])
- 		LIBS="$LIBS $tcap"
--		AC_TRY_RUN([
-+AC_TRY_RUN([
- #include <stdio.h>
- #include <slcurses.h>
- int main () { SLtt_initialize (NULL); return 0; }],
-@@ -237,7 +237,7 @@
- 		    # We might need the math library
- 		    AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm])
- 		    LIBS="$LIBS -lm"
--		    AC_TRY_RUN([
-+AC_TRY_RUN([
- #include <stdio.h>
- #include <slcurses.h>
- int main () { SLtt_initialize (NULL); return 0; }],
-@@ -252,8 +252,7 @@
- 			CURSES_LIB_NAME=slang],
- 			[AC_MSG_RESULT(no)],
- AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
--AC_MSG_WARN([*** Can not use slang when cross-compiling]))], 
--AC_MSG_WARN([*** Can not use slang when cross-compiling])),
-+AC_MSG_WARN([*** Can not use slang when cross-compiling]))],[AC_MSG_WARN(*** Can not use slang when cross-compiling)]),
- 	    AC_MSG_ERROR([
- *** The header file slcurses.h was not found. If you wish to use
- *** slang support this header file is required. Please either
-@@ -334,12 +333,11 @@
-     # Taken from aumix (can't tell from the variable name?)
-     AC_CACHE_CHECK([for private member _use_keypad in WINDOW],
-     aumix_cv_struct_window_usekeypad,
--    [AC_TRY_COMPILE([#ifdef HAVE_NCURSES_H
-+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NCURSES_H
- #include <ncurses.h>
- #else
- #include <curses.h>
--#endif], [WINDOW w; w._use_keypad;],
--    aumix_cv_struct_window_usekeypad=yes, aumix_cv_struct_window_usekeypad=no)])
-+#endif]], [[WINDOW w; w._use_keypad;]])],[aumix_cv_struct_window_usekeypad=yes],[aumix_cv_struct_window_usekeypad=no])])
-     
-     if test $aumix_cv_struct_window_usekeypad = yes; then
- 	AC_DEFINE(HAVE_USEKEYPAD, 1, [Define this if your curses lib has the _use_keypad flag.])
---- nano-1.2.1/configure~configure
-+++ nano-1.2.1/configure
-@@ -310,7 +310,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB CPP EGREP GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS CURSES_LIB LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB CPP EGREP GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS CURSES_LIB LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -1314,7 +1314,7 @@
- 
- 
- 
--am__api_version="1.6"
-+am__api_version="1.7"
- ac_aux_dir=
- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-   if test -f $ac_dir/install-sh; then
-@@ -1558,6 +1558,15 @@
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+
-  # test to see if srcdir already configured
- if test "`cd $srcdir && pwd`" != "`pwd`" &&
-    test -f $srcdir/config.status; then
-@@ -1566,9 +1575,19 @@
-    { (exit 1); exit 1; }; }
- fi
- 
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+
-+
- # Define the identity of the package.
-- PACKAGE=nano
-- VERSION=1.2.1
-+ PACKAGE='nano'
-+ VERSION='1.2.1'
- 
- 
- cat >>confdefs.h <<_ACEOF
-@@ -1694,15 +1713,11 @@
- 
- 
- 
--# Add the stamp file to the list of files AC keeps track of,
--# along with our hook.
-           ac_config_headers="$ac_config_headers config.h:config.h.in"
- 
- 
- 
- 
--
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2570,24 +2585,16 @@
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--rm -f .deps 2>/dev/null
--mkdir .deps 2>/dev/null
--if test -d .deps; then
--  DEPDIR=.deps
--else
--  # MS-DOS does not allow filenames that begin with a dot.
--  DEPDIR=_deps
--fi
--rmdir .deps 2>/dev/null
--
-+DEPDIR="${am__leading_dot}deps"
- 
-           ac_config_commands="$ac_config_commands depfiles"
- 
- 
- am_make=${MAKE-make}
- cat > confinc << 'END'
--doit:
-+am__doit:
- 	@echo done
-+.PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
- echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-@@ -2602,7 +2609,7 @@
- # In particular we don't look at `^make:' because GNU make might
- # be invoked under some other name (usually "gmake"), in which
- # case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-    am__include=include
-    am__quote=
-    _am_result=GNU
-@@ -2662,18 +2669,32 @@
-   # using a relative directory.
-   cp "$am_depcomp" conftest.dir
-   cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
- 
-   am_cv_CC_dependencies_compiler_type=none
-   if test "$am_compiler_list" = ""; then
-      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-   fi
-   for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-     # We need to recreate these files for each test, as the compiler may
-     # overwrite some of them when testing with obscure command lines.
-     # This happens at least with the AIX C compiler.
--    echo '#include "conftest.h"' > conftest.c
--    echo 'int i;' > conftest.h
--    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      : > sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
-     case $depmode in
-     nosideeffect)
-@@ -2691,13 +2712,20 @@
-     # mode.  It turns out that the SunPro C++ compiler does not properly
-     # handle `-M -o', and we need to detect this.
-     if depmode=$depmode \
--       source=conftest.c object=conftest.o \
--       depfile=conftest.Po tmpdepfile=conftest.TPo \
--       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
--       grep conftest.h conftest.Po > /dev/null 2>&1 &&
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--      am_cv_CC_dependencies_compiler_type=$depmode
--      break
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored.
-+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-     fi
-   done
- 
-@@ -2714,6 +2742,18 @@
- 
- 
- 
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
-+
- 
-         echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
- echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
-@@ -5290,6 +5330,7 @@
- 
- done
- 
-+
- if test "${ac_cv_header_regex_h+set}" = set; then
-   echo "$as_me:$LINENO: checking for regex.h" >&5
- echo $ECHO_N "checking for regex.h... $ECHO_C" >&6
-@@ -5422,7 +5463,10 @@
- if test $ac_cv_header_regex_h = yes; then
-   echo "$as_me:$LINENO: checking for broken regexec" >&5
- echo $ECHO_N "checking for broken regexec... $ECHO_C" >&6
--    if test "$cross_compiling" = yes; then
-+if test "${ac_cv_regexec_segfault_emptystr+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
-@@ -5472,6 +5516,10 @@
- fi
- 
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_regexec_segfault_emptystr" >&5
-+echo "${ECHO_T}$ac_cv_regexec_segfault_emptystr" >&6
-+
-+fi
- 
- 
- 
-@@ -6037,7 +6085,7 @@
- 		echo "$as_me:$LINENO: checking for SLtt_initialize in -lslang $tcap" >&5
- echo $ECHO_N "checking for SLtt_initialize in -lslang $tcap... $ECHO_C" >&6
- 		LIBS="$LIBS $tcap"
--		if test "$cross_compiling" = yes; then
-+if test "$cross_compiling" = yes; then
-   { echo "$as_me:$LINENO: WARNING: *** Can not use slang when cross-compiling" >&5
- echo "$as_me: WARNING: *** Can not use slang when cross-compiling" >&2;}
- else
-@@ -6091,7 +6139,7 @@
- 		    echo "$as_me:$LINENO: checking for SLtt_initialize in -lslang $tcap -lm" >&5
- echo $ECHO_N "checking for SLtt_initialize in -lslang $tcap -lm... $ECHO_C" >&6
- 		    LIBS="$LIBS -lm"
--		    if test "$cross_compiling" = yes; then
-+if test "$cross_compiling" = yes; then
-   { echo "$as_me:$LINENO: WARNING: *** Can not use slang when cross-compiling" >&5
- echo "$as_me: WARNING: *** Can not use slang when cross-compiling" >&2;}
- else
-@@ -7671,6 +7719,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- 
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
-@@ -8104,7 +8159,7 @@
- #
- 
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
--# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-+# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
-     # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-     # from automake.
-     eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
-@@ -8216,6 +8271,7 @@
- s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
- s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
- s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-+s,@CYGPATH_W@,$CYGPATH_W,;t t
- s,@PACKAGE@,$PACKAGE,;t t
- s,@VERSION@,$VERSION,;t t
- s,@ACLOCAL@,$ACLOCAL,;t t
-@@ -8230,6 +8286,7 @@
- s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
- s,@AWK@,$AWK,;t t
- s,@SET_MAKE@,$SET_MAKE,;t t
-+s,@am__leading_dot@,$am__leading_dot,;t t
- s,@CC@,$CC,;t t
- s,@CFLAGS@,$CFLAGS,;t t
- s,@LDFLAGS@,$LDFLAGS,;t t
-@@ -8244,6 +8301,8 @@
- s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
- s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
- s,@CCDEPMODE@,$CCDEPMODE,;t t
-+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
- s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
- s,@MSGFMT@,$MSGFMT,;t t
- s,@GMSGFMT@,$GMSGFMT,;t t
-@@ -8697,13 +8756,29 @@
-     cat $tmp/config.h
-     rm -f $tmp/config.h
-   fi
--  # Run the commands associated with the file.
--  case $ac_file in
--    config.h ) # update the timestamp
--echo 'timestamp for config.h:config.h.in' >"./stamp-h1"
-- ;;
-+# Compute $ac_file's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $ac_file | $ac_file:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-   esac
- done
-+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+         X$ac_file : 'X\(//\)[^/]' \| \
-+         X$ac_file : 'X\(//\)$' \| \
-+         X$ac_file : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
-+echo X$ac_file |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+done
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
- 
---- nano-1.2.1/Makefile.am~configure
-+++ nano-1.2.1/Makefile.am
-@@ -31,6 +31,6 @@
- SUBDIRS = po m4
- 
- localedir = $(datadir)/locale
--INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
-+INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\"
- 
- ACLOCAL_AMFLAGS = -I m4
---- nano-1.2.1/Makefile.in~configure
-+++ nano-1.2.1/Makefile.in
-@@ -1,7 +1,7 @@
--# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# Makefile.in generated by automake 1.7.7 from Makefile.am.
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- # Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -13,100 +13,124 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--SHELL = @SHELL@
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
- 
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_DATA = @INSTALL_DATA@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
--transform = @program_transform_name@
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
- host_triplet = @host@
--
--EXEEXT = @EXEEXT@
--OBJEXT = @OBJEXT@
--PATH_SEPARATOR = @PATH_SEPARATOR@
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
--BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
--CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CURSES_LIB = @CURSES_LIB@
--DATADIRNAME = @DATADIRNAME@
-+CYGPATH_W = @CYGPATH_W@
-+
-+DEFS = -DSYSCONFDIR=\"$(sysconfdir)\"
- DEPDIR = @DEPDIR@
--GENCAT = @GENCAT@
--GLIBC21 = @GLIBC21@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
- GLIB_CFLAGS = @GLIB_CFLAGS@
- GLIB_CONFIG = @GLIB_CONFIG@
- GLIB_LIBS = @GLIB_LIBS@
- GMSGFMT = @GMSGFMT@
--HAVE_LIB = @HAVE_LIB@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTOBJEXT = @INSTOBJEXT@
--INTLBISON = @INTLBISON@
- INTLLIBS = @INTLLIBS@
--INTLOBJS = @INTLOBJS@
--INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
--LIB = @LIB@
-+LDFLAGS = @LDFLAGS@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
--LTLIB = @LTLIB@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = makeinfo --no-split
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MSGFMT = @MSGFMT@
-+MSGMERGE = @MSGMERGE@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- POSUB = @POSUB@
--RANLIB = @RANLIB@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- STRIP = @STRIP@
--USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+XGETTEXT = @XGETTEXT@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
- install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- AUTOMAKE_OPTIONS = gnu no-dependencies
- 
--DEFS = -DSYSCONFDIR=\"$(sysconfdir)\"
--
- bin_PROGRAMS = nano
- nano_SOURCES = color.c \
- 		cut.c \
-@@ -126,7 +150,6 @@
- nano_LDADD = @GLIB_LIBS@ @LIBINTL@
- 
- info_TEXINFOS = nano.texi
--MAKEINFO = makeinfo --no-split
- 
- EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
- 		README THANKS TODO UPGRADE config.rpath install-sh missing \
-@@ -137,7 +160,7 @@
- SUBDIRS = po m4
- 
- localedir = $(datadir)/locale
--INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
-+INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\"
- 
- ACLOCAL_AMFLAGS = -I m4
- subdir = .
-@@ -154,34 +177,35 @@
- nano_OBJECTS = $(am_nano_OBJECTS)
- nano_DEPENDENCIES =
- nano_LDFLAGS =
-+
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
- depcomp =
- am__depfiles_maybe =
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
- DIST_SOURCES = $(nano_SOURCES)
-+am__TEXINFO_TEX_DIR = $(srcdir)
- INFO_DEPS = nano.info
- DVIS = nano.dvi
-+PDFS = nano.pdf
-+PSS = nano.ps
- TEXINFOS = nano.texi
- 
- NROFF = nroff
- MANS = $(man_MANS)
- 
--RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
--	uninstall-info-recursive all-recursive install-data-recursive \
--	install-exec-recursive installdirs-recursive install-recursive \
--	uninstall-recursive check-recursive installcheck-recursive
--DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \
--	Makefile.am Makefile.in NEWS THANKS TODO aclocal.m4 \
--	config.guess config.h.in config.rpath config.sub configure \
--	configure.ac install-sh missing mkinstalldirs nano.spec.in \
--	texinfo.tex
-+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-+	ps-recursive install-info-recursive uninstall-info-recursive \
-+	all-recursive install-data-recursive install-exec-recursive \
-+	installdirs-recursive install-recursive uninstall-recursive \
-+	check-recursive installcheck-recursive
-+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \
-+	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS \
-+	THANKS TODO aclocal.m4 config.guess config.h.in config.rpath \
-+	config.sub configure configure.ac install-sh missing \
-+	mkinstalldirs nano.spec.in texinfo.tex
- DIST_SUBDIRS = $(SUBDIRS)
- SOURCES = $(nano_SOURCES)
- 
-@@ -189,7 +213,7 @@
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
- .SUFFIXES:
--.SUFFIXES: .c .dvi .info .o .obj .ps .texi
-+.SUFFIXES: .c .dvi .info .o .obj .pdf .ps .texi
- 
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-  configure.lineno
-@@ -235,7 +259,7 @@
- 	  ; then \
- 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- 	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
--	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
-+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
- 	  else :; fi; \
- 	done
- 
-@@ -263,55 +287,58 @@
- 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
- 
- .c.obj:
--	$(COMPILE) -c `cygpath -w $<`
--
--nano.info: nano.texi
--nano.dvi: nano.texi
-+	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
- 
- .texi.info:
--	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
--	cd $(srcdir) \
--	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
--	       `echo $< | sed 's,.*/,,'`
-+	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
-+	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-+	 -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
- 
- .texi.dvi:
--	TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" \
-+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
--	$(TEXI2DVI) $<
-+	$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
- 
--.texi:
--	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
--	cd $(srcdir) \
--	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
--	       `echo $< | sed 's,.*/,,'`
-+.texi.pdf:
-+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-+	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-+	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
-+nano.info: nano.texi 
-+nano.dvi: nano.texi 
-+nano.pdf: nano.texi 
- TEXI2DVI = texi2dvi
-+
-+TEXI2PDF = $(TEXI2DVI) --pdf --batch
- DVIPS = dvips
- .dvi.ps:
--	$(DVIPS) $< -o $@
-+	$(DVIPS) -o $@ $<
- 
- uninstall-info-am:
- 	$(PRE_UNINSTALL)
- 	@if (install-info --version && \
--	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
-+	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
- 	  list='$(INFO_DEPS)'; \
- 	  for file in $$list; do \
--	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
--	    install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \
-+	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-+	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile"; \
-+	    install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile; \
- 	  done; \
- 	else :; fi
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(INFO_DEPS)'; \
- 	for file in $$list; do \
-+	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
-+	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
- 	  (if cd $(DESTDIR)$(infodir); then \
--	     echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \
--	     rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \
-+	     echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \
-+	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
- 	   else :; fi); \
- 	done
- 
- dist-info: $(INFO_DEPS)
- 	list='$(INFO_DEPS)'; \
- 	for base in $$list; do \
--	  d=$(srcdir); \
-+	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
- 	  for file in $$d/$$base*; do \
- 	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
- 	    test -f $(distdir)/$$relfile || \
-@@ -320,16 +347,15 @@
- 	done
- 
- mostlyclean-aminfo:
--	-rm -f nano.aux nano.cp nano.dvi nano.fn nano.ky nano.log nano.pg nano.ps \
--	  nano.tmp nano.toc nano.tp nano.vr
-+	-rm -f nano.aux nano.cp nano.cps nano.fn nano.fns nano.ky nano.kys nano.log \
-+	  nano.pg nano.pgs nano.tmp nano.toc nano.tp nano.tps nano.vr \
-+	  nano.vrs nano.dvi nano.pdf nano.ps
- 
- maintainer-clean-aminfo:
--	cd $(srcdir) && \
--	list='$(INFO_DEPS)'; for i in $$list; do \
--	  rm -f $$i; \
--	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
--	    rm -f $$i-[0-9]*; \
--	  fi; \
-+	@list='$(INFO_DEPS)'; for i in $$list; do \
-+	  i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
-+	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
-+	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
- 	done
- 
- man1dir = $(mandir)/man1
-@@ -368,6 +394,10 @@
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    1*) ;; \
-+	    *) ext='1' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-@@ -411,6 +441,10 @@
- 	done; \
- 	for i in $$list; do \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    5*) ;; \
-+	    *) ext='5' ;; \
-+	  esac; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-@@ -472,10 +506,17 @@
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- 	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
- 
- ETAGS = etags
- ETAGSFLAGS =
- 
-+CTAGS = ctags
-+CTAGSFLAGS =
-+
- tags: TAGS
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -491,9 +532,15 @@
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
-+	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	else \
-+	  include_option=--include; \
-+	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+	    test -f $$subdir/TAGS && \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
- 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-@@ -506,13 +553,28 @@
- 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- 	     $$tags $$unique
- 
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
- GTAGS:
- 	here=`$(am__cd) $(top_builddir) && pwd` \
- 	  && cd $(top_srcdir) \
- 	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- 
- top_distdir = .
-@@ -524,13 +586,20 @@
-          && rm -fr $(distdir); }; }
- 
- GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
- 
- distdir: $(DISTFILES)
- 	$(am__remove_distdir)
- 	mkdir $(distdir)
- 	$(mkinstalldirs) $(distdir)/. $(distdir)/po
--	@list='$(DISTFILES)'; for file in $$list; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-@@ -564,7 +633,7 @@
- 	  fi; \
- 	done
- 	$(MAKE) $(AM_MAKEFLAGS) \
--	  top_distdir="${top_distdir}" distdir="$(distdir)" \
-+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
- 	  dist-info
- 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-@@ -586,13 +655,13 @@
- 	$(am__remove_distdir)
- 	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
- 	chmod -R a-w $(distdir); chmod a+w $(distdir)
--	mkdir $(distdir)/=build
--	mkdir $(distdir)/=inst
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
- 	chmod a-w $(distdir)
--	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
--	  && cd $(distdir)/=build \
--	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
--	    --with-included-gettext \
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && cd $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- 	    $(DISTCHECK_CONFIGURE_FLAGS) \
- 	  && $(MAKE) $(AM_MAKEFLAGS) \
- 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-@@ -600,23 +669,39 @@
- 	  && $(MAKE) $(AM_MAKEFLAGS) install \
- 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
--	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
--	      || { echo "ERROR: files left after uninstall:" ; \
--	           find $$dc_install_base -type f -print ; \
--	           exit 1; } >&2 ) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
- 	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
- 	  && rm -f $(distdir).tar.gz \
- 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- 	$(am__remove_distdir)
- 	@echo "$(distdir).tar.gz is ready for distribution" | \
- 	  sed 'h;s/./=/g;p;x;p;x'
-+distuninstallcheck:
-+	@cd $(distuninstallcheck_dir) \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
- distcleancheck: distclean
--	if test '$(srcdir)' = . ; then \
-+	@if test '$(srcdir)' = . ; then \
- 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- 	  exit 1 ; \
- 	fi
--	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
--	  || { echo "ERROR: files left after distclean:" ; \
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
- 	       $(distcleancheck_listfiles) ; \
- 	       exit 1; } >&2
- check-am: all-am
-@@ -645,7 +730,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -656,6 +741,8 @@
- 
- distclean: distclean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+
-+	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
- 	distclean-tags
- 
-@@ -678,10 +765,12 @@
- 	$(mkinstalldirs) $(DESTDIR)$(infodir)
- 	@list='$(INFO_DEPS)'; \
- 	for file in $$list; do \
--	  d=$(srcdir); \
--	  for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
-+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+	  file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
-+	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
-+                       $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
- 	    if test -f $$ifile; then \
--	      relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \
-+	      relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
- 	      echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
- 	      $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
- 	    else : ; fi; \
-@@ -689,11 +778,12 @@
- 	done
- 	@$(POST_INSTALL)
- 	@if (install-info --version && \
--	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
-+	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
- 	  list='$(INFO_DEPS)'; \
- 	  for file in $$list; do \
--	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
--	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
-+	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-+	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\
-+	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\
- 	  done; \
- 	else : ; fi
- install-man: install-man1 install-man5
-@@ -702,7 +792,9 @@
- 
- maintainer-clean: maintainer-clean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
--	-rm -rf autom4te.cache
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-aminfo \
- 	maintainer-clean-generic
- 
-@@ -711,29 +803,38 @@
- mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \
- 	mostlyclean-generic
- 
-+pdf: pdf-recursive
-+
-+pdf-am: $(PDFS)
-+
-+ps: ps-recursive
-+
-+ps-am: $(PSS)
-+
- uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
- 
- uninstall-info: uninstall-info-recursive
- 
- uninstall-man: uninstall-man1 uninstall-man5
- 
--.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
--	clean-binPROGRAMS clean-generic clean-recursive dist dist-all \
--	dist-gzip dist-info distcheck distclean distclean-compile \
--	distclean-generic distclean-hdr distclean-recursive \
--	distclean-tags distcleancheck distdir dvi dvi-am dvi-recursive \
--	info info-am info-recursive install install-am \
--	install-binPROGRAMS install-data install-data-am \
--	install-data-recursive install-exec install-exec-am \
--	install-exec-recursive install-info install-info-am \
--	install-info-recursive install-man install-man1 install-man5 \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-aminfo \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-+	clean-binPROGRAMS clean-generic clean-recursive ctags \
-+	ctags-recursive dist dist-all dist-gzip dist-info distcheck \
-+	distclean distclean-compile distclean-generic distclean-hdr \
-+	distclean-recursive distclean-tags distcleancheck distdir \
-+	distuninstallcheck dvi dvi-am dvi-recursive info info-am \
-+	info-recursive install install-am install-binPROGRAMS \
-+	install-data install-data-am install-data-recursive \
-+	install-exec install-exec-am install-exec-recursive \
-+	install-info install-info-am install-info-recursive install-man \
-+	install-man1 install-man5 install-recursive install-strip \
-+	installcheck installcheck-am installdirs installdirs-am \
-+	installdirs-recursive maintainer-clean maintainer-clean-aminfo \
- 	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
- 	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
--	mostlyclean-recursive tags tags-recursive uninstall \
--	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-+	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
-+	ps-recursive tags tags-recursive uninstall uninstall-am \
-+	uninstall-binPROGRAMS uninstall-info-am \
- 	uninstall-info-recursive uninstall-man uninstall-man1 \
- 	uninstall-man5 uninstall-recursive
- 
diff --git a/packages/nano/nano-2.0.6/.mtn2git_empty b/packages/nano/nano-2.0.6/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/nano/nano-2.0.6/.mtn2git_empty
+++ /dev/null
diff --git a/packages/nano/nano-2.0.6/glib.m4 b/packages/nano/nano-2.0.6/glib.m4
deleted file mode 100644
index b8094bbfe0..0000000000
--- a/packages/nano/nano-2.0.6/glib.m4
+++ /dev/null
@@ -1,196 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
-dnl gthread is specified in MODULES, pass to glib-config
-dnl
-AC_DEFUN(AM_PATH_GLIB,
-[dnl 
-dnl Get the cflags and libraries from the glib-config script
-dnl
-AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
-            glib_config_prefix="$withval", glib_config_prefix="")
-AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
-            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  if test x$glib_config_exec_prefix != x ; then
-     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-     fi
-  fi
-  if test x$glib_config_prefix != x ; then
-     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-     fi
-  fi
-
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             glib_config_args="$glib_config_args gmodule"
-         ;;
-         gthread) 
-             glib_config_args="$glib_config_args gthread"
-         ;;
-      esac
-  done
-
-  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-  min_glib_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-  no_glib=""
-  if test "$GLIB_CONFIG" = "no" ; then
-    no_glib=yes
-  else
-    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of glib-config to some extent
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If glib-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-        printf("*** correct copy of glib-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GLIB_CONFIG" = "no" ; then
-       echo "*** The glib-config script installed by GLIB could not be found"
-       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-       echo "*** full path to glib-config."
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  rm -f conf.glibtest
-])
diff --git a/packages/nano/nano_1.2.1.bb b/packages/nano/nano_1.2.1.bb
deleted file mode 100644
index 1c3728096c..0000000000
--- a/packages/nano/nano_1.2.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "GNU nano (Nano's ANOther editor, or \
-Not ANOther editor) is an enhanced clone of the \
-Pico text editor."
-LICENSE = "GPL"
-SECTION = "console/utils"
-DEPENDS = "ncurses"
-
-SRC_URI = "http://www.nano-editor.org/dist/v1.2/nano-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
-           file://glib.m4"
-
-inherit autotools
-
-do_configure_prepend () {
-	install -m 0644 ${WORKDIR}/glib.m4 m4/
-}
diff --git a/packages/nano/nano_2.0.6.bb b/packages/nano/nano_2.0.7.bb
index f6ef365591..0951466b82 100644
--- a/packages/nano/nano_2.0.6.bb
+++ b/packages/nano/nano_2.0.7.bb
@@ -11,6 +11,9 @@ SRC_URI = "http://www.nano-editor.org/dist/v2.0/nano-${PV}.tar.gz \
 
 inherit autotools
 
+# only 16K more to get everything but the kitchen sink
+EXTRA_OECONF = "--enable-all"
+
 do_configure_prepend () {
 	install -m 0644 ${WORKDIR}/glib.m4 m4/
 }