From lewiz@fajita.org  Thu Nov  4 10:44:08 2004
Return-Path: <lewiz@fajita.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1516F16A4DA
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Nov 2004 10:44:08 +0000 (GMT)
Received: from infidel.fajita.org (62-249-210-170.adsl.entanet.co.uk [62.249.210.170])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C729F43D53
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Nov 2004 10:44:05 +0000 (GMT)
	(envelope-from lewiz@fajita.org)
Received: from black.fajita.org (black.fajita.org [192.168.0.13])
	by infidel.fajita.org (8.13.1/8.13.1) with ESMTP id iA4AiKSt020537
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 4 Nov 2004 10:44:20 GMT
	(envelope-from lewiz@fajita.org)
Received: (from lewiz@localhost)
	by black.fajita.org (8.13.1/8.13.1/Submit) id iA4Ajaku000999;
	Thu, 4 Nov 2004 10:45:36 GMT
	(envelope-from lewiz)
Message-Id: <200411041045.iA4Ajaku000999@black.fajita.org>
Date: Thu, 4 Nov 2004 10:45:36 GMT
From: Lewis Thompson <purple@lewiz.net>
Reply-To: Lewis Thompson <purple@lewiz.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [ PORT FIX ] mail/spamass-milter (fix failure with WITH_LDAP)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         73519
>Category:       ports
>Synopsis:       [ PORT FIX ] mail/spamass-milter (fix failure with WITH_LDAP)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 04 10:50:14 GMT 2004
>Closed-Date:    Thu Nov 04 18:04:44 GMT 2004
>Last-Modified:  Thu Nov 04 18:04:44 GMT 2004
>Originator:     Lewis Thompson
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD black.fajita.org 5.3-RELEASE FreeBSD 5.3-RELEASE #7: Mon Oct 25 17:11:33 BST 2004 root@black.fajita.org:/usr/src/sys/i386/compile/BLACK i386


	
>Description:
	mail/spamass-milter fails to build if libmilter has been linked with libldap.
This is a nasty patch to sed s/-lmilter/-lmilter -lldap/g in the spamass-milter configure
script.
>How-To-Repeat:
	
>Fix:
--- Makefile.orig	Thu Nov  4 10:11:55 2004
+++ Makefile	Thu Nov  4 10:37:58 2004
@@ -31,6 +31,14 @@
 
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/lib/libldap.so)
+WITH_LDAP=yes
+.endif
+
+.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)
+USE_OPENLDAP=		yes
+.endif
+
 .if !defined(WITH_SENDMAIL_BASE) && \
     !defined(WITH_SENDMAIL_PORT) && \
     !exists(${LOCALBASE}/lib/libmilter.a)
@@ -57,6 +65,8 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
+USE_REINPLACE=	yes
+
 USE_RC_SUBR=	yes
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
@@ -67,6 +77,9 @@
 		${FILESDIR}/activation.txt > ${WRKDIR}/activation.txt
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/spamass-milter.sh > ${WRKDIR}/spamass-milter.sh
+.if defined(WITH_LDAP)
+	@${REINPLACE_CMD} -e 's|-lmilter|-lmilter -lldap|g' ${WRKSRC}/configure
+.endif
 
 post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/spamass-milter.sh ${PREFIX}/etc/rc.d/spamass-milter.sh
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Thu Nov 4 18:04:37 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=73519 
>Unformatted:
