Date: Wed, 7 Sep 2016 16:11:00 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421507 - head/news/sn Message-ID: <201609071611.u87GB0Mx059744@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Wed Sep 7 16:11:00 2016 New Revision: 421507 URL: https://svnweb.freebsd.org/changeset/ports/421507 Log: Fix package install failure when /var/spool/news already exists. Modified: head/news/sn/Makefile head/news/sn/pkg-plist Modified: head/news/sn/Makefile ============================================================================== --- head/news/sn/Makefile Wed Sep 7 15:03:24 2016 (r421506) +++ head/news/sn/Makefile Wed Sep 7 16:11:00 2016 (r421507) @@ -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} Modified: head/news/sn/pkg-plist ============================================================================== --- head/news/sn/pkg-plist Wed Sep 7 15:03:24 2016 (r421506) +++ head/news/sn/pkg-plist Wed Sep 7 16:11:00 2016 (r421507) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609071611.u87GB0Mx059744>