- Since our GitHub-hosted distfile support understands external projects,

  use it instead of storing manually-fetched distfile in `local-distfiles',
- Remove bogus USE_LDCONFIG knob and avoid symlinking to an absolute path
- As support for some older FreeBSD versions was removed in r398738, merge
  in-place alteration of the `qmltermwidget/lib/kpty.cpp' file (previously
  conditional) into existing patch

3 files changed, 19 insertions, 14 deletions

diff --git a/x11/cool-retro-term/Makefile b/x11/cool-retro-term/Makefile
index 71ed4eb7e72d..80080f3bbb04 100644
--- a/x11/cool-retro-term/Makefile
+++ b/x11/cool-retro-term/Makefile
@@ -5,9 +5,6 @@ PORTNAME=	cool-retro-term
 PORTVERSION=	1.0.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11
-MASTER_SITES=	LOCAL/danfe:qtw
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		qmltermwidget-0.1.0${EXTRACT_SUFX}:qtw
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Terminal emulator which mimics the old cathode display
@@ -16,11 +13,12 @@ LICENSE=	GPLv3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Swordfish90
+GH_PROJECT=	qmltermwidget:qtw
+GH_TAGNAME=	v0.1.0:qtw
 
 USES=		desktop-file-utils qmake
 USE_QT5=	qmake_build buildtools_build core gui qml quick widgets \
 		graphicaleffects_run quickcontrols_run
-USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -34,13 +32,11 @@ CPP=		clang-cpp
 
 post-extract:
 	@${RMDIR} ${WRKSRC}/qmltermwidget
-	@${LN} -s ${WRKDIR}/qmltermwidget-0.1.0 ${WRKSRC}/qmltermwidget
+	@${LN} -s ../qmltermwidget-0.1.0 ${WRKSRC}/qmltermwidget
 
 post-patch:
 	@${REINPLACE_CMD} -e '/DEFINES +=/s,^macx:,,' \
 		${WRKSRC}/qmltermwidget/qmltermwidget.pro
-	@${REINPLACE_CMD} -e '/define HAVE_LOGIN/d' \
-		${WRKSRC}/qmltermwidget/lib/kpty.cpp
 	@${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \
 		${WRKSRC}/app/app.pro ${WRKSRC}/cool-retro-term.pro
 	@${REINPLACE_CMD} -e 's,\.\./icons,/icons,' \
diff --git a/x11/cool-retro-term/distinfo b/x11/cool-retro-term/distinfo
index 89e5b52087ee..a4b997a6a7af 100644
--- a/x11/cool-retro-term/distinfo
+++ b/x11/cool-retro-term/distinfo
@@ -1,4 +1,4 @@
 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 (qmltermwidget-0.1.0.tar.gz) = 127f529a96cf1c96ff201c79458cff67f497b1820b04b0b30cb473423ccb30f9
-SIZE (qmltermwidget-0.1.0.tar.gz) = 196864
+SHA256 (Swordfish90-qmltermwidget-v0.1.0_GH0.tar.gz) = 127f529a96cf1c96ff201c79458cff67f497b1820b04b0b30cb473423ccb30f9
+SIZE (Swordfish90-qmltermwidget-v0.1.0_GH0.tar.gz) = 196864
diff --git a/x11/cool-retro-term/files/patch-lib_kpty.cpp b/x11/cool-retro-term/files/patch-lib_kpty.cpp
index 0c0231b75a4b..1b165e19749f 100644
--- a/x11/cool-retro-term/files/patch-lib_kpty.cpp
+++ b/x11/cool-retro-term/files/patch-lib_kpty.cpp
@@ -1,6 +1,15 @@
 --- qmltermwidget/lib/kpty.cpp.orig
 +++ qmltermwidget/lib/kpty.cpp
-@@ -84,9 +83,10 @@ extern "C" {
+@@ -28,7 +28,7 @@
+ 
+ 
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+-#define HAVE_LOGIN
++//#define HAVE_LOGIN
+ #define HAVE_LIBUTIL_H
+ #endif
+ 
+@@ -84,9 +84,10 @@ extern "C" {
  # include <utempter.h>
  }
  #else
@@ -12,7 +21,7 @@
  # endif
  # if !defined(_PATH_UTMPX) && defined(_UTMPX_FILE)
  #  define _PATH_UTMPX _UTMPX_FILE
-@@ -503,7 +503,7 @@ void KPty::login(const char * user, cons
+@@ -503,7 +504,7 @@ void KPty::login(const char * user, cons
      // note: strncpy without terminators _is_ correct here. man 4 utmp
  
      if (user) {
@@ -21,7 +30,7 @@
      }
  
      if (remotehost) {
-@@ -550,7 +550,7 @@ void KPty::login(const char * user, cons
+@@ -550,7 +551,7 @@ void KPty::login(const char * user, cons
  #   endif
  #  endif
  #  ifdef HAVE_UTMPX
@@ -30,7 +39,7 @@
      setutxent();
      pututxline(&l_struct);
      endutxent();
-@@ -606,7 +606,7 @@ void KPty::logout()
+@@ -606,7 +607,7 @@ void KPty::logout()
      strncpy(l_struct.ut_line, str_ptr, sizeof(l_struct.ut_line));
  
  #  ifdef HAVE_UTMPX
@@ -39,7 +48,7 @@
      setutxent();
      if ((ut = getutxline(&l_struct))) {
  #  else
-@@ -614,7 +614,7 @@ void KPty::logout()
+@@ -614,7 +615,7 @@ void KPty::logout()
      setutent();
      if ((ut = getutline(&l_struct))) {
  #  endif