Index: head/mail/cyrus-imapd2/Makefile
===================================================================
--- head/mail/cyrus-imapd2/Makefile	(revision 159888)
+++ head/mail/cyrus-imapd2/Makefile	(revision 159889)
@@ -1,191 +1,191 @@
 # New ports collection makefile for:		cyrus-imapd
 # Date created:					Jan 4th 2001
 # Whom:						ume@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.1.18
 PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
 
 PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/ \
 		http://home.jp.FreeBSD.org/~ume/ipv6/
 PATCHFILES=	${PORTNAME}-2.1.16-ipv6-20031121.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
 LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^1].*
 
 LATEST_LINK=	${PORTNAME}2
 
 USE_RC_SUBR=	imapd.sh
 
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
 		--with-bdb-libdir=${LOCALBASE}/lib \
 		--with-auth=unix \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
 
 .if defined(WITH_BDB_VER)
 USE_BDB_VER=	${WITH_BDB_VER}
 .else
 USE_BDB_VER=	3
 .endif
 .if ${USE_BDB_VER} == 4
 USE_BDB=	40
 .elif ${USE_BDB_VER} != 3 && ${USE_BDB_VER} != 41
-IGNORE=		"WITH_BDB_VER must be 3, 4 or 41"
+IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4 or 41"
 .endif
 USE_BDB?=	${USE_BDB_VER}
 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \
 		--with-bdb=db${USE_BDB_VER}
 
 .if defined(WITH_SKIPLIST)
 WITH_SKIPLIST_MBOX=	YES
 WITH_SKIPLIST_SEEN=	YES
 .endif
 .if defined(WITH_SKIPLIST_MBOX)
 CONFIGURE_ARGS+=--with-mboxlist-db=skiplist
 .endif
 .if defined(WITH_SKIPLIST_SEEN)
 CONFIGURE_ARGS+=--with-seen-db=skiplist
 .endif
 
 .if defined(WITH_MURDER)
 CONFIGURE_ARGS+=--enable-murder
 CFLAGS+=	${PTHREAD_CFLAGS}
 MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=	MURDER=""
 .else
 PLIST_SUB+=	MURDER="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SNMP)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
 CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-ucdsnmp=no
 .endif
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
 		pop3test.1 sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
 CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
 		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
 CYRUS_MAN8=	arbitron.8 chk_cyrus.8 collectnews.8 ctl_cyrusdb.8 \
 		ctl_deliver.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
 		fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 \
 		mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
 		reconstruct.8 rmnews.8 squatter.8 syncnews.8 \
 		timsieved.8 tls_prune.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
 		install-configure install-murder install-perf \
 		install-prereq install-sieve install-snmpmon install-testing \
 		install-upgrade mailing-list man notes os overview questions \
 		readme sieve sieve-protocol specs
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 pre-everything::
 .if !defined(WITH_BDB_VER)
 	@if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \
 		${ECHO_MSG} ""; \
 		${ECHO_MSG} "It seems you have installed newer db than db3.  If"; \
 		${ECHO_MSG} "you are using newer db for cyrus-sasl2, you should"; \
 		${ECHO_MSG} "specify same version by WITH_BDB_VER.  For"; \
 		${ECHO_MSG} "exapmle, WITH_BDB_VER=4 for db4."; \
 		${ECHO_MSG} ""; \
 	fi
 .endif
 
 post-patch:
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			${.CURDIR}/pkg-install > ${PKGINSTALL}
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 				  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 				  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 			${WRKSRC}/tools/mkimap
 .if ${PERL_LEVEL} < 500600
 		@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
 			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
 .endif
 
 post-install:
 .for f in ${CYRUS_MAN3}
 		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
 		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}
 		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
 		@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
 .if !defined(NOPORTDOCS)
 		@${MKDIR} ${DOCSDIR}/man
 		@${MKDIR} ${DOCSDIR}/text
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
 .endfor
 .for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
 		@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
 			${DOCSDIR}/man/${f}.html; \
 		${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
 			>>${TMPPLIST}; \
 		fi
 .endfor
 		@${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/cyrusv2.mc >>${TMPPLIST}
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
 		@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
 .endif
 		@${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 			${PREFIX}/etc/imapd.conf.dist
 		@${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
 			${PREFIX}/etc/cyrus.conf.dist
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 			${PREFIX}/cyrus/bin/mkimap
 		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
 			POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/cyrus-imapd2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.108
\ No newline at end of property
+1.109
\ No newline at end of property
Index: head/mail/cyrus-imapd22/Makefile
===================================================================
--- head/mail/cyrus-imapd22/Makefile	(revision 159888)
+++ head/mail/cyrus-imapd22/Makefile	(revision 159889)
@@ -1,338 +1,338 @@
 # New ports collection makefile for:		cyrus-imapd
 # Date created:					Jan 4th 2001
 # Whom:						ume@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.2.13
 PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
 LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^2].*
 
 LATEST_LINK=	${PORTNAME}22
 
 USE_RC_SUBR=	imapd.sh
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
 		--with-bdb-libdir=${LOCALBASE}/lib \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
 
 OPTIONS=	AUTH_KRB5	"Use Kerberos5 authorization module"	off
 .if defined(WITH_BDB_VER)
 USE_BDB_VER=	${WITH_BDB_VER}
 .else
 USE_BDB_VER=	3
 .endif
 .if ${USE_BDB_VER} == 3
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	on \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 4
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	on \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 41
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	on \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 42
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	on \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 43
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	on \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 44
 OPTIONS+=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	on
 .else
-IGNORE=		"WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
+IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
 .endif
 
 OPTIONS+=	DRAC		"Enable DRAC support"			off
 OPTIONS+=	IDLE_IDLED	"Enable IMAP IDLE method idled"		off \
 		IDLE_POLL	"Enable IMAP IDLE method idle-polling"	on
 OPTIONS+=	LDAP_PTLOADER	"Enable LDAP ptloader (experimantal)"	off
 OPTIONS+=	LISTEXT		"Enable IMAP List extensions"		off
 OPTIONS+=	MURDER		"Enable IMAP Murder support"		off
 OPTIONS+=	NETSCAPEHACK	"Enable X-NETSCAPE extensions"		off
 OPTIONS+=	NNTP		"Enable NNTP support"			off
 OPTIONS+=	SNMP_4		"Enable SNMP support using net-snmp v4"	off \
 		SNMP_5		"Enable SNMP support using net-snmp v5"	off
 OPTIONS+=	PASS8BITHACK	"Add pass8bit option (not recommended)"	off
 
 BDB_VERS=	3 4 41 42 43 44
 
 .include <bsd.port.pre.mk>
 
 BDB_W:=
 BDB_WO:=
 .for v in ${BDB_VERS}
 BDB_W:=		${BDB_W} ${WITH_BDB_${v}}
 BDB_WO:=	${BDB_WO} ${WITHOUT_BDB_${v}}
 .endfor
 BDB_NUM_W!=	${ECHO_CMD} ${BDB_W} | wc -w
 BDB_NUM_WO!=	${ECHO_CMD} ${BDB_WO} | wc -w
 BDB_NUM_VERS!=	${ECHO_CMD} ${BDB_VERS} | wc -w
 
 .if ${BDB_NUM_W} == 0
 .if ${BDB_NUM_WO} == ${BDB_NUM_VERS}
 BROKEN=		"You need to select one BDB version.  Run 'make config' again!"
 .endif
 WITH_BDB_${USE_BDB_VER}=	true
 .elif ${BDB_NUM_W} != 1
 BROKEN=		"Multiple BDB versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_BDB_3)
 USE_BDB=	3
 .elif defined(WITH_BDB_4)
 USE_BDB=	40
 .elif defined(WITH_BDB_41)
 USE_BDB=	41
 .elif defined(WITH_BDB_42)
 USE_BDB=	42
 .elif defined(WITH_BDB_43)
 USE_BDB=	43
 .elif defined(WITH_BDB_44)
 USE_BDB=	44
 .endif
 CONFIGURE_ARGS+=--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-bdb=${BDB_LIB_NAME}
 
 .if defined(WITH_NNTP)
 CONFIGURE_ARGS+=--enable-nntp
 PLIST_SUB+=	NNTP=""
 .else
 PLIST_SUB+=	NNTP="@comment "
 .endif
 
 .if defined(WITH_MURDER)
 CONFIGURE_ARGS+=--enable-murder
 CFLAGS+=	${PTHREAD_CFLAGS}
 MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=	MURDER=""
 .else
 PLIST_SUB+=	MURDER="@comment "
 .endif
 
 .if defined(WITH_IDLE_IDLED) && defined(WITH_IDLE_POLL)
 BROKEN=		"Multiple IDLE methods selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_IDLE_IDLED)
 CONFIGURE_ARGS+=--with-idle=idled
 PLIST_SUB+=	IDLED=""
 .elif defined(WITH_IDLE_POLL)
 CONFIGURE_ARGS+=--with-idle=poll
 PLIST_SUB+=	IDLED="@comment "
 .elif defined(WITHOUT_IDLE_IDLED) && defined(WITHOUT_IDLE_POLL)
 CONFIGURE_ARGS+=--with-idle=no
 PLIST_SUB+=	IDLED="@comment "
 .else
 PLIST_SUB+=	IDLED="@comment "
 .endif
 
 .if defined(WITH_LISTEXT)
 CONFIGURE_ARGS+=--enable-listext
 .endif
 
 .if defined(WITH_NETSCAPEHACK)
 CONFIGURE_ARGS+=--enable-netscapehack
 .endif
 
 .if defined(WITH_DRAC)
 #EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::berkdb.m4 \
 		${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
 		${FILESDIR}/extra-patch-configure.in
 USE_AUTOTOOLS=	autoconf:259 autoheader:259
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
 
 .if defined(WITH_SNMP_4) && defined(WITH_SNMP_5)
 BROKEN=		"Multiple net-snmp versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_SNMP_4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
 .elif defined(WITH_SNMP_5)
 LIB_DEPENDS+=	netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
 .endif
 .if defined(WITH_SNMP_4) || defined(WITH_SNMP_5)
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-snmp=no
 .endif
 
 .if defined(WITH_AUTH_KRB5) && defined(WITH_LDAP_PTLOADER)
 BROKEN=		"AUTH_KRB5 and LDAP_PTLOADER are exclusive.  Run 'make config' again!"
 .endif
 .if defined(WITH_LDAP_PTLOADER)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-auth=pts --with-pts=ldap --with-ldap=${LOCALBASE}
 PLIST_SUB+=	LDAP_PTLOADER=""
 .elif defined(WITH_AUTH_KRB5)
 CONFIGURE_ARGS+=--with-auth=krb5
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .else
 CONFIGURE_ARGS+=--with-auth=unix
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .endif
 
 .if defined(WITH_PASS8BITHACK)
 EXTRA_PATCHES+=	${FILESDIR}/pass8bit.diff
 .endif
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
 		nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
 CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
 		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
 CYRUS_MAN8=	arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
 		cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
 		fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
 		master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
 		reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \
 		timsieved.8 tls_prune.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
 		install-configure install-murder install-netnews \
 		install-perf install-prereq install-sieve install-snmpmon \
 		install-testing install-upgrade install-virtdomains \
 		mailing-list man notes os overview questions readme sieve \
 		sieve-protocol specs
 
 CONFS=		cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
 		small.conf
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 post-patch:
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-install > ${PKGINSTALL}
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 				  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 				  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 			${WRKSRC}/tools/mkimap
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 				  -e "s|/usr/sieve|/var/imap/sieve|g" \
 			${WRKSRC}/tools/masssievec
 .if ${PERL_LEVEL} < 500600
 		@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
 			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
 .endif
 .if defined(WITH_DRAC)
 		@${RM} -rf ${WRKSRC}/autom4te.cache
 .endif
 
 post-install:
 .for f in ${CYRUS_MAN3}
 		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
 		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}
 		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
 		@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
 .if !defined(NOPORTDOCS)
 		@${MKDIR} ${DOCSDIR}/man
 		@${MKDIR} ${DOCSDIR}/text
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
 .endfor
 .for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
 		@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
 			${DOCSDIR}/man/${f}.html; \
 		${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
 			>>${TMPPLIST}; \
 		fi
 .endfor
 .for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
 .endfor
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
 		@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
 .endif
 		@${MKDIR} ${EXAMPLESDIR}
 		@${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR}
 .for f in ${CONFS}
 		@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR}
 		@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \
 			>>${TMPPLIST}
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 			${PREFIX}/cyrus/bin/mkimap
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
 			${PREFIX}/cyrus/bin/masssievec
 		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
 			POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/cyrus-imapd22/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.143
\ No newline at end of property
+1.144
\ No newline at end of property
Index: head/mail/cyrus-imapd23/Makefile
===================================================================
--- head/mail/cyrus-imapd23/Makefile	(revision 159888)
+++ head/mail/cyrus-imapd23/Makefile	(revision 159889)
@@ -1,329 +1,329 @@
 # New ports collection makefile for:		cyrus-imapd
 # Date created:					Dec 10th 2005
 # Whom:						ume@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.3.3
 #PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
 LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^3].*
 
 LATEST_LINK=	${PORTNAME}23
 
 USE_RC_SUBR=	imapd.sh
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
 		--with-bdb-libdir=${LOCALBASE}/lib \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
 
 .if defined(WITH_BDB_VER)
 USE_BDB_VER=	${WITH_BDB_VER}
 .else
 USE_BDB_VER=	3
 .endif
 .if ${USE_BDB_VER} == 3
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	on \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 4
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	on \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 41
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	on \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 42
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	on \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 43
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	on \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 44
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	on
 .else
-IGNORE=		"WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
+IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
 .endif
 
 OPTIONS+=	DRAC		"Enable DRAC support"			off
 OPTIONS+=	IDLED		"Enable IMAP idled support"		off
 OPTIONS+=	LDAP_PTLOADER	"Enable LDAP ptloader"			off
 OPTIONS+=	LISTEXT		"Enable IMAP List extensions"		off
 OPTIONS+=	MURDER		"Enable IMAP Murder support"		off
 OPTIONS+=	NETSCAPEHACK	"Enable X-NETSCAPE extensions"		off
 OPTIONS+=	NNTP		"Enable NNTP support"			off
 OPTIONS+=	REPLICATION	"Enable replication"			off
 OPTIONS+=	SNMP_4		"Enable SNMP support using net-snmp v4"	off \
 		SNMP_5		"Enable SNMP support using net-snmp v5"	off
 OPTIONS+=	PASS8BITHACK	"Add pass8bit option (not recommended)"	off
 
 BDB_VERS=	3 4 41 42 43 44
 
 .include <bsd.port.pre.mk>
 
 BDB_W:=
 BDB_WO:=
 .for v in ${BDB_VERS}
 BDB_W:=		${BDB_W} ${WITH_BDB_${v}}
 BDB_WO:=	${BDB_WO} ${WITHOUT_BDB_${v}}
 .endfor
 BDB_NUM_W!=	${ECHO_CMD} ${BDB_W} | wc -w
 BDB_NUM_WO!=	${ECHO_CMD} ${BDB_WO} | wc -w
 BDB_NUM_VERS!=	${ECHO_CMD} ${BDB_VERS} | wc -w
 
 .if ${BDB_NUM_W} == 0
 .if ${BDB_NUM_WO} == ${BDB_NUM_VERS}
 BROKEN=		"You need to select one BDB version.  Run 'make config' again!"
 .endif
 WITH_BDB_${USE_BDB_VER}=	true
 .elif ${BDB_NUM_W} != 1
 BROKEN=		"Multiple BDB versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_BDB_3)
 USE_BDB=	3
 .elif defined(WITH_BDB_4)
 USE_BDB=	40
 .elif defined(WITH_BDB_41)
 USE_BDB=	41
 .elif defined(WITH_BDB_42)
 USE_BDB=	42
 .elif defined(WITH_BDB_43)
 USE_BDB=	43
 .elif defined(WITH_BDB_44)
 USE_BDB=	44
 .endif
 CONFIGURE_ARGS+=--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-bdb=${BDB_LIB_NAME}
 
 .if defined(WITH_NNTP)
 CONFIGURE_ARGS+=--enable-nntp
 PLIST_SUB+=	NNTP=""
 .else
 PLIST_SUB+=	NNTP="@comment "
 .endif
 
 .if defined(WITH_MURDER)
 CONFIGURE_ARGS+=--enable-murder
 CFLAGS+=	${PTHREAD_CFLAGS}
 MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=	MURDER=""
 .else
 PLIST_SUB+=	MURDER="@comment "
 .endif
 
 .if defined(WITH_IDLED)
 CONFIGURE_ARGS+=--enable-idled
 PLIST_SUB+=	IDLED=""
 .else
 PLIST_SUB+=	IDLED="@comment "
 .endif
 
 .if defined(WITH_REPLICATION)
 CONFIGURE_ARGS+=--enable-replication
 PLIST_SUB+=	REPLICATION=""
 .else
 PLIST_SUB+=	REPLICATION="@comment "
 .endif
 
 .if defined(WITH_LISTEXT)
 CONFIGURE_ARGS+=--enable-listext
 .endif
 
 .if defined(WITH_NETSCAPEHACK)
 CONFIGURE_ARGS+=--enable-netscapehack
 .endif
 
 .if defined(WITH_DRAC)
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::berkdb.m4 \
 		${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
 		${FILESDIR}/extra-patch-configure.in
 USE_AUTOTOOLS=	autoconf:259 autoheader:259
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
 
 .if defined(WITH_SNMP_4) && defined(WITH_SNMP_5)
 BROKEN=		"Multiple net-snmp versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_SNMP_4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
 .elif defined(WITH_SNMP_5)
 LIB_DEPENDS+=	netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
 .endif
 .if defined(WITH_SNMP_4) || defined(WITH_SNMP_5)
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-snmp=no
 .endif
 
 .if defined(WITH_LDAP_PTLOADER)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 PLIST_SUB+=	LDAP_PTLOADER=""
 .else
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .endif
 
 .if defined(WITH_PASS8BITHACK)
 EXTRA_PATCHES+=	${FILESDIR}/pass8bit.diff
 .endif
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
 		nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
 CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
 		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
 CYRUS_MAN8=	arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
 		cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
 		fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
 		make_md5.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \
 		quota.8 reconstruct.8 rmnews.8 smmapd.8 squatter.8 \
 		sync_client.8 sync_reset.8 sync_server.8 syncnews.8 \
 		timsieved.8 tls_prune.8 unexpunge.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
 		install-configure install-murder install-netnews \
 		install-perf install-prereq install-replication \
 		install-sieve install-snmpmon install-testing \
 		install-upgrade install-virtdomains mailing-list man \
 		notes os overview questions readme sieve sieve-protocol \
 		specs
 
 CONFS=		cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
 		small.conf
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 post-patch:
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-install > ${PKGINSTALL}
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 				  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 				  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 			${WRKSRC}/tools/mkimap
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 				  -e "s|/usr/sieve|/var/imap/sieve|g" \
 			${WRKSRC}/tools/masssievec
 .if ${PERL_LEVEL} < 500600
 		@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
 			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
 .endif
 .if defined(WITH_DRAC)
 		@${RM} -rf ${WRKSRC}/autom4te.cache
 .endif
 
 post-install:
 .for f in ${CYRUS_MAN3}
 		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
 		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}
 		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
 		@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
 .if !defined(NOPORTDOCS)
 		@${MKDIR} ${DOCSDIR}/man
 		@${MKDIR} ${DOCSDIR}/text
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
 .endfor
 .for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
 		@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
 			${DOCSDIR}/man/${f}.html; \
 		${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
 			>>${TMPPLIST}; \
 		fi
 .endfor
 .for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
 .endfor
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
 		@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
 .endif
 		@${MKDIR} ${EXAMPLESDIR}
 		@${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR}
 .for f in ${CONFS}
 		@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR}
 		@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \
 			>>${TMPPLIST}
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 			${PREFIX}/cyrus/bin/mkimap
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
 			${PREFIX}/cyrus/bin/masssievec
 		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
 			POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/cyrus-imapd23/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.148
\ No newline at end of property
+1.149
\ No newline at end of property
Index: head/mail/cyrus-imapd24/Makefile
===================================================================
--- head/mail/cyrus-imapd24/Makefile	(revision 159888)
+++ head/mail/cyrus-imapd24/Makefile	(revision 159889)
@@ -1,329 +1,329 @@
 # New ports collection makefile for:		cyrus-imapd
 # Date created:					Dec 10th 2005
 # Whom:						ume@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.3.3
 #PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
 
 LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^3].*
 
 LATEST_LINK=	${PORTNAME}23
 
 USE_RC_SUBR=	imapd.sh
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
 		--with-bdb-libdir=${LOCALBASE}/lib \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
 
 .if defined(WITH_BDB_VER)
 USE_BDB_VER=	${WITH_BDB_VER}
 .else
 USE_BDB_VER=	3
 .endif
 .if ${USE_BDB_VER} == 3
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	on \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 4
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	on \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 41
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	on \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 42
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	on \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 43
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	on \
 		BDB_44		"Use BerkeleyDB v4.4"	off
 .elif ${USE_BDB_VER} == 44
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
 		BDB_44		"Use BerkeleyDB v4.4"	on
 .else
-IGNORE=		"WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
+IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
 .endif
 
 OPTIONS+=	DRAC		"Enable DRAC support"			off
 OPTIONS+=	IDLED		"Enable IMAP idled support"		off
 OPTIONS+=	LDAP_PTLOADER	"Enable LDAP ptloader"			off
 OPTIONS+=	LISTEXT		"Enable IMAP List extensions"		off
 OPTIONS+=	MURDER		"Enable IMAP Murder support"		off
 OPTIONS+=	NETSCAPEHACK	"Enable X-NETSCAPE extensions"		off
 OPTIONS+=	NNTP		"Enable NNTP support"			off
 OPTIONS+=	REPLICATION	"Enable replication"			off
 OPTIONS+=	SNMP_4		"Enable SNMP support using net-snmp v4"	off \
 		SNMP_5		"Enable SNMP support using net-snmp v5"	off
 OPTIONS+=	PASS8BITHACK	"Add pass8bit option (not recommended)"	off
 
 BDB_VERS=	3 4 41 42 43 44
 
 .include <bsd.port.pre.mk>
 
 BDB_W:=
 BDB_WO:=
 .for v in ${BDB_VERS}
 BDB_W:=		${BDB_W} ${WITH_BDB_${v}}
 BDB_WO:=	${BDB_WO} ${WITHOUT_BDB_${v}}
 .endfor
 BDB_NUM_W!=	${ECHO_CMD} ${BDB_W} | wc -w
 BDB_NUM_WO!=	${ECHO_CMD} ${BDB_WO} | wc -w
 BDB_NUM_VERS!=	${ECHO_CMD} ${BDB_VERS} | wc -w
 
 .if ${BDB_NUM_W} == 0
 .if ${BDB_NUM_WO} == ${BDB_NUM_VERS}
 BROKEN=		"You need to select one BDB version.  Run 'make config' again!"
 .endif
 WITH_BDB_${USE_BDB_VER}=	true
 .elif ${BDB_NUM_W} != 1
 BROKEN=		"Multiple BDB versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_BDB_3)
 USE_BDB=	3
 .elif defined(WITH_BDB_4)
 USE_BDB=	40
 .elif defined(WITH_BDB_41)
 USE_BDB=	41
 .elif defined(WITH_BDB_42)
 USE_BDB=	42
 .elif defined(WITH_BDB_43)
 USE_BDB=	43
 .elif defined(WITH_BDB_44)
 USE_BDB=	44
 .endif
 CONFIGURE_ARGS+=--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-bdb=${BDB_LIB_NAME}
 
 .if defined(WITH_NNTP)
 CONFIGURE_ARGS+=--enable-nntp
 PLIST_SUB+=	NNTP=""
 .else
 PLIST_SUB+=	NNTP="@comment "
 .endif
 
 .if defined(WITH_MURDER)
 CONFIGURE_ARGS+=--enable-murder
 CFLAGS+=	${PTHREAD_CFLAGS}
 MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=	MURDER=""
 .else
 PLIST_SUB+=	MURDER="@comment "
 .endif
 
 .if defined(WITH_IDLED)
 CONFIGURE_ARGS+=--enable-idled
 PLIST_SUB+=	IDLED=""
 .else
 PLIST_SUB+=	IDLED="@comment "
 .endif
 
 .if defined(WITH_REPLICATION)
 CONFIGURE_ARGS+=--enable-replication
 PLIST_SUB+=	REPLICATION=""
 .else
 PLIST_SUB+=	REPLICATION="@comment "
 .endif
 
 .if defined(WITH_LISTEXT)
 CONFIGURE_ARGS+=--enable-listext
 .endif
 
 .if defined(WITH_NETSCAPEHACK)
 CONFIGURE_ARGS+=--enable-netscapehack
 .endif
 
 .if defined(WITH_DRAC)
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::berkdb.m4 \
 		${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
 		${FILESDIR}/extra-patch-configure.in
 USE_AUTOTOOLS=	autoconf:259 autoheader:259
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
 
 .if defined(WITH_SNMP_4) && defined(WITH_SNMP_5)
 BROKEN=		"Multiple net-snmp versions selected.  Run 'make config' again!"
 .endif
 .if defined(WITH_SNMP_4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
 .elif defined(WITH_SNMP_5)
 LIB_DEPENDS+=	netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
 .endif
 .if defined(WITH_SNMP_4) || defined(WITH_SNMP_5)
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-snmp=no
 .endif
 
 .if defined(WITH_LDAP_PTLOADER)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 PLIST_SUB+=	LDAP_PTLOADER=""
 .else
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .endif
 
 .if defined(WITH_PASS8BITHACK)
 EXTRA_PATCHES+=	${FILESDIR}/pass8bit.diff
 .endif
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
 		nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
 CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
 		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
 CYRUS_MAN8=	arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
 		cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
 		fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
 		make_md5.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \
 		quota.8 reconstruct.8 rmnews.8 smmapd.8 squatter.8 \
 		sync_client.8 sync_reset.8 sync_server.8 syncnews.8 \
 		timsieved.8 tls_prune.8 unexpunge.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
 		install-configure install-murder install-netnews \
 		install-perf install-prereq install-replication \
 		install-sieve install-snmpmon install-testing \
 		install-upgrade install-virtdomains mailing-list man \
 		notes os overview questions readme sieve sieve-protocol \
 		specs
 
 CONFS=		cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
 		small.conf
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 post-patch:
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-install > ${PKGINSTALL}
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
 			-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 			${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 				  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 				  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
 			${WRKSRC}/tools/mkimap
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 				  -e "s|/usr/sieve|/var/imap/sieve|g" \
 			${WRKSRC}/tools/masssievec
 .if ${PERL_LEVEL} < 500600
 		@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
 			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
 .endif
 .if defined(WITH_DRAC)
 		@${RM} -rf ${WRKSRC}/autom4te.cache
 .endif
 
 post-install:
 .for f in ${CYRUS_MAN3}
 		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
 		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}
 		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
 		@${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
 .if !defined(NOPORTDOCS)
 		@${MKDIR} ${DOCSDIR}/man
 		@${MKDIR} ${DOCSDIR}/text
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
 .endfor
 .for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
 		@if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
 			${DOCSDIR}/man/${f}.html; \
 		${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
 			>>${TMPPLIST}; \
 		fi
 .endfor
 .for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
 		@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
 		@${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
 .endfor
 .for f in ${DOCS}
 		@${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
 		@${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
 		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
 .endif
 		@${MKDIR} ${EXAMPLESDIR}
 		@${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR}
 .for f in ${CONFS}
 		@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR}
 		@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
 .endfor
 		@${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \
 			>>${TMPPLIST}
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 			${PREFIX}/cyrus/bin/mkimap
 		@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
 			${PREFIX}/cyrus/bin/masssievec
 		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
 			POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/cyrus-imapd24/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.148
\ No newline at end of property
+1.149
\ No newline at end of property
Index: head/security/cyrus-sasl2/Makefile
===================================================================
--- head/security/cyrus-sasl2/Makefile	(revision 159888)
+++ head/security/cyrus-sasl2/Makefile	(revision 159889)
@@ -1,261 +1,261 @@
 # New ports collection makefile for:	cyrus-sasl2
 # Date created:				Nov 1 1999
 # Whom:					hetzels@westbend.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-sasl
 PORTVERSION=	2.1.21
 PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. OLD-VERSIONS/sasl
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 
 LATEST_LINK=	${PORTNAME}2
 
 INSTALLS_SHLIB=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}2
 
 MAN3=		sasl.3 sasl_authorize_t.3 sasl_auxprop.3 \
 		sasl_auxprop_getctx.3 sasl_auxprop_request.3 \
 		sasl_callbacks.3 sasl_canon_user_t.3 \
 		sasl_chalprompt_t.3 sasl_checkapop.3 sasl_checkpass.3 \
 		sasl_client_init.3 sasl_client_new.3 sasl_client_start.3 \
 		sasl_client_step.3 sasl_decode.3 sasl_dispose.3 sasl_done.3 \
 		sasl_encode.3 sasl_encodev.3 sasl_errdetail.3 sasl_errors.3 \
 		sasl_errstring.3 sasl_getopt_t.3 sasl_getpath_t.3 \
 		sasl_getprop.3 sasl_getrealm_t.3 sasl_getsecret_t.3 \
 		sasl_getsimple_t.3 sasl_global_listmech.3 \
 		sasl_idle.3 sasl_listmech.3 sasl_log_t.3 \
 		sasl_server_init.3 sasl_server_new.3 sasl_server_start.3 \
 		sasl_server_step.3 sasl_server_userdb_checkpass_t.3 \
 		sasl_server_userdb_setpass_t.3 sasl_setpass.3 sasl_setprop.3 \
 		sasl_user_exists.3 sasl_verifyfile_t.3
 MAN8=		sasldblistusers2.8 saslpasswd2.8
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
 		--with-dbpath=${PREFIX}/etc/sasldb2 \
 		--includedir=${PREFIX}/include \
 		--mandir=${MANPREFIX}/man \
 		--enable-static \
 		--enable-auth-sasldb \
 		--with-rc4=openssl \
 		--with-saslauthd=${SASLAUTHD_RUNPATH}
 
 .if defined(WITH_BDB_VER)
 .if ${WITH_BDB_VER} == 4
 USE_BDB=	40
 .elif ${WITH_BDB_VER} != 3 && ${WITH_BDB_VER} != 41 && \
       ${WITH_BDB_VER} != 42 && ${WITH_BDB_VER} != 43 && ${WITH_BDB_VER} != 44
-IGNORE=		"WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
+IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
 .endif
 USE_BDB?=	${WITH_BDB_VER}
 CONFIGURE_ARGS+=--with-dblib=berkeley --with-bdb-libdir=${LOCALBASE}/lib \
 		--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-bdb=${BDB_LIB_NAME}
 SASLDB_NAME=	sasldb2
 .else
 CONFIGURE_ARGS+=--with-dblib=ndbm
 SASLDB_NAME=	sasldb2.db
 .endif
 
 .if defined(WITH_MYSQL_VER)
 WITH_MYSQL=	yes
 .if ${WITH_MYSQL_VER} == 3
 WANT_MYSQL_VER=	323
 .endif
 .endif
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-mysql
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-pgsql
 .endif
 
 .if defined(WITH_SQLITE)
 USE_SQLITE=	2
 CONFIGURE_ARGS+=--with-sqlite=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-sqlite
 .endif
 
 .if defined(WITH_MYSQL) || defined(WITH_PGSQL) || defined(WITH_SQLITE)
 CONFIGURE_ARGS+=--enable-sql
 .else
 SQL=	"@comment "
 .endif
 
 .if defined(WITH_AUTHDAEMON)
 CONFIGURE_ARGS+=--with-authdaemond
 .endif
 
 .if defined(WITH_DEV_URANDOM)
 CONFIGURE_ARGS+=--with-devrandom=/dev/urandom
 .endif
 
 .if defined(WITH_ALWAYSTRUE)
 CONFIGURE_ARGS+=--enable-alwaystrue
 .endif
 
 .if defined(WITHOUT_LOGIN)
 LOGIN=	"@comment "
 .else
 CONFIGURE_ARGS+=--enable-login
 .endif
 
 .if defined(WITHOUT_PLAIN)
 CONFIGURE_ARGS+=--disable-plain
 PLAIN= "@comment "
 .endif
 
 .if defined(WITHOUT_OTP)
 CONFIGURE_ARGS+=--disable-otp
 OTP=	"@comment "
 .endif
 
 .if defined(WITHOUT_CRAM)
 CONFIGURE_ARGS+=--disable-cram
 CRAM=	"@comment "
 .endif
 
 .if defined(WITHOUT_DIGEST)
 CONFIGURE_ARGS+=--disable-digest
 DIGEST=	"@comment "
 .endif
 
 .if defined(WITHOUT_NTLM)
 CONFIGURE_ARGS+=--disable-ntlm
 NTLM=	"@comment "
 .else
 CONFIGURE_ARGS+=--enable-ntlm
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
 CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} --with-gss_impl=mit
 .elif !defined(WITHOUT_GSSAPI) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
 CONFIGURE_ARGS+=--enable-gssapi=${HEIMDAL_HOME} --with-gss_impl=heimdal
 .elif !defined(WITHOUT_GSSAPI) && ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=--enable-gssapi
 .else
 CONFIGURE_ARGS+=--disable-gssapi
 GSSAPI=	"@comment "
 .endif
 
 # KERBEROS 4 was removed in FreeBSD 5.0-CURRENT
 .if ${OSVERSION} > 500105
 .if defined(WITH_KERBEROS4)
 LIB_DEPENDS+=	krb.2:${PORTSDIR}/security/krb4
 CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4
 .else
 CONFIGURE_ARGS+=--disable-krb4
 EBONES=	"@comment "
 .endif
 .elif exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(WITHOUT_KERBEROS4)
 CONFIGURE_ARGS+=--enable-krb4
 .elif !exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4)
 LIB_DEPENDS+=	krb.2:${PORTSDIR}/security/krb4
 CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4
 .else
 CONFIGURE_ARGS+=--disable-krb4
 EBONES=	"@comment "
 .endif
 
 .if ${OPENSSLBASE} == /usr
 CONFIGURE_ARGS+=--with-openssl=yes
 .else
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 .endif
 
 SASLAUTHD_RUNPATH?=	/var/run/saslauthd
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README
 
 DOC2=	ONEWS TODO draft-burdis-cat-srp-sasl-xx.txt \
 	draft-ietf-sasl-anon-xx.txt draft-ietf-sasl-crammd5-xx.txt \
 	draft-ietf-sasl-gssapi-xx.txt draft-ietf-sasl-plain-xx.txt \
 	draft-ietf-sasl-rfc2222bis-xx.txt draft-ietf-sasl-rfc2831bis-xx.txt \
 	draft-ietf-sasl-saslprep-xx.txt draft-murchison-sasl-login-xx.txt \
 	draft-newman-sasl-c-api-xx.txt rfc1321.txt rfc1939.txt rfc2104.txt \
 	rfc2195.txt rfc2222.txt rfc2243.txt rfc2245.txt rfc2289.txt \
 	rfc2444.txt rfc2595.txt rfc2831.txt rfc2945.txt rfc3174.txt \
 	server-plugin-flow.fig testing.txt
 
 HTDOCS=	advanced appconvert components gssapi index install macosx \
 	mechanisms options plugprog programming readme sysadmin upgrading \
 	windows
 
 PLIST_SUB=	PREFIX=${PREFIX} \
 		LOGIN=${LOGIN} \
 		PLAIN=${PLAIN} \
 		OTP=${OTP} \
 		CRAM=${CRAM} \
 		DIGEST=${DIGEST} \
 		NTLM=${NTLM} \
 		GSSAPI=${GSSAPI} \
 		EBONES=${EBONES} \
 		SQL=${SQL} \
 		DOCSDIR=${DOCSDIR:S/^${PREFIX}\///}
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 # Fix sasldb name in pkg-install/deinstall scripts
 post-patch:
 	@${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \
 		-e "s;%%CYRUS_USER%%;${CYRUS_USER};g" \
 		-e "s;%%CYRUS_GROUP%%;${CYRUS_GROUP};g" \
 		${.CURDIR}/pkg-install > ${PKGINSTALL}
 	@${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \
 		-e "s;%%CYRUS_USER%%;${CYRUS_USER};g" \
 		-e "s;%%CYRUS_GROUP%%;${CYRUS_GROUP};g" \
 		${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
 	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
 
 # Create Cyrus user and group
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/html
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .for f in ${DOC2}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
 .endfor
 .for f in ${HTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}/html
 .endfor
 	@${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${DOCSDIR}
 .endif
 	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/security/cyrus-sasl2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.124
\ No newline at end of property
+1.125
\ No newline at end of property
Index: head/security/cyrus-sasl2-saslauthd/Makefile
===================================================================
--- head/security/cyrus-sasl2-saslauthd/Makefile	(revision 159888)
+++ head/security/cyrus-sasl2-saslauthd/Makefile	(revision 159889)
@@ -1,157 +1,157 @@
 # New ports collection makefile for:	cyrus-sasl2-saslauthd
 # Date created:				May 27 2003
 # Whom:					ume@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	saslauthd
 PORTVERSION=	2.1.21
 PORTREVISION=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. OLD-VERSIONS/sasl
 PKGNAMEPREFIX=	cyrus-sasl-
 DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	SASL authentication server for cyrus-sasl2
 
 LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 
 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2
 MD5_FILE=	${CYRUS_SASL2_DIR}/distinfo
 PATCHDIR=	${CYRUS_SASL2_DIR}/files
 INSTALL_WRKSRC=	${WRKDIR}/${DISTNAME}/saslauthd
 DOCSDIR=	${PREFIX}/share/doc/cyrus-sasl2
 
 USE_RC_SUBR=	saslauthd.sh
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
 		--with-dbpath=${PREFIX}/etc/sasldb2 \
 		--includedir=${PREFIX}/include \
 		--mandir=${MANPREFIX}/man \
 		--enable-static \
 		--enable-login \
 		--enable-auth-sasldb \
 		--with-rc4=openssl \
 		--with-saslauthd=${SASLAUTHD_RUNPATH}
 
 .if defined(WITH_BDB_VER)
 .if ${WITH_BDB_VER} == 4
 USE_BDB=	40
 .elif ${WITH_BDB_VER} != 3 && ${WITH_BDB_VER} != 41 && \
       ${WITH_BDB_VER} != 42 && ${WITH_BDB_VER} != 43 && ${WITH_BDB_VER} != 44
-IGNORE=		"WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
+IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
 .endif
 USE_BDB?=	${WITH_BDB_VER}
 BDB_SUFFIX?=	${WITH_BDB_VER}
 CONFIGURE_ARGS+=--with-dblib=berkeley --with-bdb-libdir=${LOCALBASE}/lib \
 		--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-bdb=${BDB_LIB_NAME}
 .else
 CONFIGURE_ARGS+=--with-dblib=ndbm
 .endif
 
 .if defined(WITH_OPENLDAP_VER)
 WITH_OPENLDAP=		yes
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 .endif
 .if defined(WITH_OPENLDAP)
 .if defined(WANT_OPENLDAP_VER) && ${WANT_OPENLDAP_VER} == 12
 BROKEN=		"this port requires OpenLDAP >= 2.0"
 .endif
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
 CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} --with-gss_impl=mit
 .elif !defined(WITHOUT_GSSAPI) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
 CONFIGURE_ARGS+=--enable-gssapi=${HEIMDAL_HOME} --with-gss_impl=heimdal
 .elif !defined(WITHOUT_GSSAPI) && ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=--enable-gssapi
 .else
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
 # KERBEROS 4 was removed in FreeBSD 5.0-CURRENT
 .if ${OSVERSION} > 500105
 .if defined(WITH_KERBEROS4)
 LIB_DEPENDS+=	krb.2:${PORTSDIR}/security/krb4
 CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4
 .else
 CONFIGURE_ARGS+=--disable-krb4
 .endif
 .elif exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(WITHOUT_KERBEROS4)
 CONFIGURE_ARGS+=--enable-krb4
 .elif !exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4)
 LIB_DEPENDS+=	krb.2:${PORTSDIR}/security/krb4
 CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4
 .else
 CONFIGURE_ARGS+=--disable-krb4
 .endif
 
 .if ${OPENSSLBASE} == /usr
 CONFIGURE_ARGS+=--with-openssl=yes
 .else
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 .endif
 
 SASLAUTHD_RUNPATH?=	/var/run/saslauthd
 .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd
 RUNPATH=	"@comment "
 .endif
 
 CYRUS_USER?=	cyrus
 
 DOCS=		AUTHORS COPYING ChangeLog INSTALL LDAP_SASLAUTHD NEWS README
 
 PLIST_SUB=	PREFIX=${PREFIX} \
 		DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \
 		RUNPATH=${RUNPATH}
 
 SUB_LIST+=	SASLAUTHD_RUNPATH=${SASLAUTHD_RUNPATH}
 
 do-build:
 	@${RM} -f ${WRKSRC}/saslauthd/saslauthd.8
 	cd ${WRKSRC}/include && ${MAKE}
 	cd ${WRKSRC}/sasldb && ${MAKE}
 	cd ${WRKSRC}/saslauthd && ${MAKE}
 	cd ${WRKSRC}/saslauthd && ${MAKE} saslcache
 	cd ${WRKSRC}/saslauthd && ${MAKE} testsaslauthd
 
 post-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/saslcache \
 		${PREFIX}/sbin/saslcache
 	@${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/testsaslauthd \
 		${PREFIX}/sbin/testsaslauthd
 	${GZIP_CMD} ${MAN8PREFIX}/man/cat8/saslauthd.8
 .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "SASLAUTHD_RUNPATH was specified."
 	@${ECHO_MSG} "Make sure to have ${SASLAUTHD_RUNPATH} by yourself."
 	@${ECHO_MSG} ""
 .else
 	${MKDIR} -m 770 ${SASLAUTHD_RUNPATH}
 	${CHOWN} ${CYRUS_USER}:mail ${SASLAUTHD_RUNPATH}
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/saslauthd
 .for file in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} ${DOCSDIR}/saslauthd
 .endfor
 .endif
 	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} \
 		POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/security/cyrus-sasl2-saslauthd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.44
\ No newline at end of property
+1.45
\ No newline at end of property