ports/64386: update: sysutils/ucspi-ssl 0.50 -> 0.65

[David Thiel]

On Wed, Mar 17, 2004 at 12:01:33PM -0800, Kirill Ponomarew wrote:
> It doesn't build on 4-x:
> sslperl.o: In function `server':
> sslperl.o(.text+0x31e): undefined reference to `eval_pv'

My apologies for not testing it on -stable. It would seem eval_pv wasn't
included in the perl API until 5.6. I've added a WITHOUT_SSLPERL knob,
and a PERL_LEVEL check, and I've verified that either installing the perl5
port or building with WITHOUT_SSLPERL will solve the problem. While I was
at it, I changed the packing list to use PORTDOCS properly. Since there
were many changes, I'm resubmitting the whole diff. Thanks for pointing 
this problem out, any other feedback is welcome.


diff -ruN ucspi-ssl/Makefile ucspi-ssl.new/Makefile
--- ucspi-ssl/Makefile	Mon Sep 29 16:56:30 2003
+++ ucspi-ssl.new/Makefile	Wed Mar 17 13:14:56 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ucspi-ssl
-PORTVERSION=	0.50
+PORTVERSION=	0.65
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.superscript.com/ucspi-ssl/
 
@@ -17,21 +17,46 @@
 
 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
+
+.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
 
-post-install:
+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 -ruN ucspi-ssl/distinfo ucspi-ssl.new/distinfo
--- ucspi-ssl/distinfo	Mon Sep 29 16:56:30 2003
+++ ucspi-ssl.new/distinfo	Wed Mar 17 12:06:14 2004
@@ -1 +1 @@
-MD5 (ucspi-ssl-0.50.tar.gz) = f8c0122aca1cafc5ef8d23ffdf466ccd
+MD5 (ucspi-ssl-0.65.tar.gz) = 5af44ab11d694e2e1d40886ee46f5545
diff -ruN ucspi-ssl/pkg-plist ucspi-ssl.new/pkg-plist
--- ucspi-ssl/pkg-plist	Mon Sep 29 16:56:30 2003
+++ ucspi-ssl.new/pkg-plist	Wed Mar 17 13:09:27 2004
@@ -3,8 +3,8 @@
 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
- at dirrm share/doc/ucspi-ssl
+%%SSLPERL%%bin/sslperl
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UCSPI-SSL
+%%PORTDOCS%%@dirrm %%DOCSDIR%%