From owner-svn-ports-head@freebsd.org Tue Oct 27 05:04:56 2015 Return-Path: Delivered-To: svn-ports-head@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 13078A06F6A; Tue, 27 Oct 2015 05:04:56 +0000 (UTC) (envelope-from koobs@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 E048C1C61; Tue, 27 Oct 2015 05:04:55 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9R54sBC056442; Tue, 27 Oct 2015 05:04:54 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9R54sIx056440; Tue, 27 Oct 2015 05:04:54 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510270504.t9R54sIx056440@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Tue, 27 Oct 2015 05:04:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400214 - head/mail/opendmarc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Oct 2015 05:04:56 -0000 Author: koobs Date: Tue Oct 27 05:04:54 2015 New Revision: 400214 URL: https://svnweb.freebsd.org/changeset/ports/400214 Log: mail/opendmarc: Add libspf2 as a run-time (library) dependency libsfp2 is a build and run-time dependency for opendmarc. Currently libspf2 is declared a BUILD_DEPENDS, which results in the libspf2 package being removed by portmaster or pkg as an unecessary package when using -s argument or autoremove command respectively. This change correctly declares libspf2 as a LIB_DEPENDS, resulting in both build and run-time dependency registration. While I'm here: - Convert MSPF conditional to an option helper - Group and sort USE{S} entries - Whitespace align OPTIONS - Tweak SPF_DESC to match ./configure output for the option - Sort pkg-plist PR: 204050 Submitted by: Douglas Approved by: portmgr (blanket) MFH: 2015Q4 Modified: head/mail/opendmarc/Makefile head/mail/opendmarc/pkg-plist Modified: head/mail/opendmarc/Makefile ============================================================================== --- head/mail/opendmarc/Makefile Tue Oct 27 02:39:38 2015 (r400213) +++ head/mail/opendmarc/Makefile Tue Oct 27 05:04:54 2015 (r400214) @@ -3,6 +3,7 @@ PORTNAME= opendmarc PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= mail security MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/Previous%20Releases @@ -18,34 +19,32 @@ LICENSE_GROUPS_SENDMAIL= FSF OSI LICENSE_NAME_SENDMAIL= Sendmail Open Source License LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -.if !exists( /usr/include/libmilter/mfapi.h ) -BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail -CFLAGS+= -I${LOCALBASE}/include -.endif - USES= libtool shebangfix -SHEBANG_FILES= reports/opendmarc-expire.in \ - reports/opendmarc-import.in \ - reports/opendmarc-params.in \ - reports/opendmarc-reports.in - -USE_RC_SUBR= opendmarc USE_LDCONFIG= yes +USE_RC_SUBR= opendmarc -GNU_CONFIGURE= yes - -PORTDOCS= * +GNU_CONFIGURE= yes -OPTIONS_DEFINE= SPF +OPTIONS_DEFINE= SPF OPTIONS_DEFAULT= SPF -SPF_DESC= Include direct SPF checking support -SPF_BUILD_DEPENDS+= libspf2>=1.2.5:${PORTSDIR}/mail/libspf2 +SPF_DESC= Enable support for SPF record checking + +SPF_LIB_DEPENDS= libspf2.so:${PORTSDIR}/mail/libspf2 +SPF_CONFIGURE_ON= --with-spf \ + --with-spf2-include=${LOCALBASE}/include/spf2 \ + --with-spf2-lib=${LOCALBASE}/lib + +SHEBANG_FILES= reports/opendmarc-expire.in \ + reports/opendmarc-import.in \ + reports/opendmarc-params.in \ + reports/opendmarc-reports.in -.include +PORTDOCS= * -.if ${PORT_OPTIONS:MSPF} -CONFIGURE_ARGS+= --with-spf --with-spf2-include=${LOCALBASE}/include/spf2 --with-spf2-lib=${LOCALBASE}/lib +.if !exists( /usr/include/libmilter/mfapi.h ) +BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail +CFLAGS+= -I${LOCALBASE}/include .endif post-install: Modified: head/mail/opendmarc/pkg-plist ============================================================================== --- head/mail/opendmarc/pkg-plist Tue Oct 27 02:39:38 2015 (r400213) +++ head/mail/opendmarc/pkg-plist Tue Oct 27 05:04:54 2015 (r400214) @@ -1,17 +1,17 @@ +etc/mail/opendmarc.conf.sample +include/opendmarc/dmarc.h +lib/libopendmarc.a +lib/libopendmarc.so +lib/libopendmarc.so.2 +lib/libopendmarc.so.2.0.1 man/man5/opendmarc.conf.5.gz man/man8/opendmarc-check.8.gz man/man8/opendmarc-expire.8.gz man/man8/opendmarc-import.8.gz +man/man8/opendmarc-importstats.8.gz man/man8/opendmarc-params.8.gz man/man8/opendmarc-reports.8.gz man/man8/opendmarc.8.gz -man/man8/opendmarc-importstats.8.gz -etc/mail/opendmarc.conf.sample -include/opendmarc/dmarc.h -lib/libopendmarc.a -lib/libopendmarc.so.2 -lib/libopendmarc.so.2.0.1 -lib/libopendmarc.so sbin/opendmarc sbin/opendmarc-check sbin/opendmarc-expire