Index: head/security/distcache/Makefile
===================================================================
--- head/security/distcache/Makefile	(revision 541953)
+++ head/security/distcache/Makefile	(revision 541954)
@@ -1,43 +1,43 @@
 # Created by: Marcel Prisi <marcel.prisi@virtua.ch>
 # $FreeBSD$
 
 PORTNAME=	distcache
 DISTVERSION=	1.5.1
 CATEGORIES=	security www
 MASTER_SITES=	SF/distcache/1.%20distcache-devel/1.5.1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Distributed OpenSSL session caching tools
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		libtool ssl tar:bzip2
 USE_RC_SUBR=	dc_server
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-ssl=${OPENSSLBASE}
 INSTALL_TARGET=	install-strip
 
 SUB_LIST=	NAME=dc_server
 PORTDOCS=	ANNOUNCE BUGS CHANGES FAQ README
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${GREP} -q 'define SSLeay_version' /usr/include/openssl/crypto.h \
 	    && ${REINPLACE_CMD} -e 's,SSLeay_version,OpenSSL_version,' \
 		${WRKSRC}/ssl/configure || :
 
 post-install:
 	# INSTALL_TARGET=install-strip isn't working!  Brute force it
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 do-test:
-	@cd ${WRKSRC} && ${SH} devel/test.sh
+	@cd ${TEST_WRKSRC} && ${SH} devel/test.sh
 
 .include <bsd.port.mk>
Index: head/security/distcache/files/patch-ssl__swamp__utils.c
===================================================================
--- head/security/distcache/files/patch-ssl__swamp__utils.c	(revision 541953)
+++ head/security/distcache/files/patch-ssl__swamp__utils.c	(revision 541954)
@@ -1,17 +1,17 @@
 --- ssl/swamp/utils.c.orig	2004-04-30 12:58:00 UTC
 +++ ssl/swamp/utils.c
 @@ -267,10 +267,14 @@ int util_parse_sslmeth(const char *str_toconvert, swam
  {
  	if(!strcmp(str_toconvert, "normal"))
  		*val = SWAMP_SSLMETH_NORMAL;
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(OPENSSL_NO_SSL2)
  	else if(!strcmp(str_toconvert, "sslv2"))
  		*val = SWAMP_SSLMETH_SSLv2;
 +#endif
-+#ifndef OPENSSL_NO_SSL3
++#ifndef OPENSSL_NO_SSL3_METHOD
  	else if(!strcmp(str_toconvert, "sslv3"))
  		*val = SWAMP_SSLMETH_SSLv3;
 +#endif
  	else if(!strcmp(str_toconvert, "tlsv1"))
  		*val = SWAMP_SSLMETH_TLSv1;
  	else