diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-14 17:01:08 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-14 17:01:08 +0000 |
| commit | b17fa2e470536f1ddf6bd541ac071564be3afbe5 (patch) | |
| tree | b8066b95ccda28883d106173204e21ea5410fff2 /mail | |
| parent | f9ae9acc6e7c6c3dc3979ebc25f27d20a72d0f12 (diff) | |
| download | pkgsrc-b17fa2e470536f1ddf6bd541ac071564be3afbe5.tar.gz | |
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 (limited to 'mail')
| -rw-r--r-- | mail/courier-imap/Makefile | 8 | ||||
| -rw-r--r-- | mail/courier-mta/Makefile | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 2e0e3ed176b..8e9187b8508 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -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 @@ HOMEPAGE= http://www.courier-mta.org/imap/ 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+= --libexecdir=${LIBEXECDIR:Q} 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_SED.courier= -e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g" \ SUBST_STAGE.courier= pre-configure .include "../../security/courier-authlib/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" post-install: ${INSTALL_DATA_DIR} ${EGDIR} diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile index 77f591d22fb..698be4eeb98 100644 --- a/mail/courier-mta/Makefile +++ b/mail/courier-mta/Makefile @@ -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+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir 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 @@ PLIST_SRC+= ${PKGDIR}/PLIST 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 @@ SUBST_STAGE.paths= post-patch .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 |