[Midnightbsd-cvs] mports [16841] trunk/mail/sendmail/bsd.milter.mk: update milter handling.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 6 16:01:22 EDT 2014


Revision: 16841
          http://svnweb.midnightbsd.org/mports/?rev=16841
Author:   laffer1
Date:     2014-09-06 16:01:22 -0400 (Sat, 06 Sep 2014)
Log Message:
-----------
update milter handling.

Modified Paths:
--------------
    trunk/mail/sendmail/bsd.milter.mk

Modified: trunk/mail/sendmail/bsd.milter.mk
===================================================================
--- trunk/mail/sendmail/bsd.milter.mk	2014-09-06 20:00:39 UTC (rev 16840)
+++ trunk/mail/sendmail/bsd.milter.mk	2014-09-06 20:01:22 UTC (rev 16841)
@@ -62,11 +62,11 @@
 .endif
 
 SENDMAIL_MILTER_PORT?=	sendmail
-MILTER_SOVER?=	4
+MILTER_SOVER?=	6
 MILTERBASE?=	${LOCALBASE}
 MILTERINC=	-I${MILTERBASE}/include
 MILTERRPATH=	${MILTERBASE}/lib
-MILTERLIB=	-L${MILTERBASE}/lib -rpath=${MILTERRPATH}
+MILTERLIB=	-L${MILTERBASE}/lib -Wl,-rpath,${MILTERRPATH}
 
 .if !defined(WITHOUT_MILTER_CFLAGS)
 .if defined(CFLAGS)
@@ -76,8 +76,7 @@
 .endif
 .endif
 
-
-.if defined(SENDMAIL_WITHOUT_MILTER)
+.if defined(WITHOUT_MILTER)
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} You must unset variable SENDMAIL_WITHOUT_MILTER,
@@ -90,7 +89,7 @@
 .if defined(WITH_SENDMAIL_BASE)
 MILTERBASE?=	/usr
 MILTERRPATH=	${DESTDIR}/usr/lib:${LOCALBASE}/lib
-MILTERLIB=	-rpath=${MILTERRPATH}
+MILTERLIB=	-Wl,-rpath,${MILTERRPATH}
 .endif
 
 .if !defined(WITHOUT_MILTER_LDFLAGS)



More information about the Midnightbsd-cvs mailing list