Attachment #87027 for bug #123572

View | Details | Raw Unified | Return to bug 123572
Collapse All | Expand All





PORTNAME=	squid
PORTVERSION=	3.0.5
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \

	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

post-install:
# Create cachemgr.conf.default manually since Squid-3's install routine
# unfortunately fails to do so (as it did in the old 2.5 days...):
	${INSTALL_DATA} ${WRKSRC}/tools/cachemgr.conf \
	    ${PREFIX}/etc/squid/cachemgr.conf.default
.if !defined(NOPORTEXAMPLES)
	@${MKDIR} ${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}




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 \

Return to bug 123572

Lines 63-68 Link Here

(-)Makefile (-4 / +1 lines)
63		63
64	PORTNAME= squid	64	PORTNAME= squid
65	PORTVERSION= 3.0.5	65	PORTVERSION= 3.0.5
		66	PORTREVISION= 1
66	CATEGORIES= www	67	CATEGORIES= www
67	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	68	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
68	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \	69	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
Lines 425-434 Link Here
425	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	426	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
426		427
427	post-install:	428	post-install:
428	# Create cachemgr.conf.default manually since Squid-3's install routine
429	# unfortunately fails to do so (as it did in the old 2.5 days...):
430	${INSTALL_DATA} ${WRKSRC}/tools/cachemgr.conf \
431	${PREFIX}/etc/squid/cachemgr.conf.default
432	.if !defined(NOPORTEXAMPLES)	429	.if !defined(NOPORTEXAMPLES)
433	@${MKDIR} ${EXAMPLESDIR}	430	@${MKDIR} ${EXAMPLESDIR}
434	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}	431	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}

Lines 1-11 Link Here

(-)files/patch-tools-Makefile.in (-7 / +59 lines)
1	--- tools/Makefile.in.orig Sun May 14 18:30:04 2006	1	This patch is mostly a patch for Squid bug #2346; the default location of the
2	+++ tools/Makefile.in Sun May 14 18:31:02 2006	2	cachemgr.cgi configuration file was not correctly passed to the preprocessor
3	@@ -297,7 +297,7 @@	3	during compilation.
		4
		5	--- tools/Makefile.in.orig 2008-05-10 16:54:15.000000000 +0200
		6	+++ tools/Makefile.in 2008-05-10 16:56:22.000000000 +0200
		7	@@ -61,7 +61,7 @@
		8	binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
		9	libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
		10	PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
		11	-am_cachemgr__CGIEXT__OBJECTS = cachemgr.$(OBJEXT)
		12	+am_cachemgr__CGIEXT__OBJECTS = cachemgr__CGIEXT_-cachemgr.$(OBJEXT)
		13	cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS)
		14	cachemgr__CGIEXT__LDADD = $(LDADD)
		15	am__DEPENDENCIES_1 =
		16	@@ -318,7 +318,7 @@
		17	SUBDIRS =
		18	squidclient_SOURCES = squidclient.cc
		19	cachemgr__CGIEXT__SOURCES = cachemgr.cc
		20	-cachemgr__CGIEXT__CFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS)
		21	+cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS)
		22	LDADD = -L../lib -lmiscutil $(XTRA_LIBS)
4	EXTRA_DIST = \	23	EXTRA_DIST = \
5	cachemgr.conf	24	cachemgr.conf
		25	@@ -440,7 +440,7 @@
		26	distclean-compile:
		27	-rm -f *.tab.c
6		28
7	-DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf	29	-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cachemgr.Po@am__quote@
8	+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf.default	30	+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po@am__quote@
		31	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/squidclient.Po@am__quote@
9		32
10	# Don't automatically uninstall config files	33	.cc.o:
11	# @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \	34	@@ -467,6 +467,20 @@
		35	@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
		36	@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
		37
		38	+cachemgr__CGIEXT_-cachemgr.o: cachemgr.cc
		39	+@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; \
		40	+@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
		41	+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.o' libtool=no @AMDEPBACKSLASH@
		42	+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
		43	+@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
		44	+
		45	+cachemgr__CGIEXT_-cachemgr.obj: cachemgr.cc
		46	+@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`; \
		47	+@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
		48	+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.obj' libtool=no @AMDEPBACKSLASH@
		49	+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
		50	+@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`
		51	+
		52	mostlyclean-libtool:
		53	-rm -f *.lo
		54
		55	@@ -835,6 +849,8 @@
		56	$(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
		57
		58	install-data-local:
		59	+ @echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default"; \
		60	+ $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default;
		61	@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
		62	echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
		63	else \