From a211a2b1ffd36c127256e444f6fd1ef663d33ab8 Mon Sep 17 00:00:00 2001
From: Wesley Shields <wxs@FreeBSD.org>
Date: Mon, 9 Jul 2012 19:24:21 +0000
Subject: Don't check WITH_FOO && !WITHOUT_FOO. [1] Remove gssapi patch that is
 no longer needed. [2]

These both apply to mail/dovecot2 also. I will be working with the
maintainer there to get these committed.

PR:		ports/167824 [1]
		ports/
Submitted by:	Dmitry Afanasiev <KOT@MATPOCKuH.Ru> [1]
		Leon Messner <l.messner@physik.tu-berlin.de> [2]
Approved by:	maintainer timeout
---
 mail/dovecot/Makefile | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'mail')

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 3efae3d59456..cdc4c54a61af 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=	--with-ioloop=kqueue
 
 ## SSL support
 #
-.if defined(WITH_SSL) && !defined(WITHOUT_SSL)
+.if defined(WITH_SSL)
 PROTOCOLS+=		imaps pop3s
 .else
 CONFIGURE_ARGS+=	--without-ssl
@@ -98,7 +98,7 @@ CONFIGURE_ARGS+=	--without-ssl
 
 ## ManageSieve support
 #
-.if defined(WITH_MANAGESIEVE) && !defined(WITHOUT_MANAGESIEVE)
+.if defined(WITH_MANAGESIEVE)
 MANAGESIEVEVERSION!=	${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V PORTVERSION
 PATCH_SITES!=		${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V MASTER_SITES
 PATCHFILES+=		dovecot-${PORTVERSION}-managesieve-${MANAGESIEVEVERSION}.diff.gz
@@ -109,7 +109,7 @@ DOCS+=			README.managesieve
 
 ## GSSAPI support
 #
-.if defined(WITH_GSSAPI) && !defined(WITHOUT_GSSAPI)
+.if defined(WITH_GSSAPI)
 CONFIGURE_ARGS+=	--with-gssapi
 .else
 CONFIGURE_ARGS+=	--without-gssapi
@@ -117,7 +117,7 @@ CONFIGURE_ARGS+=	--without-gssapi
 
 ## VPopMail Support
 #
-.if defined(WITH_VPOPMAIL) && !defined(WITHOUT_VPOPMAIL)
+.if defined(WITH_VPOPMAIL)
 VPOPMAIL=		${LOCALBASE}/vpopmail/bin/vchkpw
 BUILD_DEPENDS+=		${VPOPMAIL}:${PORTSDIR}/mail/vpopmail
 CONFIGURE_ARGS+=	--with-vpopmail
@@ -127,7 +127,7 @@ CONFIGURE_ARGS+=	--without-vpopmail
 
 ## BDB Support
 #
-.if defined(WITH_BDB) && !defined(WITHOUT_BDB)
+.if defined(WITH_BDB)
 USE_BDB=		42+
 CONFIGURE_ARGS+=	--with-db
 CFLAGS+=		-I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR}
@@ -139,7 +139,7 @@ PLIST_SUB+=		BDB="@comment "
 
 ## OpenLDAP Support
 #
-.if defined(WITH_LDAP) && !defined(WITHOUT_LDAP)
+.if defined(WITH_LDAP)
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--with-ldap
 PLIST_SUB+=		LDAP=""
@@ -151,7 +151,7 @@ PLIST_SUB+=		LDAP="@comment "
 
 ## PostgreSQL Support
 #
-.if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL)
+.if defined(WITH_PGSQL)
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-pgsql
 PLIST_SUB+=		SQL=""
@@ -163,7 +163,7 @@ PLIST_SUB+=		SQL="@comment "
 
 ## MySQL Support
 #
-.if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL)
+.if defined(WITH_MYSQL)
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql
 PLIST_SUB+=		SQL=""
@@ -175,7 +175,7 @@ PLIST_SUB+=		SQL="@comment "
 
 ## SQLite Support
 #
-.if defined(WITH_SQLITE) && !defined(WITHOUT_SQLITE)
+.if defined(WITH_SQLITE)
 USE_SQLITE=		3
 CONFIGURE_ARGS+=	--with-sqlite
 PLIST_SUB+=		SQL=""
@@ -194,11 +194,6 @@ post-patch:
 		s!-example\.conf[[:>:]]!.conf!g;\
 		s!^(confdir[[:space:]]+=[[:space:]]+)\$$\(sysconfdir\)!\1${EXAMPLESDIR}!g;\
 		' ${WRKSRC}/*/Makefile.in ${WRKSRC}/Makefile.in
-.if defined(WITH_GSSAPI)
-	@${REINPLACE_CMD} -e '\
-		s!<gssapi/gssapi\.h>!<gssapi.h>!;\
-		' ${WRKSRC}/src/auth/mech-gssapi.c ${WRKSRC}/configure
-.endif
 	@${LN} -f ${WRKSRC}/dovecot-example.conf		${WRKSRC}/dovecot.conf
 	@${LN} -f ${WRKSRC}/doc/dovecot-db-example.conf		${WRKSRC}/doc/dovecot-db.conf
 	@${LN} -f ${WRKSRC}/doc/dovecot-dict-sql-example.conf	${WRKSRC}/doc/dovecot-dict-sql.conf
-- 
cgit v1.2.3