Update clex to 4.6.4.

based on maintainer update request by PR 45960.

* * * CLEX Revision History * * *

4.6.4 released on 21-MAY-2011

  Problems fixed:

     * Name completion did not expand a single tilde as a home
       directory.
     * A mouseclick on a certain screen area of the help panel
       could lead to a crash.

  New or improved functionality:

     * The English documentation was proofread and corrected,
       the service was kindly contributed by Richard Harris.
     * Text file preview function was added.
     * The initial working directory for the secondary file
       panel is now set by a bookmark named DIR2. This
       replaces the configuration parameter DIR2.
     * The initial working directory for the primary file
       panel can be now set by a bookmark named DIR1.
     * New configuration parameter TIME_DATE controls the
       display of date and time.
     * Changes to the mouse control were made.
     * The recommendation against using alt-R for normal file
       renaming was dropped.


4.5 released on 24-SEP-2009

  Problems fixed:
     * Name completion could not complete user and group names
       containing a dot, comma or a dash character.

  New or improved functionality:
     * A mouse is supported on xterm-compatible terminals.
     * The location of configuration files has been moved
       again in order to comply with the XDG Specification.
       The standard place for these files is from now on the
       ~/.config/clex directory. Use the 'cfg-clex' utility to
       move the files to the new location.
     * There is a new option in the completion panel which
       allows completion of a name which is a part of a longer
       word. The option has a self-explaining description:
       'name to be completed starts at the cursor position'.
     * Configuration parameter C_PANEL_SIZE (completion panel
       size) cannot be set to AUTO (screen size) because this
       size is often uncomfortably small.
     * The Unicode soft hyphen character is displayed as a
       control character.
     * In the history panel a command separator is
       automatically inserted into the input line when a
       command is appended to the end of another command.
     * Configuration parameters CMD_Fn accept a new control
       sequence $~ which disables the 'Press enter to
       continue' prompt. The control is returned to CLEX
       immediately after the command execution terminates
       provided that:

          * the command has not been modified; and
          * the command terminates successfully (exit code
            zero).

     * The $! control sequence can appear anywhere in a
       configuration parameter CMD_Fn, not only at the end.
     * New function: alt-Z places the current line to the
       center of the panel. People using cluster-ssh might
       find it useful.


4.4 released on 07-APR-2009

  Problems fixed:
     * In the help text there were few UTF-8 characters which
       are now eliminated because they could not be displayed
       properly in non-UTF-8 encodings.

  New or improved functionality:
     * New function was added: change into a subdirectory
       showing the contents in the other file panel (alt-X).
       This function allows a return into the original
       directory simply by switching panels (ctrl-X).


4.3 released on 29-MAR-2009

  Problems fixed:
     * A newly added bookmark did not appear on the screen
       immediately.
     * A misleading message 'Ignoring the DIR2 configuration
       parameter' was logged when the 'DIR2' was set to
       'HOME'.

  New or improved functionality:
     * The bookmark organizer has been merged with the regular
       bookmark panel.
     * Bookmarks can have descriptive names.
     * The current working directory can be bookmarked from
       the file panel (ctrl-D).
     * The 'B_PANEL_SIZE' config parameter was removed.


4.2 released on 15-MAR-2009

  Problems fixed:
     * In some cases the 'cfg-clex' utility was generating an
       unusable template for the copy command (F5).
     * Under certain circumstances a crash was occurring on
       exit when CLEX was used over a ssh connection.

  New or improved functionality:
     * All configuration files now reside in the .clex
       subdirectory. Use the 'cfg-clex' utility to move the
       files to new location.


4.1 released on 09-FEB-2009

  Problems fixed:
     * Usage of uninitialized memory during the start-up has
       been corrected. It caused a crash on the Apple Mac OS X
       platform. Systems where CLEX starts normally are not
       affected by this bug.
     * A compilation problem on Apple Mac OS X was fixed.
     * The xterm title change feature did not work on remote
       telnet or ssh connections.

  New or improved functionality:
     * If a directory comparison is restricted to regular
       files, then only information about this type of file is
       displayed in the summary.
     * A small program named 'kbd-test' was added. It is a
       utility for


