21 files changed, 5 insertions, 621 deletions

diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index 49af0bc534dd..f9c32e79ac17 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -11,28 +11,3 @@ SUBDIR=		libgroff libdriver libbib\
 MISC=		soelim
 
 .include <bsd.subdir.mk>
-# Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
-#      Written by James Clark (jjc@jclark.com)
-# 
-# This file is part of groff.
-# 
-# groff is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2, or (at your option) any later
-# version.
-# 
-# groff is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-# 
-# You should have received a copy of the GNU General Public License along
-# with groff; see the file COPYING.  If not, write to the Free Software
-# Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-SHELL=/bin/sh
-
-.PHONY: all
-all:
-	$(SHELL) configure
-	$(MAKE) all
diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
index c2960385789b..3d68b68a1e2a 100644
--- a/gnu/usr.bin/groff/Makefile.cfg
+++ b/gnu/usr.bin/groff/Makefile.cfg
@@ -1,3 +1,6 @@
+BINDIR?=	/usr/bin
+SHAREDIR?=	/usr/share
+
 # Define `page' to be letter if your PostScript printer uses 8.5x11
 # paper (USA) and define it to be A4, if it uses A4 paper (rest of the
 # world).
diff --git a/gnu/usr.bin/groff/addftinfo/Makefile b/gnu/usr.bin/groff/addftinfo/Makefile
index 5106496c0a05..db79f7c877bd 100644
--- a/gnu/usr.bin/groff/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/addftinfo/Makefile
@@ -9,6 +9,5 @@ DPADD+=		${LIBGROFF}
 MANDEPEND=	addftinfo.1
 CLEANFILES+=	${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index f0bb84ccffbe..ff5500dc5fc4 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -18,6 +18,5 @@ afterinstall:
 
 beforedepend: eqn.cc
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grodvi/Makefile b/gnu/usr.bin/groff/grodvi/Makefile
index 25d12da7259d..9dafc47937bf 100644
--- a/gnu/usr.bin/groff/grodvi/Makefile
+++ b/gnu/usr.bin/groff/grodvi/Makefile
@@ -9,6 +9,5 @@ DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBMATH}
 MANDEPEND=	grodvi.1
 CLEANFILES+=	${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/groff/Makefile b/gnu/usr.bin/groff/groff/Makefile
index f0262155300f..6499244622c6 100644
--- a/gnu/usr.bin/groff/groff/Makefile
+++ b/gnu/usr.bin/groff/groff/Makefile
@@ -9,6 +9,5 @@ DPADD+=		${LIBGROFF} ${LIBMATH}
 MANDEPEND=	groff.1
 CLEANFILES+=	${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grops/Makefile b/gnu/usr.bin/groff/grops/Makefile
index 3c730c1d568f..3716f18484c7 100644
--- a/gnu/usr.bin/groff/grops/Makefile
+++ b/gnu/usr.bin/groff/grops/Makefile
@@ -9,6 +9,5 @@ DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBMATH}
 MANDEPEND=	grops.1
 CLEANFILES+=	${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/grotty/Makefile b/gnu/usr.bin/groff/grotty/Makefile
index a473c32f86b6..d9d1ab287127 100644
--- a/gnu/usr.bin/groff/grotty/Makefile
+++ b/gnu/usr.bin/groff/grotty/Makefile
@@ -9,6 +9,5 @@ DPADD+=		${LIBDRIVER} ${LIBGROFF} ${LIBMATH}
 MANDEPEND=	grotty.1
 CLEANFILES+=	${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/indxbib/Makefile
index d9187d770141..be2bb8f2b30a 100644
--- a/gnu/usr.bin/groff/indxbib/Makefile
+++ b/gnu/usr.bin/groff/indxbib/Makefile
@@ -15,8 +15,7 @@ CLEANFILES+=	${MANDEPEND}
 #
 afterinstall:
 	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/eign \
-		${DESTDIR}/usr/share/dict
+		${DESTDIR}${SHAREDIR}/dict
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/libgroff/cset.cc b/gnu/usr.bin/groff/libgroff/cset.cc
index 603202aa5e8d..1319aa77edbe 100644
--- a/gnu/usr.bin/groff/libgroff/cset.cc
+++ b/gnu/usr.bin/groff/libgroff/cset.cc
@@ -33,7 +33,7 @@ cset csprint(CSET_BUILTIN);
 cset csgraph(CSET_BUILTIN);
 cset cscntrl(CSET_BUILTIN);
 
-#ifdef isascii && !defined(__FreeBSD__)	/* FreeBSD uses rune based ctypes */
+#if defined(isascii) && !defined(__FreeBSD__)
 #define ISASCII(c) isascii(c)
 #else
 #define ISASCII(c) (1)
diff --git a/gnu/usr.bin/groff/lkbib/Makefile b/gnu/usr.bin/groff/lkbib/Makefile
index 288a1a6c3473..c7e8d2a506ee 100644
--- a/gnu/usr.bin/groff/lkbib/Makefile
+++ b/gnu/usr.bin/groff/lkbib/Makefile
@@ -9,6 +9,5 @@ DPADD+=		${LIBBIB} ${LIBGROFF} ${LIBMATH}
 MANDEPEND=	lkbib.1
 CLEANFILES+=	${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/lookbib/Makefile b/gnu/usr.bin/groff/lookbib/Makefile
index c1514fd5fedb..dde1c71e2a2b 100644
--- a/gnu/usr.bin/groff/lookbib/Makefile
+++ b/gnu/usr.bin/groff/lookbib/Makefile
@@ -9,6 +9,5 @@ DPADD+=		$(LIBBIB) $(LIBGROFF) $(LIBMATH)
 MANDEPEND=	lookbib.1
 CLEANFILES+=	${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile
index 0f7e13ca6e24..8998b2daf8ca 100644
--- a/gnu/usr.bin/groff/nroff/Makefile
+++ b/gnu/usr.bin/groff/nroff/Makefile
@@ -9,6 +9,5 @@ afterinstall:
 	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		$(.CURDIR)/psroff.sh $(DESTDIR)$(BINDIR)/psroff
 
-.include <../../../usr.bin/Makefile.inc>
 .include <../Makefile.cfg>
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/pfbtops/Makefile b/gnu/usr.bin/groff/pfbtops/Makefile
index 16ab64a09a41..b2773a8851f2 100644
--- a/gnu/usr.bin/groff/pfbtops/Makefile
+++ b/gnu/usr.bin/groff/pfbtops/Makefile
@@ -8,6 +8,5 @@ DPADD+=		${LIBGROFF}
 MANDEPEND=	pfbtops.1
 CLEANFILES+=	${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile
index cdd707142252..90ef8d7bf3eb 100644
--- a/gnu/usr.bin/groff/pic/Makefile
+++ b/gnu/usr.bin/groff/pic/Makefile
@@ -12,6 +12,5 @@ CLEANFILES+=	pic.cc pic.tab.h ${MANDEPEND}
 
 beforedepend: pic.cc
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/psbb/Makefile b/gnu/usr.bin/groff/psbb/Makefile
index 209813fac978..1339f539c618 100644
--- a/gnu/usr.bin/groff/psbb/Makefile
+++ b/gnu/usr.bin/groff/psbb/Makefile
@@ -6,6 +6,5 @@ SRCS=		psbb.c
 MANDEPEND=	psbb.1
 CLEANFILES+=	${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile
index 147f50b991e2..c82327adf424 100644
--- a/gnu/usr.bin/groff/refer/Makefile
+++ b/gnu/usr.bin/groff/refer/Makefile
@@ -10,6 +10,5 @@ DPADD+=		${LIBBIB} ${LIBGROFF} ${LIBMATH}
 MANDEPEND=	refer.1
 CLEANFILES+=	label.cc label.tab.h ${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tbl/Makefile b/gnu/usr.bin/groff/tbl/Makefile
index 0e76df471d1c..c58e90e3f7d1 100644
--- a/gnu/usr.bin/groff/tbl/Makefile
+++ b/gnu/usr.bin/groff/tbl/Makefile
@@ -9,6 +9,5 @@ DPADD+=		${LIBGROFF} ${LIBMATH}
 MANDEPEND=	tbl.1
 CLEANFILES+=	${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tfmtodit/Makefile b/gnu/usr.bin/groff/tfmtodit/Makefile
index 4140a25f71ad..d75c12f6ea33 100644
--- a/gnu/usr.bin/groff/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/tfmtodit/Makefile
@@ -9,6 +9,5 @@ DPADD+=		${LIBGROFF} ${LIBMATH}
 MANDEPEND=	tfmtodit.1
 CLEANFILES+=	${MANDEPEND}
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index ca925ce60fbc..78b5cee1518b 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -20,6 +20,5 @@ afterinstall:
 	install -c -o bin -g bin -m 444 ${.CURDIR}/hyphen.us \
 		${DESTDIR}${tmacdir}/hyphen.us
 
-.include "../../../usr.bin/Makefile.inc"
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/xditview/Makefile b/gnu/usr.bin/groff/xditview/Makefile
index e8f4c3027d69..c646258ae870 100644
--- a/gnu/usr.bin/groff/xditview/Makefile
+++ b/gnu/usr.bin/groff/xditview/Makefile
@@ -32,580 +32,3 @@ afterinstall:
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
-# Makefile generated by imake - do not edit!
-# $XConsortium: imake.c,v 1.65 91/07/25 17:50:17 rws Exp $
-#
-# The cpp used on this machine replaces all newlines and multiple tabs and
-# spaces in a macro expansion with a single space.  Imake tries to compensate
-# for this, but is not always successful.
-#
-
-# -------------------------------------------------------------------------
-# Makefile generated from "Imake.tmpl" and <Imakefile>
-# $XConsortium: Imake.tmpl,v 1.139 91/09/16 08:52:48 rws Exp $
-#
-# Platform-specific parameters may be set in the appropriate <vendor>.cf
-# configuration files.  Site-specific parameters should be set in the file
-# site.def.  Full rebuilds are recommended if any parameters are changed.
-#
-# If your C preprocessor does not define any unique symbols, you will need
-# to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing
-# "make World" the first time).
-#
-
-# -------------------------------------------------------------------------
-# site-specific configuration parameters that need to come before
-# the platform-specific parameters - edit site.def to change
-
-# site:  $XConsortium: site.def,v 1.2 91/07/30 20:26:44 rws Exp $
-
-# -------------------------------------------------------------------------
-# platform-specific configuration parameters - edit sun.cf to change
-
-# platform:  $XConsortium: sun.cf,v 1.72.1.1 92/03/18 13:13:37 rws Exp $
-
-# operating system:  SunOS 4.1.1
-
-# $XConsortium: sunLib.rules,v 1.7 91/12/20 11:19:47 rws Exp $
-
-# -------------------------------------------------------------------------
-# site-specific configuration parameters that go after
-# the platform-specific parameters - edit site.def to change
-
-# site:  $XConsortium: site.def,v 1.2 91/07/30 20:26:44 rws Exp $
-
-            SHELL = /bin/sh
-
-              TOP = .
-      CURRENT_DIR = .
-
-               AR = ar clq
-  BOOTSTRAPCFLAGS =
-               CC = cc
-               AS = as
-
-         COMPRESS = compress
-              CPP = /lib/cpp $(STD_CPP_DEFINES)
-    PREPROCESSCMD = cc -E $(STD_CPP_DEFINES)
-          INSTALL = install
-               LD = ld
-             LINT = lint
-      LINTLIBFLAG = -C
-         LINTOPTS = -axz
-               LN = ln -s
-             MAKE = make
-               MV = mv
-               CP = cp
-
-           RANLIB = ranlib
-  RANLIBINSTFLAGS =
-
-               RM = rm -f
-            TROFF = psroff
-         MSMACROS = -ms
-              TBL = tbl
-              EQN = eqn
-     STD_INCLUDES =
-  STD_CPP_DEFINES =
-      STD_DEFINES =
- EXTRA_LOAD_FLAGS =
-  EXTRA_LIBRARIES =
-             TAGS = ctags
-
-    SHAREDCODEDEF = -DSHAREDCODE
-         SHLIBDEF = -DSUNSHLIB
-
-    PROTO_DEFINES =
-
-     INSTPGMFLAGS =
-
-     INSTBINFLAGS = -m 0755
-     INSTUIDFLAGS = -m 4755
-     INSTLIBFLAGS = -m 0644
-     INSTINCFLAGS = -m 0444
-     INSTMANFLAGS = -m 0444
-     INSTDATFLAGS = -m 0444
-    INSTKMEMFLAGS = -g kmem -m 2755
-
-     TOP_INCLUDES = -I$(INCROOT)
-
-      CDEBUGFLAGS = -O
-        CCOPTIONS = -pipe
-
-      ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
-       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(DEFINES)
-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
-        LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES)
-
-           LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
-
-        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(LOCAL_LDFLAGS) -L$(USRLIBDIR)
-
-   LDCOMBINEFLAGS = -X -r
-      DEPENDFLAGS =
-
-        MACROFILE = sun.cf
-           RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut
-
-    IMAKE_DEFINES =
-
-         IRULESRC = $(CONFIGDIR)
-        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
-
-     ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \
-			$(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \
-			$(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES)
-
-# -------------------------------------------------------------------------
-# X Window System Build Parameters
-# $XConsortium: Project.tmpl,v 1.138.1.1 92/11/11 09:49:19 rws Exp $
-
-# -------------------------------------------------------------------------
-# X Window System make variables; this need to be coordinated with rules
-
-          PATHSEP = /
-        USRLIBDIR = /local/lib
-           BINDIR = /local/bin/X11
-          INCROOT = /local/include
-     BUILDINCROOT = $(TOP)
-      BUILDINCDIR = $(BUILDINCROOT)/X11
-      BUILDINCTOP = ..
-           INCDIR = $(INCROOT)/X11
-           ADMDIR = /usr/adm
-           LIBDIR = $(USRLIBDIR)/X11
-        CONFIGDIR = $(LIBDIR)/config
-       LINTLIBDIR = $(USRLIBDIR)/lint
-
-          FONTDIR = $(LIBDIR)/fonts
-         XINITDIR = $(LIBDIR)/xinit
-           XDMDIR = $(LIBDIR)/xdm
-           TWMDIR = $(LIBDIR)/twm
-          MANPATH = /local/man
-    MANSOURCEPATH = $(MANPATH)/man
-        MANSUFFIX = 1
-     LIBMANSUFFIX = 3
-           MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-        LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSUFFIX)
-           NLSDIR = $(LIBDIR)/nls
-        PEXAPIDIR = $(LIBDIR)/PEX
-      XAPPLOADDIR = $(LIBDIR)/app-defaults
-       FONTCFLAGS = -t
-
-     INSTAPPFLAGS = $(INSTDATFLAGS)
-
-            IMAKE = imake
-           DEPEND = makedepend
-              RGB = rgb
-
-            FONTC = bdftopcf
-
-        MKFONTDIR = mkfontdir
-        MKDIRHIER = /bin/sh $(BINDIR)/mkdirhier
-
-        CONFIGSRC = $(TOP)/config
-       DOCUTILSRC = $(TOP)/doc/util
-        CLIENTSRC = $(TOP)/clients
-          DEMOSRC = $(TOP)/demos
-           LIBSRC = $(TOP)/lib
-          FONTSRC = $(TOP)/fonts
-       INCLUDESRC = $(TOP)/X11
-        SERVERSRC = $(TOP)/server
-          UTILSRC = $(TOP)/util
-        SCRIPTSRC = $(UTILSRC)/scripts
-       EXAMPLESRC = $(TOP)/examples
-       CONTRIBSRC = $(TOP)/../contrib
-           DOCSRC = $(TOP)/doc
-           RGBSRC = $(TOP)/rgb
-        DEPENDSRC = $(UTILSRC)/makedepend
-         IMAKESRC = $(CONFIGSRC)
-         XAUTHSRC = $(LIBSRC)/Xau
-          XLIBSRC = $(LIBSRC)/X
-           XMUSRC = $(LIBSRC)/Xmu
-       TOOLKITSRC = $(LIBSRC)/Xt
-       AWIDGETSRC = $(LIBSRC)/Xaw
-       OLDXLIBSRC = $(LIBSRC)/oldX
-      XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-      BDFTOSNFSRC = $(FONTSRC)/bdftosnf
-      BDFTOSNFSRC = $(FONTSRC)/clients/bdftosnf
-      BDFTOPCFSRC = $(FONTSRC)/clients/bdftopcf
-     MKFONTDIRSRC = $(FONTSRC)/clients/mkfontdir
-         FSLIBSRC = $(FONTSRC)/lib/fs
-    FONTSERVERSRC = $(FONTSRC)/server
-     EXTENSIONSRC = $(TOP)/extensions
-         XILIBSRC = $(EXTENSIONSRC)/lib/xinput
-        PEXLIBSRC = $(EXTENSIONSRC)/lib/PEXlib
-      PHIGSLIBSRC = $(EXTENSIONSRC)/lib/PEX
-
-# $XConsortium: sunLib.tmpl,v 1.14.1.2 92/11/11 09:55:02 rws Exp $
-
-SHLIBLDFLAGS = -assert pure-text
-PICFLAGS = -pic
-
-  DEPEXTENSIONLIB =
-     EXTENSIONLIB = -lXext
-
-          DEPXLIB = $(DEPEXTENSIONLIB)
-             XLIB = $(EXTENSIONLIB) -lX11
-
-        DEPXMULIB = $(USRLIBDIR)/libXmu.sa.$(SOXMUREV)
-       XMULIBONLY = -lXmu
-           XMULIB = -lXmu
-
-       DEPOLDXLIB =
-          OLDXLIB = -loldX
-
-      DEPXTOOLLIB = $(USRLIBDIR)/libXt.sa.$(SOXTREV)
-         XTOOLLIB = -lXt
-
-        DEPXAWLIB = $(USRLIBDIR)/libXaw.sa.$(SOXAWREV)
-           XAWLIB = -lXaw
-
-        DEPXILIB =
-           XILIB = -lXi
-
-        DEPPEXLIB =
-           PEXLIB = -lPEX5
-
-        SOXLIBREV = 4.10
-          SOXTREV = 4.10
-         SOXAWREV = 5.0
-        SOOLDXREV = 4.10
-         SOXMUREV = 4.10
-        SOXEXTREV = 4.10
-      SOXINPUTREV = 4.10
-         SOPEXREV = 1.0
-
-      DEPXAUTHLIB = $(USRLIBDIR)/libXau.a
-         XAUTHLIB =  -lXau
-      DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a
-         XDMCPLIB =  -lXdmcp
-
-        DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a
-           PHIGSLIB =  -lphigs
-
-       DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a
-          XBSDLIB =  -lXbsd
-
- LINTEXTENSIONLIB = $(LINTLIBDIR)/llib-lXext.ln
-         LINTXLIB = $(LINTLIBDIR)/llib-lX11.ln
-          LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln
-        LINTXTOOL = $(LINTLIBDIR)/llib-lXt.ln
-          LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln
-           LINTXI = $(LINTLIBDIR)/llib-lXi.ln
-          LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln
-        LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln
-
-          DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-
-         DEPLIBS1 = $(DEPLIBS)
-         DEPLIBS2 = $(DEPLIBS)
-         DEPLIBS3 = $(DEPLIBS)
-
-# -------------------------------------------------------------------------
-# Imake rules for building libraries, programs, scripts, and data files
-# rules:  $XConsortium: Imake.rules,v 1.123 91/09/16 20:12:16 rws Exp $
-
-# -------------------------------------------------------------------------
-# start of Imakefile
-
-GROFF_LIBDIR = /usr/local/lib/groff
-GROFF_FONTDIR = $(GROFF_LIBDIR)/font
-GROFF_FONTPATH = .:$(GROFF_FONTDIR):/usr/local/lib/font:/usr/lib/font
-DPIS = 75 100
-
-PROGRAMS = gxditview xtotroff
-DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-SRCS1 = xditview.c Dvi.c draw.c font.c lex.c page.c \
-        parse.c XFontName.c DviChar.c device.c
-OBJS1 = xditview.o Dvi.o draw.o font.o lex.o page.o \
-        parse.o XFontName.o DviChar.o device.o
-SRCS2 = xtotroff.c XFontName.c DviChar.c
-OBJS2 = xtotroff.o XFontName.o DviChar.o
-INCLUDES = -I$(TOOLKITSRC) -I$(TOP)
-MATHLIB = -lm
-DEFINES = $(SIGNAL_DEFINES) -DFONTPATH=\"$(GROFF_FONTPATH)\" # -DX_NOT_STDC_ENV
-
- OBJS = $(OBJS1) $(OBJS2) $(OBJS3)
- SRCS = $(SRCS1) $(SRCS2) $(SRCS3)
-
-all:: $(PROGRAMS)
-
-gxditview: $(OBJS1) $(DEPLIBS1)
-	$(RM) $@
-	$(CC) -o $@ $(LDOPTIONS) $(OBJS1) $(LOCAL_LIBRARIES) $(LDLIBS) $(MATHLIB) $(EXTRA_LOAD_FLAGS)
-
-install:: gxditview
-	@if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \
-	else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi
-	$(INSTALL) -c $(INSTPGMFLAGS)  gxditview $(DESTDIR)$(BINDIR)
-
-install.man:: gxditview.man
-	@if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
-	else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
-	$(INSTALL) -c $(INSTMANFLAGS) gxditview.man $(DESTDIR)$(MANDIR)/gxditview.$(MANSUFFIX)
-
-saber_gxditview:: $(SRCS1)
-	# load -C $(ALLDEFINES) $(SRCS1) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) $(MATHLIB)
-
-osaber_gxditview:: $(OBJS1)
-	# load -C $(ALLDEFINES) $(OBJS1) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) $(MATHLIB)
-
-depend::
-	$(DEPEND) $(DEPENDFLAGS) -s "# DO NOT DELETE" -- $(ALLDEFINES) -- $(SRCS)
-
-lint:
-	$(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS)
-lint1:
-	$(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS)
-
-clean::
-	$(RM) $(PROGRAMS)
-
-xtotroff: $(OBJS2) $(DEPXLIB)
-	$(RM) $@
-	$(CC) -o $@ $(OBJS2) $(LDOPTIONS) $(XLIB) $(LDLIBS)   $(EXTRA_LOAD_FLAGS)
-
-clean::
-	$(RM) xtotroff
-
-install:: GXditview.ad
-	@if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \
-	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi
-	$(INSTALL) -c $(INSTAPPFLAGS) GXditview.ad $(DESTDIR)$(XAPPLOADDIR)/GXditview
-
-fonts: xtotroff DESC FontMap
-	@dir=`pwd`; \
-	fonts=`sed -e 's/[	 ].*//' FontMap`; \
-	for dpi in $(DPIS); do \
-	  echo Making devX$$dpi; \
-	  test -d ../devX$$dpi || mkdir ../devX$$dpi; \
-	  rm -f ../devX$$dpi/DESC; \
-	  sed -e "s/res 75/res $$dpi/" DESC >../devX$$dpi/DESC; \
-	  (cd ../devX$$dpi; \
-	  rm -f Makefile.sub; \
-	  echo DEV=X$$dpi >Makefile.sub; \
-	  echo DEVFILES=DESC $$fonts >>Makefile.sub; \
-	  $$dir/xtotroff -g -r $$dpi -s 10 $$dir/FontMap); \
-	  echo Making devX$$dpi-12; \
-	  test -d ../devX$$dpi-12 || mkdir ../devX$$dpi-12; \
-	  rm -f ../devX$$dpi-12/DESC; \
-	  sed -e "s/res 75/res $$dpi/" -e 's/unitwidth 10/unitwidth 12/' DESC \
-	    >../devX$$dpi-12/DESC; \
-	  (cd ../devX$$dpi-12; \
-	  rm -f Makefile.sub; \
-	  echo DEV=X$$dpi-12 >Makefile.sub; \
-	  echo DEVFILES=DESC $$fonts >>Makefile.sub; \
-	  $$dir/xtotroff -g -r $$dpi -s 12 $$dir/FontMap); \
-	done
-
-extraclean: clean
-	-rm -f junk tmp grot old
-
-FORCE:
-
-# -------------------------------------------------------------------------
-# common rules for all Makefiles - do not edit
-
-emptyrule::
-
-clean::
-	$(RM_CMD) "#"*
-
-Makefile::
-	-@if [ -f Makefile ]; then set -x; \
-	$(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \
-	else exit 0; fi
-	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-
-tags::
-	$(TAGS) -w *.[ch]
-	$(TAGS) -xw *.[ch] > TAGS
-
-saber:
-	# load $(ALLDEFINES) $(SRCS)
-
-osaber:
-	# load $(ALLDEFINES) $(OBJS)
-
-# -------------------------------------------------------------------------
-# empty rules for directories that do not have SUBDIRS - do not edit
-
-install::
-	@echo "install in $(CURRENT_DIR) done"
-
-install.man::
-	@echo "install.man in $(CURRENT_DIR) done"
-
-Makefiles::
-
-includes::
-
-# -------------------------------------------------------------------------
-# dependencies generated by makedepend
-
-# DO NOT DELETE
-
-xditview.o: /local/include/X11/Xatom.h /local/include/X11/Xlib.h
-xditview.o: /usr/include/sys/types.h /usr/include/sys/stdtypes.h
-xditview.o: /usr/include/sys/sysmacros.h /local/include/X11/X.h
-xditview.o: /local/include/X11/Xfuncproto.h /local/include/X11/Xosdefs.h
-xditview.o: /usr/include/stddef.h /local/include/X11/Xos.h
-xditview.o: /usr/include/string.h /usr/include/fcntl.h
-xditview.o: /usr/include/sys/fcntlcom.h /usr/include/sys/stat.h
-xditview.o: /usr/include/unistd.h /usr/include/sys/time.h
-xditview.o: /usr/include/sys/time.h /local/include/X11/Intrinsic.h
-xditview.o: /local/include/X11/Xutil.h /local/include/X11/Xresource.h
-xditview.o: /local/include/X11/Core.h /local/include/X11/Composite.h
-xditview.o: /local/include/X11/Constraint.h /local/include/X11/Object.h
-xditview.o: /local/include/X11/RectObj.h /local/include/X11/StringDefs.h
-xditview.o: /local/include/X11/Shell.h /local/include/X11/Xaw/Paned.h
-xditview.o: /local/include/X11/Xmu/Converters.h
-xditview.o: /local/include/X11/Xaw/Viewport.h /local/include/X11/Xaw/Form.h
-xditview.o: /local/include/X11/Xaw/Reports.h /local/include/X11/Xaw/Box.h
-xditview.o: /local/include/X11/Xaw/Command.h /local/include/X11/Xaw/Label.h
-xditview.o: /local/include/X11/Xaw/Simple.h /local/include/X11/Xaw/Dialog.h
-xditview.o: /local/include/X11/Xaw/SimpleMenu.h
-xditview.o: /local/include/X11/Xaw/SmeBSB.h /local/include/X11/Xaw/Sme.h
-xditview.o: /usr/include/signal.h /usr/include/sys/signal.h
-xditview.o: /usr/include/vm/faultcode.h Dvi.h xdit.bm xdit_mask.bm
-xditview.o: /usr/include/stdio.h
-Dvi.o: /local/include/X11/IntrinsicP.h /local/include/X11/Intrinsic.h
-Dvi.o: /local/include/X11/Xlib.h /usr/include/sys/types.h
-Dvi.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
-Dvi.o: /local/include/X11/X.h /local/include/X11/Xfuncproto.h
-Dvi.o: /local/include/X11/Xosdefs.h /usr/include/stddef.h
-Dvi.o: /local/include/X11/Xutil.h /local/include/X11/Xresource.h
-Dvi.o: /usr/include/string.h /local/include/X11/Core.h
-Dvi.o: /local/include/X11/Composite.h /local/include/X11/Constraint.h
-Dvi.o: /local/include/X11/Object.h /local/include/X11/RectObj.h
-Dvi.o: /local/include/X11/CoreP.h /local/include/X11/CompositeP.h
-Dvi.o: /local/include/X11/ConstrainP.h /local/include/X11/ObjectP.h
-Dvi.o: /local/include/X11/RectObjP.h /local/include/X11/StringDefs.h
-Dvi.o: /local/include/X11/Xmu/Converters.h /usr/include/stdio.h
-Dvi.o: /usr/include/ctype.h DviP.h Dvi.h DviChar.h device.h
-Dvi.o: /local/include/X11/bitmaps/gray
-draw.o: /local/include/X11/Xos.h /local/include/X11/Xosdefs.h
-draw.o: /usr/include/sys/types.h /usr/include/sys/stdtypes.h
-draw.o: /usr/include/sys/sysmacros.h /usr/include/string.h
-draw.o: /usr/include/fcntl.h /usr/include/sys/fcntlcom.h
-draw.o: /usr/include/sys/stat.h /usr/include/unistd.h /usr/include/sys/time.h
-draw.o: /usr/include/sys/time.h /local/include/X11/IntrinsicP.h
-draw.o: /local/include/X11/Intrinsic.h /local/include/X11/Xlib.h
-draw.o: /local/include/X11/X.h /local/include/X11/Xfuncproto.h
-draw.o: /usr/include/stddef.h /local/include/X11/Xutil.h
-draw.o: /local/include/X11/Xresource.h /local/include/X11/Core.h
-draw.o: /local/include/X11/Composite.h /local/include/X11/Constraint.h
-draw.o: /local/include/X11/Object.h /local/include/X11/RectObj.h
-draw.o: /local/include/X11/CoreP.h /local/include/X11/CompositeP.h
-draw.o: /local/include/X11/ConstrainP.h /local/include/X11/ObjectP.h
-draw.o: /local/include/X11/RectObjP.h /local/include/X11/StringDefs.h
-draw.o: /usr/include/stdio.h /usr/include/ctype.h /usr/include/math.h
-draw.o: /usr/include/floatingpoint.h /usr/include/sys/ieeefp.h DviP.h Dvi.h
-draw.o: DviChar.h device.h
-font.o: /local/include/X11/Xos.h /local/include/X11/Xosdefs.h
-font.o: /usr/include/sys/types.h /usr/include/sys/stdtypes.h
-font.o: /usr/include/sys/sysmacros.h /usr/include/string.h
-font.o: /usr/include/fcntl.h /usr/include/sys/fcntlcom.h
-font.o: /usr/include/sys/stat.h /usr/include/unistd.h /usr/include/sys/time.h
-font.o: /usr/include/sys/time.h /local/include/X11/IntrinsicP.h
-font.o: /local/include/X11/Intrinsic.h /local/include/X11/Xlib.h
-font.o: /local/include/X11/X.h /local/include/X11/Xfuncproto.h
-font.o: /usr/include/stddef.h /local/include/X11/Xutil.h
-font.o: /local/include/X11/Xresource.h /local/include/X11/Core.h
-font.o: /local/include/X11/Composite.h /local/include/X11/Constraint.h
-font.o: /local/include/X11/Object.h /local/include/X11/RectObj.h
-font.o: /local/include/X11/CoreP.h /local/include/X11/CompositeP.h
-font.o: /local/include/X11/ConstrainP.h /local/include/X11/ObjectP.h
-font.o: /local/include/X11/RectObjP.h /local/include/X11/StringDefs.h
-font.o: /usr/include/stdio.h /usr/include/ctype.h DviP.h Dvi.h DviChar.h
-font.o: device.h XFontName.h
-lex.o: /local/include/X11/Xos.h /local/include/X11/Xosdefs.h
-lex.o: /usr/include/sys/types.h /usr/include/sys/stdtypes.h
-lex.o: /usr/include/sys/sysmacros.h /usr/include/string.h
-lex.o: /usr/include/fcntl.h /usr/include/sys/fcntlcom.h
-lex.o: /usr/include/sys/stat.h /usr/include/unistd.h /usr/include/sys/time.h
-lex.o: /usr/include/sys/time.h /local/include/X11/IntrinsicP.h
-lex.o: /local/include/X11/Intrinsic.h /local/include/X11/Xlib.h
-lex.o: /local/include/X11/X.h /local/include/X11/Xfuncproto.h
-lex.o: /usr/include/stddef.h /local/include/X11/Xutil.h
-lex.o: /local/include/X11/Xresource.h /local/include/X11/Core.h
-lex.o: /local/include/X11/Composite.h /local/include/X11/Constraint.h
-lex.o: /local/include/X11/Object.h /local/include/X11/RectObj.h
-lex.o: /local/include/X11/CoreP.h /local/include/X11/CompositeP.h
-lex.o: /local/include/X11/ConstrainP.h /local/include/X11/ObjectP.h
-lex.o: /local/include/X11/RectObjP.h /local/include/X11/StringDefs.h
-lex.o: /usr/include/stdio.h DviP.h Dvi.h DviChar.h device.h
-page.o: /local/include/X11/Xos.h /local/include/X11/Xosdefs.h
-page.o: /usr/include/sys/types.h /usr/include/sys/stdtypes.h
-page.o: /usr/include/sys/sysmacros.h /usr/include/string.h
-page.o: /usr/include/fcntl.h /usr/include/sys/fcntlcom.h
-page.o: /usr/include/sys/stat.h /usr/include/unistd.h /usr/include/sys/time.h
-page.o: /usr/include/sys/time.h /local/include/X11/IntrinsicP.h
-page.o: /local/include/X11/Intrinsic.h /local/include/X11/Xlib.h
-page.o: /local/include/X11/X.h /local/include/X11/Xfuncproto.h
-page.o: /usr/include/stddef.h /local/include/X11/Xutil.h
-page.o: /local/include/X11/Xresource.h /local/include/X11/Core.h
-page.o: /local/include/X11/Composite.h /local/include/X11/Constraint.h
-page.o: /local/include/X11/Object.h /local/include/X11/RectObj.h
-page.o: /local/include/X11/CoreP.h /local/include/X11/CompositeP.h
-page.o: /local/include/X11/ConstrainP.h /local/include/X11/ObjectP.h
-page.o: /local/include/X11/RectObjP.h /local/include/X11/StringDefs.h
-page.o: /usr/include/stdio.h /usr/include/ctype.h DviP.h Dvi.h DviChar.h
-page.o: device.h
-parse.o: /local/include/X11/Xos.h /local/include/X11/Xosdefs.h
-parse.o: /usr/include/sys/types.h /usr/include/sys/stdtypes.h
-parse.o: /usr/include/sys/sysmacros.h /usr/include/string.h
-parse.o: /usr/include/fcntl.h /usr/include/sys/fcntlcom.h
-parse.o: /usr/include/sys/stat.h /usr/include/unistd.h
-parse.o: /usr/include/sys/time.h /usr/include/sys/time.h
-parse.o: /local/include/X11/IntrinsicP.h /local/include/X11/Intrinsic.h
-parse.o: /local/include/X11/Xlib.h /local/include/X11/X.h
-parse.o: /local/include/X11/Xfuncproto.h /usr/include/stddef.h
-parse.o: /local/include/X11/Xutil.h /local/include/X11/Xresource.h
-parse.o: /local/include/X11/Core.h /local/include/X11/Composite.h
-parse.o: /local/include/X11/Constraint.h /local/include/X11/Object.h
-parse.o: /local/include/X11/RectObj.h /local/include/X11/CoreP.h
-parse.o: /local/include/X11/CompositeP.h /local/include/X11/ConstrainP.h
-parse.o: /local/include/X11/ObjectP.h /local/include/X11/RectObjP.h
-parse.o: /local/include/X11/StringDefs.h /usr/include/stdio.h
-parse.o: /usr/include/ctype.h DviP.h Dvi.h DviChar.h device.h
-XFontName.o: /local/include/X11/Xlib.h /usr/include/sys/types.h
-XFontName.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
-XFontName.o: /local/include/X11/X.h /local/include/X11/Xfuncproto.h
-XFontName.o: /local/include/X11/Xosdefs.h /usr/include/stddef.h
-XFontName.o: /local/include/X11/Xos.h /usr/include/string.h
-XFontName.o: /usr/include/fcntl.h /usr/include/sys/fcntlcom.h
-XFontName.o: /usr/include/sys/stat.h /usr/include/unistd.h
-XFontName.o: /usr/include/sys/time.h /usr/include/sys/time.h XFontName.h
-XFontName.o: /usr/include/ctype.h
-DviChar.o: DviChar.h
-device.o: /usr/include/stdio.h /usr/include/ctype.h /local/include/X11/Xos.h
-device.o: /local/include/X11/Xosdefs.h /usr/include/sys/types.h
-device.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
-device.o: /usr/include/string.h /usr/include/fcntl.h
-device.o: /usr/include/sys/fcntlcom.h /usr/include/sys/stat.h
-device.o: /usr/include/unistd.h /usr/include/sys/time.h
-device.o: /usr/include/sys/time.h /local/include/X11/Intrinsic.h
-device.o: /local/include/X11/Xlib.h /local/include/X11/X.h
-device.o: /local/include/X11/Xfuncproto.h /usr/include/stddef.h
-device.o: /local/include/X11/Xutil.h /local/include/X11/Xresource.h
-device.o: /local/include/X11/Core.h /local/include/X11/Composite.h
-device.o: /local/include/X11/Constraint.h /local/include/X11/Object.h
-device.o: /local/include/X11/RectObj.h device.h
-xtotroff.o: /local/include/X11/Xlib.h /usr/include/sys/types.h
-xtotroff.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
-xtotroff.o: /local/include/X11/X.h /local/include/X11/Xfuncproto.h
-xtotroff.o: /local/include/X11/Xosdefs.h /usr/include/stddef.h
-xtotroff.o: /usr/include/stdio.h /usr/include/ctype.h XFontName.h DviChar.h
-xtotroff.o: /usr/include/stdlib.h
-XFontName.o: /local/include/X11/Xlib.h /usr/include/sys/types.h
-XFontName.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
-XFontName.o: /local/include/X11/X.h /local/include/X11/Xfuncproto.h
-XFontName.o: /local/include/X11/Xosdefs.h /usr/include/stddef.h
-XFontName.o: /local/include/X11/Xos.h /usr/include/string.h
-XFontName.o: /usr/include/fcntl.h /usr/include/sys/fcntlcom.h
-XFontName.o: /usr/include/sys/stat.h /usr/include/unistd.h
-XFontName.o: /usr/include/sys/time.h /usr/include/sys/time.h XFontName.h
-XFontName.o: /usr/include/ctype.h
-DviChar.o: DviChar.h