svn commit: r313677 - in head: . mail/avenger mail/avenger/files

Pawel Pekala pawel at FreeBSD.org
Fri Mar 8 22:28:00 UTC 2013 

Author: pawel
Date: Fri Mar  8 22:27:59 2013
New Revision: 313677
URL: http://svnweb.freebsd.org/changeset/ports/313677

Log:
  - Update to version 0.8.3
  - Remove leading article from COMMENT
  - Get database dependency through USE_BDB
  - Support OptionsNG, add DOCS and SASL options
  - Use port framework for user and group creation
  - Make daemon binary look for config files in ETCDIR not /etc
  - Install config files in ETCDIR and preserve them when modified

Added:
  head/mail/avenger/files/
  head/mail/avenger/files/patch-Makefile.in   (contents, props changed)
  head/mail/avenger/files/pkg-message.in   (contents, props changed)
Deleted:
  head/mail/avenger/pkg-deinstall
  head/mail/avenger/pkg-install
Modified:
  head/GIDs
  head/UIDs
  head/mail/avenger/Makefile
  head/mail/avenger/distinfo
  head/mail/avenger/pkg-plist

Modified: head/GIDs
==============================================================================
--- head/GIDs	Fri Mar  8 22:27:39 2013	(r313676)
+++ head/GIDs	Fri Mar  8 22:27:59 2013	(r313677)
@@ -82,6 +82,7 @@ webcamd:*:145:
 ventrilo:*:146:
 kdm:*:147:
 ipv6mon:*:148:
+avenger:*:149:
 rbldns:*:153:
 trircd:*:154:
 sfs:*:171:

Modified: head/UIDs
==============================================================================
--- head/UIDs	Fri Mar  8 22:27:39 2013	(r313676)
+++ head/UIDs	Fri Mar  8 22:27:59 2013	(r313677)
@@ -90,6 +90,7 @@ webcamd:*:145:145::0:0:Webcamd user:/var
 ventrilo:*:146:146::0:0:& server:/usr/local/ventrilo-server:/usr/sbin/nologin
 kdm:*:147:147::0:0:KDE Display Manager:/nonexistent:/usr/sbin/nologin
 ipv6mon:*:148:148::0:0:IPv6 Address Monitoring Daemon:/nonexistent:/usr/sbin/nologin
+avenger:*:149:149::0:0:Mail Avenger:/var/spool/avenger:/usr/sbin/nologin
 rbldns:*:153:153::0:0:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin
 trircd:*:154:154::0:0:& user:/usr/local/etc/tr-ircd:/usr/sbin/nologin
 sfs:*:171:171::0:0:Self-Certifying File System:/nonexistent:/usr/sbin/nologin

Modified: head/mail/avenger/Makefile
==============================================================================
--- head/mail/avenger/Makefile	Fri Mar  8 22:27:39 2013	(r313676)
+++ head/mail/avenger/Makefile	Fri Mar  8 22:27:59 2013	(r313677)
@@ -1,28 +1,22 @@
-# New ports collection makefile for:	avenger
-# Date created:		8 May 2005
-# Whom:			dm
-#
+# Created by: dm
 # $FreeBSD$
-#
-# If you would like to use SASL authentication, you will need to define:
-#
-#     WITH_AVENGER_SASL2=yes
-#
-# in your make.conf file.
-#
 
 PORTNAME=	avenger
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.8.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailavenger.org/dist/
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	An anti-spam SMTP server
-
-LIB_DEPENDS=	db-4.3:${PORTSDIR}/databases/db43
+COMMENT=	Anti-spam SMTP server
 
 GNU_CONFIGURE=	yes
+USE_BDB=	43
+
+USERS=		${PORTNAME}
+GROUPS=		${USERS}
+
+PORTDOCS=	INSTALL INSTALL.html README NEWS
+SUB_FILES=	pkg-message
 
 MAN1=		aliascheck.1 avenger.1 dbutil.1 deliver.1 dotlock.1 \
 		edinplace.1 escape.1 macutil.1 mailexec.1 match.1 \
@@ -31,19 +25,37 @@ MAN5=		asmtpd.conf.5
 MAN8=		asmtpd.8 avenger.local.8
 
 CONFIGURE_ENV=	WFLAGS='-Wall'
-CONFIGURE_ARGS=	--with-db=${LOCALBASE}
+CONFIGURE_ARGS=	--with-db=${LOCALBASE} --with-etcdir=${ETCDIR}
+
+OPTIONS_DEFINE=	SASL
 
