Index: head/comms/trustedqsl/Makefile
===================================================================
--- head/comms/trustedqsl/Makefile	(revision 402643)
+++ head/comms/trustedqsl/Makefile	(revision 402644)
@@ -1,57 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	trustedqsl
 PORTVERSION=	2.1.3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.arrl.org/files/file/LoTW%20Instructions/ \
 		LOCAL/shurd
 DISTNAME=	tqsl-${PORTVERSION}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Station electronic trusted logbook
 
 LICENSE=	ARRL
 LICENSE_NAME=	American Radio Relay League, Inc. All rights reserved.
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 USE_BDB=	5+
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-USES=		cmake compiler:features pkgconfig tar:tgz
+USES=		cmake compiler:c++11-lib pkgconfig tar:tgz
 CMAKE_ARGS=	-DBDB_PREFIX=${LOCALBASE}
 USE_WX=		2.8+
-WX_UNICODE=	yes
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 
 OPTIONS_DEFINE=	GEN_CRQ LOAD_CERT STATION_LOC CONVERTER
 GEN_CRQ_DESC=	Build gen_crq
 LOAD_CERT_DESC=	Build load_cert
 STATION_LOC_DESC=	Build station_loc
 CONVERTER_DESC=	Build converter
 
 GEN_CRQ_CMAKE_ON=	-DBUILD_GENCRQ=ON
 LOAD_CERT_CMAKE_ON=	-DBUILD_LOADCERT=ON
 STATION_LOC_CMAKE_ON=	-DBUILD_STATIONLOC=ON
 CONVERTER_CMAKE_ON=	-DBUILD_CONVERTER=ON
 
 OPTIONS_SUB=	yes
 
 post-stage-GEN_CRQ-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gen_crq ${STAGEDIR}${PREFIX}/bin
 post-stage-LOAD_CERT-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/load_cert ${STAGEDIR}${PREFIX}/bin
 post-stage-STATION_LOC-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/station_loc ${STAGEDIR}${PREFIX}/bin
 post-stage-CONVERTER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/converter ${STAGEDIR}${PREFIX}/bin
 
 post-patch:
 	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \
 		${FILESDIR}/pkg-message > ${WRKDIR}/pkg-message
 
 .include <bsd.port.mk>
Index: head/comms/trustedqsl/files/patch-CMakeLists.txt
===================================================================
--- head/comms/trustedqsl/files/patch-CMakeLists.txt	(revision 402643)
+++ head/comms/trustedqsl/files/patch-CMakeLists.txt	(revision 402644)
@@ -1,12 +1,12 @@
 --- CMakeLists.txt.orig	2015-10-21 17:26:38 UTC
 +++ CMakeLists.txt
 @@ -15,6 +15,9 @@ find_package(OptionalAddSubdirectory REQ
  
  option(USE_STATIC_MSVCRT "Use a static Visual C++ Runtime when building with MSVC")
  
 +if(UNIX)
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 +endif()
  if(MSVC AND USE_STATIC_MSVCRT)
  foreach(flag_var
          CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
Index: head/comms/trustedqsl/files/patch-apps_CMakeLists.txt
===================================================================
--- head/comms/trustedqsl/files/patch-apps_CMakeLists.txt	(revision 402643)
+++ head/comms/trustedqsl/files/patch-apps_CMakeLists.txt	(revision 402644)
@@ -1,15 +1,15 @@
---- apps/CMakeLists.txt.orig	2015-11-29 00:14:00 UTC
+--- apps/CMakeLists.txt.orig	2015-10-21 17:26:38 UTC
 +++ apps/CMakeLists.txt
 @@ -148,7 +148,11 @@ if(NOT APPLE AND NOT WIN32)
  	add_definitions("-DCONFDIR=\"${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/\"")
  	install(TARGETS tqsl DESTINATION bin)
  	install(DIRECTORY help DESTINATION share/TrustedQSL)
 -	install(FILES tqsl.5 DESTINATION share/man/man5)
 +	if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 +		install(FILES tqsl.5 DESTINATION man/man5)
 +	else()
 +		install(FILES tqsl.5 DESTINATION share/man/man5)
 +	endif()
  	install(FILES icons/key48.png DESTINATION share/pixmaps RENAME TrustedQSL.png)
  	install(FILES lang/de/tqslapp.mo DESTINATION share/locale/de/LC_MESSAGES)
  	install(FILES lang/de/wxstd.mo DESTINATION share/locale/de/LC_MESSAGES)
Index: head/comms/trustedqsl/files/patch-src_xml.h
===================================================================
--- head/comms/trustedqsl/files/patch-src_xml.h	(revision 402643)
+++ head/comms/trustedqsl/files/patch-src_xml.h	(revision 402644)
@@ -1,43 +1,51 @@
 --- src/xml.h.orig	2015-10-21 17:26:38 UTC
 +++ src/xml.h
-@@ -28,7 +28,7 @@ namespace tqsllib {
+@@ -13,6 +13,7 @@
  
+ #include <string>
+ #include <map>
++#include <memory>
+ #include <vector>
+ #include <utility>
+ #include <expat.h>
+@@ -28,7 +29,7 @@ namespace tqsllib {
+ 
  class XMLElement;
  
 -typedef multimap<string, XMLElement> XMLElementList;
 +typedef multimap<string, std::shared_ptr<XMLElement> > XMLElementList;
  typedef map<string, string> XMLElementAttributeList;
  
  /** Encapsulates an XML element
-@@ -62,7 +62,7 @@ class XMLElement {
+@@ -62,7 +63,7 @@ class XMLElement {
        */
  	pair<string, bool> getAttribute(const string& key);
  	/// Add an element to the list of contained subelements
 -	XMLElementList::iterator addElement(const XMLElement& element);
 +	XMLElementList::iterator addElement(std::shared_ptr<XMLElement> element);
  	XMLElementAttributeList& getAttributeList() { return _attributes; }
  	XMLElementList& getElementList() { return _elements; }
  	/// Parse an XML file and add its element tree to this element
-@@ -134,8 +134,8 @@ XMLElement::setAttribute(const string& k
+@@ -134,8 +135,8 @@ XMLElement::setAttribute(const string& k
  }
  
  inline XMLElementList::iterator
 -XMLElement::addElement(const XMLElement& element) {
 -	XMLElementList::iterator it = _elements.insert(make_pair(element.getElementName(), element));
 +XMLElement::addElement(std::shared_ptr<XMLElement> element) {
 +	XMLElementList::iterator it = _elements.insert(make_pair(element->getElementName(), element));
  	return it;
  }
  
-@@ -158,9 +158,9 @@ inline bool
+@@ -158,9 +159,9 @@ inline bool
  XMLElement::getNextElement(XMLElement& element) {
  	if (_iter == _elements.end())
  		return false;
 -	if (_iterByName && _iter->second.getElementName() != _iterName)
 +	if (_iterByName && _iter->second->getElementName() != _iterName)
  		return false;
 -	element = _iter->second;
 +	element = *_iter->second;
  	++_iter;
  	return true;
  }