x11/lilyterm: Add DOCS option, remove redundant config file, patch man page

Approved by:	jrm
Differential Revision:	https://reviews.freebsd.org/D13463

4 files changed, 67 insertions, 5 deletions

diff --git a/x11/lilyterm/Makefile b/x11/lilyterm/Makefile
index a05f0f96e763..4c5ae4806638 100644
--- a/x11/lilyterm/Makefile
+++ b/x11/lilyterm/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	lilyterm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.9.4
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	jwb@FreeBSD.org
@@ -22,13 +23,14 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Tetralet
 GH_PROJECT=	LilyTerm
 
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=	gettext
+NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 post-install:
+	@${RM} -r ${STAGEDIR}${EXAMPLESDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilyterm
 	${MV} ${STAGEDIR}${PREFIX}/etc/xdg/lilyterm.conf \
 		${STAGEDIR}${PREFIX}/etc/xdg/lilyterm.conf.sample
diff --git a/x11/lilyterm/files/patch-data_lilyterm.1 b/x11/lilyterm/files/patch-data_lilyterm.1
new file mode 100644
index 000000000000..7378b4d679df
--- /dev/null
+++ b/x11/lilyterm/files/patch-data_lilyterm.1
@@ -0,0 +1,55 @@
+--- data/lilyterm.1.orig	2013-02-27 09:04:56 UTC
++++ data/lilyterm.1
+@@ -110,7 +110,7 @@ The following key bindings may custom or
+ Disable/Enable hyperlinks, function keys and right click menu for temporary.
+ 
+ .TP
+-.BI <Ctrl><T>
++.BI <Shift+Ctrl><T>
+ Add a New tab with current directory.
+ 
+ .TP
+@@ -134,7 +134,7 @@ Move current tab to First/Last.
+ Switch to 1st ~ 12th tab.
+ 
+ .TP
+-.BI <Ctrl><O>
++.BI <Shift+Ctrl><O>
+ Select all the text in the Vte Terminal box.
+ 
+ .TP
+@@ -158,11 +158,11 @@ Asks to scroll Up/Down 1 line on Vte Ter
+ Asks to scroll Up/Down on Vte Terminal box.
+ 
+ .TP
+-.BI <Ctrl><Delete/Insert>
++.BI <Shift+Ctrl><C>
+ Copy the text to clipboard / Paste the text in clipboard.
+ 
+ .TP
+-.BI <Shift><Delete/Insert>
++.BI <Shift+Ctrl><V>
+ Copy the text to primary clipboard / Paste the text in primary clipboard.
+ .br
+ i.e. Emulate a middle button mouse click to copy/paste the text.
+@@ -171,17 +171,17 @@ i.e. Emulate a middle button mouse click
+ Some key bindings that disabled by default but maybe useful:
+ 
+ .TP
+-.BI <Ctrl><Q>
++.BI <Shift+Ctrl><Q>
+ Close current tab.
+ .br
+ \fIUsing \fR\fB<Ctrl><D>\fR\fI or '\fR\fBexit\fR\fI' to close tabs is recommended.\fR
+ 
+ .TP
+-.BI <Ctrl><N>
++.BI <Shift+Ctrl><N>
+ Open a new window with current directory.
+ 
+ .TP
+-.BI <Ctrl><E>
++.BI <Shift+Ctrl><E>
+ Rename the current tab.
+ 
+ .SH FILE
diff --git a/x11/lilyterm/files/patch-data_lilyterm.conf b/x11/lilyterm/files/patch-data_lilyterm.conf
index 9351d09bb1d8..2c0d1b01eba6 100644
--- a/x11/lilyterm/files/patch-data_lilyterm.conf
+++ b/x11/lilyterm/files/patch-data_lilyterm.conf
@@ -61,7 +61,7 @@
  
  # Shows copy/paste menu on right click menu.
  show_copy_paste_menu = 1
-@@ -302,7 +302,7 @@ disable_key_binding = Ctrl grave
+@@ -302,19 +302,19 @@ disable_key_binding = Ctrl grave
  
  # Add a new tab.
  # Left it blank to disable this function key.
@@ -70,7 +70,13 @@
  
  # Close current tab.
  # Left it blank to disable this function key.
-@@ -314,7 +314,7 @@ edit_label_key = 
+-close_tab_key = 
++close_tab_key = Shift+Ctrl Q
+ 
+ # Rename the page name of current tab.
+ # Left it blank to disable this function key.
+-edit_label_key = 
++edit_label_key = Shift+Ctrl E
  
  # Find the strings matching the search regex.
  # Left it blank to disable this function key.
diff --git a/x11/lilyterm/pkg-plist b/x11/lilyterm/pkg-plist
index 2ab657410002..539776a160d6 100644
--- a/x11/lilyterm/pkg-plist
+++ b/x11/lilyterm/pkg-plist
@@ -5,7 +5,6 @@ share/applications/lilyterm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lilyterm.conf
 %%NLS%%share/locale/de/LC_MESSAGES/lilyterm.mo
 %%NLS%%share/locale/es/LC_MESSAGES/lilyterm.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/lilyterm.mo