Kill the .Dt override and restore installation a normal man page.

4 files changed, 40 insertions, 11 deletions

diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index 097d5561fb3..f577e7a270f 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2013/03/11 19:47:38 bsiegert Exp $
+# $NetBSD: Makefile,v 1.22 2013/03/23 12:18:19 joerg Exp $
 
 DISTNAME=			mksh-R44
 PKGNAME=			${DISTNAME:S/-R/-/}
@@ -8,7 +8,6 @@ MASTER_SITES=			http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
 SITES.${DISTNAME}.cat1.gz=	${MASTER_SITES:S/dist/cats/}
 
 EXTRACT_SUFX=			.tgz
-DISTFILES=			${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}.cat1.gz
 
 MAINTAINER=			ahoka@NetBSD.org
 HOMEPAGE=			http://mirbsd.de/mksh
@@ -30,12 +29,10 @@ do-build:
 	cd ${WRKBUILD} && LIBS=${LIBS:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
 	    CPPFLAGS=${CPPFLAGS:Q} LDFLAGS=${LDFLAGS:Q} \
 	    ${TOOLS_SHELL} ${WRKSRC}/Build.sh -r
-	${GZCAT} ${DISTDIR}/${DISTNAME}.cat1.gz > ${WRKSRC}/mksh.0
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/mksh ${DESTDIR}${PREFIX}/bin/mksh
-	${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/
-	${INSTALL_MAN} ${WRKSRC}/mksh.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/
+	${INSTALL_MAN} ${WRKSRC}/mksh.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${DESTDIR}${PREFIX}/share/examples/mksh/
 
 # Uncomment this if you want to run the regression tests
diff --git a/shells/mksh/PLIST b/shells/mksh/PLIST
index 8235aba6dba..9a34d40e9ea 100644
--- a/shells/mksh/PLIST
+++ b/shells/mksh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/03/11 19:47:38 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/03/23 12:18:19 joerg Exp $
 bin/mksh
-man/cat1/mksh.0
+man/man1/mksh.1
 share/examples/mksh/dot.mkshrc
diff --git a/shells/mksh/distinfo b/shells/mksh/distinfo
index 1564d187f54..72322edb94d 100644
--- a/shells/mksh/distinfo
+++ b/shells/mksh/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.19 2013/03/11 19:47:38 bsiegert Exp $
+$NetBSD: distinfo,v 1.20 2013/03/23 12:18:19 joerg Exp $
 
-SHA1 (mksh-R44.cat1.gz) = 9f086affda624c53beedfd45523b40ced3b87c2e
-RMD160 (mksh-R44.cat1.gz) = 2644edb96a5def67e9c2b07b1d2a20d29c85c0ac
-Size (mksh-R44.cat1.gz) = 52261 bytes
 SHA1 (mksh-R44.tgz) = 2e575f8de79305e42fc1c7fdda2c8051482a4758
 RMD160 (mksh-R44.tgz) = 4cf1525c477c4bece519c024cc73ee6ca064d34a
 Size (mksh-R44.tgz) = 346239 bytes
diff --git a/shells/mksh/patches/patch-mksh.1 b/shells/mksh/patches/patch-mksh.1
new file mode 100644
index 00000000000..f5ab391a742
--- /dev/null
+++ b/shells/mksh/patches/patch-mksh.1
@@ -0,0 +1,35 @@
+$NetBSD: patch-mksh.1,v 1.1 2013/03/23 12:18:20 joerg Exp $
+
+--- mksh.1.orig	2013-03-23 12:06:12.000000000 +0000
++++ mksh.1
+@@ -62,29 +62,15 @@
+ .\"
+ .\" Implement .Dd with the Mdocdate RCS keyword
+ .\"
+-.rn Dd xD
+-.de Dd
+-.ie \\$1$Mdocdate: \{\
+-.	xD \\$2 \\$3, \\$4
+-.\}
+-.el .xD \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
+-..
+ .\"
+ .\" .Dd must come before definition of .Mx, because when called
+ .\" with -mandoc, it might implement .Mx itself, but we want to
+ .\" use our own definition. And .Dd must come *first*, always.
+ .\"
+-.Dd $Mdocdate: February 19 2013 $
++.Dd February 19, 2013
+ .\"
+ .\" Check which macro package we use, and do other -mdoc setup.
+ .\"
+-.ie \n(.g \{\
+-.	if 
\*[.T]
utf8
 .tr \[la]\*(Lt
+-.	if 
\*[.T]
utf8
 .tr \[ra]\*(Gt
+-.	ie d volume-ds-1 .ds tT gnu
+-.	el .ds tT bsd
+-.\}
+-.el .ds tT ucb
+ .\"
+ .\" Implement .Mx (MirBSD)
+ .\"