From owner-svn-ports-all@FreeBSD.ORG Fri Oct 31 17:09:24 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03F9F5DA; Fri, 31 Oct 2014 17:09:24 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CA484E71; Fri, 31 Oct 2014 17:09:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9VH9N29038780; Fri, 31 Oct 2014 17:09:23 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9VH9Nsa038777; Fri, 31 Oct 2014 17:09:23 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201410311709.s9VH9Nsa038777@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 31 Oct 2014 17:09:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371877 - head/www/polipo X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Oct 2014 17:09:24 -0000 Author: marino Date: Fri Oct 31 17:09:22 2014 New Revision: 371877 URL: https://svnweb.freebsd.org/changeset/ports/371877 QAT: https://qat.redports.org/buildarchive/r371877/ Log: www/polipo: Fix build that uses custom PCACHEDIR While here, remove obsolete @dirrm lines, combine install targets, and condense mkdir commands into one. PR: 193606 Submitted by: WATANABE Kazuhiro Approved by: maintainer (Frank Behrens) Modified: head/www/polipo/Makefile head/www/polipo/pkg-plist Modified: head/www/polipo/Makefile ============================================================================== --- head/www/polipo/Makefile Fri Oct 31 16:43:11 2014 (r371876) +++ head/www/polipo/Makefile Fri Oct 31 17:09:22 2014 (r371877) @@ -26,6 +26,7 @@ SUB_FILES= pkg-message pkg-install pkg-d SUB_LIST+= USER=${PUSER} GROUP=${PGRP} DESTDIR=${DESTDIR} PCONFIGDIR=${PCONFIGDIR} \ PCACHEDIR=${PCACHEDIR} PPIDDIR=${PPIDDIR} PPIDFILE=${PPIDFILE} \ PLOGFILE=${PLOGFILE} +PLIST_SUB= PCACHEDIR=${PCACHEDIR} # polipo installation options, propagated to install scripts PUSER?= polipo @@ -38,18 +39,16 @@ PLOGFILE?= /var/log/polipo MAKE_ENV+= DISK_CACHE_ROOT=${PCACHEDIR} do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily/ \ + ${STAGEDIR}${PCONFIGDIR} \ + ${STAGEDIR}${PCACHEDIR} \ + ${STAGEDIR}${DOCSDIR} ${INSTALL_PROGRAM} ${WRKSRC}/polipo ${STAGEDIR}${PREFIX}/bin/ - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily/ ${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${STAGEDIR}${PREFIX}/etc/periodic/daily/ ${INSTALL_MAN} ${WRKSRC}/polipo.man ${STAGEDIR}${PREFIX}/man/man1/polipo.1 - ${MKDIR} ${STAGEDIR}${PCONFIGDIR} ${INSTALL_DATA} ${WRKSRC}/config.sample ${WRKSRC}/forbidden.sample ${STAGEDIR}${PCONFIGDIR} ${INSTALL_DATA} ${WRKSRC}/polipo.info ${STAGEDIR}${PREFIX}/${INFO_PATH} - ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/localindex.html ${STAGEDIR}${DATADIR}/www/index.html -post-install: - ${MKDIR} ${STAGEDIR}${PCACHEDIR} - .include Modified: head/www/polipo/pkg-plist ============================================================================== --- head/www/polipo/pkg-plist Fri Oct 31 16:43:11 2014 (r371876) +++ head/www/polipo/pkg-plist Fri Oct 31 17:09:22 2014 (r371877) @@ -4,9 +4,4 @@ bin/polipo etc/periodic/daily/400.polipo man/man1/polipo.1.gz %%DATADIR%%/www/index.html -@dirrmtry %%DATADIR%%/www -@dirrmtry %%DATADIR%% -@dirrmtry etc/polipo -@dirrmtry etc/periodic/daily -@dirrmtry etc/periodic -@dirrmtry /var/cache/polipo +@dir %%PCACHEDIR%%