ports/163760: [PATCH] mail/mimedefang OPTIONS Broken

[John Marshall]

>Number:         163760
>Category:       ports
>Synopsis:       [PATCH] mail/mimedefang OPTIONS Broken
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 02 02:30:14 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     John Marshall
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
Riverwillow Pty Ltd
>Environment:
System: FreeBSD rwpc15 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Aug 13 07:41:35 AEST 2011 root at rwpc13:/build/obj/build/src/sys/RWPC13 i386


	
>Description:

The port's Makfile was updated in 2.72_1 to include a new CLAMAV knob.
The CLAMAV option processing precedes inclusion of bsd.pre.mk, so the
option processing doesn't work.  This forces a dependency on CLAMAV
irrespective of the knob setting.

>How-To-Repeat:

Move the CLAMAV processing to the proper place in the Makefile.

>Fix:

Patch attached.

--- mimedefang_2.72_1.diff begins here ---
--- Makefile.orig	2011-12-29 01:26:17.000000000 +1100
+++ Makefile	2012-01-02 12:57:27.000000000 +1100
@@ -42,15 +42,6 @@
 			--with-ipheader \
 			--prefix=${PREFIX}
 
-.if defined (MIMEDEFANG_DISABLE_CLAMAV) || defined(WITHOUT_CLAMAV)
-CONFIGURE_ARGS+=	--disable-antivirus \
-			--disable-clamav \
-			--disable-clamd
-.else
-BUILD_DEPENDS+=	clamscan:${PORTSDIR}/security/clamav
-RUN_DEPENDS+=	clamscan:${PORTSDIR}/security/clamav
-.endif
-
 MAN1=	mimedefang-util.1
 MAN5=	mimedefang-filter.5
 MAN7=	mimedefang-notify.7 mimedefang-protocol.7
@@ -71,6 +62,15 @@
 CONFIGURE_ARGS+=	--with-milterinc=${LOCALBASE}/include --with-milterlib=${LOCALBASE}/lib
 .endif
 
+.if defined (MIMEDEFANG_DISABLE_CLAMAV) || defined(WITHOUT_CLAMAV)
+CONFIGURE_ARGS+=	--disable-antivirus \
+			--disable-clamav \
+			--disable-clamd
+.else
+BUILD_DEPENDS+=	clamscan:${PORTSDIR}/security/clamav
+RUN_DEPENDS+=	clamscan:${PORTSDIR}/security/clamav
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/fgrep -e/d' ${WRKSRC}/configure
 
--- mimedefang_2.72_1.diff ends here ---


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