Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Jan 2014 14:35:23 +0100 (CET)
From:      Axel Steiner <ast@treibsand.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/185822: [MANTAINER UPDATE] mail/spmfilter: update to 0.6.7
Message-ID:  <20140116133523.284A91AC4EE@santiago.treibsand.com>
Resent-Message-ID: <201401161340.s0GDe0rA024236@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         185822
>Category:       ports
>Synopsis:       [MANTAINER UPDATE] mail/spmfilter: update to 0.6.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 16 13:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Axel Steiner
>Release:        FreeBSD 9.0-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD santiago.treibsand.com 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 02:52:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
- update port to version 0.6.7
- added stage support
- fixed missing man pages in pkg-plist
- added stop signal in rc script
>How-To-Repeat:
	
>Fix:

	

--- spmfilter_0.6.7.patch begins here ---
diff -ruN spmfilter_0.6.3/Makefile spmfilter/Makefile
--- spmfilter_0.6.3/Makefile	2014-01-14 10:48:38.000000000 +0100
+++ spmfilter/Makefile	2014-01-16 11:56:08.000000000 +0100
@@ -1,7 +1,7 @@
 # $FreeBSD: mail/spmfilter/Makefile 339433 2014-01-11 16:12:42Z tabthorpe $
 
 PORTNAME=	spmfilter
-PORTVERSION=	0.6.3
+PORTVERSION=	0.6.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.${PORTNAME}.org/files/
 
@@ -10,10 +10,10 @@
 
 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 \
+RUN_DEPENDS=	libcmime>=0.1.10:${PORTSDIR}/mail/libcmime \
 		libesmtp>=1.0:${PORTSDIR}/mail/libesmtp
 
 SMFUSER?=	nobody
@@ -34,8 +34,6 @@
 # Default requirement for spmfilter rc script
 _REQUIRE=	LOGIN
 
-NO_STAGE=	yes
-
 SUB_FILES=	pkg-install pkg-deinstall
 
 SUB_LIST+=	SMFUSER=${SMFUSER} \
@@ -96,16 +94,11 @@
 	@${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 -ruN spmfilter_0.6.3/distinfo spmfilter/distinfo
--- spmfilter_0.6.3/distinfo	2014-01-14 10:48:38.000000000 +0100
+++ spmfilter/distinfo	2014-01-16 09:59:55.000000000 +0100
@@ -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 -ruN spmfilter_0.6.3/files/spmfilter.in spmfilter/files/spmfilter.in
--- spmfilter_0.6.3/files/spmfilter.in	2014-01-14 10:48:38.000000000 +0100
+++ spmfilter/files/spmfilter.in	2014-01-16 14:19:11.000000000 +0100
@@ -21,6 +21,7 @@
 rcvar=spmfilter_enable
 
 command=%%PREFIX%%/sbin/spmfilter
+sig_stop=KILL
 
 load_rc_config $name
 
diff -ruN spmfilter_0.6.3/pkg-plist spmfilter/pkg-plist
--- spmfilter_0.6.3/pkg-plist	2014-01-14 10:48:38.000000000 +0100
+++ spmfilter/pkg-plist	2014-01-15 13:03:27.000000000 +0100
@@ -26,8 +26,11 @@
 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
--- spmfilter_0.6.7.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140116133523.284A91AC4EE>