aboutsummaryrefslogtreecommitdiff
path: root/news/leafnode
diff options
context:
space:
mode:
Diffstat (limited to 'news/leafnode')
-rw-r--r--news/leafnode/Makefile12
-rw-r--r--news/leafnode/files/pkg-install.in2
-rw-r--r--news/leafnode/pkg-plist9
3 files changed, 9 insertions, 14 deletions
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index f56b992955d6..31661b4167b2 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,9 +1,5 @@
-# ports collection Makefile for: leafnode
-# Whom: Brian Somers <brian@FreeBSD.org>
-# Date created: 1997-06-27
-#
+# Created by: Brian Somers <brian@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= leafnode
DISTVERSION= 1.11.8
@@ -15,7 +11,7 @@ MASTER_SITES= SF \
MAINTAINER= mandree@FreeBSD.org
COMMENT= NNTP package for offline news caching and reading
-LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre
+LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
MAKE_JOBS_SAFE= yes
@@ -56,7 +52,7 @@ DOCS= ADD-ONS ChangeLog COPYING CREDITS FAQ.txt FAQ.pdf FAQ.html \
KNOWNBUGS
DOCS_DE= INSTALL_de LIESMICH-daemontools README README_de
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= *
.endif
@@ -70,7 +66,7 @@ pre-configure:
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/setup-daemontools.sh ${PREFIX}/sbin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
${MKDIR} ${DOCSDIR}/german
diff --git a/news/leafnode/files/pkg-install.in b/news/leafnode/files/pkg-install.in
index f5518dadf806..c57e7e5e566c 100644
--- a/news/leafnode/files/pkg-install.in
+++ b/news/leafnode/files/pkg-install.in
@@ -15,6 +15,8 @@ case "$2" in
temp.files; do
install -d -o news -g news -m 2775 %%SPOOLDIR%%/$d
done
+ mkdir -p "${PKG_PREFIX}/var/spool"
+ mkdir -p "${PKG_PREFIX}/lib/leafnode"
;;
*)
diff --git a/news/leafnode/pkg-plist b/news/leafnode/pkg-plist
index 873918ba13bf..b474a62f0cfe 100644
--- a/news/leafnode/pkg-plist
+++ b/news/leafnode/pkg-plist
@@ -17,17 +17,14 @@ sbin/setup-daemontools.sh
@comment only remove these when empty:
@comment we don't want to kill the news spool across updates
@unexec rm -f %%SPOOLDIR%%/leaf.node/lock.file
-@dirrmtry %%SPOOLDIR%%/failed.postings 2>/dev/null || :
@dirrmtry %%SPOOLDIR%%/failed.postings
@dirrmtry %%SPOOLDIR%%/leaf.node
-@dirrmtry %%SPOOLDIR%%/message.id/*
+@unexec rmdir %%SPOOLDIR%%/message.id/* 2>/dev/null || :
@dirrmtry %%SPOOLDIR%%/message.id
@dirrmtry %%SPOOLDIR%%/interesting.groups
@dirrmtry %%SPOOLDIR%%/out.going
@dirrmtry %%SPOOLDIR%%/temp.files
@dirrmtry %%SPOOLDIR%%
-@dirrmtry %D/var/spool
-@dirrmtry %D/var
-@dirrmtry %D/lib/leafnode
+@unexec rmdir %D/var/spool %D/var %D/lib/leafnode 2>/dev/null || :
@dirrm etc/leafnode
-@unexec if test -d "%%SPOOLDIR%%" || test -d "%D/etc/leafnode" ; then echo ; echo "==============================================================================" ; echo "If you want to remove leafnode for good," ; echo "type: rm -rf %D/etc/leafnode %%SPOOLDIR%%" ; echo "==============================================================================" ; fi
+@unexec if test -d "%%SPOOLDIR%%" || test -d "%D/etc/leafnode" ; then echo ; echo "==============================================================================" ; echo "If you want to remove leafnode for good, delete spool and configuration:" ; echo "type: rm -rf %D/etc/leafnode %%SPOOLDIR%%" ; echo "==============================================================================" ; fi