6 files changed, 31 insertions, 21 deletions

diff --git a/shells/lshell/Makefile b/shells/lshell/Makefile
index 179b3a5494f1..a1c29f8c0650 100644
--- a/shells/lshell/Makefile
+++ b/shells/lshell/Makefile
@@ -2,17 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	lshell
-PORTVERSION=	0.9.16
-PORTREVISION=	2
+PORTVERSION=	0.9.18.20160916
 CATEGORIES=	shells
-MASTER_SITES=	SF
+DISTNAME=	${PORTNAME}_0.9.18
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dam@my.gd
 COMMENT=	Shell environment to limited sets of commands to users
 
 LICENSE=	GPLv3+
 
+GH_ACCOUNT=	ghantoos
+GH_PROJECT=	lshell
+GH_TAGNAME=	279d7ab
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${GH_TAGNAME}
+
+NO_ARCH=	yes
 USES=		python
+USE_GITHUB=	yes
 USE_PYTHON=	distutils
 
 post-patch:
diff --git a/shells/lshell/distinfo b/shells/lshell/distinfo
index b5b82d68bd4e..db929d563065 100644
--- a/shells/lshell/distinfo
+++ b/shells/lshell/distinfo
@@ -1,2 +1,3 @@
-SHA256 (lshell-0.9.16.tar.gz) = 22b28f22eb3445ed1514953c24e30bf3feaacc1225a19332f50245982537c35f
-SIZE (lshell-0.9.16.tar.gz) = 41766
+TIMESTAMP = 1486360979
+SHA256 (lshell_0.9.18_GH0.tar.gz) = a922653348bf5c66b3bb63dab5ae8d0e667d6a819110bed407258e3a20ddfae5
+SIZE (lshell_0.9.18_GH0.tar.gz) = 54561
diff --git a/shells/lshell/files/patch-lshell_checkconfig.py b/shells/lshell/files/patch-lshell_checkconfig.py
index 6427ccffc8b4..9fcfb65b3061 100644
--- a/shells/lshell/files/patch-lshell_checkconfig.py
+++ b/shells/lshell/files/patch-lshell_checkconfig.py
@@ -1,6 +1,6 @@
---- lshell/checkconfig.py.orig	2013-08-19 19:59:37 UTC
+--- lshell/checkconfig.py	2017-01-11 18:12:28 UTC
 +++ lshell/checkconfig.py
-@@ -307,7 +307,7 @@ class CheckConfig:
+@@ -238,7 +238,7 @@
              try:
                  if logfilename == "syslog":
                      from logging.handlers import SysLogHandler
diff --git a/shells/lshell/files/patch-lshell_shellcmd.py b/shells/lshell/files/patch-lshell_shellcmd.py
deleted file mode 100644
index 4512cc2c8629..000000000000
--- a/shells/lshell/files/patch-lshell_shellcmd.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- lshell/shellcmd.py.orig	2013-09-07 23:07:08 UTC
-+++ lshell/shellcmd.py
-@@ -134,7 +134,7 @@ class ShellCmd(cmd.Cmd, object):
-                 self.g_arg = ' '.join(self.g_line.split()[1:])
-                 self.cd()
-             else:
--                os.system('set -m; %s' % self.g_line)
-+                os.system('%s' % self.g_line)
-         elif self.g_cmd not in ['', '?', 'help', None]: 
-             self.log.warn('INFO: unknown syntax -> "%s"' %self.g_line)
-             self.stderr.write('*** unknown syntax: %s\n' %self.g_cmd)
diff --git a/shells/lshell/pkg-descr b/shells/lshell/pkg-descr
index 2578f13a065f..56d1063ce08f 100644
--- a/shells/lshell/pkg-descr
+++ b/shells/lshell/pkg-descr
@@ -3,4 +3,4 @@ commands, choose to enable or disable any command over SSH (e.g. SCP,
 SFTP, rsync, etc.) log user's commands, implement timing restrictions,
 and more.
 
-WWW: http://lshell.ghantoos.org
+WWW: https://github.com/ghantoos/lshell/
diff --git a/shells/lshell/pkg-plist b/shells/lshell/pkg-plist
index 048d54ab24a7..e92f66d9387e 100644
--- a/shells/lshell/pkg-plist
+++ b/shells/lshell/pkg-plist
@@ -5,14 +5,27 @@ man/man1/lshell.1.gz
 %%PYTHON_SITELIBDIR%%/lshell/__init__.py
 %%PYTHON_SITELIBDIR%%/lshell/__init__.pyc
 %%PYTHON_SITELIBDIR%%/lshell/__init__.pyo
+%%PYTHON_SITELIBDIR%%/lshell/builtins.py
+%%PYTHON_SITELIBDIR%%/lshell/builtins.pyc
+%%PYTHON_SITELIBDIR%%/lshell/builtins.pyo
 %%PYTHON_SITELIBDIR%%/lshell/checkconfig.py
 %%PYTHON_SITELIBDIR%%/lshell/checkconfig.pyc
 %%PYTHON_SITELIBDIR%%/lshell/checkconfig.pyo
+%%PYTHON_SITELIBDIR%%/lshell/sec.py
+%%PYTHON_SITELIBDIR%%/lshell/sec.pyc
+%%PYTHON_SITELIBDIR%%/lshell/sec.pyo
 %%PYTHON_SITELIBDIR%%/lshell/shellcmd.py
 %%PYTHON_SITELIBDIR%%/lshell/shellcmd.pyc
 %%PYTHON_SITELIBDIR%%/lshell/shellcmd.pyo
 %%PYTHON_SITELIBDIR%%/lshell/utils.py
 %%PYTHON_SITELIBDIR%%/lshell/utils.pyc
 %%PYTHON_SITELIBDIR%%/lshell/utils.pyo
+%%PYTHON_SITELIBDIR%%/lshell/variables.py
+%%PYTHON_SITELIBDIR%%/lshell/variables.pyc
+%%PYTHON_SITELIBDIR%%/lshell/variables.pyo
+%%PYTHON_SITELIBDIR%%/lshell-0.9.18-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/lshell-0.9.18-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/lshell-0.9.18-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/lshell-0.9.18-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md