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 de978c7cfba69054ebd9f99c168683bd14a3a876..14821eefb0b7f7b207cb1d053ebfee9550b1425e 100644 (file)
--- 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 d89d7bff83cf1591051709f41b4bde901e5ec51e..b6c0eebd235329047daec5c6f2234b756dded213 100644 (file)
--- 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 c59525662297704dc3f0d147d21b108619a7e9fe..137369f136799363c5b3813252a0d005eded97f8 100644 (file)
--- 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