Redo the OpenBSD build wrapper import. Thanx cvs.

8 files changed, 115 insertions, 16 deletions

diff --git a/gnu/usr.bin/groff/Makefile.bsd-wrapper b/gnu/usr.bin/groff/Makefile.bsd-wrapper
new file mode 100644
index 00000000000..925c6f6e07c
--- /dev/null
+++ b/gnu/usr.bin/groff/Makefile.bsd-wrapper
@@ -0,0 +1,81 @@
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.1 1996/09/14 20:20:39 etheisen Exp $
+
+#
+# groff config
+#
+PREFIX=		/usr/
+DATASUBDIR=	/usr/share
+FONTDIR=	/usr/share/groff_font
+INDEXDIR=	/usr/share/dict/papers
+COMMON_WORDS=	/usr/share/dict/eign
+
+GNUCFLAGS=	CFLAGS="$(CFLAGS)"
+GNUCXXFLAGS=	CCFLAGS="$(CXXFLAGS)"
+
+CLEANFILES=	config.cache config.log pic/pic.cc eqn/eqn.cc \
+		refer/label.cc $(MAN)
+
+MAN=	addftinfo/addftinfo.1 groff/groff.1 troff/troff.1 tbl/tbl.1 \
+	pic/pic.1 eqn/eqn.1 grops/grops.1 grotty/grotty.1 grodvi/grodvi.1 \
+	tfmtodit/tfmtodit.1 grolj4/grolj4.1 hpftodit/hpftodit.1 \
+	refer/refer.1 lookbib/lookbib.1 indxbib/indxbib.1 lkbib/lkbib.1 \
+	soelim/soelim.1 pfbtops/pfbtops.1 psbb/psbb.1 man/groff_char.7 \
+	man/groff_font.5 man/groff_out.5 tmac/groff_ms.7 tmac/me.7 \
+	tmac/msafer.7 afmtodit/afmtodit.1 grog/grog.1 nroff/nroff.1 \
+	mm/groff_mm.7 mm/groff_mmse.7 
+
+all: config.status gnu_build
+
+.FORCE: .IGNORE
+
+config: .FORCE
+	-rm -f config.cache
+	/bin/sh $(.CURDIR)/configure --prefix=$(PREFIX)
+
+config.status:
+	/bin/sh $(.CURDIR)/configure --prefix=$(PREFIX)
+
+gnu_build:
+	$(MAKE) $(GNUCFLAGS) $(GNUCXXFLAGS) LDFLAGS="-s $(LDSTATIC)" \
+		prefix=$(PREFIX) \
+		datasubdir=$(DATASUBDIR) \
+		fontdir=$(FONTDIR) \
+		indexdir=$(INDEXDIR) \
+		common_words_file=$(COMMON_WORDS)
+
+install: maninstall
+	$(MAKE) $(GNUCFLAGS) $(GNUCXXFLAGS) LDFLAGS=$(LDSTATIC) \
+		prefix=$(DESTDIR)$(PREFIX) \
+		datasubdir=$(DESTDIR)$(DATASUBDIR) \
+		fontdir=$(DESTDIR)$(FONTDIR) \
+		indexdir=$(DESTDIR)$(INDEXDIR) \
+		common_words_file=$(DESTDIR)$(COMMON_WORDS) \
+		INSTALL_MAN= TMAC_AN= TMAC_ANDOC= MDOCFILES= tmac_an= \
+		install
+	install -c -o $(BINOWN) -g $(BINGRP) -m 444 $(.CURDIR)/tmac/tmac.an \
+                $(DESTDIR)$(DATASUBDIR)/tmac/tmac.an.old
+
+clean cleandir:
+	rm -f $(CLEANFILES)
+	-@if [ -e Makefile ]; then $(MAKE) distclean; fi
+
+#
+# Fix gnu manpage suffix 
+#
+.SUFFIXES: .n .1 .2 .3 .4 .5 .6 .7 .8 .9
+
+.n.1 .n.2 .n.3 .n.4 .n.5 .n.6 .n.7 .n.8 .n.9:
+	-@ln -sf $(.OBJDIR)/$(.IMPSRC) $(.TARGET)
+
+depend:
+	# Nothing here so far...
+
+lint:
+	# Nothing here so far...
+
+tags:
+	# Nothing here so far...
+
+.include <bsd.obj.mk>
+.include <bsd.subdir.mk>
+.include <bsd.man.mk>
diff --git a/gnu/usr.bin/groff/Makefile.ccpg b/gnu/usr.bin/groff/Makefile.ccpg
index ff774ddf3a0..617bf47de69 100644
--- a/gnu/usr.bin/groff/Makefile.ccpg
+++ b/gnu/usr.bin/groff/Makefile.ccpg
@@ -9,7 +9,7 @@ $(PROG): $(OBJS) $(XLIBS)
 
 install_bin: install_prog
 install_prog: $(PROG)
