AT&T is unlikely to release an new version of Research UNIX any time soon.

So, it's pointless to make adding version strings easy for downstream.
One source file less to maintain.

2 files changed, 17 insertions, 43 deletions

diff --git a/usr.bin/mandoc/att.c b/usr.bin/mandoc/att.c
index 1fde7497514..9921fcd7ee6 100644
--- a/usr.bin/mandoc/att.c
+++ b/usr.bin/mandoc/att.c
@@ -1,4 +1,4 @@
-/*	$Id: att.c,v 1.8 2014/04/20 16:44:44 schwarze Exp $ */
+/*	$OpenBSD: att.c,v 1.9 2014/11/28 18:57:04 schwarze Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,20 +14,34 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
 #include <string.h>
 
 #include "mdoc.h"
 #include "libmdoc.h"
 
 #define LINE(x, y) \
-	if (0 == strcmp(p, x)) return(y);
+	if (0 == strcmp(p, x)) return(y)
 
 
 const char *
 mdoc_a2att(const char *p)
 {
 
-#include "att.in"
+	LINE("v1",	"Version\\~1 AT&T UNIX");
+	LINE("v2",	"Version\\~2 AT&T UNIX");
+	LINE("v3",	"Version\\~3 AT&T UNIX");
+	LINE("v4",	"Version\\~4 AT&T UNIX");
+	LINE("v5",	"Version\\~5 AT&T UNIX");
+	LINE("v6",	"Version\\~6 AT&T UNIX");
+	LINE("v7",	"Version\\~7 AT&T UNIX");
+	LINE("32v",	"Version\\~32V AT&T UNIX");
+	LINE("III",	"AT&T System\\~III UNIX");
+	LINE("V",	"AT&T System\\~V UNIX");
+	LINE("V.1",	"AT&T System\\~V Release\\~1 UNIX");
+	LINE("V.2",	"AT&T System\\~V Release\\~2 UNIX");
+	LINE("V.3",	"AT&T System\\~V Release\\~3 UNIX");
+	LINE("V.4",	"AT&T System\\~V Release\\~4 UNIX");
 
 	return(NULL);
 }
diff --git a/usr.bin/mandoc/att.in b/usr.bin/mandoc/att.in
deleted file mode 100644
index fb0bb43fa41..00000000000
--- a/usr.bin/mandoc/att.in
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$Id: att.in,v 1.5 2011/07/24 02:52:56 schwarze Exp $ */
-/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file defines the AT&T versions of the .At macro.  This probably
- * isn't going to change.  The right-hand side is the formatted string.
- *
- * Be sure to escape strings.
- * The non-breaking blanks prevent ending an output line right before
- * a number.  Groff prevent line breaks at the same places.
- */
-
-LINE("v1",		"Version\\~1 AT&T UNIX")
-LINE("v2",		"Version\\~2 AT&T UNIX")
-LINE("v3",		"Version\\~3 AT&T UNIX")
-LINE("v4",		"Version\\~4 AT&T UNIX")
-LINE("v5",		"Version\\~5 AT&T UNIX")
-LINE("v6",		"Version\\~6 AT&T UNIX")
-LINE("v7",		"Version\\~7 AT&T UNIX")
-LINE("32v",		"Version\\~32V AT&T UNIX")
-LINE("III",		"AT&T System\\~III UNIX")
-LINE("V",		"AT&T System\\~V UNIX")
-LINE("V.1",		"AT&T System\\~V Release\\~1 UNIX")
-LINE("V.2",		"AT&T System\\~V Release\\~2 UNIX")
-LINE("V.3",		"AT&T System\\~V Release\\~3 UNIX")
-LINE("V.4",		"AT&T System\\~V Release\\~4 UNIX")