- 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

1 files changed, 14 insertions, 5 deletions

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