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.

4 files changed, 20 insertions, 51 deletions

diff --git a/Makefile b/Makefile
index c2548622..a8255fec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.447 2014/11/28 18:36:35 schwarze Exp $
+# $Id: Makefile,v 1.448 2014/11/28 18:57:31 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -101,7 +101,6 @@ DISTFILES	 = INSTALL \
 		   NEWS \
 		   TODO \
 		   apropos.1 \
-		   att.in \
 		   cgi.h.example \
 		   chars.in \
 		   compat_fts.h \
diff --git a/Makefile.depend b/Makefile.depend
index 9ac53738..d3c13e09 100644
--- a/Makefile.depend
+++ b/Makefile.depend
@@ -1,5 +1,4 @@
-arch.o: arch.c config.h mdoc.h libmdoc.h arch.in
-att.o: att.c config.h mdoc.h libmdoc.h att.in
+att.o: att.c config.h mdoc.h libmdoc.h
 cgi.o: cgi.c config.h mandoc.h mandoc_aux.h main.h manpath.h mansearch.h cgi.h
 chars.o: chars.c config.h mandoc.h mandoc_aux.h libmandoc.h chars.in
 compat_fgetln.o: compat_fgetln.c config.h
@@ -42,9 +41,9 @@ mdoc_term.o: mdoc_term.c config.h mandoc.h mandoc_aux.h out.h term.h mdoc.h main
 mdoc_validate.o: mdoc_validate.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h
 msec.o: msec.c config.h mandoc.h libmandoc.h msec.in
 out.o: out.c config.h mandoc_aux.h mandoc.h out.h
-preconv.o: preconv.c config.h
+preconv.o: preconv.c config.h mandoc.h libmandoc.h
 read.o: read.c config.h mandoc.h mandoc_aux.h libmandoc.h mdoc.h man.h main.h
-roff.o: roff.c config.h mandoc.h mandoc_aux.h libroff.h libmandoc.h predefs.in
+roff.o: roff.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h predefs.in
 st.o: st.c config.h mdoc.h libmdoc.h st.in
 tbl.o: tbl.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h
 tbl_data.o: tbl_data.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h
@@ -56,7 +55,6 @@ term.o: term.c config.h mandoc.h mandoc_aux.h out.h term.h main.h
 term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h out.h term.h main.h
 term_ps.o: term_ps.c config.h mandoc.h mandoc_aux.h out.h main.h term.h
 tree.o: tree.c config.h mandoc.h mdoc.h man.h main.h
-vol.o: vol.c config.h mdoc.h libmdoc.h vol.in
 test-dirent-namlen.o: test-dirent-namlen.c
 test-fgetln.o: test-fgetln.c
 test-fts.o: test-fts.c
diff --git a/att.c b/att.c
index eba05a1d..a1703ebc 100644
--- a/att.c
+++ b/att.c
@@ -1,4 +1,4 @@
-/*	$Id: att.c,v 1.12 2014/08/10 23:54:41 schwarze Exp $ */
+/*	$Id: att.c,v 1.13 2014/11/28 18:57:31 schwarze Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -17,21 +17,33 @@
 #include "config.h"
 
 #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/att.in b/att.in
deleted file mode 100644
index b4ef8221..00000000
--- a/att.in
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$Id: att.in,v 1.8 2011/07/31 17:30:33 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")