FreeBSD: Update for final R14.1.1.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 62ab26da67dd966405c5bc27614f728b3a686ea0)

6 files changed, 299 insertions, 1 deletions

diff --git a/freebsd/dependencies/pinentry-tqt/Makefile b/freebsd/dependencies/pinentry-tqt/Makefile
index c02c102ab..0628d3773 100644
--- a/freebsd/dependencies/pinentry-tqt/Makefile
+++ b/freebsd/dependencies/pinentry-tqt/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	pinentry
 PORTVERSION=	1.2.1
-PORTREVISION?=	0
+PORTREVISION?=	0.1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG/pinentry
 
diff --git a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqinternal__p.h b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqinternal__p.h
new file mode 100644
index 000000000..d792132dc
--- /dev/null
+++ b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqinternal__p.h
@@ -0,0 +1,11 @@
+--- tqt/secqinternal_p.h.orig	2017-12-03 16:28:12 UTC
++++ tqt/secqinternal_p.h
+@@ -63,7 +63,7 @@ class TQWidget;
+ class TQPainter;
+ class TQPixmap;
+ 
+-class Q_EXPORT SecTQSharedDoubleBuffer
++class TQ_EXPORT SecTQSharedDoubleBuffer
+ {
+ public:
+     enum DoubleBufferFlags {
diff --git a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp
new file mode 100644
index 000000000..4fbca94ab
--- /dev/null
+++ b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp
@@ -0,0 +1,100 @@
+--- tqt/secqlineedit.cpp.orig	2019-03-06 07:09:48 UTC
++++ tqt/secqlineedit.cpp
+@@ -86,7 +86,7 @@
+ #include "ntqaccessible.h"
+ #endif
+ 
+-#ifndef QT_NO_ACCEL
++#ifndef TQT_NO_ACCEL
+ #include "ntqkeysequence.h"
+ #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
+ #else
+@@ -235,7 +235,7 @@ struct SecTQLineEditPrivate : public TQt
+     inline bool hasSelectedText() const { return !text.isEmpty() && selend > selstart; }
+     inline void deselect() { selDirty |= (selend > selstart); selstart = selend = 0; }
+     void removeSelectedText();
+-#ifndef QT_NO_CLIPBOARD
++#ifndef TQT_NO_CLIPBOARD
+     void copy( bool clipboard = TRUE ) const;
+ #endif
+     inline bool inSelection( int x ) const
+@@ -1018,14 +1018,14 @@ bool SecTQLineEdit::isReadOnly() const
+ void SecTQLineEdit::setReadOnly( bool enable )
+ {
+     d->readOnly = enable;
+-#ifndef QT_NO_CURSOR
++#ifndef TQT_NO_CURSOR
+     setCursor( enable ? arrowCursor : ibeamCursor );
+ #endif
+     update();
+ }
+ 
+ 
+-#ifndef QT_NO_CLIPBOARD
++#ifndef TQT_NO_CLIPBOARD
+ /*!
+     Copies the selected text to the clipboard and deletes it, if there
+     is any, and if echoMode() is \c Normal.
+@@ -1081,7 +1081,7 @@ void SecTQLineEditPrivate::copy( bool clipboard ) cons
+ #endif
+ }
+ 
+-#endif // !QT_NO_CLIPBOARD
++#endif // !TQT_NO_CLIPBOARD
+ 
+ /*!\reimp
+ */
+@@ -1177,7 +1177,7 @@ void SecTQLineEdit::mousePressEvent( TQMouseEvent* e )
+ void SecTQLineEdit::mouseMoveEvent( TQMouseEvent * e )
+ {
+ 
+-#ifndef QT_NO_CURSOR
++#ifndef TQT_NO_CURSOR
+     if ( ( e->state() & MouseButtonMask ) == 0 ) {
+ 	if ( !d->readOnly )
+ 	  setCursor( ( d->inSelection( e->pos().x() ) ? arrowCursor : ibeamCursor ) );
+@@ -1193,7 +1193,7 @@ void SecTQLineEdit::mouseMoveEvent( TQMouseEvent * e )
+ */
+ void SecTQLineEdit::mouseReleaseEvent( TQMouseEvent* e )
+ {
+-#ifndef QT_NO_CLIPBOARD
++#ifndef TQT_NO_CLIPBOARD
+     if (TQApplication::clipboard()->supportsSelection() ) {
+ 	if ( e->button() == LeftButton ) {
+ 	    d->copy( FALSE );
+@@ -1286,7 +1286,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
+ 	case Key_B:
+ 	    cursorForward( e->state() & ShiftButton, -1 );
+ 	    break;
+-#ifndef QT_NO_CLIPBOARD
++#ifndef TQT_NO_CLIPBOARD
+ 	case Key_C:
+ 	    copy();
+ 	    break;
+@@ -1322,7 +1322,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
+ 		clear();
+ 	    break;
+ #endif
+-#ifndef QT_NO_CLIPBOARD
++#ifndef TQT_NO_CLIPBOARD
+ 	case Key_V:
+ 	    if ( !d->readOnly )
+ 		paste();
+@@ -1431,7 +1431,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
+ 	    if ( !d->readOnly )
+ 		undo();
+ 	    break;
+-#ifndef QT_NO_CLIPBOARD
++#ifndef TQT_NO_CLIPBOARD
+ 	case Key_F16: // Copy key on Sun keyboards
+ 	    copy();
+ 	    break;
+@@ -1720,7 +1720,7 @@ void SecTQLineEdit::clipboardChanged()
+ 
+ void SecTQLineEditPrivate::init( const SecTQString& txt )
+ {
+-#ifndef QT_NO_CURSOR
++#ifndef TQT_NO_CURSOR
+     q->setCursor( readOnly ? arrowCursor : ibeamCursor );
+ #endif
+     q->setFocusPolicy( TQWidget::StrongFocus );
diff --git a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.h b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.h
new file mode 100644
index 000000000..cf199b93a
--- /dev/null
+++ b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.h
@@ -0,0 +1,47 @@
+--- tqt/secqlineedit.h.orig	2019-03-06 07:09:48 UTC
++++ tqt/secqlineedit.h
+@@ -80,7 +80,7 @@ class TQPopupMenu;
+ class TQTextParagraph;
+ class TQTextCursor;
+ 
+-class Q_EXPORT SecTQLineEdit : public TQFrame
++class TQ_EXPORT SecTQLineEdit : public TQFrame
+ {
+     TQ_OBJECT
+     TQ_ENUMS( EchoMode )
+@@ -127,7 +127,7 @@ class Q_EXPORT SecTQLineEdit : public TQFrame (public)
+ 
+     int alignment() const;
+ 
+-#ifndef QT_NO_COMPAT
++#ifndef TQT_NO_COMPAT
+     void cursorLeft( bool mark, int steps = 1 ) { cursorForward( mark, -steps ); }
+     void cursorRight( bool mark, int steps = 1 ) { cursorForward( mark, steps ); }
+ #endif
+@@ -153,7 +153,7 @@ class Q_EXPORT SecTQLineEdit : public TQFrame (public)
+     bool isUndoAvailable() const;
+     bool isRedoAvailable() const;
+ 
+-#ifndef QT_NO_COMPAT
++#ifndef TQT_NO_COMPAT
+     bool hasMarkedText() const { return hasSelectedText(); }
+     SecTQString markedText() const { return selectedText(); }
+ #endif
+@@ -175,7 +175,7 @@ public slots:
+     virtual void setSelection( int, int );
+     virtual void setCursorPosition( int );
+     virtual void setAlignment( int flag );
+-#ifndef QT_NO_CLIPBOARD
++#ifndef TQT_NO_CLIPBOARD
+     virtual void cut();
+     virtual void copy() const;
+     virtual void paste();
+@@ -204,7 +204,7 @@ signals: (protected)
+     void resizeEvent( TQResizeEvent * );
+     void drawContents( TQPainter * );
+     void windowActivationChange( bool );
+-#ifndef QT_NO_COMPAT
++#ifndef TQT_NO_COMPAT
+     void repaintArea( int, int ) { update(); }
+ #endif
+ 
diff --git a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp
new file mode 100644
index 000000000..f5ea4924b
--- /dev/null
+++ b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp
@@ -0,0 +1,93 @@
+--- tqt/secqstring.cpp.orig	2017-12-03 16:32:49 UTC
++++ tqt/secqstring.cpp
+@@ -80,8 +80,8 @@ static uint computeNewMax( uint len )
+ // IMPORTANT! If you change these, make sure you also change the
+ // "delete unicode" statement in ~SecTQStringData() in SecTQString.h correspondingly!
+ 
+-#define QT_ALLOC_SECTQCHAR_VEC(N) (TQChar*) ::secmem_malloc (sizeof(TQChar) * (N))
+-#define QT_DELETE_SECTQCHAR_VEC(P) ::secmem_free (P)
++#define TQT_ALLOC_SECTQCHAR_VEC(N) (TQChar*) ::secmem_malloc (sizeof(TQChar) * (N))
++#define TQT_DELETE_SECTQCHAR_VEC(P) ::secmem_free (P)
+ 
+ 
+ /*****************************************************************************
+@@ -188,7 +188,7 @@ static uint computeNewMax( uint len )
+     \sa TQChar TQCString TQByteArray SecTQConstString
+ */
+ 
+-Q_EXPORT SecTQStringData *SecTQString::shared_null = 0;
++TQ_EXPORT SecTQStringData *SecTQString::shared_null = 0;
+ QT_STATIC_CONST_IMPL SecTQString SecTQString::null;
+ QT_STATIC_CONST_IMPL TQChar TQChar::null;
+ QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd);
+@@ -220,7 +220,7 @@ SecTQStringData* SecTQString::makeSharedNull()
+ */
+ SecTQString::SecTQString( TQChar ch )
+ {
+-    d = new SecTQStringData( QT_ALLOC_SECTQCHAR_VEC( 1 ), 1, 1 );
++    d = new SecTQStringData( TQT_ALLOC_SECTQCHAR_VEC( 1 ), 1, 1 );
+     d->unicode[0] = ch;
+ }
+ 
+@@ -239,7 +239,7 @@ SecTQString::SecTQString( int size, bool /*dummy*/ )
+ {
+     if ( size ) {
+ 	int l = size;
+-	TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( l );
++	TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( l );
+ 	d = new SecTQStringData( uc, 0, l );
+     } else {
+ 	d = shared_null ? shared_null : (shared_null=new SecTQStringData);
+@@ -258,7 +258,7 @@ SecTQString::SecTQString( const TQString &str )
+ 	d = shared_null ? shared_null : makeSharedNull();
+ 	d->ref();
+     } else {
+-	TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( length );
++	TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( length );
+ 	if ( unicode )
+ 	    memcpy(uc, unicode, length*sizeof(TQChar));
+ 	d = new SecTQStringData(uc,unicode ? length : 0,length);
+@@ -287,7 +287,7 @@ SecTQString::SecTQString( const TQChar* unicode, uint 
+ 	d = shared_null ? shared_null : makeSharedNull();
+ 	d->ref();
+     } else {
+-	TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( length );
++	TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( length );
+ 	if ( unicode )
+ 	    memcpy(uc, unicode, length*sizeof(TQChar));
+ 	d = new SecTQStringData(uc,unicode ? length : 0,length);
+@@ -429,7 +429,7 @@ void SecTQString::setLength( uint newLen )
+ 	 ( newLen * 4 < d->maxl && d->maxl > 4 ) ) {
+ 	// detach, grow or shrink
+ 	uint newMax = computeNewMax( newLen );
+-	TQChar* nd = QT_ALLOC_SECTQCHAR_VEC( newMax );
++	TQChar* nd = TQT_ALLOC_SECTQCHAR_VEC( newMax );
+ 	if ( nd ) {
+ 	    uint len = TQMIN( d->len, newLen );
+ 	    memcpy( nd, d->unicode, sizeof(TQChar) * len );
+@@ -594,10 +594,10 @@ SecTQString &SecTQString::insert( uint index, const TQ
+ 
+     if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) {
+ 	// Part of me - take a copy.
+-	TQChar *tmp = QT_ALLOC_SECTQCHAR_VEC( len );
++	TQChar *tmp = TQT_ALLOC_SECTQCHAR_VEC( len );
+ 	memcpy(tmp,s,len*sizeof(TQChar));
+ 	insert(index,tmp,len);
+-	QT_DELETE_SECTQCHAR_VEC( tmp );
++	TQT_DELETE_SECTQCHAR_VEC( tmp );
+ 	return *this;
+     }
+ 
+@@ -669,10 +669,10 @@ SecTQString &SecTQString::replace( uint index, uint le
+ 	memcpy( d->unicode+index, s, len * sizeof(TQChar) );
+     } else if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) {
+ 	// Part of me - take a copy.
+-	TQChar *tmp = QT_ALLOC_SECTQCHAR_VEC( slen );
++	TQChar *tmp = TQT_ALLOC_SECTQCHAR_VEC( slen );
+ 	memcpy( tmp, s, slen * sizeof(TQChar) );
+ 	replace( index, len, tmp, slen );
+-	QT_DELETE_SECTQCHAR_VEC( tmp );
++	TQT_DELETE_SECTQCHAR_VEC( tmp );
+     } else {
+ 	remove( index, len );
+ 	insert( index, s, slen );
diff --git a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.h b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.h
new file mode 100644
index 000000000..0dd7973ba
--- /dev/null
+++ b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.h
@@ -0,0 +1,47 @@
+--- tqt/secqstring.h.orig	2017-12-03 16:33:12 UTC
++++ tqt/secqstring.h
+@@ -87,7 +87,7 @@ class SecTQCharRef;
+ template <class T> class TQDeepCopy;
+ #include <stdio.h>
+ // internal
+-struct Q_EXPORT SecTQStringData : public TQShared {
++struct TQ_EXPORT SecTQStringData : public TQShared {
+     SecTQStringData() :
+         TQShared(), unicode(0), len(0), maxl(0) { ref(); }
+     SecTQStringData(TQChar *u, uint l, uint m) :
+@@ -109,7 +109,7 @@ struct Q_EXPORT SecTQStringData : public TQShared {
+ };
+ 
+ 
+-class Q_EXPORT SecTQString
++class TQ_EXPORT SecTQString
+ {
+ public:
+     SecTQString();                                  // make null string
+@@ -191,7 +191,7 @@ class Q_EXPORT SecTQString (private)
+     friend class TQDeepCopy<SecTQString>;
+ };
+ 
+-class Q_EXPORT SecTQCharRef {
++class TQ_EXPORT SecTQCharRef {
+     friend class SecTQString;
+     SecTQString& s;
+     uint p;
+@@ -249,7 +249,7 @@ class Q_EXPORT SecTQCharRef { (public)
+ inline SecTQCharRef SecTQString::at( uint i ) { return SecTQCharRef(this,i); }
+ inline SecTQCharRef SecTQString::operator[]( int i ) { return at((uint)i); }
+ 
+-class Q_EXPORT SecTQConstString : private SecTQString {
++class TQ_EXPORT SecTQConstString : private SecTQString {
+ public:
+     SecTQConstString( const TQChar* unicode, uint length );
+     ~SecTQConstString();
+@@ -297,7 +297,7 @@ inline bool SecTQString::isEmpty() const
+   SecTQString non-member operators
+  *****************************************************************************/
+ 
+-Q_EXPORT inline const SecTQString operator+( const SecTQString &s1, const SecTQString &s2 )
++TQ_EXPORT inline const SecTQString operator+( const SecTQString &s1, const SecTQString &s2 )
+ {
+     SecTQString tmp( s1 );
+     tmp += s2;