-install_data: install_man
+install_data:
 install_man: $(MANPAGES)
 uninstall_sub: uninstall_prog uninstall_man
 depend: depend_src
diff --git a/gnu/usr.bin/groff/Makefile.comm b/gnu/usr.bin/groff/Makefile.comm
index 3888444a29a..5096685f499 100644
--- a/gnu/usr.bin/groff/Makefile.comm
+++ b/gnu/usr.bin/groff/Makefile.comm
@@ -50,14 +50,18 @@ MANPAGES=$(MAN1) $(MAN5) $(MAN7)
 MANCLEAN=$(MANPAGES)
 fontsubdir=$(fontdir)/dev$(DEV)
 
-all install install_bin install_data TAGS depend distfiles uninstall_sub:
+# Target to use for installing unformatted man-pages.  Some systems may not
+# want them installed.                                   
+INSTALL_MAN=install_man
 
-install: install_bin install_data
+all install install_bin install_data $(INSTALL_MAN) TAGS depend distfiles uninstall_sub:
+
+install: install_bin install_data $(INSTALL_MAN)
 uninstall: uninstall_sub
 pure:
 
 .PHONY: all clean distclean mostlyclean realclean extraclean depend distfiles
-.PHONY: install install_bin install_data
+.PHONY: install install_bin install_data $(INSTALL_MAN)
 .PHONY: uninstall uninstall_sub
 .PHONY: pure
 
diff --git a/gnu/usr.bin/groff/Makefile.cpg b/gnu/usr.bin/groff/Makefile.cpg
index 1b9f66f0da3..86e5a178937 100644
--- a/gnu/usr.bin/groff/Makefile.cpg
+++ b/gnu/usr.bin/groff/Makefile.cpg
@@ -9,7 +9,7 @@ $(PROG): $(OBJS) $(XLIBS)
 
 install_bin: install_prog
 install_prog: $(PROG)
-install_data: install_man
+install_data:
 install_man: $(MANPAGES)
 uninstall_sub: uninstall_prog uninstall_man
 depend: depend_src
diff --git a/gnu/usr.bin/groff/Makefile.in b/gnu/usr.bin/groff/Makefile.in
index 58da8bc8f40..89f7aa5c735 100644
--- a/gnu/usr.bin/groff/Makefile.in
+++ b/gnu/usr.bin/groff/Makefile.in
@@ -214,6 +214,15 @@ PURIFYCCFLAGS=
 #PURIFYCCFLAGS=-g++=yes \
 #  -collector=`dirname \`$(CCC) -print-libgcc-file-name\``/ld
 
+#
+# XXX - OpenBSD build mods
+#
+INSTALL_MAN=install_man
+TMAC_AN=tmac.an
+TMAC_ANDOC=tmac.andoc
+TMAC_S=tmac.s
+MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms
+
 # Passing down MAKEOVERRIDES prevents $(MAKE) from containing a second
 # copy of $(MDEFINES) when making individual directories; this could
 # cause the argument list to become too long on some systems.
@@ -239,7 +248,9 @@ MDEFINES="MAKEOVERRIDES=$(MAKEOVERRIDES)" \
   "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_DATA=$(INSTALL_DATA)" \
   "ETAGS=$(ETAGS)" "ETAGSFLAGS=$(ETAGSFLAGS)" "ETAGSCCFLAG=$(ETAGSCCFLAG)" \
   "PERLPATH=$(PERLPATH)" "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \
-  "PURIFY=$(PURIFY)" "PURIFYCCFLAGS=$(PURIFYCCFLAGS)"
+  "PURIFY=$(PURIFY)" "PURIFYCCFLAGS=$(PURIFYCCFLAGS)" \
+  "INSTALL_MAN=$(INSTALL_MAN)" "TMAC_AN=$(TMAC_AN)" "TMAC_ANDOC=$(TMAC_ANDOC)" \
+  "TMAC_S=$(TMAC_S)" "MDOCFILES=$(MDOCFILES)"
 
 SHELL=/bin/sh
 INCDIRS=include
