4 files changed, 30 insertions, 22 deletions

diff --git a/editors/diakonos/Makefile b/editors/diakonos/Makefile
index ea34c04e9df0..61ef4afeeffa 100644
--- a/editors/diakonos/Makefile
+++ b/editors/diakonos/Makefile
@@ -2,27 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	diakonos
-PORTVERSION=	0.9.4
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.9.7
 CATEGORIES=	editors ruby
-MASTER_SITES=	http://diakonos.pist0s.ca/archives/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Linux editor for the masses
+COMMENT=	Console editor for the masses
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENCE
 
+RUN_DEPENDS=	rubygem-curses>0:devel/rubygem-curses
+
+USES=		shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	Pistos
 USE_RUBY=	yes
+SHEBANG_FILES=	bin/${PORTNAME}
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	installation.rb
 SUB_LIST=	RUBY_SITELIBDIR=${RUBY_SITELIBDIR}
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} 's|/usr/bin/env ruby|${RUBY}|g' ${WRKSRC}/bin/${PORTNAME}
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME}
@@ -33,10 +37,10 @@ do-install:
 		${STAGEDIR}${PREFIX}/etc/diakonos.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/diakonos-256-colour.conf \
 		${STAGEDIR}${PREFIX}/etc/diakonos-256-colour.conf.sample
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/help
 
 post-install-DOCS-on:
