From owner-svn-ports-head@FreeBSD.ORG  Tue Oct 28 20:35:59 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EC9E0610;
 Tue, 28 Oct 2014 20:35:58 +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 B6B592F9;
 Tue, 28 Oct 2014 20:35:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9SKZwJh059440;
 Tue, 28 Oct 2014 20:35:58 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9SKZwSR059437;
 Tue, 28 Oct 2014 20:35:58 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201410282035.s9SKZwSR059437@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 28 Oct 2014 20:35:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r371646 - head/mail/mixmaster
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-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Oct 2014 20:35:59 -0000

Author: antoine
Date: Tue Oct 28 20:35:57 2014
New Revision: 371646
URL: https://svnweb.freebsd.org/changeset/ports/371646
QAT: https://qat.redports.org/buildarchive/r371646/

Log:
  Fix stage violation (and allow staging as a regular user)

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

Modified: head/mail/mixmaster/Makefile
==============================================================================
--- head/mail/mixmaster/Makefile	Tue Oct 28 20:35:44 2014	(r371645)
+++ head/mail/mixmaster/Makefile	Tue Oct 28 20:35:57 2014	(r371646)
@@ -28,12 +28,9 @@ CONFIG_FILES=	abuse.txt.in dest.blk mix.
 		allpingers.txt
 
 OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=DOCS
 
 .include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} < 1000000
 BROKEN=		Does not compile
 .endif
@@ -49,7 +46,7 @@ pre-install:
 	${GZCAT} ${DISTDIR}/allpingers.txt.gz >${WRKSRC}/Mix/conf/allpingers.txt
 	${REINPLACE_CMD} -e "s|/etc/mixmaster|${ETCDIR}|g" ${WRKDIR}/mixmaster-update.pl
 	${REINPLACE_CMD} -e "s|/usr/bin|${PREFIX}/bin|g" ${WRKDIR}/mixmaster-update.pl
-	${MKDIR} ${ETCDIR}
+	${MKDIR} ${STAGEDIR}${ETCDIR}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Mix/Src/mixmaster ${STAGEDIR}${PREFIX}/bin/mixmaster
@@ -67,4 +64,4 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/Mix/conf/${FILE} ${STAGEDIR}${ETCDIR}/${FILE}.sample
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/mail/mixmaster/pkg-plist
==============================================================================
--- head/mail/mixmaster/pkg-plist	Tue Oct 28 20:35:44 2014	(r371645)
+++ head/mail/mixmaster/pkg-plist	Tue Oct 28 20:35:57 2014	(r371646)
@@ -27,4 +27,3 @@ bin/remailer
 @sample %%ETCDIR%%/usage.txt.in.sample
 man/man1/mixmaster.1.gz
 man/man1/mpgp.1.gz
-@dirrmtry %%ETCDIR%%