- Update to version 1.1.1, install manual page

- Add run-time dependency on sql-sqlite3 to enable save/restore
  of profile and other settings [*]
- Fix some stage Q/A warnings while here

Reported by:	Lundin Cahill [*]

5 files changed, 44 insertions, 33 deletions

diff --git a/x11/cool-retro-term/Makefile b/x11/cool-retro-term/Makefile
index 382fc4fc71a2..a47990ce42b7 100644
--- a/x11/cool-retro-term/Makefile
+++ b/x11/cool-retro-term/Makefile
@@ -2,9 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cool-retro-term
-PORTVERSION=	1.0.0
-PORTREVISION=	7
-DISTVERSIONPREFIX=	v
+PORTVERSION=	1.1.1
 CATEGORIES=	x11
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -15,11 +13,13 @@ LICENSE=	GPLv3
 USE_GITHUB=	yes
 GH_ACCOUNT=	Swordfish90
 GH_PROJECT=	qmltermwidget:qtw
-GH_TAGNAME=	v0.1.0:qtw
+GH_TAGNAME=	0.2.0:qtw
 
-USES=		gmake desktop-file-utils qmake qt:5
-USE_QT=		qmake_build buildtools_build core declarative gui widgets \
-		graphicaleffects_run quickcontrols_run
+USES=		gmake gl qmake qt:5
+USE_GL=		gl
+USE_QT=		qmake_build buildtools_build core declarative gui \
+		network sql widgets graphicaleffects_run \
+		quickcontrols_run sql-sqlite3_run
 
 .include <bsd.port.pre.mk>
 
@@ -33,7 +33,7 @@ CPP=		clang-cpp
 
 post-extract:
 	@${RMDIR} ${WRKSRC}/qmltermwidget
-	@${LN} -s ../qmltermwidget-0.1.0 ${WRKSRC}/qmltermwidget
+	@${LN} -s ../qmltermwidget-0.2.0 ${WRKSRC}/qmltermwidget
 
 post-patch:
 	@${REINPLACE_CMD} -e '/DEFINES +=/s,^macx:,,' \
@@ -43,4 +43,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,\.\./icons,/icons,' \
 		${WRKSRC}/app/main.cpp
 
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/packaging/debian/cool-retro-term.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1
+
 .include <bsd.port.post.mk>
