ports/111565: [patch] mail/postfix-current: remove deprecated feaute

[Gabor Kovesdan]

>Number:         111565
>Category:       ports
>Synopsis:       [patch] mail/postfix-current: remove deprecated feaute
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 14 13:10:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Gabor Kovesdan
>Release:        FreeBSD 6.2-RELEASE amd64
>Organization:
n/a
>Environment:
System: FreeBSD server.t-hosting.hu 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Feb 2 11:51:40 CET 2007 gabor at server.t-hosting.hu:/usr/src/sys/amd64/compile/FREEBSD amd64

>Description:

The security/cyrus-sasl port is expired and should be remove but it is waiting
for the dependencies to drop support so that we can remove it. I have sent this
PR with the patch because the maintainer ignored my HEADSUP mail, in which I
asked the affected maintainers to modify their ports manually.

>How-To-Repeat:
>Fix:

--- mail-postfix-current.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/mail/postfix-current/Makefile,v
retrieving revision 1.205
diff -u -r1.205 Makefile
--- Makefile	3 Apr 2007 13:55:28 -0000	1.205
+++ Makefile	14 Apr 2007 12:57:39 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 DISTVERSION=	2.5-20070402
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@@ -30,7 +31,6 @@
 
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions" 			on \
-		SASL		"Cyrus SASLv1 (Simple Auth. and Sec. Layer)"		off \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		off \
 		DOVECOT		"Dovecot SASL authentication method"			off \
 		SASLKRB		"If your SASL req. Kerberos select this option"		off \
@@ -91,17 +91,8 @@
 POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
-.if defined(WITH_SASL)
-.if defined(WITH_SASL2) || defined(WITH_DOVECOT)
-BROKEN=			Select only one SASL authentication method
-.endif
-LIB_DEPENDS+=		sasl.8:${PORTSDIR}/security/cyrus-sasl
-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl1
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl -lpam -lcrypt
-.endif
-
 .if defined(WITH_SASL2)
-.if defined(WITH_SASL) || defined(WITH_DOVECOT)
+.if defined(WITH_DOVECOT)
 BROKEN=			Select only one SASL authentication method
 .endif
 LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
@@ -110,7 +101,7 @@
 .endif
 
 .if defined(WITH_DOVECOT)
-.if defined(WITH_SASL) || defined(WITH_SASL2)
+.if defined(WITH_SASL2)
 BROKEN=			Select only one SASL authentication method
 .endif
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
@@ -204,17 +195,6 @@
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 
 pre-patch:
-.if defined(WITH_SASL) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl.a)
-	@if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | ${GREP} -wq "mysql_init"; then \
-		${ECHO_MSG}; \
-		${ECHO_MSG} "Your SASL library it's compiled with MYSQL"; \
-		${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \
-		${ECHO_MSG} "select MYSQL OPTION in config menu."; \
-		${ECHO_MSG} "# make clean config"; \
-		${ECHO_MSG}; \
-		sleep 5; \
-	fi
-.endif
 .if defined(WITH_SASL2) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl2.a)
 	@if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \
 		${ECHO_MSG}; \
--- mail-postfix-current.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: