aboutsummaryrefslogtreecommitdiff
path: root/news
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2016-09-07 16:11:00 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2016-09-07 16:11:00 +0000
commite0c01ee5d1b01c92de9c0f77a3027c04a668f366 (patch)
treece32db1a31a010c51a86ee6273fb8753047faf7e /news
parent156aea0bae9aae30d42662e0eddef3d81e6f5c7d (diff)
downloadports-e0c01ee5d1b01c92de9c0f77a3027c04a668f366.tar.gz
ports-e0c01ee5d1b01c92de9c0f77a3027c04a668f366.zip
Fix package install failure when /var/spool/news already exists.
Notes
Notes: svn path=/head/; revision=421507
Diffstat (limited to 'news')
-rw-r--r--news/sn/Makefile6
-rw-r--r--news/sn/pkg-plist4
2 files changed, 4 insertions, 6 deletions
diff --git a/news/sn/Makefile b/news/sn/Makefile
index 4eb12c334693..b8d9d9909514 100644
--- a/news/sn/Makefile
+++ b/news/sn/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sn
PORTVERSION= 0.3.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= news
MASTER_SITES= http://www.infa.abo.fi/~patrik/sn/files/ \
http://home.arcor.de/teambushido/fbsd_ports/ \
@@ -36,10 +36,8 @@ post-patch:
s|/bin/bash|${LOCALBASE}/bin/bash|' \
${WRKSRC}/Makefile
-pre-install:
- @${MKDIR} ${STAGEDIR}/var/spool/news
-
post-install:
+ @${MKDIR} ${STAGEDIR}/var/spool/news
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/news/sn/pkg-plist b/news/sn/pkg-plist
index e5372067d4bf..e3dc92ee4646 100644
--- a/news/sn/pkg-plist
+++ b/news/sn/pkg-plist
@@ -35,5 +35,5 @@ sbin/snscan
sbin/snsend
sbin/snsplit
sbin/snstore
-@exec /bin/mkdir /var/spool/news
-@unexec rmdir /var/spool/news 2>/dev/null ||( echo "===> If you don't plan to use them later, you can safely remove /var/spool/news. Deinstall process kept these files intact:" | fmt && for i in $(find /var/spool/news -type f); do echo " - $i"; done)
+@dir /var/spool/news
+@postunexec [ ! -d /var/spool/news ] || ( echo "===> If you don't plan to use them later, you can safely remove /var/spool/news. Deinstall process kept these files intact:" | fmt && for i in $(find /var/spool/news -type f); do echo " - $i"; done)