diff options
| -rw-r--r-- | mail/courier-imap/Makefile | 37 | ||||
| -rw-r--r-- | mail/maildrop/Makefile | 13 | ||||
| -rw-r--r-- | mail/sqwebmail/Makefile | 20 |
3 files changed, 48 insertions, 22 deletions
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index b4d80a73214d..4b691f80300d 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -16,8 +16,8 @@ MASTER_SITE_SUBDIR= courier MAINTAINER= oliver@FreeBSD.org COMMENT= IMAP (and POP3) server that provides access to Maildir mailboxes -BUILD_DEPENDS= ${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib -RUN_DEPENDS= ${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib +BUILD_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base +RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base .if defined(WITH_DRAC) BROKEN= DRAC support doesn't work with 4.0.0 right now @@ -44,12 +44,17 @@ CONFIGURE_ENV= CFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ # WITH_SYSLOG_FACILITY: The syslogfacility to use # -OPTIONS= OPENSSL "Build with OpenSSL support" on \ - FAM "Build in fam support for IDLE command" off \ - DRAC "Build in DRAC support" off \ - TRASHQUOTA "Include deleted mails in the quota" off \ - GDBM "Use gdbm files instead of bdb" off \ - IPV6 "Build with IPv6 support" on +OPTIONS= OPENSSL "Build with OpenSSL support" on \ + FAM "Build in fam support for IDLE command" off \ + DRAC "Build in DRAC support" off \ + TRASHQUOTA "Include deleted mails in the quota" off \ + GDBM "Use gdbm db instead of system bdb" off \ + IPV6 "Build with IPv6 support" on + + +.if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) +.include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" +.endif CONFDIR?= ${PREFIX}/etc/${PORTNAME} RCDIR?= ${PREFIX}/etc/rc.d @@ -58,12 +63,10 @@ LIBEXECDIR?= ${PREFIX}/libexec/${PORTNAME} PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ RCDIR=${RCDIR:S,^${PREFIX}/,,} \ - USERDB=${USERDB:S,^${PREFIX}/,,} \ LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ - --with-userdb=${USERDB} \ --datadir=${DATADIR} \ --libexecdir=${LIBEXECDIR} \ --enable-workarounds-for-imap-client-bugs \ @@ -73,6 +76,10 @@ CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ .include <bsd.port.pre.mk> +.if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) +.include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" +.endif + .if !defined(WITHOUT_SSL) # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk .include "${PORTSDIR}/Mk/bsd.openssl.mk" @@ -86,15 +93,13 @@ PLIST_SUB+= OPENSSLFLAG="@comment " CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY} .endif -# Without explicitly mentioning this, if gdbm libraries are present, -# they are silently picked up and used by courier-imap in place of -# the standard db (v1) files. -# +.if defined(WITH_AUTH_USERDB) .if defined(WITH_GDBM) +CONFIGURE_ARGS+=--with-db=gdb --with-userdb=${USERDB} LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm -CONFIGURE_ARGS+=--with-db=gdbm .else -CONFIGURE_ARGS+=--with-db=db +CONFIGURE_ARGS+=--with-db=db --with-userdb=${USERDB} +.endif .endif .if defined(WITHOUT_IPV6) diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index 25de11834c73..f54de85434e9 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -37,6 +37,12 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +.if defined(WITH_AUTHLIB) +.if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) +.include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" +.endif +.endif + .include <bsd.port.pre.mk> .if ${OSVERSION} <= 502010 @@ -71,8 +77,11 @@ CONFIGURE_ARGS+= --enable-trusted-users="${MAILDROP_TRUSTED_USERS}" .endif .if defined(WITH_AUTHLIB) -BUILD_DEPENDS= ${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib -RUN_DEPENDS= ${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib +.if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) +.include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" +.endif +BUILD_DEPENDS+= courierauthconfig:${PORTSDIR}/security/courier-authlib-base +RUN_DEPENDS+= courierauthconfig:${PORTSDIR}/security/courier-authlib-base USE_REINPLACE= yes CONFIGURE_ARGS+= --enable-authlib diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 38cce6912064..b681226989e6 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -15,11 +15,15 @@ MASTER_SITE_SUBDIR= courier MAINTAINER= oliver@FreeBSD.org COMMENT= CGI Webmail client for Maildirs -BUILD_DEPENDS= ${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib -RUN_DEPENDS= ${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib - CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" +BUILD_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base +RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base + +.if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) +.include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" +.endif + # # User-serviceable variables # @@ -44,6 +48,8 @@ CACHEDIR?= ${PREFIX}/var/sqwebmail/cache CACHEOWNER?= bin # +# will be migrated to options if possible sooner or later! +# # set WITHOUT_CACHEDIR to disable the cache dir # set WITH_HTTPS to generate https:// URLs for all accesses # set WITH_HTTPS=login to generate https:// URLs for only password access @@ -182,6 +188,12 @@ MAN8= deliverquota.8 EXTRA_DOCS= README README.logindomainlist.html README.pam sqwebmail/ChangeLog \ maildir/README.maildirquota.txt maildir/README.sharedfolders.txt +.include <bsd.port.pre.mk> + +.if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) +.include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" +.endif + post-patch: @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/liblock/configure @@ -214,4 +226,4 @@ post-install: @${ECHO_MSG} "0 * * * * ${CACHEOWNER} ${PREFIX}/share/sqwebmail/cleancache.pl" @${ECHO_MSG} "" -.include <bsd.port.mk> +.include <bsd.port.post.mk> |