From ast@treibsand.com  Thu Jan 16 13:37:31 2014
Return-Path: <ast@treibsand.com>
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 098F8ABC
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Jan 2014 13:37:31 +0000 (UTC)
Received: from mail.treibsand.com (mail.treibsand.com [IPv6:2001:608:c00:5::25])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 8D47F1D67
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Jan 2014 13:37:30 +0000 (UTC)
Received: from santiago.treibsand.com (santiago.treibsand.com [194.97.149.218])
	(Authenticated sender: relay)
	by mail.treibsand.com (Postfix) with ESMTPA id 5751B1CE936
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Jan 2014 14:35:23 +0100 (CET)
Received: by santiago.treibsand.com (Postfix, from userid 1001)
	id 284A91AC4EE; Thu, 16 Jan 2014 14:35:23 +0100 (CET)
Message-Id: <20140116133523.284A91AC4EE@santiago.treibsand.com>
Date: Thu, 16 Jan 2014 14:35:23 +0100 (CET)
From: Axel Steiner <ast@treibsand.com>
Reply-To: Axel Steiner <ast@treibsand.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MANTAINER UPDATE] mail/spmfilter: update to 0.6.7
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         185822
>Category:       ports
>Synopsis:       [MANTAINER UPDATE] mail/spmfilter: update to 0.6.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    danilo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 16 13:40:00 UTC 2014
>Closed-Date:    Sat Jan 18 22:57:57 UTC 2014
>Last-Modified:  Sat Jan 18 23:00:00 UTC 2014
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->danilo 
Responsible-Changed-By: danilo 
Responsible-Changed-When: Thu Jan 16 20:42:44 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185822 
State-Changed-From-To: open->closed 
State-Changed-By: danilo 
State-Changed-When: Sat Jan 18 22:57:56 UTC 2014 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185822 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185822: commit references a PR
Date: Sat, 18 Jan 2014 22:57:46 +0000 (UTC)

 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 <ast@treibsand.com> (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 <bsd.port.mk>
 
 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
