Spplat our 1.1.5 `mk' ifiles over the top of the 4.4 ones. So far

as I can tell, this is ts the right thing to do.

1 files changed, 64 insertions, 20 deletions

diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 99f3a0e..7836d03 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,58 +1,102 @@
-#	@(#)bsd.man.mk	8.1 (Berkeley) 6/8/93
+#	from: @(#)bsd.man.mk	5.2 (Berkeley) 5/11/90
+#	$Id: bsd.man.mk,v 1.6 1994/06/05 20:42:39 csgr Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
+INSTALL?=	install
 MANGRP?=	bin
 MANOWN?=	bin
 MANMODE?=	444
 
-MANDIR?=	/usr/share/man/cat
+MANDIR?=	/usr/share/man/man
+MANSRC?=	${.CURDIR}
+MINSTALL=	${INSTALL}  ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
 
-MINSTALL=	install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
+MCOMPRESS=	gzip -f
+BASENAME=	basename
+ZEXTENSION=	.gz
+.if !defined(NOMANCOMPRESS)
+ZEXT=		${ZEXTENSION}
+.else
+ZEXT=
+.endif
+
+MANALL=		${MAN1} ${MAN2} ${MAN3} ${MAN3F} ${MAN4} ${MAN5}	\
+		${MAN6} ${MAN7} ${MAN8}
 
-maninstall:
+maninstall: ${MANDEPEND}
 .if defined(MAN1) && !empty(MAN1)
-	${MINSTALL} ${MAN1} ${DESTDIR}${MANDIR}1${MANSUBDIR}
+	(cd ${MANSRC}; ${MINSTALL} ${MAN1} ${DESTDIR}${MANDIR}1${MANSUBDIR})
 .endif
 .if defined(MAN2) && !empty(MAN2)
-	${MINSTALL} ${MAN2} ${DESTDIR}${MANDIR}2${MANSUBDIR}
+	(cd ${MANSRC}; ${MINSTALL} ${MAN2} ${DESTDIR}${MANDIR}2${MANSUBDIR})
 .endif
 .if defined(MAN3) && !empty(MAN3)
-	${MINSTALL} ${MAN3} ${DESTDIR}${MANDIR}3${MANSUBDIR}
+	(cd ${MANSRC}; ${MINSTALL} ${MAN3} ${DESTDIR}${MANDIR}3${MANSUBDIR})
 .endif
 .if defined(MAN3F) && !empty(MAN3F)
-	${MINSTALL} ${MAN3F} ${DESTDIR}${MANDIR}3f${MANSUBDIR}
+	(cd ${MANSRC}; ${MINSTALL} ${MAN3F} ${DESTDIR}${MANDIR}3f${MANSUBDIR})
 .endif
 .if defined(MAN4) && !empty(MAN4)
-	${MINSTALL} ${MAN4} ${DESTDIR}${MANDIR}4${MANSUBDIR}
+	(cd ${MANSRC}; ${MINSTALL} ${MAN4} ${DESTDIR}${MANDIR}4${MANSUBDIR})
 .endif
 .if defined(MAN5) && !empty(MAN5)
-	${MINSTALL} ${MAN5} ${DESTDIR}${MANDIR}5${MANSUBDIR}
+	(cd ${MANSRC}; ${MINSTALL} ${MAN5} ${DESTDIR}${MANDIR}5${MANSUBDIR})
 .endif
 .if defined(MAN6) && !empty(MAN6)
-	${MINSTALL} ${MAN6} ${DESTDIR}${MANDIR}6${MANSUBDIR}
+	(cd ${MANSRC}; ${MINSTALL} ${MAN6} ${DESTDIR}${MANDIR}6${MANSUBDIR})
 .endif
 .if defined(MAN7) && !empty(MAN7)
-	${MINSTALL} ${MAN7} ${DESTDIR}${MANDIR}7${MANSUBDIR}
+	(cd ${MANSRC}; ${MINSTALL} ${MAN7} ${DESTDIR}${MANDIR}7${MANSUBDIR})
 .endif
 .if defined(MAN8) && !empty(MAN8)
-	${MINSTALL} ${MAN8} ${DESTDIR}${MANDIR}8${MANSUBDIR}
+	(cd ${MANSRC}; ${MINSTALL} ${MAN8} ${DESTDIR}${MANDIR}8${MANSUBDIR})
+.endif
+
+# by default all pages are compressed
+# we don't handle .so's yet
+.if !empty(MANALL:S/ //g)
+.if !defined(NOMANCOMPRESS) 
+	@set ${MANALL} ;						\
+	while test $$# -ge 1; do					\
+		name=`${BASENAME} $$1`;					\
+		sect=`expr $$name : '.*\.\([^.]*\)'`;			\
+		echo "compressing in"					\
+			"${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}:"	\
+			"$$name -> $${name}${ZEXT}";			\
+		${MCOMPRESS} ${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name ; \
+		shift ;							\
+	done ; true
+.else
+# we are installing uncompressed pages, so nuke any compressed pages
+	@set ${MANALL} ;						\
+	while test $$# -ge 1; do					\
+		name=`${BASENAME} $$1`;					\
+		sect=`expr $$name : '.*\.\([^.]*\)'`;			\
+		rm -f ${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name${ZEXTENSION};\
+		shift ;							\
+	done ; true
+.endif
 .endif
+
 .if defined(MLINKS) && !empty(MLINKS)
 	@set ${MLINKS}; \
 	while test $$# -ge 2; do \
 		name=$$1; \
 		shift; \
-		dir=${DESTDIR}${MANDIR}`expr $$name : '[^\.]*\.\(.*\)'`; \
-		l=$${dir}${MANSUBDIR}/`expr $$name : '\([^\.]*\)'`.0; \
+		sect=`expr $$name : '.*\.\([^.]*\)'`; \
+		dir=${DESTDIR}${MANDIR}$$sect; \
+		l=$${dir}${MANSUBDIR}/$$name; \
 		name=$$1; \
 		shift; \
-		dir=${DESTDIR}${MANDIR}`expr $$name : '[^\.]*\.\(.*\)'`; \
-		t=$${dir}${MANSUBDIR}/`expr $$name : '\([^\.]*\)'`.0; \
-		echo $$t -\> $$l; \
-		rm -f $$t; \
-		ln $$l $$t; \
+		sect=`expr $$name : '.*\.\([^.]*\)'`; \
+		dir=${DESTDIR}${MANDIR}$$sect; \
+		t=$${dir}${MANSUBDIR}/$$name; \
+		echo $${t}${ZEXT} -\> $${l}${ZEXT}; \
+		rm -f $${t}${ZEXTENSION}; \
+		rm -f $${t}; \
+		ln $${l}${ZEXT} $${t}${ZEXT}; \
 	done; true
 .endif