diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index 2693fa55d8c3..9be8115205e8 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -9,43 +9,31 @@ MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/
 DISTNAME=	qca-${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Cross-platform crypto API for QT
+COMMENT=	Cross-platform crypto API for Qt
 
 USE_BZIP2=	yes
 USE_QT4=	corelib qmake_build moc_build
 HAS_CONFIGURE=	yes
 QT_NONSTANDARD=	yes
-CONFIGURE_ARGS+=--prefix=${PREFIX}
+CONFIGURE_ARGS+=--prefix=${PREFIX} \
+		--disable-tests
 CONFIGURE_ENV+=	QMAKESPEC=${QMAKESPEC}
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
-
-MAN1=		qcatool2.1
+DESTDIRNAME=	INSTALL_ROOT
 
 .if defined(PACKAGE_BUILDING)
 CONFIGURE_ENV+=	QC_VERBOSE=Y
 .endif
 
-.if defined(MAINTAINER_MODE)
-USE_QT4+=	qtestlib
-.else
-CONFIGURE_ARGS+=--disable-tests
-.endif
+OPTIONS_DEFINE=	DEBUG
+OPTIONS_SUB=	yes
 
-.if !defined(WITH_DEBUG)
-CONFIGURE_ARGS+=--release --no-separate-debug-info
-PLIST_SUB+=	DEBUG="@comment "
-.else
-CONFIGURE_ARGS+=--debug
-PLIST_SUB+=	DEBUG=""
-.endif
+DEBUG_CONFIGURE_ON=	--debug
+DEBUG_CONFIGURE_OFF=	--release --no-separate-debug-info
 
-NO_STAGE=	yes
 pre-configure:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/configure
 	${MKDIR} ${WRKSRC}/libdata/pkgconfig
 
-post-install:
-	${STRIP_CMD} ${PREFIX}/bin/qcatool2 ${PREFIX}/lib/libqca.so.${PORTVERSION}
-
 .include <bsd.port.mk>
diff --git a/devel/qca/pkg-plist b/devel/qca/pkg-plist
index 6aac7adb825c..104cda2454ff 100644
--- a/devel/qca/pkg-plist
+++ b/devel/qca/pkg-plist
@@ -22,6 +22,7 @@ lib/libqca.so.2.0
 lib/libqca.so.2.0.3
 %%DEBUG%%lib/libqca.so.2.0.3.debug
 libdata/pkgconfig/qca2.pc
+man/man1/qcatool2.1.gz
 share/qca/certs/README
 share/qca/certs/rootcerts.pem
 share/qt4/mkspecs/features/crypto.prf
diff --git a/security/qca-cyrus-sasl/Makefile b/security/qca-cyrus-sasl/Makefile
index e53dd05b74cc..ccfdd5ba0dd0 100644
--- a/security/qca-cyrus-sasl/Makefile
+++ b/security/qca-cyrus-sasl/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/plugins/
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QCA Cyrus SASL plugin
 
-LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca \
-		sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca \
+		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 
 USE_BZIP2=	yes
 USE_QT4=	corelib qmake_build moc_build
@@ -19,17 +19,12 @@ QT_NONSTANDARD=	yes
 CONFIGURE_ARGS+=--plugins-path=${PREFIX}/${QT_PLUGINDIR_REL} \
 		--with-sasl-inc=${LOCALBASE}/include \
 		--with-sasl-lib=${LOCALBASE}/lib
+DESTDIRNAME=	INSTALL_ROOT
 
-.if !defined(WITH_DEBUG)
-CONFIGURE_ARGS+=--release --no-separate-debug-info
-PLIST_SUB+=	DEBUG="@comment "
-.else
-CONFIGURE_ARGS+=--debug
-PLIST_SUB+=	DEBUG=""
-.endif
+OPTIONS_DEFINE=	DEBUG
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
-post-install:
-	${STRIP_CMD} ${PREFIX}/${QT_PLUGINDIR_REL}/crypto/libqca-cyrus-sasl.so
+DEBUG_CONFIGURE_ON=	--debug
+DEBUG_CONFIGURE_OFF=	--release --no-separate-debug-info
 
 .include <bsd.port.mk>
diff --git a/security/qca-gnupg/Makefile b/security/qca-gnupg/Makefile
index 1b2d5198ffb7..898547c48bfe 100644
--- a/security/qca-gnupg/Makefile
+++ b/security/qca-gnupg/Makefile
@@ -9,24 +9,19 @@ MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/plugins/
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QCA GnuPG plugin
 
-LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
 
 USE_BZIP2=	yes
 USE_QT4=	corelib qmake_build moc_build
 HAS_CONFIGURE=	yes
 QT_NONSTANDARD=	yes
 CONFIGURE_ARGS+=--plugins-path=${PREFIX}/${QT_PLUGINDIR_REL}
+DESTDIRNAME=	INSTALL_ROOT
 
-.if !defined(WITH_DEBUG)
-CONFIGURE_ARGS+=--release --no-separate-debug-info
-PLIST_SUB+=	DEBUG="@comment "
-.else
-CONFIGURE_ARGS+=--debug
-PLIST_SUB+=	DEBUG=""
-.endif
+OPTIONS_DEFINE=	DEBUG
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
-post-install:
-	${STRIP_CMD} ${PREFIX}/${QT_PLUGINDIR_REL}/crypto/libqca-gnupg.so
+DEBUG_CONFIGURE_ON=	--debug
+DEBUG_CONFIGURE_OFF=	--release --no-separate-debug-info
 
 .include <bsd.port.mk>
diff --git a/security/qca-ossl/Makefile b/security/qca-ossl/Makefile
index 64127ec33479..3082da5a4b3e 100644
--- a/security/qca-ossl/Makefile
+++ b/security/qca-ossl/Makefile
@@ -10,28 +10,22 @@ MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/plugins/
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QCA OpenSLL plugin
 
-LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
 
 USE_BZIP2=	yes
 USE_QT4=	corelib qmake_build moc_build
 HAS_CONFIGURE=	yes
 QT_NONSTANDARD=	yes
 USE_OPENSSL=	yes
-
 CONFIGURE_ARGS=	--plugins-path=${PREFIX}/${QT_PLUGINDIR_REL} \
 		--with-openssl-inc=${OPENSSLINC} \
 		--with-openssl-lib=${OPENSSLLIB}
+DESTDIRNAME=	INSTALL_ROOT
 
-.if !defined(WITH_DEBUG)
-CONFIGURE_ARGS+=--release --no-separate-debug-info
-PLIST_SUB+=	DEBUG="@comment "
-.else
-CONFIGURE_ARGS+=--debug
-PLIST_SUB+=	DEBUG=""
-.endif
+OPTIONS_DEFINE=	DEBUG
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
-post-install:
-	${STRIP_CMD} ${PREFIX}/${QT_PLUGINDIR_REL}/crypto/libqca-ossl.so
+DEBUG_CONFIGURE_ON=	--debug
+DEBUG_CONFIGURE_OFF=	--release --no-separate-debug-info
 
 .include <bsd.port.mk>