CLEX 4.0 released on 22-DEC-2008

   This is the initial release of the CLEX 4 branch. Main new
   features are:
     * Unicode support was implemented.
     * Several configuration parameters have been converted to options
       which are saved automatically.
     * The log panel and optional logging to a file for auditing and
       troubleshooting were added.
     * There is now 'cfg-clex' utility.
     * A built-in function for renaming files with invalid or
       unprintable characters was added.
   Enhancements (compared to previous releases) include:
     * Configuring prompt, time format and date format is more flexible.
     * The help is not limited to one link per line.
     * The user interface of the directory compare function was redesigned.
     * Changes in the pattern matching routine were made
     * Panel filtering is now available in two more panels.
     * A new tool for inserting control characters into the input line
       was added.

14 files changed, 54 insertions, 135 deletions

diff --git a/sysutils/clex/Makefile b/sysutils/clex/Makefile
index 3b838f922cb..66a5a200b19 100644
--- a/sysutils/clex/Makefile
+++ b/sysutils/clex/Makefile
@@ -1,18 +1,30 @@
-# $NetBSD: Makefile,v 1.4 2010/03/17 14:17:49 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2012/02/17 13:23:28 obache Exp $
 #
 
-DISTNAME=		clex-3.16
+DISTNAME=		clex-4.6.4
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.clex.sk/download/
 
 MAINTAINER=		bartosz.kuzma@gmail.com
-HOMEPAGE=		http://www.clex.sk/download/
+HOMEPAGE=		http://www.clex.sk/
 COMMENT=		File manager with a full-screen user interface
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_NCURSES=		yes # enter_{bold,reverse,underline}_mode
 GNU_CONFIGURE=		yes
 
