- Update from 0.6.3 to 0.6.7

- Add stage support

PR:		ports/185822
Submitted by:	Axel Steiner <ast@treibsand.com> (maintainer)

4 files changed, 12 insertions, 20 deletions

diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile
index dfdf56047138..b8be6b03bcdf 100644
--- a/mail/spmfilter/Makefile
+++ b/mail/spmfilter/Makefile
@@ -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 mail filtering framework, written in C
 
 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 <bsd.port.mk>
diff --git a/mail/spmfilter/distinfo b/mail/spmfilter/distinfo
index 38e250ac003b..20230ea7a27b 100644
--- a/mail/spmfilter/distinfo
+++ b/mail/spmfilter/distinfo
@@ -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
diff --git a/mail/spmfilter/files/spmfilter.in b/mail/spmfilter/files/spmfilter.in
index f280bb715129..50d95c829505 100644
--- a/mail/spmfilter/files/spmfilter.in
+++ b/mail/spmfilter/files/spmfilter.in
@@ -21,6 +21,7 @@ name=spmfilter
 rcvar=spmfilter_enable
 
 command=%%PREFIX%%/sbin/spmfilter
+sig_stop=KILL
 
 load_rc_config $name
 
diff --git a/mail/spmfilter/pkg-plist b/mail/spmfilter/pkg-plist
index 77db4470303a..93ef62474be5 100644
--- a/mail/spmfilter/pkg-plist
+++ b/mail/spmfilter/pkg-plist
@@ -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