summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/polipo/Makefile11
-rw-r--r--www/polipo/pkg-plist7
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%%