From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Tue, 26 Aug 2025 02:36:53 +0000 (+0000)
Subject: Remove DEFAULT_ICP_PORT build variable (#2146)
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a782502775d9da8436b44a19fef985ce15fbbee;p=thirdparty%2Fsquid.git

Remove DEFAULT_ICP_PORT build variable (#2146)

Since 2008 commit df2eec10, this variable has only been used for
icp_port documentation and only in one location. Just stating the IANA
registered port (i.e. 3130) there is better.
---

diff --git a/src/Common.am b/src/Common.am
index de978c7cfb..14821eefb0 100644
--- a/src/Common.am
+++ b/src/Common.am
@@ -12,7 +12,6 @@
 
 ## Default variables
 DEFAULT_HTTP_PORT	= 3128
-DEFAULT_ICP_PORT	= 3130
 DEFAULT_PREFIX		= $(prefix)
 DEFAULT_CONFIG_DIR	= $(sysconfdir)
 DEFAULT_CONFIG_FILE	= $(DEFAULT_CONFIG_DIR)/squid.conf
diff --git a/src/Makefile.am b/src/Makefile.am
index d89d7bff83..b6c0eebd23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -643,7 +643,6 @@ cf_gen_defines.cci: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre $(top_builddi
 cf.data: cf.data.pre Makefile
 	sed \
 	-e "s%[@]DEFAULT_HTTP_PORT[@]%$(DEFAULT_HTTP_PORT)%g" \
-	-e "s%[@]DEFAULT_ICP_PORT[@]%$(DEFAULT_ICP_PORT)%g" \
 	-e "s%[@]DEFAULT_CACHE_EFFECTIVE_USER[@]%$(CACHE_EFFECTIVE_USER)%g" \
 	-e "s%[@]DEFAULT_MIME_TABLE[@]%$(DEFAULT_MIME_TABLE)%g" \
 	-e "s%[@]DEFAULT_SSL_CRTD[@]%$(DEFAULT_SSL_CRTD)%g" \
diff --git a/src/cf.data.pre b/src/cf.data.pre
index c595256622..137369f136 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -8479,7 +8479,7 @@ DOC_START
 	and from neighbor caches.  The standard UDP port for ICP is 3130.
 
 	Example:
-		icp_port @DEFAULT_ICP_PORT@
+		icp_port 3130
 DOC_END
 
 NAME: htcp_port