svn commit: r372370 - head/mail/postfix

[Olli Hauer]

Author: ohauer
Date: Sun Nov  9 18:21:23 2014
New Revision: 372370
URL: https://svnweb.freebsd.org/changeset/ports/372370
QAT: https://qat.redports.org/buildarchive/r372370/

Log:
  - sort OPTIONS_DEFINE
  - fix build and install for non root users,
    (sgid and group for sbin/postdrop and sbin/postqueue was lost if build
     as non root and installed with sudo)
  - install /var/spool/postfix directories with correct owner/mode
  - use $WRKDIR instead of /tmp
  
  Approved by:	sahil (implicit)

Modified:
  head/mail/postfix/Makefile
  head/mail/postfix/pkg-plist

Modified: head/mail/postfix/Makefile
==============================================================================
--- head/mail/postfix/Makefile	Sun Nov  9 18:14:26 2014	(r372369)
+++ head/mail/postfix/Makefile	Sun Nov  9 18:21:23 2014	(r372370)
@@ -3,6 +3,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.11.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -38,8 +39,8 @@ USE_SUBMAKE=	yes
 USE_PERL5=	build
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
-OPTIONS_DEFINE=	PCRE SASL2 TLS BDB MYSQL PGSQL SQLITE OPENLDAP LDAP_SASL \
-		CDB NIS VDA TEST SPF INST_BASE LMDB DOCS
+OPTIONS_DEFINE=	BDB CDB DOCS INST_BASE LDAP_SASL LMDB MYSQL NIS \
+		OPENLDAP PCRE PGSQL SASL2 SPF SQLITE TEST TLS VDA
 
 OPTIONS_RADIO=		RG1 RG2
 OPTIONS_RADIO_RG1=	DOVECOT DOVECOT2
@@ -332,7 +333,7 @@ pre-install:
 .endif
 
 do-install:
-	@(cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=${STAGEDIR} tempdir=/tmp \
+	@(cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=${STAGEDIR} tempdir=${WRKDIR} \
 		config_directory=${ETCDIR} \
 		command_directory=${PREFIX}/sbin \
 		daemon_directory=${DAEMONDIR} \

Modified: head/mail/postfix/pkg-plist
==============================================================================
--- head/mail/postfix/pkg-plist	Sun Nov  9 18:14:26 2014	(r372369)
+++ head/mail/postfix/pkg-plist	Sun Nov  9 18:21:23 2014	(r372370)
@@ -127,32 +127,36 @@ libexec/postfix/virtual
 sbin/postalias
 sbin/postcat
 sbin/postconf
-sbin/postdrop
 sbin/postfix
 sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
 sbin/postmulti
+ at group maildrop
+ at mode 2755
+sbin/postdrop
 sbin/postqueue
+ at group
+ at mode
 sbin/postsuper
 sbin/sendmail
 @dir /var/db/postfix
- at dir /var/spool/postfix/active
- at dir /var/spool/postfix/bounce
- at dir /var/spool/postfix/corrupt
- at dir /var/spool/postfix/defer
- at dir /var/spool/postfix/deferred
- at dir /var/spool/postfix/flush
- at dir /var/spool/postfix/hold
- at dir /var/spool/postfix/incoming
- at dir /var/spool/postfix/maildrop
- at dir /var/spool/postfix/pid
- at dir /var/spool/postfix/private
- at dir /var/spool/postfix/public
- at dir /var/spool/postfix/saved
- at dir /var/spool/postfix/trace
- at dir /var/spool/postfix
+ at dir(postfix,,700) /var/spool/postfix/active
+ at dir(postfix,,700) /var/spool/postfix/bounce
+ at dir(postfix,,700) /var/spool/postfix/corrupt
+ at dir(postfix,,700) /var/spool/postfix/defer
+ at dir(postfix,,700) /var/spool/postfix/deferred
+ at dir(postfix,,700) /var/spool/postfix/flush
+ at dir(postfix,,700) /var/spool/postfix/hold
+ at dir(postfix,,700) /var/spool/postfix/incoming
+ at dir(postfix,maildrop,730) /var/spool/postfix/maildrop
+ at dir(,postfix,755) /var/spool/postfix/pid
+ at dir(postfix,,700) /var/spool/postfix/private
+ at dir(postfix,maildrop,710) /var/spool/postfix/public
+ at dir(postfix,,700) /var/spool/postfix/saved
+ at dir(postfix,,700) /var/spool/postfix/trace
+ at dir(postfix,postfix,700) /var/spool/postfix
 %%BASE%%@cwd /
 @dir etc/postfix
 @cwd %%RESETPREFIX%%