--- devel/qca/Makefile	(revision 543636)
+++ devel/qca/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	qca
 DISTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KDE/stable/qca/${PORTVERSION}
 PKGNAMESUFFIX=	-qt5
@@ -54,7 +55,7 @@ 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base
-IGNORE=			Does not support OpenSSL < 1.1
+IGNORE=			does not support OpenSSL < 1.1
 .endif
 
 .include <bsd.port.post.mk>
--- devel/qca-legacy/Makefile	(revision 543636)
+++ devel/qca-legacy/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	qca
 PORTVERSION=	2.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	KDE/stable/qca/${PORTVERSION}
 PKGNAMESUFFIX=	-legacy-qt5
@@ -14,46 +14,49 @@ 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS_INSTALL=	qca-qt5-*
-
 BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		cmake compiler:c++11-lang qt:5 tar:xz
-CMAKE_ARGS=	-DBUILD_PLUGINS=none -DBUILD_TESTS=no \
+USE_LDCONFIG=	yes
+USE_QT=		core buildtools_build qmake_build
+
+CMAKE_ARGS=	-DBUILD_PLUGINS=none \
+		-DBUILD_TESTS=no \
 		-DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \
 		-DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \
 		-DQCA_MAN_INSTALL_DIR=${PREFIX}/man
 CONFIGURE_ENV=	QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
-USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DQCA_SUFFIX=qt5
-USE_QT=	core buildtools_build qmake_build
 
+CONFLICTS_INSTALL=	qca-qt5-*
+
+PORTSCOUT=	limit:^2\.2\.1
+
 PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
-OPTIONS_DEFINE=	BOTAN GNUPG OPENSSL SASL TEST
-OPTIONS_DEFAULT=GNUPG OPENSSL
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		BOTAN GNUPG OPENSSL SASL TEST
+OPTIONS_DEFAULT=	GNUPG OPENSSL
+OPTIONS_SUB=		yes
 
-BOTAN_CMAKE_ON=		-DWITH_botan_PLUGIN=yes
 BOTAN_DESC=		Build with Botan crypto library
 BOTAN_LIB_DEPENDS=	libbotan-2.so:security/botan2
 BOTAN_USES=		pkgconfig
 
+BOTAN_CMAKE_ON=	-DWITH_botan_PLUGIN=yes
+
+GNUPG_RUN_DEPENDS=	gpg2:security/gnupg
 GNUPG_CMAKE_ON=		-DWITH_gnupg_PLUGIN=yes
-GNUPG_RUN_DEPENDS=	gpg2:security/gnupg
 
+OPENSSL_USES=		ssl
 OPENSSL_CMAKE_ON=	-DWITH_ossl_PLUGIN=yes
-OPENSSL_USES=		ssl
 
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CMAKE_ON=		-DWITH_cyrus-sasl_PLUGIN=yes
-SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
+TEST_USE=		QT=network,testlib
 TEST_CMAKE_BOOL=	BUILD_TESTS
 TEST_TEST_TARGET=	test
-TEST_USE=		QT=network,testlib
 
-PORTSCOUT=		limit:^2\.2\.1
-
 .include <bsd.port.mk>
--- editors/encryptpad/Makefile	(revision 543636)
+++ editors/encryptpad/Makefile	(working copy)
@@ -4,7 +4,7 @@ 
 PORTNAME=	encryptpad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors security
 
 MAINTAINER=	dmgk@FreeBSD.org
--- sysutils/daggy/Makefile	(revision 543636)
+++ sysutils/daggy/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	daggy
 DISTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org