Index: security/keepassx2/Makefile
===================================================================
--- security/keepassx2/Makefile	(revision 423536)
+++ security/keepassx2/Makefile	(working copy)
@@ -12,9 +12,18 @@
 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.* keepassx2-devel-2.*
 
 USES=		cmake compiler:features desktop-file-utils shared-mime-info
 USE_LDCONFIG=	yes