Date: Fri, 31 Oct 2014 17:09:23 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371877 - head/www/polipo Message-ID: <201410311709.s9VH9Nsa038777@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.post.mk> 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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410311709.s9VH9Nsa038777>