Date: Wed, 23 Oct 2013 12:01:51 +0200 (CEST) From: Axel Steiner <ast@treibsand.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/183232: [MAINTAINER UPDATE] mail/spmfilter: update to 0.6.3 Message-ID: <20131023100151.7E4481ABD46@santiago.treibsand.com> Resent-Message-ID: <201310231010.r9NAA0pG093419@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183232 >Category: ports >Synopsis: [MAINTAINER UPDATE] mail/spmfilter: update to 0.6.3 >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: Wed Oct 23 10:10:00 UTC 2013 >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.3 - changed port dependencies - added pkg-install.in and pkg-deinstall.in files - changed master site >How-To-Repeat: >Fix: --- spmfilter_0.6.3.patch begins here --- diff -ruN spmfilter_0.4.2/Makefile spmfilter/Makefile --- spmfilter_0.4.2/Makefile 2013-10-22 16:55:32.000000000 +0200 +++ spmfilter/Makefile 2013-10-23 11:54:57.000000000 +0200 @@ -1,26 +1,28 @@ # $FreeBSD: mail/spmfilter/Makefile 327742 2013-09-20 19:59:12Z bapt $ PORTNAME= spmfilter -PORTVERSION= 0.4.2 -PORTREVISION= 5 +PORTVERSION= 0.6.3 CATEGORIES= mail -MASTER_SITES= http://www.${PORTNAME}.org/attachments/download/60/ +MASTER_SITES= http://www.${PORTNAME}.org/files/ MAINTAINER= ast@treibsand.com COMMENT= Spmfilter is a high-performance mail filtering framework, written in C LICENSE= LGPL3 -BUILD_DEPENDS= gmime-24>=2.4:${PORTSDIR}/mail/gmime24 \ - libesmtp>=1.0:${PORTSDIR}/mail/libesmtp \ - glib>=2.14:${PORTSDIR}/devel/glib20 - -RUN_DEPENDS= gmime-24>=2.4:${PORTSDIR}/mail/gmime24 \ - libesmtp>=1.0:${PORTSDIR}/mail/libesmtp \ - glib>=2.14:${PORTSDIR}/devel/glib20 +BUILD_DEPENDS= libcmime>=0.1:${PORTSDIR}/mail/libcmime \ + libesmtp>=1.0:${PORTSDIR}/mail/libesmtp + +RUN_DEPENDS= libcmime>=0.1:${PORTSDIR}/mail/libcmime \ + libesmtp>=1.0:${PORTSDIR}/mail/libesmtp + +SMFUSER?= nobody +SMFGROUP?= mail +SMFDIR?= /var/spool/spmfilter USES= cmake pkgconfig -CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \ +CMAKE_ARGS+= --no-warn-unused-cli \ + -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \ -DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib" USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_RC_SUBR= ${PORTNAME} @@ -33,6 +35,15 @@ _REQUIRE= LOGIN NO_STAGE= yes + +SUB_FILES= pkg-install pkg-deinstall + +SUB_LIST+= SMFUSER=${SMFUSER} \ + SMFGROUP=${SMFGROUP} \ + SMFDIR=${SMFDIR} \ + +PLIST_SUB= LIB_VERSION=${PORTVERSION} + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDB4} @@ -51,7 +62,6 @@ .if ${PORT_OPTIONS:MOPENLDAP_VER} WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif -_REQUIRE+= slapd .else CMAKE_ARGS+= -DWITHOUT_LDAP=TRUE .endif @@ -60,31 +70,37 @@ LIB_DEPENDS+= zdb:${PORTSDIR}/databases/libzdb USE_MYSQL= yes _REQUIRE+= mysql -.else -CMAKE_ARGS+= -DWITHOUT_ZDB=TRUE .endif .if ${PORT_OPTIONS:MPGSQL} +LIB_DEPENDS+= zdb:${PORTSDIR}/databases/libzdb USE_PGSQL= yes _REQUIRE+= postgresql .endif +.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL} +CMAKE_ARGS+= -DWITHOUT_ZDB=TRUE +.endif + MAN1= ${PORTNAME}.1 MAN5= ${PORTNAME}.conf.5 MANCOMPRESSED= yes SUB_LIST+= REQUIRE="${_REQUIRE}" -PLIST_SUB= LIB_VERSION=${PORTVERSION} - post-patch: @${REINPLACE_CMD} -e 's|share/man|man|' \ ${WRKSRC}/cmake/Modules/SMFMacros.cmake @${REINPLACE_CMD} -E -e 's|(HAVE_DB4 )db|\1${BDB_LIB_NAME}|' \ ${WRKSRC}/cmake/Modules/FindDB4.cmake - @${REINPLACE_CMD} -E -e 's|\$${LIBDIR}(/pkgconfig)|$${CMAKE_INSTALL_PREFIX}/libdata\1|' \ + @${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/ @@ -92,4 +108,5 @@ ${CP} -p ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf ; \ fi + .include <bsd.port.mk> diff -ruN spmfilter_0.4.2/distinfo spmfilter/distinfo --- spmfilter_0.4.2/distinfo 2013-10-22 16:55:32.000000000 +0200 +++ spmfilter/distinfo 2013-10-22 16:14:25.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (spmfilter-0.4.2.tar.gz) = 1f9fdcbbac3f1301ab0bf2803bb699fa2e9a8075d78d158d96e2d066c3124d02 -SIZE (spmfilter-0.4.2.tar.gz) = 54418 +SHA256 (spmfilter-0.6.3.tar.gz) = 59b241546aed1ae230b89631a96b7f5a2b26869d5ee7fb8d398736d407287056 +SIZE (spmfilter-0.6.3.tar.gz) = 889547 diff -ruN spmfilter_0.4.2/files/pkg-deinstall.in spmfilter/files/pkg-deinstall.in --- spmfilter_0.4.2/files/pkg-deinstall.in 1970-01-01 01:00:00.000000000 +0100 +++ spmfilter/files/pkg-deinstall.in 2013-09-19 11:30:46.000000000 +0200 @@ -0,0 +1,14 @@ +#!/bin/sh +# +# +# + +USER=%%SMFUSER%% +GROUP=%%SMFGROUP%% +DIR=%%SMFDIR%% + +if [ "$2" = "POST-DEINSTALL" ]; then + if [ -e ${DIR} ]; then + echo "You should manually remove the \"${DIR}\" directory." + fi +fi diff -ruN spmfilter_0.4.2/files/pkg-install.in spmfilter/files/pkg-install.in --- spmfilter_0.4.2/files/pkg-install.in 1970-01-01 01:00:00.000000000 +0100 +++ spmfilter/files/pkg-install.in 2013-10-10 10:56:05.000000000 +0200 @@ -0,0 +1,10 @@ +#!/bin/sh + +USER=%%SMFUSER%% +GROUP=%%SMFGROUP%% +DIR=%%SMFDIR%% + +if [ "$2" = "PRE-INSTALL" ]; then + /usr/bin/install -o ${USER} -g ${GROUP} -m 755 -d ${DIR} + echo "Created \"${DIR}\" directory." +fi diff -ruN spmfilter_0.4.2/pkg-plist spmfilter/pkg-plist --- spmfilter_0.4.2/pkg-plist 2013-10-22 16:55:32.000000000 +0200 +++ spmfilter/pkg-plist 2013-10-22 16:42:48.000000000 +0200 @@ -1,19 +1,30 @@ include/spmfilter/smf/smf_core.h +include/spmfilter/smf/smf_dict.h +include/spmfilter/smf/smf_email_address.h +include/spmfilter/smf/smf_envelope.h +include/spmfilter/smf/smf_header.h +include/spmfilter/smf/smf_list.h include/spmfilter/smf/smf_lookup.h include/spmfilter/smf/smf_message.h -include/spmfilter/smf/smf_mime.h +include/spmfilter/smf/smf_modules.h +include/spmfilter/smf/smf_nexthop.h +include/spmfilter/smf/smf_part.h include/spmfilter/smf/smf_session.h include/spmfilter/smf/smf_settings.h +include/spmfilter/smf/smf_smtp.h include/spmfilter/smf/smf_trace.h include/spmfilter/spmfilter.h include/spmfilter/spmfilter_config.h -libdata/pkgconfig/spmfilter.pc lib/spmfilter/libpipe.so +lib/spmfilter/libpipe.so.0.6 lib/spmfilter/libpipe.so.%%LIB_VERSION%% lib/spmfilter/libsmf.so +lib/spmfilter/libsmf.so.0.6 lib/spmfilter/libsmf.so.%%LIB_VERSION%% lib/spmfilter/libsmtpd.so +lib/spmfilter/libsmtpd.so.0.6 lib/spmfilter/libsmtpd.so.%%LIB_VERSION%% +libdata/pkgconfig/spmfilter.pc sbin/spmfilter @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 --- spmfilter_0.6.3.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?20131023100151.7E4481ABD46>