Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Jul 2014 21:03:08 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r361290 - head/mail/mimedefang
Message-ID:  <201407082103.s68L38jh093537@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Tue Jul  8 21:03:07 2014
New Revision: 361290
URL: http://svnweb.freebsd.org/changeset/ports/361290
QAT: https://qat.redports.org/buildarchive/r361290/

Log:
  - Update to 2.75
  - Stagify
  
  PR:		191537
  Submitted by:	m.tsatsenko@gmail.com (maintainer)

Modified:
  head/mail/mimedefang/Makefile
  head/mail/mimedefang/distinfo
  head/mail/mimedefang/pkg-plist

Modified: head/mail/mimedefang/Makefile
==============================================================================
--- head/mail/mimedefang/Makefile	Tue Jul  8 20:52:37 2014	(r361289)
+++ head/mail/mimedefang/Makefile	Tue Jul  8 21:03:07 2014	(r361290)
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	mimedefang
-PORTVERSION=	2.74
+PORTVERSION=	2.75
 CATEGORIES=	mail
-MASTER_SITES=	http://www.mimedefang.org/static/
+MASTER_SITES=	http://www.mimedefang.org/static/ \
+		http://fossies.org/linux/misc/
 
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Milter based anti-spam and anti-virus filtering program
@@ -23,12 +24,14 @@ OPTIONS_DEFINE=	CLAMAV EXAMPLES DOCS
 OPTIONS_DEFAULT=	CLAMAV
 CLAMAV_DESC=	Enable Clamav
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	script/mimedefang-util
+perl_OLD_CMD=	perl
 GNU_CONFIGURE=	yes
 
 MAILUSER?=		mailnull
 SPOOLDIR?=		/var/spool/MIMEDefang
-QUARANTINEDIR?=	/var/spool/MD-Quarantine
+QUARANTINEDIR?=		/var/spool/MD-Quarantine
 
 CONFIGURE_ENV+=		PERL=${PERL}
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc \
@@ -39,17 +42,14 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/
 			--with-ipheader \
 			--prefix=${PREFIX}
 
-MAN1=	mimedefang-util.1
-MAN5=	mimedefang-filter.5
-MAN7=	mimedefang-notify.7 mimedefang-protocol.7
-MAN8=	mimedefang.8 mimedefang.pl.8 mimedefang-multiplexor.8 \
-	md-mx-ctrl.8 watch-mimedefang.8 watch-multiple-mimedefangs.8
-
 SUB_FILES=	pkg-message
 
+PLIST_SUB+=	MAIL_USER="${MAILUSER}" \
+		MIMEDEFANG_RUNDIR="${SPOOLDIR}" \
+		MIMEDEFANG_QUARANTINEDIR="${QUARANTINEDIR}"
+
 CONFIG_FILES=	mimedefang-filter sa-mimedefang.cf mimedefang-ip-key
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if !exists( /usr/include/libmilter/mfapi.h )
@@ -77,24 +77,15 @@ pre-install:
 
 post-install:
 	@${REINPLACE_CMD} -e 's,%%CHMOD%%,${CHMOD},g' ${WRKSRC}/examples/init-script
-	@${INSTALL_SCRIPT} ${WRKSRC}/examples/init-script ${PREFIX}/etc/rc.d/mimedefang
+	@${INSTALL_SCRIPT} ${WRKSRC}/examples/init-script ${STAGEDIR}${PREFIX}/etc/rc.d/mimedefang
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}/
 .endif
-.for f in ${CONFIG_FILES}
-	@if [ ! -f ${ETCDIR}/${f} ]; then \
-		${CP} -p ${ETCDIR}/${f}.example ${ETCDIR}/${f} ; \
-	fi
-.endfor
 
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples/ && ${INSTALL_DATA} stream-by-domain-filter \
-		suggested-minimum-filter-for-windows-clients README ${EXAMPLESDIR}/
+		suggested-minimum-filter-for-windows-clients README ${STAGEDIR}${EXAMPLESDIR}/
 .endif
-	@[ -d ${SPOOLDIR} ] && ${CHGRP} ${MAILUSER} ${SPOOLDIR}
-	@[ -d ${QUARANTINEDIR} ] && ${CHGRP} ${MAILUSER} ${QUARANTINEDIR}
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>

Modified: head/mail/mimedefang/distinfo
==============================================================================
--- head/mail/mimedefang/distinfo	Tue Jul  8 20:52:37 2014	(r361289)
+++ head/mail/mimedefang/distinfo	Tue Jul  8 21:03:07 2014	(r361290)
@@ -1,2 +1,2 @@
-SHA256 (mimedefang-2.74.tar.gz) = eb35d200d291cf7d456c644b94c9d4825ca2d0e345193539d63cd971adeb8605
-SIZE (mimedefang-2.74.tar.gz) = 362500
+SHA256 (mimedefang-2.75.tar.gz) = 7852da1039ed22bc8df4e43c3094ee8c6d6ba154479efd37b643d488a3c85a42
+SIZE (mimedefang-2.75.tar.gz) = 363535

Modified: head/mail/mimedefang/pkg-plist
==============================================================================
--- head/mail/mimedefang/pkg-plist	Tue Jul  8 20:52:37 2014	(r361289)
+++ head/mail/mimedefang/pkg-plist	Tue Jul  8 21:03:07 2014	(r361290)
@@ -6,6 +6,16 @@ bin/md-mx-ctrl
 bin/watch-mimedefang
 bin/watch-multiple-mimedefangs.tcl
 etc/rc.d/mimedefang
+man/man1/mimedefang-util.1.gz
+man/man5/mimedefang-filter.5.gz
+man/man7/mimedefang-notify.7.gz
+man/man7/mimedefang-protocol.7.gz
+man/man8/md-mx-ctrl.8.gz
+man/man8/mimedefang-multiplexor.8.gz
+man/man8/mimedefang.8.gz
+man/man8/mimedefang.pl.8.gz
+man/man8/watch-mimedefang.8.gz
+man/man8/watch-multiple-mimedefangs.8.gz
 @unexec if cmp -s %D/%%ETCDIR%%/mimedefang-ip-key %D/%%ETCDIR%%/mimedefang-ip-key.example; then rm -f %D/%%ETCDIR%%/mimedefang-ip-key; fi
 %%ETCDIR%%/mimedefang-ip-key.example
 @exec [ -f %B/mimedefang-ip-key ] || cp -p %D/%F %B/mimedefang-ip-key
@@ -15,6 +25,10 @@ etc/rc.d/mimedefang
 @unexec if cmp -s %D/%%ETCDIR%%/sa-mimedefang.cf %D/%%ETCDIR%%/sa-mimedefang.cf.example; then rm -f %D/%%ETCDIR%%/sa-mimedefang.cf; fi
 %%ETCDIR%%/sa-mimedefang.cf.example
 @exec [ -f %B/sa-mimedefang.cf ] || cp -p %D/%F %B/sa-mimedefang.cf
+@exec [ -d %%MIMEDEFANG_RUNDIR%% ] || mkdir -p %%MIMEDEFANG_RUNDIR%%
+@exec chgrp %%MAIL_USER%% %%MIMEDEFANG_RUNDIR%%
+@exec [ -d %%MIMEDEFANG_QUARANTINEDIR%% ] || mkdir -p %%MIMEDEFANG_QUARANTINEDIR%%
+@exec chgrp %%MAIL_USER%% %%MIMEDEFANG_QUARANTINEDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.SPAMASSASSIN
 %%PORTDOCS%%%%DOCSDIR%%/README.SOPHIE



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