aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantoine <antoine@FreeBSD.org>2014-10-29 04:35:57 +0800
committerantoine <antoine@FreeBSD.org>2014-10-29 04:35:57 +0800
commit6195e61b44e7cdfc7c22621eeda2f653c09b1c79 (patch)
treeb0b04131c1a2a9ee766c508caa27f870700038f7
parentc67a0e79eb9721bc25e1af80f374bfc1d220c88f (diff)
downloadfreebsd-ports-gnome-6195e61b44e7cdfc7c22621eeda2f653c09b1c79.tar.gz
freebsd-ports-gnome-6195e61b44e7cdfc7c22621eeda2f653c09b1c79.tar.zst
freebsd-ports-gnome-6195e61b44e7cdfc7c22621eeda2f653c09b1c79.zip
Fix stage violation (and allow staging as a regular user)
-rw-r--r--mail/mixmaster/Makefile7
-rw-r--r--mail/mixmaster/pkg-plist1
2 files changed, 2 insertions, 6 deletions
diff --git a/mail/mixmaster/Makefile b/mail/mixmaster/Makefile
index 6c5be08106a6..5cdf3ca2326a 100644
--- a/mail/mixmaster/Makefile
+++ b/mail/mixmaster/Makefile
@@ -28,12 +28,9 @@ CONFIG_FILES= abuse.txt.in dest.blk mix.cfg news.hlp pubring.mix type1.hlp \
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>
diff --git a/mail/mixmaster/pkg-plist b/mail/mixmaster/pkg-plist
index 825eb01029f0..3a8aad396d9a 100644
--- a/mail/mixmaster/pkg-plist
+++ b/mail/mixmaster/pkg-plist
@@ -27,4 +27,3 @@ bin/remailer
@sample %%ETCDIR%%/usage.txt.in.sample
man/man1/mixmaster.1.gz
man/man1/mpgp.1.gz
-@dirrmtry %%ETCDIR%%