PRINTERDEVICE can now take multiple values.

4 files changed, 2 insertions, 17 deletions

diff --git a/share/doc/psd/title/Makefile b/share/doc/psd/title/Makefile
index c125c08..d073730 100644
--- a/share/doc/psd/title/Makefile
+++ b/share/doc/psd/title/Makefile
@@ -4,9 +4,4 @@ VOLUME=	psd
 DOC=	Title
 SRCS=	Title
 
-# unroff(1) requires a macro package as an argument
-.if defined(PRINTERDEVICE) && ${PRINTERDEVICE} == "html"
-MACROS=	-ms
-.endif
-
 .include <bsd.doc.mk>
diff --git a/share/doc/smm/title/Makefile b/share/doc/smm/title/Makefile
index b2bbe8f..c1f1c9b 100644
--- a/share/doc/smm/title/Makefile
+++ b/share/doc/smm/title/Makefile
@@ -4,9 +4,4 @@ VOLUME=	smm
 DOC=	Title
 SRCS=	Title
 
-# unroff(1) requires a macro package as an argument
-.if defined(PRINTERDEVICE) && ${PRINTERDEVICE} == "html"
-MACROS=	-ms
-.endif
-
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile
index 7d42600..ac9f088 100644
--- a/share/doc/usd/13.viref/Makefile
+++ b/share/doc/usd/13.viref/Makefile
@@ -22,7 +22,7 @@ CLEANFILES+=	index.so.${_dev}
 # Build index.so as a side-effect of building the paper.
 index.so.${_dev}: ${SRCS} ${EXTRA:Nindex.so.${_dev}}
 	sed -e 's:^\.so index\.so\.\\\*\[\.T\]$$::' vi.ref-patched | \
-	    ${ROFF} -U -z
+	    ${ROFF.${_dev}} -U -z
 	sed -e 's/MINUSSIGN/-/' \
 	    -e 's/DOUBLEQUOTE/""/' \
 	    -e "s/SQUOTE/'/" \
diff --git a/share/doc/usd/title/Makefile b/share/doc/usd/title/Makefile
index 4b14043..b773fc3 100644
--- a/share/doc/usd/title/Makefile
+++ b/share/doc/usd/title/Makefile
@@ -1,12 +1,7 @@
 # $FreeBSD$
 
 VOLUME=	usd
-SRCS=	Title
 DOC=	Title
-
-# unroff(1) requires a macro package as an argument
-.if defined(PRINTERDEVICE) && ${PRINTERDEVICE} == "html"
-MACROS=	-ms
-.endif
+SRCS=	Title
 
 .include <bsd.doc.mk>