diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index 45c366fea575..d63636367543 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -1,70 +1,71 @@
 # New ports collection makefile for:	gnutls
 # Date created:				13 Nov 2002
 # Whom:					Sergei Kolobov <sergei@kolobov.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gnutls-devel
 PORTVERSION=	1.3.5
 CATEGORIES=	security net
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
 		${MASTER_SITE_GNUPG} \
 		http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
 		ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/ \
 		ftp://ftp.gnutls.org/pub/gnutls/
 MASTER_SITE_SUBDIR=	alpha/gnutls
 DISTNAME=	gnutls-${PORTVERSION}
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
 LIB_DEPENDS=	gcrypt.13:${PORTSDIR}/security/libgcrypt \
 		gpg-error.2:${PORTSDIR}/security/libgpg-error
 
-.if defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.8)
-LIB_DEPENDS+=	opencdk.8:${PORTSDIR}/security/opencdk
-.endif
-
-.if defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.3)
-LIB_DEPENDS+=	tasn1.3:${PORTSDIR}/security/libtasn1
-.endif
-
 CONFLICTS=	gnutls-[0-9]*
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	MAKEINFO="${LOCALBASE}/bin/makeinfo"
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="${LOCALBASE}/bin/makeinfo"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-included-lzo --disable-static --disable-nls
 MANCOMPRESSED=	no
 
+.include <bsd.port.pre.mk>
+.if defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.8)
+LIB_DEPENDS+=   opencdk.8:${PORTSDIR}/security/opencdk
+.endif
+
+.if defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.3)
+LIB_DEPENDS+=   tasn1.2:${PORTSDIR}/security/libtasn1
+.endif
+
 .if !defined(NOPORTDOCS)
 PORTDOCS=	AUTHORS NEWS README THANKS
 .endif
 EXAMPLES=	doc/examples/*.c
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' \
 		${WRKSRC}/lib/Makefile.in ${WRKSRC}/libextra/Makefile.in
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
 .include "Makefile.man"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 07120466f8f3..15106092245c 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,73 +1,73 @@
 # New ports collection makefile for:	gnutls
 # Date created:				13 Nov 2002
 # Whom:					Sergei Kolobov <sergei@kolobov.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gnutls
 PORTVERSION=	1.2.11
 CATEGORIES=	security net
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
 	ftp://ftp.gnutls.org/pub/gnutls/ \
 	${MASTER_SITE_GNUPG} \
 	http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
 	ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/
 MASTER_SITE_SUBDIR=	alpha/gnutls
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library
 
 LIB_DEPENDS=	gcrypt.13:${PORTSDIR}/security/libgcrypt \
 		gpg-error.2:${PORTSDIR}/security/libgpg-error
 
-.if defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.8)
-LIB_DEPENDS+=	opencdk.8:${PORTSDIR}/security/opencdk
-.endif
-
-.if defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.3)
-LIB_DEPENDS+=	tasn1.3:${PORTSDIR}/security/libtasn1
-.endif
-
 CONFLICTS=	gnutls-devel-[0-9]*
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="${LOCALBASE}/bin/makeinfo"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-included-lzo --with-included-libtasn1
 MANCOMPRESSED=	no
 
 .include <bsd.port.pre.mk>
+.if defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.8)
+LIB_DEPENDS+=   opencdk.8:${PORTSDIR}/security/opencdk
+.endif
+
+.if defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.3)
+LIB_DEPENDS+=   tasn1.2:${PORTSDIR}/security/libtasn1
+.endif
+
 .if ${OSVERSION} < 600000
 BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
 .endif
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=		AUTHORS NEWS README THANKS
 .endif
 EXAMPLES=	doc/examples/*.c
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' \
 		${WRKSRC}/lib/Makefile.in ${WRKSRC}/libextra/Makefile.in
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
 .include "Makefile.man"
 .include <bsd.port.post.mk>