From owner-svn-ports-all@FreeBSD.ORG Thu Jun 5 20:59:35 2014 Return-Path: Delivered-To: svn-ports-all@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 7087DB29; Thu, 5 Jun 2014 20:59:35 +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 5E7A3296D; Thu, 5 Jun 2014 20:59:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55KxZLC079076; Thu, 5 Jun 2014 20:59:35 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55KxYBg079073; Thu, 5 Jun 2014 20:59:34 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201406052059.s55KxYBg079073@svn.freebsd.org> From: Pawel Pekala Date: Thu, 5 Jun 2014 20:59:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356707 - head/mail/proxsmtp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 20:59:35 -0000 Author: pawel Date: Thu Jun 5 20:59:34 2014 New Revision: 356707 URL: http://svnweb.freebsd.org/changeset/ports/356707 QAT: https://qat.redports.org/buildarchive/r356707/ Log: - Add staging support - Convert to new option framework - More precise BSD license - Use @sample for config file - Fix typo, remove Author tag from pkg-descr Modified: head/mail/proxsmtp/Makefile head/mail/proxsmtp/pkg-descr head/mail/proxsmtp/pkg-plist Modified: head/mail/proxsmtp/Makefile ============================================================================== --- head/mail/proxsmtp/Makefile Thu Jun 5 20:54:57 2014 (r356706) +++ head/mail/proxsmtp/Makefile Thu Jun 5 20:59:34 2014 (r356707) @@ -3,13 +3,14 @@ PORTNAME= proxsmtp PORTVERSION= 1.10 +PORTREVISION= 1 CATEGORIES= mail security MASTER_SITES= http://thewalter.net/stef/software/proxsmtp/ MAINTAINER= ports@FreeBSD.org COMMENT= Flexible SMTP filter which can act also as transparent proxy -LICENSE= BSD +LICENSE= BSD3CLAUSE USES= gmake GNU_CONFIGURE= yes @@ -17,12 +18,10 @@ GNU_CONFIGURE= yes USE_RC_SUBR= proxsmtpd SUB_FILES= pkg-message -MAN5= proxsmtpd.conf.5 -MAN8= proxsmtpd.8 - PORTDOCS= ChangeLog NEWS README -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} -e \ '/^acx_pthread_flags/s|=.*|="${PTHREAD_LIBS}"|' \ @@ -30,17 +29,8 @@ post-patch: post-install: (cd ${WRKSRC}/doc && ${INSTALL_DATA} proxsmtpd.conf \ - ${PREFIX}/etc/proxsmtpd.conf-sample) -.if !exists(${PREFIX}/etc/proxsmtpd.conf) - (cd ${PREFIX}/etc && ${CP} -p proxsmtpd.conf-sample \ - ${PREFIX}/etc/proxsmtpd.conf) -.endif -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for docs in ${PORTDOCS} - (cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}) -.endfor -.endif - @${CAT} ${PKGMESSAGE} + ${STAGEDIR}${PREFIX}/etc/proxsmtpd.conf.sample) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/mail/proxsmtp/pkg-descr ============================================================================== --- head/mail/proxsmtp/pkg-descr Thu Jun 5 20:54:57 2014 (r356706) +++ head/mail/proxsmtp/pkg-descr Thu Jun 5 20:59:34 2014 (r356707) @@ -1,8 +1,7 @@ ProxSMTP is a flexible tool that allows you to reject, change or log -email based on arbitrary critera. It accepts SMTP connections and +email based on arbitrary criteria. It accepts SMTP connections and forwards the SMTP commands and responses to another SMTP server. You need to be able to write the filtering scripts that integrate it with your particular needs. -Author: Nielsen WWW: http://thewalter.net/stef/software/proxsmtp/ Modified: head/mail/proxsmtp/pkg-plist ============================================================================== --- head/mail/proxsmtp/pkg-plist Thu Jun 5 20:54:57 2014 (r356706) +++ head/mail/proxsmtp/pkg-plist Thu Jun 5 20:59:34 2014 (r356707) @@ -1,5 +1,5 @@ @unexec [ ! -f /var/run/proxsmtpd.pid ] || %%PREFIX%%/etc/rc.d/proxsmtpd.sh stop || true -@unexec if cmp -s %D/etc/proxsmtpd.conf-sample %D/etc/proxsmtpd.conf; then rm -f %D/etc/proxsmtpd.conf; fi -etc/proxsmtpd.conf-sample -@exec if [ ! -f %D/etc/proxsmtpd.conf ] ; then cp -p %D/%F %B/proxsmtpd.conf; fi +@sample etc/proxsmtpd.conf.sample +man/man5/proxsmtpd.conf.5.gz +man/man8/proxsmtpd.8.gz sbin/proxsmtpd