From owner-svn-ports-head@freebsd.org Sun May 26 16:11:36 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7722415AA6E0; Sun, 26 May 2019 16:11:36 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E0D58C268; Sun, 26 May 2019 16:11:36 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E9C0A1E026; Sun, 26 May 2019 16:11:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4QGBZhi097022; Sun, 26 May 2019 16:11:35 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4QGBZcE097021; Sun, 26 May 2019 16:11:35 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201905261611.x4QGBZcE097021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sun, 26 May 2019 16:11:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502727 - head/net/relayd X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: head/net/relayd X-SVN-Commit-Revision: 502727 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1E0D58C268 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 May 2019 16:11:36 -0000 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 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@FreeBSD.org +MAINTAINER= koue@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 - -.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 + +.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 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