[zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.squid:1.2 cvs.mk:1.4 squid_recipes.mk:1.3 squid_targets.mk:1.2 standard_targets.mk:1.3

[Chris McDonough]

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv3569

Modified Files:
	Makefile.squid cvs.mk squid_recipes.mk squid_targets.mk 
	standard_targets.mk 
Log Message:
Changes to make Squid work.


=== NZO_SiteLayout/Makefile.squid 1.1.1.1 => 1.2 ===
 #   cvs.mk for other known chcckouts).
 #-----------------------------------------------------------------------
-SQUID_CHECKOUT=src/Squid-2.4-STABLE6
+SQUID_CHECKOUT=src/Squid-2.4-STABLE6+
 
 include squid_targets.mk
 
@@ -27,6 +27,9 @@
 #
 #   Add / remove here ass appropriate.
 #-----------------------------------------------------------------------
+ROOT_TARGETS=\
+${SQUID_ROOT_TARGETS}
+
 OPT_TARGETS=\
 ${SQUID_OPT_TARGETS} \
 


=== NZO_SiteLayout/cvs.mk 1.3 => 1.4 ===
 #   Squid versions
 
-src/Squid-2.4-STABLE6: CVS_REPOSITORY=${CUSTOM_CVS_REPOSITORY}
-src/Squid-2.4-STABLE6: CVS_MODULE=Squid
-src/Squid-2.4-STABLE6: CVS_TAG=-r SQUID_2_4_STABLE6-p1
+src/Squid-2.4-STABLE6+: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY}
+src/Squid-2.4-STABLE6+: CVS_MODULE=Squid-2.4STABLE6+
+src/Squid-2.4-STABLE6+: CVS_TAG=
 
 src/Squid-2.5-PRE5: CVS_REPOSITORY=${SQUID_CVS_REPOSITORY}
 src/Squid-2.5-PRE5: CVS_MODULE=squid


=== NZO_SiteLayout/squid_recipes.mk 1.2 => 1.3 ===
 #       checkouts in 'cvs.mk'.
 #=======================================================================
+HTTP_PORT=8881
+ICP_PORT=3130
+REDIRECT_BINARY=
+VAR_DIR=${BASE_DIR}/var
+PACKAGE_DIR=${BASE_DIR}/opt
+LOG_DIR=${BASE_DIR}/log
+CACHE_DIR=${VAR_DIR}/squid/cache
+CACHE_MEM_MB=500
+HTTPD_ACCEL_PORT=8080
+HTTPD_ACCEL_HOST=localhost
+
+SEDSCRIPT=\
+-e "s@%LOG_DIR%@${LOG_DIR}@g;\
+s@%LOGDIR%@${LOG_DIR}@g;\
+s@%HTTP_PORT%@${HTTP_PORT}@g;\
+s@%ICP_PORT%@${ICP_PORT}@g;\
+s@%PACKAGE_DIR%@${PACKAGE_DIR}@g;\
+s@%REDIRECT_BINARY%@${REDIRECT_BINARY}@g;\
+s@%CACHE_DIR%@${CACHE_DIR}@g;\
+s@%VAR_DIR%@${VAR_DIR}@g;\
+s@%VARDIR%@${VAR_DIR}@g;\
+s@%CACHE_MEM_MB%@${CACHE_MEM_MB}@g;\
+s@%HTTPD_ACCEL_HOST%@${HTTPD_ACCEL_HOST}@g;\
+s@%HTTPD_ACCEL_PORT%@${HTTPD_ACCEL_PORT}@g;\
+s@%ETCDIR%@${BASE_DIR}/etc at g;\
+s@%BINDIR%@${BASE_DIR}/bin at g;\
+"
 
 ${SQUID_CHECKOUT}: ${BASE_DIR}/src
 	${CD} ${BASE_DIR}/src \
@@ -26,7 +53,17 @@
 ${SQUID_BINARY}: opt/%/bin/squid: src/%/configure
 	${MKDIR} ${PACKAGE_DIR}/build
 	${CD} ${PACKAGE_DIR}/build \
-      &&  ${BASE_DIR}/$< --prefix=${PACKAGE_DIR}
+      &&  ${BASE_DIR}/$< \
+           --prefix=${PACKAGE_DIR} \
+           --bindir=${BASE_DIR}/bin \
+           --sbindir=${BASE_DIR}/bin \
+           --sysconfdir=${BASE_DIR}/etc \
+           --enable-gnuregex \
+           --enable-async-io=20 \
+           --enable-forw-via-db  \
+           --enable-linux-netfilter \
+           --enable-cachemgr-hostname=$(shell hostname) \
+           --enable-referer-log
 	${CD} ${PACKAGE_DIR}/build && ${MAKE} all
 	${CD} ${PACKAGE_DIR}/build && ${MAKE} install
 
@@ -38,28 +75,23 @@
 opt/Squid/bin/squid: ${SQUID_BUILD}/bin/squid opt/Squid
 
 bin/squid: opt/Squid/bin/squid
-	${MKDIR} bin
-	${LNSF} ${BASE_DIR}/$< ${BASE_DIR}/$@
-
-SQUID_CONF_FILES=\
-etc/squid.conf \
-etc/mime.conf
-
-${SQUID_CONF_FILES}: etc/%.conf : ${MAKEFILEDIR}/etc/%.conf.in
-	${MKDIR} ${BASE_DIR}/${@D}
-	${CP} $< $@
 
 bin/squidctl: ${MAKEFILEDIR}/bin/squidctl.in
 	${MKDIR} ${BASE_DIR}/${@D}
-	${CP} $< $@
+	${SED} ${SEDSCRIPT} < $<  > $@
+	${CHMOD} 775 ${BASE_DIR}/$@
 
-var/squid/cache:
+log var/squid/cache:
 	${MKDIR} ${BASE_DIR}/$@
 
-squid: bin/squid bin/squidctl
+etc/squid.conf:
+	${MKDIR} ${BASE_DIR}/${@D} && \
+          ${SED} ${SEDSCRIPT} < ${MAKEFILEDIR}/etc/squid.conf.in > $@
+
+squid: bin/squid bin/squidctl etc/squid.conf
 
 squid_usage:
 	@${ECHO} "   squid -- Build Squid binary."
 	@${ECHO}
 
-.PHONY: squid squid_usage
+.PHONY: squid squid_usage etc/squid.conf


=== NZO_SiteLayout/squid_targets.mk 1.1.1.1 => 1.2 ===
 #	Standard Squid targets
 #=======================================================================
+SQUID_ROOT_TARGETS=\
+log \
 
 SQUID_OPT_TARGETS=\
 opt/Squid \
@@ -9,9 +11,8 @@
 bin/squid \
 bin/squidctl \
 
-SQUID_ETC_TARGETS=\
-etc/squid.conf \
-etc/mime.conf \
-
 SQUID_VAR_TARGETS=\
 var/squid/cache \
+
+SQUID_ETC_TARGETS=\
+etc/squid.conf


=== NZO_SiteLayout/standard_targets.mk 1.2 => 1.3 ===
 install: compile ${BIN_TARGETS}
 
-instance: install ${ROOT_TARGETS} ${ETC_TARGETS} ${VAR_TARGETS}
+instance: install ${ROOT_TARGETS} ${VAR_TARGETS} ${ETC_TARGETS}
 
 clean:
 	${RM} ${OPT_TARGETS}