From owner-svn-ports-all@freebsd.org  Sat Sep 10 21:19:19 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 004B7BD2D47;
 Sat, 10 Sep 2016 21:19:18 +0000 (UTC)
 (envelope-from marino@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 mx1.freebsd.org (Postfix) with ESMTPS id B6CA6FF6;
 Sat, 10 Sep 2016 21:19:18 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8ALJHii025809;
 Sat, 10 Sep 2016 21:19:17 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8ALJHo1025808;
 Sat, 10 Sep 2016 21:19:17 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609102119.u8ALJHo1025808@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Sat, 10 Sep 2016 21:19:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421742 - head/mail/qmail
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Sep 2016 21:19:19 -0000

Author: marino
Date: Sat Sep 10 21:19:17 2016
New Revision: 421742
URL: https://svnweb.freebsd.org/changeset/ports/421742

Log:
  mail/qmail-spamcontrol: document and support SSL requirement
  
  My eyes are bleeding from looking at this qmail stuff.  The compiling
  in the pre-patch target is an essentially nice touch.
  
  Approved by:	SSL blanket

Modified:
  head/mail/qmail/Makefile

Modified: head/mail/qmail/Makefile
==============================================================================
--- head/mail/qmail/Makefile	Sat Sep 10 20:23:46 2016	(r421741)
+++ head/mail/qmail/Makefile	Sat Sep 10 21:19:17 2016	(r421742)
@@ -283,9 +283,12 @@ EXTRA_MAN8=	qmail-badloadertypes.8 qmail
 		qmail-recipients.8 qmail-smtpam.8
 ALL_TARGET+=	${EXTRA_MAN8}
 MMAN8+=		${EXTRA_MAN8}
-USES+=		perl5
+USES+=		perl5 ssl
 USE_PERL5=	patch build
 CFLAGS+=	-include /usr/include/errno.h
+CFLAGS+=	-I${OPENSSLINC} -L${OPENSSLLIB}
+# Required for the insane pre-patch compiling done by this slave port
+PATCH_DEPENDS+=	${BUILD_DEPENDS:M*ssl*}
 .endif
 
 .if defined(SLAVE_LDAP)
@@ -660,6 +663,8 @@ post-extract:
 .if defined(SLAVE_SPAMCONTROL)
 	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${SPAMCONTROL_DIST}
 	@cd ${WRKDIR} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${UCSPI_SSL_DIST}
+	${REINPLACE_CMD} -e "s@-lssl@-L${OPENSSLLIB} -lssl@g" \
+		${UCSPISRC}/src/ssl.lib
 .endif
 
 # XXX - Move all the major patch applications to post-extract