From tmseck@netcologne.de  Sat May 10 17:15:20 2008
Return-Path: <tmseck@netcologne.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 368601065670
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 10 May 2008 17:15:20 +0000 (UTC)
	(envelope-from tmseck@netcologne.de)
Received: from smtp3.netcologne.de (smtp3.netcologne.de [194.8.194.66])
	by mx1.freebsd.org (Postfix) with ESMTP id BAB9E8FC13
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 10 May 2008 17:15:19 +0000 (UTC)
	(envelope-from tmseck@netcologne.de)
Received: from laurel.tmseck.homedns.org (xdsl-84-44-231-211.netcologne.de [84.44.231.211])
	by smtp3.netcologne.de (Postfix) with SMTP id 75E34677E4
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 10 May 2008 19:15:18 +0200 (CEST)
Received: (qmail 758 invoked from network); 10 May 2008 17:15:17 -0000
Received: from unknown (HELO hardy.tmseck.homedns.org) (192.168.1.2)
  by 0 with SMTP; 10 May 2008 17:15:17 -0000
Received: from hardy.tmseck.homedns.org (localhost [127.0.0.1])
	by hardy.tmseck.homedns.org (8.14.2/8.14.2) with ESMTP id m4AHFHbL009664;
	Sat, 10 May 2008 19:15:17 +0200 (CEST)
	(envelope-from tmseck@netcologne.de)
Received: (from thomas@localhost)
	by hardy.tmseck.homedns.org (8.14.2/8.14.2/Submit) id m4AHFG74009663;
	Sat, 10 May 2008 19:15:16 +0200 (CEST)
	(envelope-from tmseck@netcologne.de)
Message-Id: <200805101715.m4AHFG74009663@hardy.tmseck.homedns.org>
Date: Sat, 10 May 2008 19:15:16 +0200 (CEST)
From: Thomas-Martin Seck <tmseck@web.de>
Reply-To: Thomas-Martin Seck <tmseck@web.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer] www/squid: correct handling of the default cachemgr.cgi configuration file
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         123573
>Category:       ports
>Synopsis:       [Maintainer] www/squid: correct handling of the default cachemgr.cgi configuration file
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 10 17:20:00 UTC 2008
>Closed-Date:    Fri May 16 12:27:31 UTC 2008
>Last-Modified:  Fri May 16 12:30:01 UTC 2008
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of May 10, 2008.

	
>Description:
- Fix a mistake I (the maintainer) had introduced regarding the
  installation of the cachemgr.conf.default file: instead of explicitly
  installing it I thought it would be enough to change an automake
  variable that served an entirely different purpose, namely
  hardcoding the path to the configuration in the cachemgr.cgi
  binary.
- While at it: remove a no longer needed .sh reference from
  files/pkg-message.in.
- Set PORTREVISION to 1 because the hardcoded name of the default
  configuration file has changed within cachemgr.cgi.
	
>How-To-Repeat:
Install www/squid, look at the installation message and run
'grep -a cachemgr.conf' on libexec/squid/cachemgr.cgi.
	<code/input/activities to reproduce the problem (multiple
	lines)>
>Fix:
Apply this patch:

Index: Makefile
===================================================================
--- Makefile	(.../www/squid)	(revision 1370)
+++ Makefile	(.../local/squid)	(revision 1370)
@@ -76,6 +76,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.6.20
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
Index: files/patch-tools-Makefile.in
===================================================================
--- files/patch-tools-Makefile.in	(.../www/squid)	(revision 1370)
+++ files/patch-tools-Makefile.in	(.../local/squid)	(revision 1370)
@@ -1,11 +1,11 @@
---- tools/Makefile.in.orig	Sun May 14 18:30:04 2006
-+++ tools/Makefile.in	Sun May 14 18:31:02 2006
-@@ -297,7 +297,7 @@
- EXTRA_DIST = \
- 	cachemgr.conf
+--- tools/Makefile.in.orig	2008-05-10 18:39:20.000000000 +0200
++++ tools/Makefile.in	2008-05-10 18:40:02.000000000 +0200
+@@ -791,6 +791,8 @@
+ $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
  
--DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
-+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf.default
- 
- # Don't automatically uninstall config files
- #	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
+ install-data-local:
++	@echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default"; \
++	$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default;
+ 	@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
+ 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
+ 	else \
Index: files/pkg-message.in
===================================================================
--- files/pkg-message.in	(.../www/squid)	(revision 1370)
+++ files/pkg-message.in	(.../local/squid)	(revision 1370)
@@ -20,7 +20,7 @@
 
      To enable Squid, set squid_enable=yes in either
      /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
-     Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details.
+     Please see %%PREFIX%%/etc/rc.d/squid for further details.
 
      Note:
      If you just updated your Squid installation from 2.5 or earlier,
	


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Wed May 14 18:01:50 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=123573 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Fri May 16 12:27:30 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=123573 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/123573: commit references a PR
Date: Fri, 16 May 2008 12:27:27 +0000 (UTC)

 miwi        2008-05-16 12:27:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/squid            Makefile 
     www/squid/files      patch-tools-Makefile.in pkg-message.in 
   Log:
   - Fix a mistake I (the maintainer) had introduced regarding the
   installation of the cachemgr.conf.default file: instead of explicitly
   installing it I thought it would be enough to change an automake
   variable that served an entirely different purpose, namely
   hardcoding the path to the configuration in the cachemgr.cgi
   binary.
   - While at it: remove a no longer needed .sh reference from
   files/pkg-message.in.
   - Set PORTREVISION to 1 because the hardcoded name of the default
   configuration file has changed within cachemgr.cgi.
   
   PR:             123573
   Submitted by:   Thomas-Martin Seck <tmseck@web.de> (maintainer)
   
   Revision  Changes    Path
   1.211     +1 -0      ports/www/squid/Makefile
   1.2       +10 -10    ports/www/squid/files/patch-tools-Makefile.in
   1.5       +1 -1      ports/www/squid/files/pkg-message.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
