From owner-svn-ports-head@FreeBSD.ORG Mon Sep 30 21:37:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1F878FC5; Mon, 30 Sep 2013 21:37:19 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F1AAA27BA; Mon, 30 Sep 2013 21:37:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8ULbIli051764; Mon, 30 Sep 2013 21:37:18 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8ULbIt4051762; Mon, 30 Sep 2013 21:37:18 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201309302137.r8ULbIt4051762@svn.freebsd.org> From: Matthias Andree Date: Mon, 30 Sep 2013 21:37:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328878 - head/news/leafnode X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Sep 2013 21:37:19 -0000 Author: mandree Date: Mon Sep 30 21:37:18 2013 New Revision: 328878 URL: http://svnweb.freebsd.org/changeset/ports/328878 Log: Support staging, and update LIB_DEPENDS format. Modified: head/news/leafnode/Makefile head/news/leafnode/pkg-plist Modified: head/news/leafnode/Makefile ============================================================================== --- head/news/leafnode/Makefile Mon Sep 30 21:37:16 2013 (r328877) +++ head/news/leafnode/Makefile Mon Sep 30 21:37:18 2013 (r328878) @@ -10,24 +10,24 @@ MASTER_SITES= SF \ MAINTAINER= mandree@FreeBSD.org COMMENT= NNTP package for offline news caching and reading -LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre - +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre USE_XZ= yes GNU_CONFIGURE= yes CONFLICTS= newsx-1* s-news-0* -NO_STAGE= yes .include +# TODO: remove this auto-selection, and tell users through UPDATING to +# move their spool to /var/spool/leafnode, and run texpire -r .if exists(/var/spool/news/leaf.node) && !defined(PACKAGE_BUILDING) LEAFNODE_SPOOLDIR?=/var/spool/news .elif exists(${LOCALBASE}/var/spool/leafnode/leaf.node) && !defined(PACKAGE_BUILDING) LEAFNODE_SPOOLDIR?=${LOCALBASE}/var/spool/leafnode .endif LEAFNODE_SPOOLDIR?=/var/spool/leafnode -PLIST_SUB= SPOOLDIR=${LEAFNODE_SPOOLDIR} +PLIST_SUB= SPOOLDIR=${LEAFNODE_SPOOLDIR} REALPREFIX=${PREFIX} CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/leafnode \ --with-spooldir=${LEAFNODE_SPOOLDIR} --with-ipv6 \ @@ -64,18 +64,16 @@ pre-configure: @${ECHO_MSG} post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/setup-daemontools.sh ${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/setup-daemontools.sh ${STAGEDIR}${PREFIX}/sbin .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} - ${MKDIR} ${DOCSDIR}/german - cd ${WRKSRC}/doc_german && ${INSTALL_DATA} ${DOCS_DE} ${DOCSDIR}/german + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/german + cd ${WRKSRC}/doc_german && ${INSTALL_DATA} ${DOCS_DE} ${STAGEDIR}${DOCSDIR}/german .endif - ${MKDIR} ${MAN1DIR_DE} ${MAN8DIR_DE} + ${MKDIR} ${STAGEDIR}${MAN1DIR_DE} ${STAGEDIR}${MAN8DIR_DE} cd ${WRKSRC}/doc_german && \ - ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/de.ISO8859-1/man1 && \ - ${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/de.ISO8859-1/man8 - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} + ${INSTALL_MAN} ${MAN1} ${STAGEDIR}${MAN1PREFIX}/man/de.ISO8859-1/man1 && \ + ${INSTALL_MAN} ${MAN8} ${STAGEDIR}${MAN8PREFIX}/man/de.ISO8859-1/man8 .include Modified: head/news/leafnode/pkg-plist ============================================================================== --- head/news/leafnode/pkg-plist Mon Sep 30 21:37:16 2013 (r328877) +++ head/news/leafnode/pkg-plist Mon Sep 30 21:37:18 2013 (r328878) @@ -1,21 +1,37 @@ @comment $FreeBSD$ bin/leafnode-version bin/newsq -etc/leafnode/config.example -etc/leafnode/filters.example -etc/leafnode/nntp.rules.dist -etc/leafnode/run.tcpd.dist -etc/leafnode/run.tcpserver.dist -etc/leafnode/Makefile.dist -etc/leafnode/UNINSTALL-daemontools +%%ETCDIR%%/config.example +%%ETCDIR%%/filters.example +%%ETCDIR%%/nntp.rules.dist +%%ETCDIR%%/run.tcpd.dist +%%ETCDIR%%/run.tcpserver.dist +%%ETCDIR%%/Makefile.dist +%%ETCDIR%%/UNINSTALL-daemontools +man/man1/leafnode-version.1.gz +man/man1/newsq.1.gz +man/man8/applyfilter.8.gz +man/man8/checkgroups.8.gz +man/man8/fetchnews.8.gz +man/man8/leafnode.8.gz +man/man8/texpire.8.gz +man/de.ISO8859-1/man1/leafnode-version.1.gz +man/de.ISO8859-1/man1/newsq.1.gz +man/de.ISO8859-1/man8/applyfilter.8.gz +man/de.ISO8859-1/man8/checkgroups.8.gz +man/de.ISO8859-1/man8/fetchnews.8.gz +man/de.ISO8859-1/man8/leafnode.8.gz +man/de.ISO8859-1/man8/texpire.8.gz sbin/leafnode sbin/fetchnews sbin/texpire sbin/checkgroups sbin/applyfilter sbin/setup-daemontools.sh +@dirrmtry %%ETCDIR%% @comment only remove these when empty: @comment we don't want to kill the news spool across updates +@cwd / @unexec rm -f %%SPOOLDIR%%/leaf.node/lock.file @dirrmtry %%SPOOLDIR%%/failed.postings @dirrmtry %%SPOOLDIR%%/leaf.node @@ -25,6 +41,6 @@ sbin/setup-daemontools.sh @dirrmtry %%SPOOLDIR%%/out.going @dirrmtry %%SPOOLDIR%%/temp.files @dirrmtry %%SPOOLDIR%% +@cwd %%REALPREFIX%% @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, delete spool and configuration:" ; echo "type: rm -rf %D/etc/leafnode %%SPOOLDIR%%" ; echo "==============================================================================" ; fi