-.include "../../devel/ncurses/buildlink3.mk"
+# for easy to maintain patches
+post-extract:
+	cd ${WRKSRC} && ${RM} -f src/*.orig
+
+.include "../../mk/bsd.prefs.mk"
+
+# libtinfo in DragonFly is linked with libncurses
+.if ${OPSYS} == "DragonFly"
+BUILDLINK_TRANSFORM+=	rm:-ltinfo
+.endif
+
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/clex/PLIST b/sysutils/clex/PLIST
index f9f60ff4351..4c0ad512615 100644
--- a/sysutils/clex/PLIST
+++ b/sysutils/clex/PLIST
@@ -1,3 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/12/01 03:54:26 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/02/17 13:23:28 obache Exp $
+bin/cfg-clex
 bin/clex
+bin/kbd-test
+man/man1/cfg-clex.1
 man/man1/clex.1
+man/man1/kbd-test.1
diff --git a/sysutils/clex/distinfo b/sysutils/clex/distinfo
index 6f59db1d5d8..6602aa24a15 100644
--- a/sysutils/clex/distinfo
+++ b/sysutils/clex/distinfo
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.3 2007/07/12 12:43:20 obache Exp $
+$NetBSD: distinfo,v 1.4 2012/02/17 13:23:28 obache Exp $
 
-SHA1 (clex-3.16.tar.gz) = e92c5c596fead2cf09c22cd484b3bbff536c58e0
-RMD160 (clex-3.16.tar.gz) = 69ab253a9c451559cc4db1650ef13b24ecccbd2c
-Size (clex-3.16.tar.gz) = 186313 bytes
-SHA1 (patch-aa) = b6cd477159c3b2279f1d9d3f8dc04709115de57c
-SHA1 (patch-ab) = 0b6e36eca7ab1bc85af0a488d6d8be97f52480d5
-SHA1 (patch-ac) = f658ab8f033f60f49d5f0a2e2982a60d961a61fa
-SHA1 (patch-ad) = 318d238e46ce31102f83d9857e6f61fb671ad58b
-SHA1 (patch-ae) = 0c72744fde6b0315941396b0a62281cccb49e4dd
-SHA1 (patch-af) = 1532776758559542bdecc86b720ce2900c107867
-SHA1 (patch-ag) = ee108f63473474f7af42e25e158a22a49f0a764d
-SHA1 (patch-ah) = 21ed59c002e0a99df1091e04775807ad2b6b9a29
-SHA1 (patch-ai) = be0490fc358c252ef953d71f520efd641f7ac46f
+SHA1 (clex-4.6.4.tar.gz) = 601091677349dbd8613f185a594361a8d78c65ab
+RMD160 (clex-4.6.4.tar.gz) = 6f1ea4a1ca1c4b26f34c429ef458a04491950695
+Size (clex-4.6.4.tar.gz) = 243297 bytes
+SHA1 (patch-src_cfg-clex) = 4fb8995131195b4f54a53c72eac85da2cd6f14a2
+SHA1 (patch-src_clexheaders.h) = d60ec230f3b2656063c1f51257fc4e29267cf8b7
diff --git a/sysutils/clex/patches/patch-aa b/sysutils/clex/patches/patch-aa
deleted file mode 100644
index 19db6171f00..00000000000
--- a/sysutils/clex/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/01/13 15:16:14 joerg Exp $
-
---- src/bookmarks.c.orig	2006-01-13 14:28:29.000000000 +0000
-+++ src/bookmarks.c
-@@ -43,8 +43,6 @@ static FLAG changed = 0;		/* bookmarks h
- static const char *user_bm_file;	/* personal bookmarks filename */
- static time_t bm_file_mod = 0;		/* last modification of the file */
- 
--extern int errno;
--
- static void
- bm_error(const char *format, ...)
- {
diff --git a/sysutils/clex/patches/patch-ab b/sysutils/clex/patches/patch-ab
deleted file mode 100644
index cbe008bcfb4..00000000000
--- a/sysutils/clex/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/01/13 15:16:14 joerg Exp $
-
---- src/cfg.c.orig	2006-01-13 14:43:42.000000000 +0000
-+++ src/cfg.c
-@@ -42,8 +42,6 @@
- #define CFG_LINES_LIMIT 100		/* config file size limit (in lines) */
- #define CFG_ERRORS_LIMIT  12	/* error limit */
- 
--extern int errno;
--
- static const char *user_config_file; /* personal cfg filename */
- 
- /* used in error handling: */
diff --git a/sysutils/clex/patches/patch-ac b/sysutils/clex/patches/patch-ac
deleted file mode 100644
index cef227f3926..00000000000
--- a/sysutils/clex/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/07/12 12:43:21 obache Exp $
-
---- src/completion.c.orig	2007-04-24 08:58:51.000000000 +0200
-+++ src/completion.c
-@@ -111,8 +111,6 @@ static int cc_max;			/* max number of ca
- static FLAG done;			/* done: completion not possible or
- 							  full (not partial) name was completed */
- 
--extern int errno;
--
- static void
- environ_completion_init(void)
- {
diff --git a/sysutils/clex/patches/patch-ad b/sysutils/clex/patches/patch-ad
deleted file mode 100644
index 99681b238e8..00000000000
--- a/sysutils/clex/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2007/07/12 12:43:21 obache Exp $
-
---- src/exec.c.orig	2007-04-24 08:59:04.000000000 +0200
-+++ src/exec.c
-@@ -50,8 +50,6 @@
- #include "ustring.h"		/* us_copy() */
- #include "xterm_title.h"	/* xterm_title_set() */
- 
--extern int errno;
--
- #define MAX_SHELL_ARGS	8
- static char *shell_argv[MAX_SHELL_ARGS + 2 + 1];
- static int cmd_index;		/* which parameter is the command
diff --git a/sysutils/clex/patches/patch-ae b/sysutils/clex/patches/patch-ae
deleted file mode 100644
index b717b443eaf..00000000000
--- a/sysutils/clex/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/01/13 15:16:14 joerg Exp $
-
---- src/filepanel.c.orig	2006-01-13 14:58:36.000000000 +0000
-+++ src/filepanel.c
-@@ -37,8 +37,6 @@
- #include "ustring.h"	/* USTR() */
- #include "util.h"		/* base_name() */
- 
--extern int errno;
--
- void
- files_initialize(void)
- {
diff --git a/sysutils/clex/patches/patch-af b/sysutils/clex/patches/patch-af
deleted file mode 100644
index af7a551b2a6..00000000000
--- a/sysutils/clex/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/01/13 15:16:14 joerg Exp $
-
---- src/help.c.orig	2006-01-13 14:58:59.000000000 +0000
-+++ src/help.c
-@@ -94,8 +94,6 @@ static int head, tail;			/* circular buf
- #define MVINDEX(X,N) \
-   (X = (X + HELP_HISTORY_ALLOC + N) % HELP_HISTORY_ALLOC)
- 
--extern int errno;
--
- static int
- page2num(const char *pagename)
- {
diff --git a/sysutils/clex/patches/patch-ag b/sysutils/clex/patches/patch-ag
deleted file mode 100644
index 4c56c99617b..00000000000
--- a/sysutils/clex/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2007/07/12 12:43:21 obache Exp $
-
---- src/list.c.orig	2007-04-24 08:59:39.000000000 +0200
-+++ src/list.c
-@@ -83,8 +83,6 @@
- 
- #define CACHE_SIZE 		24	/* size of cache for user/group name lookups */
- 
--extern int errno;
--
- static time_t now;
- static FLAG do_a, do_d, do_i, do_l, do_L, do_m, do_M, do_o, do_s;
- static FLAG clock24, use_pathname = 0;
diff --git a/sysutils/clex/patches/patch-ah b/sysutils/clex/patches/patch-ah
deleted file mode 100644
index 162e77bfdb1..00000000000
--- a/sysutils/clex/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/01/13 15:16:14 joerg Exp $
-
---- src/tty.c.orig	2006-01-13 14:59:50.000000000 +0000
-+++ src/tty.c
-@@ -25,8 +25,6 @@
- 
- #include "control.h"	/* err_exit() */
- 
--extern int errno;
--
- static struct termios text_termios, raw_termios, *ptermios = 0;
- #ifdef _POSIX_JOB_CONTROL
- static pid_t save_pgid = 0;
diff --git a/sysutils/clex/patches/patch-ai b/sysutils/clex/patches/patch-ai
deleted file mode 100644
index b1d5702f544..00000000000
--- a/sysutils/clex/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/01/13 15:16:14 joerg Exp $
-
---- src/ustring.c.orig	2006-01-13 15:00:13.000000000 +0000
-+++ src/ustring.c
-@@ -26,8 +26,6 @@
- 
- #include "util.h"				/* emalloc() */
- 
--extern int errno;
--
- /*
-  * The USTRING structure (defined in clex.h) can store a string
-  * of unlimited length. The memory is allocated dynamically.
diff --git a/sysutils/clex/patches/patch-src_cfg-clex b/sysutils/clex/patches/patch-src_cfg-clex
new file mode 100644
index 00000000000..aa89f458853
--- /dev/null
+++ b/sysutils/clex/patches/patch-src_cfg-clex
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_cfg-clex,v 1.1 2012/02/17 13:23:28 obache Exp $
+
+* portability fix
+
+--- src/cfg-clex.orig	2009-05-20 08:58:50.000000000 +0000
++++ src/cfg-clex
+@@ -144,7 +144,7 @@ convert_config() {
+ 	if [ x"$CLEX_ACTIVE_LAYOUT" != x ] ; then
+ 		CLEX_LAYOUT_ACTIVE=`expr $CLEX_ACTIVE_LAYOUT + 1`
+ 	fi
+-	if [ x"$CLEX_XTERM_TITLE" == x'2' ] ; then
++	if [ x"$CLEX_XTERM_TITLE" = x'2' ] ; then
+ 		CLEX_XTERM_TITLE='1'
+ 	fi
+ 	if [ x"$CLEX_LAYOUT1" != x ] ; then
diff --git a/sysutils/clex/patches/patch-src_clexheaders.h b/sysutils/clex/patches/patch-src_clexheaders.h
new file mode 100644
index 00000000000..7622f135238
--- /dev/null
+++ b/sysutils/clex/patches/patch-src_clexheaders.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_clexheaders.h,v 1.1 2012/02/17 13:23:28 obache Exp $
+
+* Need to treat *BSD same as FreeBSD.
+
+--- src/clexheaders.h.orig	2009-01-11 19:44:35.000000000 +0000
++++ src/clexheaders.h
+@@ -1,4 +1,4 @@
+-#if !defined(__APPLE__) && !defined(__FreeBSD__)
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+ # define _XOPEN_SOURCE 600
+ #endif
+