Date: Mon, 13 May 2013 05:39:50 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317998 - in head/news/leafnode: . files Message-ID: <201305130539.r4D5doOT057175@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Mon May 13 05:39:50 2013 New Revision: 317998 URL: http://svnweb.freebsd.org/changeset/ports/317998 Log: Make pkgNG happier. Reported by: miwi Modified: head/news/leafnode/Makefile head/news/leafnode/files/pkg-install.in (contents, props changed) head/news/leafnode/pkg-plist (contents, props changed) Modified: head/news/leafnode/Makefile ============================================================================== --- head/news/leafnode/Makefile Mon May 13 05:33:57 2013 (r317997) +++ head/news/leafnode/Makefile Mon May 13 05:39:50 2013 (r317998) @@ -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 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 Modified: head/news/leafnode/files/pkg-install.in ============================================================================== --- head/news/leafnode/files/pkg-install.in Mon May 13 05:33:57 2013 (r317997) +++ head/news/leafnode/files/pkg-install.in Mon May 13 05:39:50 2013 (r317998) @@ -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" ;; *) Modified: head/news/leafnode/pkg-plist ============================================================================== --- head/news/leafnode/pkg-plist Mon May 13 05:33:57 2013 (r317997) +++ head/news/leafnode/pkg-plist Mon May 13 05:39:50 2013 (r317998) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305130539.r4D5doOT057175>