diff --git a/x11/cool-retro-term/distinfo b/x11/cool-retro-term/distinfo
index a4b997a6a7af..2fc956abc111 100644
--- a/x11/cool-retro-term/distinfo
+++ b/x11/cool-retro-term/distinfo
@@ -1,4 +1,5 @@
-SHA256 (Swordfish90-cool-retro-term-v1.0.0_GH0.tar.gz) = db799084680545b6961e1b3d1bb7ff0cb8105e82279fe734c2c07c32525350d9
-SIZE (Swordfish90-cool-retro-term-v1.0.0_GH0.tar.gz) = 7809236
-SHA256 (Swordfish90-qmltermwidget-v0.1.0_GH0.tar.gz) = 127f529a96cf1c96ff201c79458cff67f497b1820b04b0b30cb473423ccb30f9
-SIZE (Swordfish90-qmltermwidget-v0.1.0_GH0.tar.gz) = 196864
+TIMESTAMP = 1547928537
+SHA256 (Swordfish90-cool-retro-term-1.1.1_GH0.tar.gz) = 1252bafa33c8befbb86528ed75db98677cdc1298704db728e326ffd258d5ed13
+SIZE (Swordfish90-cool-retro-term-1.1.1_GH0.tar.gz) = 1975853
+SHA256 (Swordfish90-qmltermwidget-0.2.0_GH0.tar.gz) = 23e19eedb59d6fe3e37ecc06872f54befd94384946926e009c42c4b39914cfe2
+SIZE (Swordfish90-qmltermwidget-0.2.0_GH0.tar.gz) = 219516
diff --git a/x11/cool-retro-term/files/patch-lib_Vt102Emulation.cpp b/x11/cool-retro-term/files/patch-lib_Vt102Emulation.cpp
new file mode 100644
index 000000000000..214299c58a0b
--- /dev/null
+++ b/x11/cool-retro-term/files/patch-lib_Vt102Emulation.cpp
@@ -0,0 +1,20 @@
+From 2233b6f998b2e8ca05761aaeefa59a77f3bf1b64
+From: Kent Engstrom <kent@nsc.liu.se>
+Date: Mon, 17 Jun 2019 11:15:17 +0200
+Subject: [PATCH] Refix CTRL+SPACE behaviour on QT5.
+
+As per discussion in Swordfish90/cool-retro-term issue #165, revert
+later change back to the state after commit 490eeaf, "Fix CTRL+SPACE
+behaviour on QT5."
+
+--- qmltermwidget/lib/Vt102Emulation.cpp.orig
++++ qmltermwidget/lib/Vt102Emulation.cpp
+@@ -1230,7 +1230,7 @@ void Vt102Emulation::sendKeyEvent( QKeyEvent* origEvent )
+         }
+         else if ( !entry.text().isEmpty() )
+         {
+-            textToSend += _codec->fromUnicode(QString::fromUtf8(entry.text(true,modifiers)));
++            textToSend += entry.text(true,modifiers);
+         }
+         else if((modifiers & Qt::ControlModifier) && event->key() >= 0x40 && event->key() < 0x5f) {
+             textToSend += (event->key() & 0x1f);
diff --git a/x11/cool-retro-term/files/patch-lib_kpty.cpp b/x11/cool-retro-term/files/patch-lib_kpty.cpp
index 1b165e19749f..591743bff414 100644
--- a/x11/cool-retro-term/files/patch-lib_kpty.cpp
+++ b/x11/cool-retro-term/files/patch-lib_kpty.cpp
@@ -3,7 +3,7 @@
 @@ -28,7 +28,7 @@
  
  
- #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 -#define HAVE_LOGIN
 +//#define HAVE_LOGIN
  #define HAVE_LIBUTIL_H
@@ -21,15 +21,6 @@
  # endif
  # if !defined(_PATH_UTMPX) && defined(_UTMPX_FILE)
  #  define _PATH_UTMPX _UTMPX_FILE
-@@ -503,7 +504,7 @@ void KPty::login(const char * user, cons
-     // note: strncpy without terminators _is_ correct here. man 4 utmp
- 
-     if (user) {
--        strncpy(l_struct.ut_name, user, sizeof(l_struct.ut_name));
-+        strncpy(l_struct.ut_user, user, sizeof(l_struct.ut_user));
-     }
- 
-     if (remotehost) {
 @@ -550,7 +551,7 @@ void KPty::login(const char * user, cons
  #   endif
  #  endif
@@ -48,12 +39,3 @@
      setutxent();
      if ((ut = getutxline(&l_struct))) {
  #  else
-@@ -614,7 +615,7 @@ void KPty::logout()
-     setutent();
-     if ((ut = getutline(&l_struct))) {
- #  endif
--        memset(ut->ut_name, 0, sizeof(*ut->ut_name));
-+        memset(ut->ut_user, 0, sizeof(*ut->ut_user));
-         memset(ut->ut_host, 0, sizeof(*ut->ut_host));
- #  ifdef HAVE_STRUCT_UTMP_UT_SYSLEN
-         ut->ut_syslen = 0;
diff --git a/x11/cool-retro-term/pkg-plist b/x11/cool-retro-term/pkg-plist
index 959b6699aa74..84f0c33a5ed1 100644
--- a/x11/cool-retro-term/pkg-plist
+++ b/x11/cool-retro-term/pkg-plist
@@ -3,11 +3,15 @@ bin/cool-retro-term
 %%QT_QMLDIR%%/QMLTermWidget/color-schemes/BlackOnLightYellow.schema
 %%QT_QMLDIR%%/QMLTermWidget/color-schemes/BlackOnRandomLight.colorscheme
 %%QT_QMLDIR%%/QMLTermWidget/color-schemes/BlackOnWhite.schema
+%%QT_QMLDIR%%/QMLTermWidget/color-schemes/BreezeModified.colorscheme
 %%QT_QMLDIR%%/QMLTermWidget/color-schemes/DarkPastels.colorscheme
 %%QT_QMLDIR%%/QMLTermWidget/color-schemes/GreenOnBlack.colorscheme
 %%QT_QMLDIR%%/QMLTermWidget/color-schemes/Linux.colorscheme
+%%QT_QMLDIR%%/QMLTermWidget/color-schemes/Solarized.colorscheme
+%%QT_QMLDIR%%/QMLTermWidget/color-schemes/SolarizedLight.colorscheme
+%%QT_QMLDIR%%/QMLTermWidget/color-schemes/Tango.colorscheme
+%%QT_QMLDIR%%/QMLTermWidget/color-schemes/Ubuntu.colorscheme
 %%QT_QMLDIR%%/QMLTermWidget/color-schemes/WhiteOnBlack.schema
-%%QT_QMLDIR%%/QMLTermWidget/color-schemes/color-schemes.qrc
 %%QT_QMLDIR%%/QMLTermWidget/color-schemes/cool-retro-term.schema
 %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/BlackOnLightColor.schema
 %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/DarkPicture.schema
@@ -30,13 +34,13 @@ bin/cool-retro-term
 %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/default.keytab
 %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/historic/vt100.keytab
 %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/historic/x11r5.keytab
-%%QT_QMLDIR%%/QMLTermWidget/kb-layouts/kb-layouts.qrc
 %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/linux.keytab
 %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/macbook.keytab
 %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/solaris.keytab
 %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/vt420pc.keytab
 %%QT_QMLDIR%%/QMLTermWidget/libqmltermwidget.so
 %%QT_QMLDIR%%/QMLTermWidget/qmldir
+man/man1/cool-retro-term.1.gz
 share/applications/cool-retro-term.desktop
 share/icons/hicolor/128x128/apps/cool-retro-term.png
 share/icons/hicolor/256x256/apps/cool-retro-term.png