diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/polipo/Makefile | 16 | ||||
| -rw-r--r-- | www/polipo/files/patch-aa | 18 | ||||
| -rw-r--r-- | www/polipo/files/polipo.sh.in | 2 | ||||
| -rw-r--r-- | www/polipo/pkg-plist | 2 |
4 files changed, 24 insertions, 14 deletions
diff --git a/www/polipo/Makefile b/www/polipo/Makefile index a85fc0947e24..ee1f3aff1355 100644 --- a/www/polipo/Makefile +++ b/www/polipo/Makefile @@ -7,6 +7,7 @@ PORTNAME= polipo PORTVERSION= 0.9.8 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.pps.jussieu.fr/~jch/software/files/polipo/ \ http://www.sax.de/~frank/polipo4bsd/files/ @@ -16,7 +17,7 @@ COMMENT= A small and fast caching web proxy MAN1= polipo.1 -USE_RC_SUBR= yes +USE_RC_SUBR= polipo.sh .include <bsd.port.pre.mk> @@ -31,18 +32,10 @@ NOPORTDOCS= yes INFO= polipo .endif -.if !defined(NOPORTDOCS) DOCSDIR= ${DATADIR}/www/doc PORTDOCS= * -PLIST_FILES+= share/polipo/www/index.html -.endif - -# created on the fly due to variable substitution -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message pkg-install pkg-deinstall 400.polipo polipo.sh +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} RC_SUBR=${RC_SUBR} @@ -62,7 +55,6 @@ pre-install: apply-slist do-install: ${INSTALL_PROGRAM} ${WRKSRC}/polipo ${DESTDIR}${PREFIX}/bin/ - ${INSTALL_SCRIPT} ${WRKDIR}/polipo.sh ${DESTDIR}${PREFIX}/etc/rc.d/ ${MKDIR} ${DESTDIR}${PREFIX}/etc/periodic/daily/ ${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${DESTDIR}${PREFIX}/etc/periodic/daily/ ${INSTALL_MAN} ${WRKSRC}/polipo.man ${DESTDIR}${PREFIX}/man/man1/polipo.1 @@ -83,6 +75,6 @@ do-install: post-install: @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - ${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/www/polipo/files/patch-aa b/www/polipo/files/patch-aa index 05c762f04e4c..6b61212d3dbc 100644 --- a/www/polipo/files/patch-aa +++ b/www/polipo/files/patch-aa @@ -83,3 +83,21 @@ The default root of the local web space. .SH SIGNALS .TP +--- server.c Thu Jan 20 00:21:19 2005 ++++ server.c Wed Jul 27 13:24:28 2005 +@@ -1783,10 +1783,11 @@ + } else if(code < 400 && + (content_range.from >= 0 || content_range.to >= 0 || + content_range.full_length >= 0)) { +- do_log(L_ERROR, "Range without partial content.\n"); +- httpServerAbort(connection, 1, 502, +- internAtom("Range without partial content")); +- goto fail; ++ do_log(L_WARN, "Range without partial content.\n"); ++ /* Damn anakata. */ ++ content_range.from = -1; ++ content_range.to = -1; ++ content_range.full_length = -1; + } else if(code != 304 && code != 412) { + full_len = len; + } diff --git a/www/polipo/files/polipo.sh.in b/www/polipo/files/polipo.sh.in index b2e666697d42..c4b0b8994392 100644 --- a/www/polipo/files/polipo.sh.in +++ b/www/polipo/files/polipo.sh.in @@ -4,7 +4,7 @@ # PROVIDE: polipo # REQUIRE: NETWORK # BEFORE: NETWORK -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD shutdown . %%RC_SUBR%% diff --git a/www/polipo/pkg-plist b/www/polipo/pkg-plist index cd09a86d4942..9a446ee0b531 100644 --- a/www/polipo/pkg-plist +++ b/www/polipo/pkg-plist @@ -1,7 +1,7 @@ bin/polipo etc/polipo/config.sample etc/polipo/forbidden.sample -etc/rc.d/polipo.sh etc/periodic/daily/400.polipo +%%PORTDOCS%%%%DATADIR%%/www/index.html @unexec rmdir %D/etc/periodic/daily 2>/dev/null || true @unexec rmdir %D/etc/periodic 2>/dev/null || true |