From owner-svn-ports-all@freebsd.org Sat Feb 13 10:32:17 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3252FAA65ED; Sat, 13 Feb 2016 10:32:17 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F2DE61D2D; Sat, 13 Feb 2016 10:32:16 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1DAWFKK069508; Sat, 13 Feb 2016 10:32:15 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1DAWFFK069507; Sat, 13 Feb 2016 10:32:15 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201602131032.u1DAWFFK069507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Sat, 13 Feb 2016 10:32:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408781 - head/mail/sendmail X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2016 10:32:17 -0000 Author: dinoex Date: Sat Feb 13 10:32:15 2016 New Revision: 408781 URL: https://svnweb.freebsd.org/changeset/ports/408781 Log: - use LIB_DEPENDS - remove option WITHOUT_MILTER Modified: head/mail/sendmail/bsd.milter.mk Modified: head/mail/sendmail/bsd.milter.mk ============================================================================== --- head/mail/sendmail/bsd.milter.mk Sat Feb 13 10:06:20 2016 (r408780) +++ head/mail/sendmail/bsd.milter.mk Sat Feb 13 10:32:15 2016 (r408781) @@ -14,8 +14,8 @@ # WITH_SENDMAIL_BASE=yes - Use milter in the base # WITH_SENDMAIL_PORT=yes - Use milter from ports # -# If unspecified, check for the lib exits in the base system, -# but give an installed port preference over it. +# If unspecified, check for the lib exist in the base system, +# but gives an installed port preference over it. # # # Overrideable defaults: @@ -56,8 +56,7 @@ WITH_SENDMAIL_BASE=yes .if defined(WITH_SENDMAIL_STATIC_MILTER) BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT} .else -BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilter.so.${MILTER_SOVER}:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT} -RUN_DEPENDS+= ${LOCALBASE}/lib/libmilter.so.${MILTER_SOVER}:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT} +LIB_DEPENDS+= libmilter.so.${MILTER_SOVER}:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT} .endif SENDMAIL_MILTER_PORT?= libmilter @@ -75,14 +74,6 @@ CFLAGS=${MILTERINC} .endif .endif -.if defined(WITHOUT_MILTER) -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} You must unset variable SENDMAIL_WITHOUT_MILTER, - @${ECHO_MSG} and rebuild sendmail in the ports - @${FALSE} -.endif - .endif .if defined(WITH_SENDMAIL_BASE)