3 files changed, 44 insertions, 19 deletions

diff --git a/sysutils/ucspi-ssl/Makefile b/sysutils/ucspi-ssl/Makefile
index bd080510f7e5..313ba32796d9 100644
--- a/sysutils/ucspi-ssl/Makefile
+++ b/sysutils/ucspi-ssl/Makefile
@@ -6,32 +6,57 @@
 #
 
 PORTNAME=	ucspi-ssl
-PORTVERSION=	0.50
+PORTVERSION=	0.67
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.superscript.com/ucspi-ssl/
 
 MAINTAINER=	lx@redundancy.redundancy.org
-COMMENT=	"UCSPI tools for building SSL client-server applications"
+COMMENT=	UCSPI tools for building SSL client-server applications
 
 RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
 
-NO_PACKAGE=     "Non-explicit licensing terms"
+NO_PACKAGE=	Non-explicit licensing terms
 
-ALL_TARGET=	it
-INSTALL_TARGET=	setup check
+DOCS=		CHANGES TODO UCSPI-SSL
 
-DOCS=		CHANGES README TODO UCSPI-SSL
+WRKSRC=		${WRKDIR}/host/superscript.com/net/${DISTNAME}
 
 do-configure:
-	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
-	${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
-	${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-tcpbin
-	${ECHO_CMD} "${PREFIX}/ssl/certs" > ${WRKSRC}/conf-cadir
+	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc
+	${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/src/conf-home
+	${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/src/conf-tcpbin
+	${ECHO_CMD} "${PREFIX}/ssl/certs" > ${WRKSRC}/src/conf-cadir
 
-post-install:
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_SSLPERL)
+.if ${PERL_LEVEL} < 500600
+IGNORE=		"requires Perl 5.6.0 or greater. Please install lang/perl5 and retry, or define WITHOUT_SSLPERL"
+.endif
+.else
+PLIST_SUB+=	SSLPERL="@comment "
+.endif
+
+do-build:
+.if defined(WITHOUT_SSLPERL)
+	cd ${WRKSRC} && package/compile https@ sslcat sslconnect sslclient sslserver
+.else
+	cd ${WRKSRC} && package/compile
+.endif
+
+do-install:
+.for x in https@ sslcat sslconnect
+	${INSTALL_SCRIPT} ${WRKSRC}/command/${x} ${PREFIX}/bin
+.endfor
+.for x in sslclient sslserver
+	${INSTALL_PROGRAM} ${WRKSRC}/command/${x} ${PREFIX}/bin
+.endfor
+.if !defined(WITHOUT_SSLPERL)
+	${INSTALL_PROGRAM} ${WRKSRC}/command/sslperl ${PREFIX}/bin
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	cd ${WRKSRC}/src && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/ucspi-ssl/distinfo b/sysutils/ucspi-ssl/distinfo
index 3b19bede4789..30f393b2824d 100644
--- a/sysutils/ucspi-ssl/distinfo
+++ b/sysutils/ucspi-ssl/distinfo
@@ -1 +1 @@
-MD5 (ucspi-ssl-0.50.tar.gz) = f8c0122aca1cafc5ef8d23ffdf466ccd
+MD5 (ucspi-ssl-0.67.tar.gz) = ff77a2c2a4f340e88aa3a0d68c816311
diff --git a/sysutils/ucspi-ssl/pkg-plist b/sysutils/ucspi-ssl/pkg-plist
index d4e27728b2e2..61a82b47c156 100644
--- a/sysutils/ucspi-ssl/pkg-plist
+++ b/sysutils/ucspi-ssl/pkg-plist
@@ -3,8 +3,8 @@ bin/sslcat
 bin/sslclient
 bin/sslconnect
 bin/sslserver
-share/doc/ucspi-ssl/CHANGES
-share/doc/ucspi-ssl/README
-share/doc/ucspi-ssl/TODO
-share/doc/ucspi-ssl/UCSPI-SSL
-@dirrm share/doc/ucspi-ssl
+%%SSLPERL%%bin/sslperl
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UCSPI-SSL
+%%PORTDOCS%%@dirrm %%DOCSDIR%%