svn commit: r502727 - head/net/relayd

[Steve Wills]

Author: swills
Date: Sun May 26 16:11:35 2019
New Revision: 502727
URL: https://svnweb.freebsd.org/changeset/ports/502727

Log:
  net/relayd: fix build on 12/CURRENT
  
  While here, assign maintainer to submitter and clean up formatting a
  little
  
  PR:		236657
  Submitted by:	Nikola Kolev <koue at chaosophia.net>

Modified:
  head/net/relayd/Makefile   (contents, props changed)
  head/net/relayd/distinfo   (contents, props changed)

Modified: head/net/relayd/Makefile
==============================================================================
--- head/net/relayd/Makefile	Sun May 26 15:17:33 2019	(r502726)
+++ head/net/relayd/Makefile	Sun May 26 16:11:35 2019	(r502727)
@@ -2,36 +2,29 @@
 
 PORTNAME=	relayd
 PORTVERSION=	5.5.20140810
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	koue at chaosophia.net
 COMMENT=	OpenBSD relay daemon
 
 LICENSE=	ISCL
 
 GH_ACCOUNT=	mmatuska
 
-USES=		uidfix ssl
+USES=		ssl uidfix
 USE_GITHUB=	yes
 USE_RC_SUBR=	relayd
 WRKSRC_SUBDIR=	src/usr.sbin
 
 CFLAGS+=	-Wall
 
-MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
+MAKE_ARGS+=	BINDIR=${PREFIX}/sbin \
+		MANDIR=${PREFIX}/man/man
 
 USERS=		_relayd
 GROUPS=		_relayd
 
-BROKEN_FreeBSD_12=	does not build, OpenSSL 1.1 unsupported	
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 1300000
-BROKEN=	does not build, OpenSSL 1.1 unsupported	
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/relayd/relay.c \
@@ -42,5 +35,21 @@ post-patch:
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/../etc/relayd.conf \
 		${STAGEDIR}${PREFIX}/etc/relayd.conf.sample
+
+.include <bsd.port.pre.mk>
+
+.if ! ${SSL_DEFAULT:Mlibressl*}
+. ifnmake describe
+STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
+. endif
+BUILD_DEPENDS+=	${NONEXISTENT}:security/libressl:stage
+CFLAGS+=	-I${STAGEDIR_libressl}${LOCALBASE}/include
+
+post-configure:
+	${REINPLACE_CMD} 's|-lssl|${STAGEDIR_libressl}${LOCALBASE}/lib/libssl.a|g' \
+		 ${WRKSRC}/relayd/Makefile
+	${REINPLACE_CMD} 's|-lcrypto|${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a|g' \
+		${WRKSRC}/relayd/Makefile
+.endif # SSL_DEFAULT
 
 .include <bsd.port.post.mk>

Modified: head/net/relayd/distinfo
==============================================================================
--- head/net/relayd/distinfo	Sun May 26 15:17:33 2019	(r502726)
+++ head/net/relayd/distinfo	Sun May 26 16:11:35 2019	(r502727)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1557969145
 SHA256 (mmatuska-relayd-5.5.20140810_GH0.tar.gz) = 7acde883a8ee35b65dd58ac56d344f374eb15755bfb27310ce2c0bc6ebe87588
 SIZE (mmatuska-relayd-5.5.20140810_GH0.tar.gz) = 179424