From owner-svn-ports-all@freebsd.org  Sat Sep 10 21:20:55 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 028A1BD2DFA;
 Sat, 10 Sep 2016 21:20:55 +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 C9D4F209;
 Sat, 10 Sep 2016 21:20:54 +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 u8ALKscZ025977;
 Sat, 10 Sep 2016 21:20:54 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8ALKsNj025976;
 Sat, 10 Sep 2016 21:20:54 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609102120.u8ALKsNj025976@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:20:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421743 - head/mail/qmail-dk
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:20:55 -0000

Author: marino
Date: Sat Sep 10 21:20:53 2016
New Revision: 421743
URL: https://svnweb.freebsd.org/changeset/ports/421743

Log:
  mail/qmail-dk: document SSL requirement and support its configuration
  
  While here, remove a bunch of ineffective sed commands against the main
  makefile.

Modified:
  head/mail/qmail-dk/Makefile

Modified: head/mail/qmail-dk/Makefile
==============================================================================
--- head/mail/qmail-dk/Makefile	Sat Sep 10 21:19:17 2016	(r421742)
+++ head/mail/qmail-dk/Makefile	Sat Sep 10 21:20:53 2016	(r421743)
@@ -17,7 +17,7 @@ LIB_DEPENDS+=	libdomainkeys.so:mail/libd
 PATCH_SITES=	QMAIL
 PATCHFILES=	qmail-1.03-dk-0.54.patch
 
-USES=		qmail
+USES=		qmail ssl
 
 PREFIX?=	${QMAIL_PREFIX}
 
@@ -46,12 +46,11 @@ do-configure:
 post-patch:
 	@${REINPLACE_CMD} -e 's,"../domainkeys.h",<domainkeys.h>,' \
 		${WRKSRC}/qmail-dk.c
-	@${REINPLACE_CMD} -e 's,../libdomainkeys.a,${LOCALBASE}/lib/libdomainkeys.a,g' \
-		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -E 's|( *c\(auto.*")qmail-smtpd(".*)$$|\1qmail-smtpd\2\1qmail-dk\2|' \
 		${WRKSRC}/hier.c
-	@${REINPLACE_CMD} 's!/var/qmail!${PREFIX}!; \
-			   s!/usr/local/!${LOCALBASE}/!' \
+	@${REINPLACE_CMD} \
+		-e 's|../libdomainkeys.a|${LOCALBASE}/lib/libdomainkeys.a|' \
+		-e 's|\(-lcrypto\)|-L${OPENSSLLIB} \1|' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's!nofiles!qnofiles!g' \
 		${WRKSRC}/conf-groups