-.if defined(WITH_AVENGER_SASL2)
-LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
-# Note, for version 0.7.2, the --enable-sasl=/... syntax is broken
-#CONFIGURE_ARGS+=	--enable-sasl=${LOCALBASE}
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSASL}
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-sasl
 .endif
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
-
 post-install:
-	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} POST-INSTALL
+	${MKDIR} ${ETCDIR}
+.for file in asmtpd.conf unknown
+	${INSTALL_DATA} ${WRKSRC}/etc/${file} ${ETCDIR}/${file}.sample
+	@if [ ! -f ${ETCDIR}/${file} ]; then \
+		${CP} -p ${ETCDIR}/${file}.sample ${ETCDIR}/${file} ; \
+	fi
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/etc/pf.os ${PREFIX}/share
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/smtp-filter.pf ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/avsendmail.m4 ${DATADIR}
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
+
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/mail/avenger/distinfo
==============================================================================
--- head/mail/avenger/distinfo	Fri Mar  8 22:27:39 2013	(r313676)
+++ head/mail/avenger/distinfo	Fri Mar  8 22:27:59 2013	(r313677)
@@ -1,2 +1,2 @@
-SHA256 (avenger-0.8.1.tar.gz) = 580c06121bc0cc68431f5ef02b110bbba45a733d444b034a775c970597e84a1a
-SIZE (avenger-0.8.1.tar.gz) = 830234
+SHA256 (avenger-0.8.3.tar.gz) = 0242648ddb4f26d39e89049a23cf5ab2f8992105f124e7334835daaf636cc4b7
+SIZE (avenger-0.8.3.tar.gz) = 874695

Added: head/mail/avenger/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/avenger/files/patch-Makefile.in	Fri Mar  8 22:27:59 2013	(r313677)
@@ -0,0 +1,14 @@
+--- ./Makefile.in.orig	2013-03-08 21:13:45.000000000 +0100
++++ ./Makefile.in	2013-03-08 21:16:55.000000000 +0100
+@@ -287,9 +287,9 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ LYNX = lynx
+-SUBDIRS = libasync asmtpd util local doc etc
++SUBDIRS = libasync asmtpd util local doc
+ libexec_SCRIPTS = avenger
+-sample_DATA = INSTALL INSTALL.html
++sample_DATA =
+ CLEANFILES = core *.core *~
+ DISTCLEANFILES = autom4te*.cache config.status config.log avenger
+ EXTRA_DIST = .gitignore avenger.in INSTALL.html LICENSE

Added: head/mail/avenger/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/avenger/files/pkg-message.in	Fri Mar  8 22:27:59 2013	(r313677)
@@ -0,0 +1,8 @@
+-----------------------------------------------------------
+
+Before using Mail Avenger, you will need to configure it.
+Instructions are available in:
+
+%%DATADIR%%/INSTALL
+
+-----------------------------------------------------------

Modified: head/mail/avenger/pkg-plist
==============================================================================
--- head/mail/avenger/pkg-plist	Fri Mar  8 22:27:39 2013	(r313676)
+++ head/mail/avenger/pkg-plist	Fri Mar  8 22:27:59 2013	(r313677)
@@ -10,15 +10,17 @@ bin/match
 bin/sendmac
 bin/smtpdcheck
 bin/synos
+ at unexec if cmp -s %D/etc/avenger/asmtpd.conf.sample %D/etc/avenger/asmtpd.conf; then rm -f %D/etc/avenger/asmtpd.conf; fi
+%%ETCDIR%%/asmtpd.conf.sample
+ at exec if [ ! -f %D/etc/avenger/asmtpd.conf ] ; then cp -p %D/%F %B/asmtpd.conf; fi
+ at unexec if cmp -s %D/etc/avenger/unknown.sample %D/etc/avenger/unknown; then rm -f %D/etc/avenger/unknown; fi
+%%ETCDIR%%/unknown.sample
+ at exec if [ ! -f %D/etc/avenger/unknown ] ; then cp -p %D/%F %B/unknown; fi
 libexec/avenger
 libexec/avenger.local
 sbin/asmtpd
-%%DATADIR%%/INSTALL
-%%DATADIR%%/INSTALL.html
-%%DATADIR%%/asmtpd.conf
 %%DATADIR%%/avsendmail.m4
-%%DATADIR%%/smtp-filter.iptables
 %%DATADIR%%/smtp-filter.pf
-%%DATADIR%%/unknown
 share/pf.os
 @dirrm %%DATADIR%%
+ at dirrmtry %%ETCDIR%%

More information about the svn-ports-head mailing list