From owner-svn-ports-head@FreeBSD.ORG Thu Jul 24 21:18:57 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org 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 023A23C3; Thu, 24 Jul 2014 21:18:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D75E1295D; Thu, 24 Jul 2014 21:18:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6OLIu10001291; Thu, 24 Jul 2014 21:18:56 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6OLItfl001286; Thu, 24 Jul 2014 21:18:55 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201407242118.s6OLItfl001286@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Thu, 24 Jul 2014 21:18:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362854 - in head/mail/archivesmtp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jul 2014 21:18:57 -0000 Author: danilo Date: Thu Jul 24 21:18:55 2014 New Revision: 362854 URL: http://svnweb.freebsd.org/changeset/ports/362854 QAT: https://qat.redports.org/buildarchive/r362854/ Log: - Update from 1.1.b1 to 1.2 - Add stage support PR: ports/191518 Submitted by: netherby@hotmail.com Modified: head/mail/archivesmtp/Makefile head/mail/archivesmtp/distinfo head/mail/archivesmtp/files/archivesmtp.in head/mail/archivesmtp/pkg-descr head/mail/archivesmtp/pkg-plist Modified: head/mail/archivesmtp/Makefile ============================================================================== --- head/mail/archivesmtp/Makefile Thu Jul 24 21:15:46 2014 (r362853) +++ head/mail/archivesmtp/Makefile Thu Jul 24 21:18:55 2014 (r362854) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= archivesmtp -PORTVERSION= 1.1.b1 +PORTVERSION= 1.2 CATEGORIES= mail MASTER_SITES= http://www.dancingfortune.com/projects/archivesmtp/files/ @@ -12,24 +12,18 @@ COMMENT= SMTP mail archiver CFLAGS+= ${PTHREAD_CFLAGS} LIBS+= ${PTHREAD_LIBS}\ -lmilter -MAKE_ENV+= LDADD="${LIBS}"\ - BINDIR="${PREFIX}/sbin"\ - MANDIR="${MANPREFIX}/man/man"\ - NO_MANCOMPRESS="yes" +MAKE_ENV+= LDADD="${LIBS}" USE_RC_SUBR= archivesmtp SUB_FILES= pkg-message -SUB_LIST+= SOCKETBASE=${SOCKETBASE}\ - SOCKETDIR=${SOCKETDIR} +SUB_LIST+= SOCKETBASE="${SOCKETBASE}"\ + SOCKETDIR="${SOCKETDIR}" PLIST_SUB+= ${SUB_LIST} -MAN8= archivesmtp.8 - # Path for unix/local socket (by default also used for pid file) SOCKETBASE?= /var/run SOCKETDIR?= archivesmtp -NO_STAGE= yes .include # Sets up libmilter dependencies and options @@ -40,14 +34,14 @@ pre-build: ${CP} ${FILESDIR}/top-Makefile ${WRKSRC}/Makefile ${CP} ${FILESDIR}/src-Makefile ${WRKSRC}/src/Makefile +do-install: + ${INSTALL} -s ${WRKSRC}/src/archivesmtp ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/src/archivesmtp.8 ${STAGEDIR}${PREFIX}/man/man8 + post-install: # Install sample configuration file - ${INSTALL_DATA} ${WRKSRC}/src/archivesmtp.conf.sample ${PREFIX}/etc - # Create directory for unix/local socket - ${MKDIR} ${SOCKETBASE}/${SOCKETDIR} - ${CHOWN} nobody ${SOCKETBASE}/${SOCKETDIR} - ${CHMOD} 755 ${SOCKETBASE}/${SOCKETDIR} - # Print post install message - @${CAT} ${PKGMESSAGE} + ${INSTALL_DATA} ${WRKSRC}/src/archivesmtp.conf.sample ${STAGEDIR}${PREFIX}/etc + # Create socket directory + @${MKDIR} ${STAGEDIR}${SOCKETBASE}/${SOCKETDIR} .include Modified: head/mail/archivesmtp/distinfo ============================================================================== --- head/mail/archivesmtp/distinfo Thu Jul 24 21:15:46 2014 (r362853) +++ head/mail/archivesmtp/distinfo Thu Jul 24 21:18:55 2014 (r362854) @@ -1,2 +1,2 @@ -SHA256 (archivesmtp-1.1.b1.tar.gz) = 0b4c8ddb15262721801c929fd104549c63d569af82ba9aaa5d26294ad88f72d8 -SIZE (archivesmtp-1.1.b1.tar.gz) = 101835 +SHA256 (archivesmtp-1.2.tar.gz) = b3ec9e21271dbfd130b2603a9c6f98d1091d9ff9d675094f74a21b2f3b099c54 +SIZE (archivesmtp-1.2.tar.gz) = 120810 Modified: head/mail/archivesmtp/files/archivesmtp.in ============================================================================== --- head/mail/archivesmtp/files/archivesmtp.in Thu Jul 24 21:15:46 2014 (r362853) +++ head/mail/archivesmtp/files/archivesmtp.in Thu Jul 24 21:18:55 2014 (r362854) @@ -1,12 +1,15 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: archivesmtp # BEFORE: mail +# KEYWORD: shutdown . /etc/rc.subr name="archivesmtp" -rcvar=archivesmtp_enable +rcvar=`set_rcvar` command="%%PREFIX%%/sbin/${name}" @@ -18,9 +21,10 @@ load_rc_config "$name" : ${archivesmtp_socket="unix:%%SOCKETBASE%%/%%SOCKETDIR%%/mta.sock"} : ${archivesmtp_config="%%PREFIX%%/etc/archivesmtp.conf"} : ${archivesmtp_pidfile="%%SOCKETBASE%%/%%SOCKETDIR%%/run.pid"} +# archivesmtp_flags= May be used to set optional behaviours. pidfile="${archivesmtp_pidfile}" -command_args="${archivesmtp_flags} -p ${archivesmtp_socket} -f ${archivesmtp_config} -u ${archivesmtp_chuser} -r ${archivesmtp_pidfile} &" +command_args="-p ${archivesmtp_socket} -f ${archivesmtp_config} -u ${archivesmtp_chuser} -r ${archivesmtp_pidfile} ${archivesmtp_flags} &" run_rc_command "$1" Modified: head/mail/archivesmtp/pkg-descr ============================================================================== --- head/mail/archivesmtp/pkg-descr Thu Jul 24 21:15:46 2014 (r362853) +++ head/mail/archivesmtp/pkg-descr Thu Jul 24 21:18:55 2014 (r362854) @@ -4,6 +4,6 @@ specific locations in mbox format. Addin programs is also supported. The libmilter interface is used and must be supported by the MTA for ArchiveSMTP to work. -Version: 1.1.b1 +Version: 1.2 WWW: http://www.dancingfortune.com/projects/archivesmtp/ Modified: head/mail/archivesmtp/pkg-plist ============================================================================== --- head/mail/archivesmtp/pkg-plist Thu Jul 24 21:15:46 2014 (r362853) +++ head/mail/archivesmtp/pkg-plist Thu Jul 24 21:18:55 2014 (r362854) @@ -1,7 +1,7 @@ sbin/archivesmtp etc/archivesmtp.conf.sample -@stopdaemon archivesmtp +man/man8/archivesmtp.8.gz +@owner nobody +@mode 755 @exec mkdir -p %%SOCKETBASE%%/%%SOCKETDIR%% -@exec chown nobody %%SOCKETBASE%%/%%SOCKETDIR%% -@cwd %%SOCKETBASE%% -@dirrm %%SOCKETDIR%% +@dirrmtry %%SOCKETBASE%%/%%SOCKETDIR%%