From owner-svn-ports-all@FreeBSD.ORG Sat Jan 18 22:57:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22623690; Sat, 18 Jan 2014 22:57:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0C8C4182C; Sat, 18 Jan 2014 22:57:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IMvcJa083281; Sat, 18 Jan 2014 22:57:38 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IMvcqE083277; Sat, 18 Jan 2014 22:57:38 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201401182257.s0IMvcqE083277@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Sat, 18 Jan 2014 22:57:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340222 - in head/mail/spmfilter: . files 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.17 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, 18 Jan 2014 22:57:39 -0000 Author: danilo Date: Sat Jan 18 22:57:37 2014 New Revision: 340222 URL: http://svnweb.freebsd.org/changeset/ports/340222 QAT: https://qat.redports.org/buildarchive/r340222/ Log: - Update from 0.6.3 to 0.6.7 - Add stage support PR: ports/185822 Submitted by: Axel Steiner (maintainer) Modified: head/mail/spmfilter/Makefile head/mail/spmfilter/distinfo head/mail/spmfilter/files/spmfilter.in (contents, props changed) head/mail/spmfilter/pkg-plist Modified: head/mail/spmfilter/Makefile ============================================================================== --- head/mail/spmfilter/Makefile Sat Jan 18 22:56:42 2014 (r340221) +++ head/mail/spmfilter/Makefile Sat Jan 18 22:57:37 2014 (r340222) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= spmfilter -PORTVERSION= 0.6.3 +PORTVERSION= 0.6.7 CATEGORIES= mail MASTER_SITES= http://www.${PORTNAME}.org/files/ @@ -10,11 +10,10 @@ COMMENT= Spmfilter is a high-performance LICENSE= LGPL3 -BUILD_DEPENDS= libcmime>=0.1:${PORTSDIR}/mail/libcmime \ +BUILD_DEPENDS= libcmime>=0.1.10:${PORTSDIR}/mail/libcmime \ libesmtp>=1.0:${PORTSDIR}/mail/libesmtp -RUN_DEPENDS= libcmime>=0.1:${PORTSDIR}/mail/libcmime \ - libesmtp>=1.0:${PORTSDIR}/mail/libesmtp +RUN_DEPENDS:= ${BUILD_DEPENDS} SMFUSER?= nobody SMFGROUP?= mail @@ -34,8 +33,6 @@ DB4_DESC= DB4 backend # Default requirement for spmfilter rc script _REQUIRE= LOGIN -NO_STAGE= yes - SUB_FILES= pkg-install pkg-deinstall SUB_LIST+= SMFUSER=${SMFUSER} \ @@ -67,13 +64,13 @@ CMAKE_ARGS+= -DWITHOUT_LDAP=TRUE .endif .if ${PORT_OPTIONS:MMYSQL} -LIB_DEPENDS+= zdb:${PORTSDIR}/databases/libzdb +LIB_DEPENDS+= libzdb.so:${PORTSDIR}/databases/libzdb USE_MYSQL= yes _REQUIRE+= mysql .endif .if ${PORT_OPTIONS:MPGSQL} -LIB_DEPENDS+= zdb:${PORTSDIR}/databases/libzdb +LIB_DEPENDS+= libzdb.so:${PORTSDIR}/databases/libzdb USE_PGSQL= yes _REQUIRE+= postgresql .endif @@ -82,10 +79,6 @@ _REQUIRE+= postgresql CMAKE_ARGS+= -DWITHOUT_ZDB=TRUE .endif -MAN1= ${PORTNAME}.1 -MAN5= ${PORTNAME}.conf.5 -MANCOMPRESSED= yes - SUB_LIST+= REQUIRE="${_REQUIRE}" post-patch: @@ -96,16 +89,11 @@ post-patch: @${REINPLACE_CMD} -E -e 's|\$${CMAKE_INSTALL_LIBDIR}(/pkgconfig)|$${CMAKE_INSTALL_PREFIX}/libdata\1|' \ -e 's|(COMMON_LIBS )db|\1${BDB_LIB_NAME}|' \ ${WRKSRC}/src/CMakeLists.txt - @${REINPLACE_CMD} -e 's|clamav;spamassassin||' \ - ${WRKSRC}/spmfilter.conf.sample pre-install: @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL post-install: - @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${PREFIX}/etc/ - @if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \ - ${CP} -p ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf ; \ - fi + @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/ .include Modified: head/mail/spmfilter/distinfo ============================================================================== --- head/mail/spmfilter/distinfo Sat Jan 18 22:56:42 2014 (r340221) +++ head/mail/spmfilter/distinfo Sat Jan 18 22:57:37 2014 (r340222) @@ -1,2 +1,2 @@ -SHA256 (spmfilter-0.6.3.tar.gz) = 59b241546aed1ae230b89631a96b7f5a2b26869d5ee7fb8d398736d407287056 -SIZE (spmfilter-0.6.3.tar.gz) = 889547 +SHA256 (spmfilter-0.6.7.tar.gz) = 8b675a1d36e84d360985aad69330071a3fcf414a6e7a4066320b1c1d09156776 +SIZE (spmfilter-0.6.7.tar.gz) = 875995 Modified: head/mail/spmfilter/files/spmfilter.in ============================================================================== --- head/mail/spmfilter/files/spmfilter.in Sat Jan 18 22:56:42 2014 (r340221) +++ head/mail/spmfilter/files/spmfilter.in Sat Jan 18 22:57:37 2014 (r340222) @@ -21,6 +21,7 @@ name=spmfilter rcvar=spmfilter_enable command=%%PREFIX%%/sbin/spmfilter +sig_stop=KILL load_rc_config $name Modified: head/mail/spmfilter/pkg-plist ============================================================================== --- head/mail/spmfilter/pkg-plist Sat Jan 18 22:56:42 2014 (r340221) +++ head/mail/spmfilter/pkg-plist Sat Jan 18 22:57:37 2014 (r340222) @@ -26,8 +26,11 @@ lib/spmfilter/libsmtpd.so.0.6 lib/spmfilter/libsmtpd.so.%%LIB_VERSION%% libdata/pkgconfig/spmfilter.pc sbin/spmfilter +man/man1/spmfilter.1.gz +man/man5/spmfilter.conf.5.gz @unexec if cmp -s %D/etc/spmfilter.conf.sample %D/etc/spmfilter.conf; then rm -f %D/etc/spmfilter.conf; fi etc/spmfilter.conf.sample +@exec if [ ! -f %D/etc/spmfilter.conf ] ; then cp -p %D/%F %B/spmfilter.conf; fi @dirrmtry libdata/pkgconfig @dirrm include/spmfilter/smf @dirrm include/spmfilter