@@ -254,7 +265,7 @@ OTHERDIRS=man tmac afmtodit grog nroff mm
 ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(OTHERDIRS)
 EXTRADIRS=devps/generate devdvi/generate xditview doc
 DISTDIRS=$(ALLDIRS) $(EXTRADIRS)
-TARGETS=all install install_bin install_data clean distclean mostlyclean \
+TARGETS=all install install_bin install_data $(INSTALL_MAN) clean distclean mostlyclean \
   realclean extraclean distfiles TAGS depend uninstall_sub
 
 do=all
diff --git a/gnu/usr.bin/groff/Makefile.man b/gnu/usr.bin/groff/Makefile.man
index 59378de0127..09ef1293ed2 100644
--- a/gnu/usr.bin/groff/Makefile.man
+++ b/gnu/usr.bin/groff/Makefile.man
@@ -1,4 +1,4 @@
 all: $(MANPAGES)
-install_data: install_man
+install_data:
 install_man: $(MANPAGES)
 uninstall_sub: uninstall_man
diff --git a/gnu/usr.bin/groff/devps/Makefile.sub b/gnu/usr.bin/groff/devps/Makefile.sub
index a46693f96df..80ff13fa494 100644
--- a/gnu/usr.bin/groff/devps/Makefile.sub
+++ b/gnu/usr.bin/groff/devps/Makefile.sub
@@ -32,4 +32,4 @@ symbolsl.pfa: symbolsl.ps
 
 $(PSFILES):
 	-rm -f $@
-	sed -f $(srcdir)/psstrip.sed $? >$@
+	sed -f $(srcdir)/psstrip.sed $(srcdir)/$? >$@
diff --git a/gnu/usr.bin/groff/tmac/Makefile.sub b/gnu/usr.bin/groff/tmac/Makefile.sub
index b07cee70f38..789ba4f9e6b 100644
--- a/gnu/usr.bin/groff/tmac/Makefile.sub
+++ b/gnu/usr.bin/groff/tmac/Makefile.sub
@@ -1,11 +1,10 @@
 MAN7=groff_ms.n me.n msafer.n
 
-NORMALFILES=tmac.andoc tmac.pic tmac.ps tmac.psnew tmac.psold tmac.pspic \
+NORMALFILES=$(TMAC_ANDOC) tmac.pic tmac.ps tmac.psnew tmac.psold tmac.pspic \
       tmac.psatk tmac.dvi tmac.tty tmac.tty-char tmac.X tmac.Xps tmac.latin1 \
       tmac.lj4 eqnrc troffrc tmac.safer
-SPECIALFILES=tmac.an tmac.s
+SPECIALFILES=$(TMAC_AN) tmac.s
 STRIPFILES=tmac.e tmac.doc tmac.doc.old
-MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms
 mdocdir=$(tmacdir)/mdoc
 CLEANADD=stamp-strip stamp-wrap tmac.e-s tmac.doc-s tmac.doc.old-s \
  doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s *-wrap
@@ -27,10 +26,14 @@ install_data: $(NORMALFILES) $(SPECIALFILES) stamp-wrap stamp-strip man.local
 	  rm -f $(tmacdir)/$$f; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
 	done
-	-rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s
-	$(INSTALL_DATA) $(srcdir)/tmac.s $(tmacdir)/tmac.$(tmac_s_prefix)s
-	-rm -f $(tmacdir)/tmac.$(tmac_an_prefix)an
-	$(INSTALL_DATA) $(srcdir)/tmac.an $(tmacdir)/tmac.$(tmac_an_prefix)an
+	if test -n "$(TMAC_S)"; then \
+		rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s ; \
+		$(INSTALL_DATA) $(srcdir)/tmac.s $(tmacdir)/tmac.$(tmac_s_prefix)s ; \
+	fi
+	if test -n "$(TMAC_AN)"; then \
+		rm -f $(tmacdir)/tmac.$(tmac_an_prefix)an ; \
+		$(INSTALL_DATA) $(srcdir)/tmac.an $(tmacdir)/tmac.$(tmac_an_prefix)an ; \
+	fi
 	for f in $(STRIPFILES); do \
 	  rm -f $(tmacdir)/$$f; \
 	  $(INSTALL_DATA) $$f-s $(tmacdir)/$$f; \