Index: head/www/polipo/Makefile
===================================================================
--- head/www/polipo/Makefile	(revision 479277)
+++ head/www/polipo/Makefile	(revision 479278)
@@ -1,55 +1,55 @@
 # Created by: Frank Behrens <frank@pinky.sax.de>
 # $FreeBSD$
 
 PORTNAME=	polipo
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/
 
 MAINTAINER=	frank@pinky.sax.de
 COMMENT=	Small and fast caching web proxy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		makeinfo
 USE_RC_SUBR=	polipo
 
 INFO=		polipo
 
 .include <bsd.port.pre.mk>
 
 DOCSDIR=	${DATADIR}/www/doc
 PORTDOCS=	*
 
 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
 PGRP?=		polipo
 PCONFIGDIR?=	${PREFIX}/etc/polipo/
 PCACHEDIR?=	/var/cache/polipo
 PPIDDIR?=	/var/run/polipo/
 PPIDFILE=	${PPIDDIR}polipo.pid
 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/
 	${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${STAGEDIR}${PREFIX}/etc/periodic/daily/
 	${INSTALL_MAN} ${WRKSRC}/polipo.man ${STAGEDIR}${PREFIX}/man/man1/polipo.1
 	${INSTALL_DATA} ${WRKSRC}/config.sample ${WRKSRC}/forbidden.sample ${STAGEDIR}${PCONFIGDIR}
 	${INSTALL_DATA} ${WRKSRC}/polipo.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 	${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/localindex.html ${STAGEDIR}${DATADIR}/www/index.html
 
 .include <bsd.port.post.mk>
Index: head/www/polipo/files/pkg-install.in
===================================================================
--- head/www/polipo/files/pkg-install.in	(revision 479277)
+++ head/www/polipo/files/pkg-install.in	(revision 479278)
@@ -1,76 +1,76 @@
 #!/bin/sh
 
 POLIPOUSER=%%USER%%
 POLIPOGROUP=%%GROUP%%
 UID=173
 GID=${UID}
 
 POLIPOCACHE=%%PCACHEDIR%%
 POLIPOLOG=%%PLOGFILE%%
 PPIDDIR=%%PPIDDIR%%
 POLIPOPID=%%PPIDFILE%%
 
 if [ "$2" = "PRE-INSTALL" ]; then
 
 	if fgrep "polipo" "%%DESTDIR%%/etc/newsyslog.conf" 2>/dev/null 1>&2; then
 		if ! fgrep "polipo.pid" "%%DESTDIR%%/etc/newsyslog.conf" 2>/dev/null 1>&2; then
 			echo "==> ERROR: Previous installation left an invalid entry in %%DESTDIR%%/etc/newsyslog.conf."
 			echo "==> Please remove the polipo line from this file and try again."
 			exit 1
 		fi
 	fi
 
 	if ! pw groupshow "$POLIPOGROUP" 2>/dev/null 1>&2; then
 		if pw groupadd $POLIPOGROUP -g ${GID} ; then
 			echo "=> Added group \"$POLIPOGROUP\"."
 		else
 			echo "=> Adding group \"$POLIPOGROUP\" failed..."
 			exit 1
 		fi
 	fi
 
 	if ! pw usershow "$POLIPOUSER" 2>/dev/null 1>&2; then
 		if pw useradd $POLIPOUSER -u ${UID} -g $POLIPOGROUP -h - \
 			-s "/sbin/nologin" -d "/nonexistent" \
 			-c "polipo web cache"; \
 		then
 			echo "=> Added user \"$POLIPOUSER\"."
 		else
 			echo "=> Adding user \"$POLIPOUSER\" failed..."
 			exit 1
 		fi
 	fi
 
 elif [ "$2" = "POST-INSTALL" ]; then
 
 	if [ ! -d "%%DESTDIR%%$PPIDDIR" ]; then
 		mkdir -p "%%DESTDIR%%$PPIDDIR" || exit 1
 		chgrp "$POLIPOGROUP" "%%DESTDIR%%$PPIDDIR" || exit 1
 		chmod g+w "%%DESTDIR%%$PPIDDIR" || exit 1
 	fi
 
 	if [ ! -f "%%DESTDIR%%$POLIPOLOG" ]; then
 		touch "%%DESTDIR%%$POLIPOLOG" || exit 1
 		chown "$POLIPOUSER" "%%DESTDIR%%$POLIPOLOG" || exit 1
 		chmod u=rw,g=r,o= "%%DESTDIR%%$POLIPOLOG" || exit 1
 	fi
 
 	if ! fgrep "${POLIPOLOG}" "%%DESTDIR%%/etc/newsyslog.conf" 2>/dev/null 1>&2; then
-	    echo "Add a line to /etc/newsyslog.conf (or /usr/local/etc/newsyslog.d/polipo if"
+	    echo "Add a line to /etc/newsyslog.conf (or /usr/local/etc/newsyslog.conf.d/polipo.conf if"
 	    echo "supported on your system) to enable automatic log file rotation:"
 	    echo
 	    echo "${POLIPOLOG} ${POLIPOUSER}: 640 3 100 * J ${POLIPOPID} 30"
 	    echo
 	fi
 
 fi
 
 OSVER=`uname -r | sed -e 's/\..*//'`
 if [ ${OSVER} = "8" -o ${OSVER} = "9" ]; then
     CACHEPARENT=`dirname ${POLIPOCACHE}`
     echo "You will need to manually run:"
     echo "  chmod o+x %%DESTDIR%%$CACHEPARENT"
     echo "to ensure the cache is useable."
 fi
 
 exit 0