- Update `www/httest' to the latest version 2.4.24

- Reluctantly start to demand contemporary OpenSSL

1 files changed, 5 insertions, 9 deletions

diff --git a/www/httest/Makefile b/www/httest/Makefile
index 35c45a5c550b..3081cc942d35 100644
--- a/www/httest/Makefile
+++ b/www/httest/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	httest
-PORTVERSION=	2.4.23
-PORTREVISION=	3
+PORTVERSION=	2.4.24
 CATEGORIES=	www
 MASTER_SITES=	SF/htt/htt${PORTVERSION:R}/${PORTNAME}-${PORTVERSION}
 
@@ -41,18 +40,15 @@ MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
-# Reported upstream:
-# https://sourceforge.net/p/htt/tickets/5/
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085
-BROKEN=		does not build with OpenSSL 1.1.1
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base
+BROKEN=	requires OpenSSL 1.1.1, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|`$$APR_CONFIG --cflags`||; s|-llua|-llua-${LUA_VER}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/generate_modules_c.sh
-	@${REINPLACE_CMD} -e 's|<pcre/pcre.h>|<pcre.h>|' ${WRKSRC}/src/httest.c ${WRKSRC}/src/regex.c \
-		${WRKSRC}/src/body.c ${WRKSRC}/src/module.h ${WRKSRC}/src/worker.c
+	@${REINPLACE_CMD} -e 's|^apr_time_t start_time|extern &|' \
+		${WRKSRC}/src/perf_module.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}