diff options
| author | John Marino <marino@FreeBSD.org> | 2014-10-31 17:09:22 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-10-31 17:09:22 +0000 |
| commit | 901b71f4be840d63f1972c91a8c6256c6211af89 (patch) | |
| tree | f3978a4061d87cd3862278d463db608e5ddf0a32 | |
| parent | - Clarify LICENSE (diff) | |
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)
| -rw-r--r-- | www/polipo/Makefile | 11 | ||||
| -rw-r--r-- | www/polipo/pkg-plist | 7 |
2 files changed, 6 insertions, 12 deletions
diff --git a/www/polipo/Makefile b/www/polipo/Makefile index 91b135369fd0..613db90619e6 100644 --- a/www/polipo/Makefile +++ b/www/polipo/Makefile @@ -26,6 +26,7 @@ SUB_FILES= pkg-message pkg-install pkg-deinstall 400.polipo 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> diff --git a/www/polipo/pkg-plist b/www/polipo/pkg-plist index 6d3fc4a2c665..700569f47193 100644 --- a/www/polipo/pkg-plist +++ b/www/polipo/pkg-plist @@ -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%% |