svn commit: r371646 - head/mail/mixmaster

[Antoine Brodin]

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
- at dirrmtry %%ETCDIR%%