From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 22 10:50:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 068021065671 for ; Thu, 22 May 2008 10:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CA8758FC0C for ; Thu, 22 May 2008 10:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m4MAo2TA077475 for ; Thu, 22 May 2008 10:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m4MAo2MV077474; Thu, 22 May 2008 10:50:02 GMT (envelope-from gnats) Resent-Date: Thu, 22 May 2008 10:50:02 GMT Resent-Message-Id: <200805221050.m4MAo2MV077474@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thomas-Martin Seck Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4B661065670 for ; Thu, 22 May 2008 10:41:42 +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 3D3318FC1E for ; Thu, 22 May 2008 10:41:41 +0000 (UTC) (envelope-from tmseck@netcologne.de) Received: from laurel.tmseck.homedns.org (xdsl-81-173-168-125.netcologne.de [81.173.168.125]) by smtp3.netcologne.de (Postfix) with SMTP id 3B95A677EA for ; Thu, 22 May 2008 12:41:40 +0200 (CEST) Received: (qmail 855 invoked from network); 22 May 2008 10:41:40 -0000 Received: from unknown (HELO bledge.tmseck.homedns.org) (192.168.1.4) by 0 with SMTP; 22 May 2008 10:41:40 -0000 Received: from bledge.tmseck.homedns.org (localhost [127.0.0.1]) by bledge.tmseck.homedns.org (8.14.2/8.14.2) with ESMTP id m4MAfcFT052465; Thu, 22 May 2008 12:41:38 +0200 (CEST) (envelope-from tmseck@netcologne.de) Received: (from thomas@localhost) by bledge.tmseck.homedns.org (8.14.2/8.14.2/Submit) id m4MAfbEB052464; Thu, 22 May 2008 12:41:37 +0200 (CEST) (envelope-from tmseck@netcologne.de) Message-Id: <200805221041.m4MAfbEB052464@bledge.tmseck.homedns.org> Date: Thu, 22 May 2008 12:41:37 +0200 (CEST) From: Thomas-Martin Seck To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/123891: [Maintainer] www/squid30: update to 3.0.STABLE6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Thomas-Martin Seck List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 May 2008 10:50:03 -0000 >Number: 123891 >Category: ports >Synopsis: [Maintainer] www/squid30: update to 3.0.STABLE6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu May 22 10:50:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 8.0-CURRENT i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of May 22, 2008. >Description: - Update to 3.0.STABLE6 - Remove a patch that is no longer needed Removed files: files/patch-tools-Makefile.in >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid30) (revision 1380) +++ Makefile (.../local/squid30) (revision 1380) @@ -62,8 +62,7 @@ # requests. PORTNAME= squid -PORTVERSION= 3.0.5 -PORTREVISION= 1 +PORTVERSION= 3.0.6 CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \ @@ -82,7 +81,7 @@ http://www1.jp.squid-cache.org/Versions/v3/3.0/ \ http://www2.tw.squid-cache.org/Versions/v3/3.0/ MASTER_SITE_SUBDIR= squid-3/STABLE -DISTNAME= squid-3.0.STABLE5 +DISTNAME= squid-3.0.STABLE6 DIST_SUBDIR= squid3.0 PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ Index: distinfo =================================================================== --- distinfo (.../www/squid30) (revision 1380) +++ distinfo (.../local/squid30) (revision 1380) @@ -1,3 +1,3 @@ -MD5 (squid3.0/squid-3.0.STABLE5.tar.bz2) = 60255e66bca8203afb9a635f318b9c65 -SHA256 (squid3.0/squid-3.0.STABLE5.tar.bz2) = fc5023aebcdfbdde8e3390e5beedbf15780a6b4bef55e635df0983c1e5658cd4 -SIZE (squid3.0/squid-3.0.STABLE5.tar.bz2) = 1772673 +MD5 (squid3.0/squid-3.0.STABLE6.tar.bz2) = 231323a73346041cec825e785960e348 +SHA256 (squid3.0/squid-3.0.STABLE6.tar.bz2) = b01879f3d342bc031b9e92d006e50ae4d6cfeb918cda241c1f2e740becf1a720 +SIZE (squid3.0/squid-3.0.STABLE6.tar.bz2) = 1770652 Index: files/patch-tools-Makefile.in =================================================================== --- files/patch-tools-Makefile.in (.../www/squid30) (revision 1380) +++ files/patch-tools-Makefile.in (.../local/squid30) (revision 1380) @@ -1,63 +0,0 @@ -This patch is mostly a patch for Squid bug #2346; the default location of the -cachemgr.cgi configuration file was not correctly passed to the preprocessor -during compilation. - ---- tools/Makefile.in.orig 2008-05-10 16:54:15.000000000 +0200 -+++ tools/Makefile.in 2008-05-10 16:56:22.000000000 +0200 -@@ -61,7 +61,7 @@ - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) --am_cachemgr__CGIEXT__OBJECTS = cachemgr.$(OBJEXT) -+am_cachemgr__CGIEXT__OBJECTS = cachemgr__CGIEXT_-cachemgr.$(OBJEXT) - cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS) - cachemgr__CGIEXT__LDADD = $(LDADD) - am__DEPENDENCIES_1 = -@@ -318,7 +318,7 @@ - SUBDIRS = - squidclient_SOURCES = squidclient.cc - cachemgr__CGIEXT__SOURCES = cachemgr.cc --cachemgr__CGIEXT__CFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS) -+cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS) - LDADD = -L../lib -lmiscutil $(XTRA_LIBS) - EXTRA_DIST = \ - cachemgr.conf -@@ -440,7 +440,7 @@ - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cachemgr.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/squidclient.Po@am__quote@ - - .cc.o: -@@ -467,6 +467,20 @@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -+cachemgr__CGIEXT_-cachemgr.o: cachemgr.cc -+@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.o -MD -MP -MF "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po"; else rm -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc -+ -+cachemgr__CGIEXT_-cachemgr.obj: cachemgr.cc -+@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.obj -MD -MP -MF "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi`; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po"; else rm -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi` -+ - mostlyclean-libtool: - -rm -f *.lo - -@@ -835,6 +849,8 @@ - $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h - - 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 \ >Release-Note: >Audit-Trail: >Unformatted: