Index: branches/2016Q4/security/keepassx2/files/patch-CMakeLists.txt
===================================================================
--- branches/2016Q4/security/keepassx2/files/patch-CMakeLists.txt	(revision 424340)
+++ branches/2016Q4/security/keepassx2/files/patch-CMakeLists.txt	(nonexistent)
@@ -1,15 +0,0 @@
---- CMakeLists.txt.orig	2013-10-29 23:22:19.870422125 +0000
-+++ CMakeLists.txt	2013-10-29 23:22:29.394420605 +0000
-@@ -175,9 +175,9 @@
- 
-   int main() { return 0; }" ZLIB_SUPPORTS_GZIP)
- 
--if(NOT ZLIB_SUPPORTS_GZIP)
--  message(FATAL_ERROR "zlib 1.2.x or higher is required to use the gzip format")
--endif()
-+#if(NOT ZLIB_SUPPORTS_GZIP)
-+#  message(FATAL_ERROR "zlib 1.2.x or higher is required to use the gzip format")
-+#endif()
- 
- if(UNIX)
-   check_cxx_source_compiles("#include <sys/prctl.h>

Property changes on: branches/2016Q4/security/keepassx2/files/patch-CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2016Q4/security/keepassx2/Makefile
===================================================================
--- branches/2016Q4/security/keepassx2/Makefile	(revision 424340)
+++ branches/2016Q4/security/keepassx2/Makefile	(revision 424341)
@@ -1,33 +1,42 @@
 # Created by: Eric Camachat <eric@camachat.org>
 # $FreeBSD$
 
 PORTNAME=	keepassx
-PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTVERSION=	2.0.3
 PORTEPOCH=	2
 CATEGORIES=	security
 MASTER_SITES=	https://www.keepassx.org/releases/${PORTVERSION}/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	eric@camachat.org
 COMMENT=	Cross Platform Password Manager
 
+LICENSE=	BOOST-1.0 BSD3CLAUSE CC0-1.0 GPLv2 GPLv3 LGPL21 LGPL3 NOKIA-LGPL-EXCEPTION
+LICENSE_COMB=	multi
+LICENSE_NAME_BOOST-1.0=	Boost Software License version 1.0
+LICENSE_NAME_NOKIA-LGPL-EXCEPTION=	Nokia Qt LGPL Exception version 1.1
+LICENSE_FILE_BOOST-1.0=	${WRKSRC}/LICENSE.BOOST-1.0
+LICENSE_FILE_NOKIA-LGPL-EXCEPTION=	${WRKSRC}/LICENSE.NOKIA-LGPL-EXCEPTION
+LICENSE_PERMS_BOOST-1.0=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_NOKIA-LGPL-EXCEPTION=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
-CONFLICTS_INSTALL=	keepassx-0.*
+CONFLICTS_INSTALL=	keepassx-0.* keepassx-devel-*
 
 USES=		cmake compiler:features desktop-file-utils shared-mime-info
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_QT4=	corelib gui xml qtestlib uic_build moc_build \
 		qmake_build rcc_build linguisttools
 USE_XORG=	ice inputproto sm x11 xcursor xext xfixes xi xrandr xrender \
 		xt xtst
 
 .include <bsd.port.pre.mk>
 
 .if !${COMPILER_FEATURES:Mc++0x}
 CMAKE_ARGS+=	-DWITH_CXX11:BOOL=OFF
 .endif
+CMAKE_ARGS+=	-DZLIB_SUPPORTS_GZIP:BOOL=ON
 
 .include <bsd.port.post.mk>
Index: branches/2016Q4/security/keepassx2/distinfo
===================================================================
--- branches/2016Q4/security/keepassx2/distinfo	(revision 424340)
+++ branches/2016Q4/security/keepassx2/distinfo	(revision 424341)
@@ -1,2 +1,3 @@
-SHA256 (keepassx-2.0.2.tar.gz) = 204bdcf49c72078cd6f02b4f29b062923cca9e7b2d3551f2bf352763daa236b8
-SIZE (keepassx-2.0.2.tar.gz) = 1532353
+TIMESTAMP = 1476902766
+SHA256 (keepassx-2.0.3.tar.gz) = 23ffb4ae360c58aa139943442d175bc6b8f08e6a876ae76c4543ab983a6647c5
+SIZE (keepassx-2.0.3.tar.gz) = 1540235
Index: branches/2016Q4
===================================================================
--- branches/2016Q4	(revision 424340)
+++ branches/2016Q4	(revision 424341)

Property changes on: branches/2016Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r424298