diff options
| -rw-r--r-- | mail/imap-uw/Makefile | 17 | ||||
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 25 |
2 files changed, 22 insertions, 20 deletions
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index d81093445b6..394dfd7c430 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2001/12/15 08:30:26 martti Exp $ +# $NetBSD: Makefile,v 1.38 2002/03/18 17:11:05 fredb Exp $ DISTNAME= imap-2001a PKGNAME= imap-uw-2001.1 @@ -27,15 +27,6 @@ ALL_TARGET= gso ALL_TARGET= neb .endif -# CCLIENT_MBOX_FMT is the default format used by c-client programs for new -# mailbox creation. Check the UW IMAP documentation for more details -# regarding the pros and cons of the various mailbox formats. -# -# Possible values: mbox, mbx, mh, mmdf, mtx, mx, news, phile, tenex, unix -# Default: unix -# -CCLIENT_MBOX_FMT?= unix - CCLIENT_INCS= c-client.h env.h env_unix.h flstring.h fs.h ftl.h \ imap4r1.h linkage.c linkage.h mail.h misc.h netmsg.h \ newsrc.h nl.h nntp.h osdep.h pop3.h rfc822.h smtp.h \ @@ -58,13 +49,17 @@ MAKE_ENV+= SSLDIR="${SSLBASE}" MAKE_ENV+= SSLCERTS="${SSLCERTS}" MAKE_ENV+= CCLIENT_MAJOR="${CCLIENT_MAJOR}" MAKE_ENV+= CCLIENT_MINOR="${CCLIENT_MINOR}" -MAKE_ENV+= CREATEPROTO=${CCLIENT_MBOX_FMT}proto +MAKE_ENV+= CREATEPROTO=${UMAP_IW_CCLIENT_MBOX_FMT}proto ALL_TARGET+= CC="${LIBTOOL} ${CC}" ALL_TARGET+= EXTRACFLAGS="${CFLAGS}" ALL_TARGET+= EXTRALDFLAGS="${LDFLAGS}" +.if defined(IMAP_UW_NO_CLEARTEXT) && ${IMAP_UW_NO_CLEARTEXT} == "YES" +ALL_TARGET+= SSLTYPE="nopwd" +.else ALL_TARGET+= SPECIALAUTHENTICATORS="ssl" ALL_TARGET+= SSLTYPE="unix" +.endif post-extract: # diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 050d560b7f0..56ae51abc97 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.43 2002/03/07 09:00:14 seb Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.44 2002/03/18 17:11:04 fredb Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -465,14 +465,6 @@ ARLA_CACHE?= ${LOCALBASE}/cache # Possible: category/pkg # Default: not defined -CCLIENT_MBOX_FMT?= unix -# Used in imap-uw to set the default format used by c-client programs for new -# mailbox creation. Check the UW IMAP documentation for more details -# regarding the pros and cons of the various mailbox formats. -# -# Possible: mbox, mbx, mh, mmdf, mtx, mx, news, phile, tenex, unix -# Default: unix - CUPS_GROUP?= sys # Used in the cups package to specify the group to run CUPS commands as. # Possible: any group name @@ -567,6 +559,21 @@ FOX_USE_XUNICODE?= YES # Possible: yes, no, not defined # Default: not defined (-> Russian support enabled) +IMAP_UW_CCLIENT_MBOX_FMT?= unix +# Used in imap-uw to set the default format used by c-client programs for +# new mailbox creation. Check the UW IMAP documentation for more details +# regarding the pros and cons of the various mailbox formats. +# +# Possible: mbox, mbx, mh, mmdf, mtx, mx, news, phile, tenex, unix +# Default: unix + +#IMAP_UW_NO_CLEARTEXT?= YES +# Used in imap-uw to disallow plaintext passwords except when SSL or TLS +# is used. This effectively disallows cleartext passwords. +# +# Possible: not defined, YES +# Default: not defined + INN_DATA_DIR?= /var/news # Used by inn to specify the data directory. # Possible: any path you like |