[pkgsrc/trunk]: pkgsrc Add a buildlink dependency on openssl to couriertcpd, ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3de9a9b70ea0
branches:  trunk
changeset: 514589:3de9a9b70ea0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 14 17:01:08 2006 +0000

description:
Add a buildlink dependency on openssl to couriertcpd, which needs the
SSL libraries to build couriertls, which encapsulates the logic for
handling SSL connections for Courier services.  Drop the dependency
on openssl from both courier-imap and courier-mta, which only need
the "openssl" tool instead.  Bump the PKGREVISIONs for all three
packages due to the changed dependencies.  Problem noted by Ondrej
Tuma in private email.

diffstat:

 mail/courier-imap/Makefile |  8 ++++----
 mail/courier-mta/Makefile  |  8 ++++----
 net/couriertcpd/Makefile   |  5 ++++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diffs (98 lines):

diff -r dd9593fe30d1 -r 3de9a9b70ea0 mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile        Wed Jun 14 16:57:52 2006 +0000
+++ b/mail/courier-imap/Makefile        Wed Jun 14 17:01:08 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2006/06/09 22:12:10 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2006/06/14 17:01:08 jlam Exp $
 
 DISTNAME=      courier-imap-4.1.1
+PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -12,7 +13,7 @@
 DEPENDS+=      courier-maildir>=0.53.1:../../mail/courier-maildir
 DEPENDS+=      couriertcpd>=0.53.2:../../net/couriertcpd
 
-USE_TOOLS+=            env gmake perl
+USE_TOOLS+=            env gmake openssl:run perl
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 
@@ -28,7 +29,7 @@
 CONFIGURE_ARGS+=       --with-mailuser=${ROOT_USER:Q}
 CONFIGURE_ARGS+=       --with-piddir=${VARBASE:Q}/run
 CONFIGURE_ARGS+=       --program-transform-name='s/\.rc$$//'
-CONFIGURE_ENV+=                OPENSSL=${SSLBASE:Q}/bin/openssl
+CONFIGURE_ENV+=                OPENSSL=${TOOLS_OPENSSL:Q}
 
 INSTALL_AM_MAKEFLAGS=  sysconfdir=${EGDIR:Q}
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
@@ -70,7 +71,6 @@
 SUBST_STAGE.courier=   pre-configure
 
 .include "../../security/courier-authlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 
 post-install:
        ${INSTALL_DATA_DIR} ${EGDIR}
diff -r dd9593fe30d1 -r 3de9a9b70ea0 mail/courier-mta/Makefile
--- a/mail/courier-mta/Makefile Wed Jun 14 16:57:52 2006 +0000
+++ b/mail/courier-mta/Makefile Wed Jun 14 17:01:08 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2006/06/09 22:12:18 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/14 17:01:08 jlam Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
+PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -15,7 +16,7 @@
 DEPENDS+=      couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd
 DEPENDS+=      maildrop>=2.0.2:../../mail/maildrop
 
-USE_TOOLS+=            gmake perl:run
+USE_TOOLS+=            gmake openssl:run perl:run
 USE_LANGUAGES=         c c++
 
 PKGNAME=               ${DISTNAME:S/-/-mta-/}
@@ -29,7 +30,7 @@
 
 USERGROUP_PHASE=       configure
 
-CONFIGURE_ENV+=                OPENSSL=${SSLBASE:Q}/bin/openssl
+CONFIGURE_ENV+=                OPENSSL=${TOOLS_OPENSSL:Q}
 CONFIGURE_ENV+=                PROCMAIL=${LOCALBASE:Q}/bin/procmail
 
 CONFIGURE_ARGS+=       --datadir=${DATADIR:Q}
@@ -81,7 +82,6 @@
 
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../security/courier-authlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 
 post-extract:
        ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
diff -r dd9593fe30d1 -r 3de9a9b70ea0 net/couriertcpd/Makefile
--- a/net/couriertcpd/Makefile  Wed Jun 14 16:57:52 2006 +0000
+++ b/net/couriertcpd/Makefile  Wed Jun 14 17:01:08 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/06/09 22:11:03 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2006/06/14 17:01:08 jlam Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
 PKGNAME=       ${DISTNAME:S/-/tcpd-/}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -43,6 +44,8 @@
 REQD_DIRS=             ${DOCDIR}
 MAKE_DIRS+=            ${VARBASE}/run ${COURIER_STATEDIR}
 
+.include "../../security/openssl/buildlink3.mk"
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/tcpd/couriertcpd                   \
                ${PREFIX}/bin/couriertcpd