Index: head/sysutils/ucspi-ssl/Makefile
===================================================================
--- head/sysutils/ucspi-ssl/Makefile	(revision 349816)
+++ head/sysutils/ucspi-ssl/Makefile	(revision 349817)
@@ -1,63 +1,60 @@
 # Created by: David Thiel <lx@redundancy.redundancy.org>
 # $FreeBSD$
 
 PORTNAME=	ucspi-ssl
 PORTVERSION?=	0.70
 PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	LOCAL/garga/ucspi-ssl \
 		http://www.superscript.com/ucspi-ssl/ \
 		http://dev.qmailrocks.org/downloads/qmailrocks_3.0-beta/ \
 		${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
 
 MAINTAINER?=	lx@FreeBSD.org
 COMMENT?=	UCSPI tools for building SSL client-server applications
 
 RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 CONFLICTS?=	ucspi-ssl-tls-[0-9]*
 
 USES=		perl5
 
 RESTRICTED=	Non-explicit licensing terms
 
 PORTDOCS=	CHANGES TODO UCSPI-SSL
 
 WRKSRC=		${WRKDIR}/host/superscript.com/net/${DISTNAME}
 
 SCRIPTS_TO_INSTALL=	https@ sslcat sslconnect
 
-NO_STAGE=	yes
 post-patch:
 .for x in ${SCRIPTS_TO_INSTALL}
 	@${REINPLACE_CMD} -i ''	-e 's|HOME/command/|${PREFIX}/bin/|' \
 		${WRKSRC}/src/${x}.sh
 .endfor
 
 do-configure:
 	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc
 	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-ld
 	${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/src/conf-home
 	${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/src/conf-tcpbin
 	${ECHO_CMD} "/etc/ssl" > ${WRKSRC}/src/conf-cadir
 	${ECHO_CMD} "/etc/ssl/cert.pem" > ${WRKSRC}/src/conf-cafile
 	${ECHO_CMD} "/etc/ssl/dh1024.pem" > ${WRKSRC}/src/conf-dhfile
 
 do-build:
 	cd ${WRKSRC} && package/compile
 
 do-install:
 .for x in ${SCRIPTS_TO_INSTALL}
-	${INSTALL_SCRIPT} ${WRKSRC}/command/${x} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/command/${x} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .for x in sslclient sslserver sslperl
-	${INSTALL_PROGRAM} ${WRKSRC}/command/${x} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/command/${x} ${STAGEDIR}${PREFIX}/bin
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/src && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/src && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/ucspi-ssl-tls/Makefile
===================================================================
--- head/sysutils/ucspi-ssl-tls/Makefile	(revision 349816)
+++ head/sysutils/ucspi-ssl-tls/Makefile	(revision 349817)
@@ -1,21 +1,20 @@
 # $FreeBSD$
 
 PORTREVISION=	4
 PORTEPOCH=	0
 PKGNAMESUFFIX=	-tls
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	UCSPI tools for building SSL client-server applications w/ TLS support
 
 CONFLICTS=	ucspi-ssl-[0-9]*
 
 PATCH_SITES+=		http://www.fehcom.de/qmail/spamcontrol/:tls \
 			${MASTER_SITE_LOCAL:S/$/:tls/}
 PATCH_SITE_SUBDIR+=	garga/ucspi-ssl/:tls
 PATCHFILES+=		ucspi-ssl-0.70_ucspitls-0.6.patch_:tls
 PATCH_WRKSRC=		${WRKSRC}/src
 
 MASTERDIR=	${.CURDIR}/../ucspi-ssl
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"