From 086c5c1c67b379ffcdbad47460e1366a35f8b8c0 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 3 Sep 2024 20:40:51 +0200
Subject: [PATCH] syntax-check: Catch all FSF postal addresses.

* top/maint.mk (sc_franklin_street): Rename to sc_fsf_postal,
improve regexp.
---
 ChangeLog    | 6 ++++++
 top/maint.mk | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31b402c0ea..a281d657a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-09-03  Simon Josefsson  <simon@josefsson.org>
+
+	syntax-check: Catch all FSF postal addresses.
+	* top/maint.mk (sc_franklin_street): Rename to sc_fsf_postal,
+	improve regexp.
+
 2024-09-03  Bruno Haible  <bruno@clisp.org>
 
 	unlockpt tests: Avoid test failure on Haiku.
diff --git a/top/maint.mk b/top/maint.mk
index 68f027aa28..a6f130d3d6 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1047,11 +1047,11 @@ sc_GFDL_version:
 	halt='GFDL vN, N!=3'						\
 	  $(_sc_search_regexp)
 
-# Look out for 'Franklin Street' addresses -- use URLs instead:
+# Look out for FSF postal addresses -- use URLs instead:
 # https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Code.html
-sc_franklin_street:
-	@prohibit='Franklin.*Street'					\
-	halt='use URLs instead of old Franklin Street postal address'	\
+sc_fsf_postal:
+	@prohibit='(Mass Ave|Massachusetts Ave|Temple Pl|Franklin St|Milk St)' \
+	halt='use license URLs instead of FSF postal address' \
 	 $(_sc_search_regexp)
 
 # Don't use Texinfo's @acronym{}.
-- 
2.39.5