Bug 185822

Summary: [MANTAINER UPDATE] mail/spmfilter: update to 0.6.7
Product: Ports & Packages Reporter: Axel Steiner <ast>
Component: Individual Port(s)Assignee: Danilo Egea Gondolfo <danilo>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
spmfilter_0.6.7.patch none

Description Axel Steiner 2014-01-16 13:40:00 UTC 
- update port to version 0.6.7
- added stage support
- fixed missing man pages in pkg-plist
- added stop signal in rc script
Comment 1 Danilo Egea Gondolfo freebsd_committer freebsd_triage 2014-01-16 20:42:44 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->danilo

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-01-18 22:57:46 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"
Comment 3 Danilo Egea Gondolfo freebsd_committer freebsd_triage 2014-01-18 22:57:56 UTC 
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!