5 files changed, 49 insertions, 36 deletions

diff --git a/misc/clex/Makefile b/misc/clex/Makefile
index a4ba9cb95441..56eb1013e533 100644
--- a/misc/clex/Makefile
+++ b/misc/clex/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for:	clex-tty
+# New ports collection makefile for:	CLEX File Manager
 # Date created:				Tue Oct 30, 2002
 # Whom:			Michael L. Hostbaek <mich@freebsdcluster.org>
 #
@@ -6,34 +6,34 @@
 #
 
 PORTNAME=	clex
-PORTVERSION=	3.18
+PORTVERSION=	4.6.4
 CATEGORIES=	misc
 MASTER_SITES=	http://www.clex.sk/download/
-MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mich@FreeBSD.org
-COMMENT=	A commandline file manager
+COMMENT=	A command line file manager
+
+LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_NCURSES=	yes
 
-DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README
-MAN1=		clex.1
-
-OPTIONS=	LARGE_FILES "Enable support for large files" on
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+PLIST_FILES=	bin/clex bin/cfg-clex bin/kbd-test
+PORTDOCS=	AUTHORS ChangeLog README
+MAN1=		clex.1 cfg-clex.1 kbd-test.1
 
-.if !defined(WITH_LARGE_FILES)
-CONFIGURE_ARGS+=	--disable-largefile
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e '18s,^,#include <stdio.h>,' \
+		${WRKSRC}/src/preview.c
 
-do-install:
 .if !defined(NOPORTDOCS)
+post-install:
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
-	@${INSTALL_MAN} ${WRKSRC}/src/${MAN1} ${MAN1PREFIX}/man/man1
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/clex/distinfo b/misc/clex/distinfo
index 61f55c5f7fab..2882e46dadbb 100644
--- a/misc/clex/distinfo
+++ b/misc/clex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clex-3.18.tar.gz) = e71dbe391234de3b237948231d9baa739cf3956a668dff7cb96af8fc0b7a0576
-SIZE (clex-3.18.tar.gz) = 206303
+SHA256 (clex-4.6.4.tar.gz) = 3b0fdd4ba7511edf542bf96dfd16556338cde8756863c4d1a3e40eebe63afceb
+SIZE (clex-4.6.4.tar.gz) = 243297
diff --git a/misc/clex/files/patch-control.c b/misc/clex/files/patch-control.c
new file mode 100644
index 000000000000..9a40211c461c
--- /dev/null
+++ b/misc/clex/files/patch-control.c
@@ -0,0 +1,21 @@
+--- src/control.c.old	2011-07-14 21:48:59.000000000 +0200
++++ src/control.c	2011-07-14 21:54:55.000000000 +0200
+@@ -395,12 +395,12 @@
+ };
+ 
+ static KEY_BINDING tab_log[] = {
+-	{ 0, 0,  WCH_CTRL('M'),	cx_pan_home,		0	},
+-	{ 1, 0,  KEY_LEFT,		cx_log_left,		0	},
+-	{ 1, 0,  KEY_RIGHT,		cx_log_right,		0	},
+-	{ 1, 0,  KEY_HOME,		cx_log_home,		0	},
+-	{ 0, 0,  L'm',			cx_log_mark,		0	},
+-	{ 0, 1,  L'l',			cx_trans_return,	0	},
++	{ 0, 0,  WCH_CTRL('M'),	cx_pan_home,		0			},
++	{ 1, 0,  KEY_LEFT,		cx_log_left,		OPT_NOFILT	},
++	{ 1, 0,  KEY_RIGHT,		cx_log_right,		OPT_NOFILT	},
++	{ 1, 0,  KEY_HOME,		cx_log_home,		OPT_NOFILT	},
++	{ 0, 0,  L'm',			cx_log_mark,		OPT_NOFILT	},
++	{ 0, 1,  L'l',			cx_trans_return,	0			},
+ 	END_TABLE
+ };
+ 
diff --git a/misc/clex/pkg-descr b/misc/clex/pkg-descr
index f38f211ef967..c298ac4d304b 100644
--- a/misc/clex/pkg-descr
+++ b/misc/clex/pkg-descr
@@ -1,11 +1,11 @@
-CLEX is a file manager with a full-screen user interface
-written in C with the curses library. It displays directory
-contents (including file status details) and provides
-features like command history, filename insertion, or name
-completion in order to help the user to construct commands
-to be executed by the shell (there are no built-in commands).
-CLEX is easily configurable and all its features are
-explained in the on-line help.
+CLEX (pronounced KLEKS) is a file manager with full-screen user interface.
+It displays directory contents, including file status details, and provides
+features like command history, filename insertion, or name completion, in
+order to help users to create commands to be executed by the shell.
+
+CLEX is versatile tool for system administrators and all users that utilize
+the enormous power of the command line.  Its unique one-panel user interface
+enhances productivity and lessens the probability of mistake.  There are no
+built-in commands; CLEX is an add-on to your favorite shell.
 
-Author: Vlado Potisk <clex@clex.sk>
 WWW: http://www.clex.sk/
diff --git a/misc/clex/pkg-plist b/misc/clex/pkg-plist
deleted file mode 100644
index b10be036af64..000000000000
--- a/misc/clex/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/clex
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%