-	(cd ${WRKSRC} && ${INSTALL_DATA} CHANGELOG LICENCE README.rdoc \
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/help
+	(cd ${WRKSRC} && ${INSTALL_DATA} CHANGELOG README.rdoc \
 		${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/help/*.dhf ${STAGEDIR}${DOCSDIR}/help
 
diff --git a/editors/diakonos/distinfo b/editors/diakonos/distinfo
index acaf7c6464e1..8551c9166fc0 100644
--- a/editors/diakonos/distinfo
+++ b/editors/diakonos/distinfo
@@ -1,2 +1,3 @@
-SHA256 (diakonos-0.9.4.tar.gz) = 3d4a8db9054dd2ae0f571a0e41c2b0977122164e95f501cba1e9ff9bfcc87e42
-SIZE (diakonos-0.9.4.tar.gz) = 126301
+TIMESTAMP = 1600936577
+SHA256 (Pistos-diakonos-v0.9.7_GH0.tar.gz) = 77b7f2d2ba29c3a72fff85c91038e19c40eef8a162945105bad203c065c554f9
+SIZE (Pistos-diakonos-v0.9.7_GH0.tar.gz) = 129807
diff --git a/editors/diakonos/pkg-descr b/editors/diakonos/pkg-descr
index 3e09f61a26cd..985d8f231618 100644
--- a/editors/diakonos/pkg-descr
+++ b/editors/diakonos/pkg-descr
@@ -2,4 +2,4 @@ Diakonos, the console text editor with a key mapping you practically
 already know. Easy to use and easy to configure, but potent in the
 hands of power users.
 
-WWW: http://diakonos.pist0s.ca/
+WWW: https://github.com/Pistos/diakonos
diff --git a/editors/diakonos/pkg-plist b/editors/diakonos/pkg-plist
index e6cb71d684b2..f6b3dc52318c 100644
--- a/editors/diakonos/pkg-plist
+++ b/editors/diakonos/pkg-plist
@@ -16,24 +16,24 @@ bin/diakonos
 %%RUBY_SITELIBDIR%%/diakonos/buffer/searching.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer/selection.rb
 %%RUBY_SITELIBDIR%%/diakonos/buffer/undo.rb
-%%RUBY_SITELIBDIR%%/diakonos/clipboard-klipper.rb
 %%RUBY_SITELIBDIR%%/diakonos/clipboard-klipper-dbus.rb
+%%RUBY_SITELIBDIR%%/diakonos/clipboard-klipper.rb
+%%RUBY_SITELIBDIR%%/diakonos/clipboard-osx.rb
 %%RUBY_SITELIBDIR%%/diakonos/clipboard-xclip.rb
 %%RUBY_SITELIBDIR%%/diakonos/clipboard.rb
+%%RUBY_SITELIBDIR%%/diakonos/config-file.rb
 %%RUBY_SITELIBDIR%%/diakonos/config.rb
-%%RUBY_SITELIBDIR%%/diakonos/cursor.rb
-%%RUBY_SITELIBDIR%%/diakonos/extension.rb
-%%RUBY_SITELIBDIR%%/diakonos/extension-set.rb
-%%RUBY_SITELIBDIR%%/diakonos/core-ext/bignum.rb
 %%RUBY_SITELIBDIR%%/diakonos/core-ext/enumerable.rb
-%%RUBY_SITELIBDIR%%/diakonos/core-ext/fixnum.rb
 %%RUBY_SITELIBDIR%%/diakonos/core-ext/hash.rb
 %%RUBY_SITELIBDIR%%/diakonos/core-ext/object.rb
 %%RUBY_SITELIBDIR%%/diakonos/core-ext/regexp.rb
 %%RUBY_SITELIBDIR%%/diakonos/core-ext/string.rb
 %%RUBY_SITELIBDIR%%/diakonos/ctag.rb
+%%RUBY_SITELIBDIR%%/diakonos/cursor.rb
 %%RUBY_SITELIBDIR%%/diakonos/display.rb
 %%RUBY_SITELIBDIR%%/diakonos/display/format.rb
+%%RUBY_SITELIBDIR%%/diakonos/extension-set.rb
+%%RUBY_SITELIBDIR%%/diakonos/extension.rb
 %%RUBY_SITELIBDIR%%/diakonos/finding.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions-deprecated.rb
 %%RUBY_SITELIBDIR%%/diakonos/functions.rb
@@ -55,24 +55,27 @@ bin/diakonos
 %%RUBY_SITELIBDIR%%/diakonos/help.rb
 %%RUBY_SITELIBDIR%%/diakonos/hooks.rb
 %%RUBY_SITELIBDIR%%/diakonos/installation.rb
+%%RUBY_SITELIBDIR%%/diakonos/interaction-handler.rb
 %%RUBY_SITELIBDIR%%/diakonos/interaction.rb
-%%RUBY_SITELIBDIR%%/diakonos/keying.rb
 %%RUBY_SITELIBDIR%%/diakonos/key-map.rb
+%%RUBY_SITELIBDIR%%/diakonos/keying.rb
+%%RUBY_SITELIBDIR%%/diakonos/line-mover.rb
 %%RUBY_SITELIBDIR%%/diakonos/list.rb
 %%RUBY_SITELIBDIR%%/diakonos/logging.rb
 %%RUBY_SITELIBDIR%%/diakonos/mode.rb
 %%RUBY_SITELIBDIR%%/diakonos/mouse.rb
+%%RUBY_SITELIBDIR%%/diakonos/number-fitter.rb
+%%RUBY_SITELIBDIR%%/diakonos/range.rb
 %%RUBY_SITELIBDIR%%/diakonos/readline.rb
-%%RUBY_SITELIBDIR%%/diakonos/sessions.rb
+%%RUBY_SITELIBDIR%%/diakonos/readline/functions.rb
 %%RUBY_SITELIBDIR%%/diakonos/search.rb
+%%RUBY_SITELIBDIR%%/diakonos/sessions.rb
 %%RUBY_SITELIBDIR%%/diakonos/sized-array.rb
 %%RUBY_SITELIBDIR%%/diakonos/text-mark.rb
 %%RUBY_SITELIBDIR%%/diakonos/vendor/fuzzy_file_finder.rb
 %%RUBY_SITELIBDIR%%/diakonos/version.rb
 %%RUBY_SITELIBDIR%%/diakonos/window.rb
-%%RUBY_SITELIBDIR%%/diakonos/readline/functions.rb
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/LICENCE
 %%PORTDOCS%%%%DOCSDIR%%/README.rdoc
 %%PORTDOCS%%%%DOCSDIR%%/help/about-help.dhf
 %%PORTDOCS%%%%DOCSDIR%%/help/clipboard.dhf