4 files changed, 20 insertions, 6 deletions

diff --git a/www/squid31/files/pkg-deinstall.in b/www/squid31/files/pkg-deinstall.in
index c775ba284cc2..5ec2fe766068 100644
--- a/www/squid31/files/pkg-deinstall.in
+++ b/www/squid31/files/pkg-deinstall.in
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/usr/sbin
 case $2 in
 DEINSTALL)
 	cd ${PKG_PREFIX}/etc/squid || exit 1
-	for f in cachemgr.conf mime.conf msntauth.conf squid.conf; do
+	for f in cachemgr.conf errorpage.css mime.conf msntauth.conf squid.conf; do
 		cmp -s -z ${f} ${f}.default && rm ${f}
 	done
 	;;
diff --git a/www/squid31/files/pkg-install.in b/www/squid31/files/pkg-install.in
index 8e87a6c545c8..a244e2e2dd58 100644
--- a/www/squid31/files/pkg-install.in
+++ b/www/squid31/files/pkg-install.in
@@ -50,6 +50,18 @@ PRE-INSTALL)
 		echo "I will use the existing user '${squid_user}':"
 	fi
 	pw usershow ${squid_user}
+	# Starting with 3.1, Squid's PID file moved from
+	# ${squid_base}/logs/squid.pid to ${squid_base}/squid.pid.
+	# Since we usually start the Squid master process as ${squid_user},
+	# make sure that ${squid_base} is writable for it.
+	if [ ! -d ${squid_base} ]; then
+		echo "Creating ${squid_base}..."
+		install -d -o root -g ${squid_group} \
+		    -m 0775 ${squid_base}
+	else
+		chgrp ${squid_group} ${squid_base}
+		chmod g+w ${squid_base}
+	fi
 	for dir in cache logs; do
 	if [ ! -d ${squid_base}/${dir} ]; then
 		echo "Creating ${squid_base}/${dir}..."
@@ -64,7 +76,7 @@ PRE-INSTALL)
 	fi
 	;;
 POST-INSTALL)
-	for file in cachemgr.conf mime.conf squid.conf; do
+	for file in cachemgr.conf errorpage.css mime.conf msntauth.conf squid.conf; do
 		if [ ! -f ${squid_confdir}/${file} \
 		    -a -f ${squid_confdir}/${file}.default ]; then
 			echo "Creating ${file} from default..."
diff --git a/www/squid31/files/pkg-message.in b/www/squid31/files/pkg-message.in
index 8a17b2772a7f..5979dcacbbc0 100644
--- a/www/squid31/files/pkg-message.in
+++ b/www/squid31/files/pkg-message.in
@@ -24,8 +24,11 @@
 
      Note:
      If you just updated your Squid installation from an earlier version,
-     make sure to check your Squid configuration against the 3.0 default
+     make sure to check your Squid configuration against the 3.1 default
      configuration file %%PREFIX%%/etc/squid/squid.conf.default.
+     
+     %%PREFIX%%/etc/squid/squid.conf.documented is a fully annotated
+     configuration file you can consult for further reference.
 
      Additionally, you should check your configuration by calling
      'squid -f /path/to/squid.conf -k parse' before starting Squid.
diff --git a/www/squid31/files/squid.in b/www/squid31/files/squid.in
index bd9483908ae6..2b39eaef5d3c 100644
--- a/www/squid31/files/squid.in
+++ b/www/squid31/files/squid.in
@@ -37,10 +37,9 @@ stop_cmd="squid_stop"
 
 load_rc_config ${name}
 
-squid_chdir=${squid_chdir:-"%%PREFIX%%/squid/logs"}
+squid_chdir=${squid_chdir:-"%%PREFIX%%/squid"}
 squid_enable=${squid_enable:-"NO"}
-squid_flags=${squid_flags-"-D"}
-squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/logs/squid.pid"}
+squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/squid.pid"}
 squid_user=${squid_user:-%%SQUID_UID%%}
 default_config=%%PREFIX%%/etc/squid/squid.conf