Date: 23 Jan 2002 20:55:16 +0100 From: assar@FreeBSD.org To: Ruslan Ermilov <ru@FreeBSD.org> Cc: freebsd-doc@FreeBSD.org Subject: Re: docs/33645: k5list(1) contains many incorrect "klist" entries. Message-ID: <5llmeo7sgr.fsf@assaris.sics.se> In-Reply-To: Ruslan Ermilov's message of "Wed, 23 Jan 2002 19:53:33 %2B0200" References: <200201161505.g0GF5Hp52703@freefall.freebsd.org> <5l665t80hp.fsf@assaris.sics.se> <5l1ygh801k.fsf@assaris.sics.se> <20020123195333.A22346@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Ruslan Ermilov <ru@FreeBSD.org> writes:
> Besides some bugs in Makefiles (please test them with "make all-man"),
> may I suggest that you use MANFILTER to tweak the contents of manpages
> rather than patching them directly on the HEAD branch and taking them
> off the vendor branch?
That's a better idea. This patch (which passes "make all-man") does
that. Comments?
/assar
--=-=-=
Content-Disposition: attachment; filename=hdman.diff
Index: kerberos5/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/kerberos5/Makefile.inc,v
retrieving revision 1.8
diff -u -w -r1.8 Makefile.inc
--- kerberos5/Makefile.inc 3 Aug 2001 16:03:24 -0000 1.8
+++ kerberos5/Makefile.inc 23 Jan 2002 19:25:44 -0000
@@ -170,4 +170,13 @@
.endif
+MANFILTER= sed -e's,KADMIN,K5ADMIN,g' -e's,kadmin,k5admin,g' \
+ -e's,KADMIND,K5ADMIND,g' -e's,kadmind,k5admind,g' \
+ -e's,KSTASH,K5STASH,g' -e's,kstash,k5stash,g' \
+ -e's,KPASSWD,K5PASSWD,g' -e's,kpasswd,k5passwd,g' \
+ -e's,KPASSWDD,K5PASSWDD,g' -e's,kpasswdd,k5passwdd,g' \
+ -e's,KDESTROY,K5DESTROY,g' -e's,kdestroy,k5destroy,g' \
+ -e's,KINIT,K5INIT,g' -e's,kinit,k5init,g' \
+ -e's,KLIST,K5LIST,g' -e's,klist,k5list,g'
+
.endif
Index: kerberos5/libexec/k5admind/Makefile
===================================================================
RCS file: /home/ncvs/src/kerberos5/libexec/k5admind/Makefile,v
retrieving revision 1.6
diff -u -w -r1.6 Makefile
--- kerberos5/libexec/k5admind/Makefile 13 Feb 2001 16:56:57 -0000 1.6
+++ kerberos5/libexec/k5admind/Makefile 23 Jan 2002 19:25:44 -0000
@@ -30,11 +30,14 @@
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-NOMAN= yes
+MAN= k5admind.8
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kadmin
+
+k5admind.8: kadmind.8
+ ln -sf ${.OODATE} ${.TARGET}
kadm5/private.h: kadm5
cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
Index: kerberos5/libexec/k5passwdd/Makefile
===================================================================
RCS file: /home/ncvs/src/kerberos5/libexec/k5passwdd/Makefile,v
retrieving revision 1.7
diff -u -w -r1.7 Makefile
--- kerberos5/libexec/k5passwdd/Makefile 27 Mar 2001 14:07:29 -0000 1.7
+++ kerberos5/libexec/k5passwdd/Makefile 23 Jan 2002 19:25:44 -0000
@@ -25,11 +25,14 @@
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-MAN= kpasswdd.8
+MAN= k5passwdd.8
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kpasswd
+
+k5passwdd.8: kpasswdd.8
+ ln -sf ${.OODATE} ${.TARGET}
kadm5/admin.h: kadm5
cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
Index: kerberos5/usr.bin/k5admin/Makefile
===================================================================
RCS file: /home/ncvs/src/kerberos5/usr.bin/k5admin/Makefile,v
retrieving revision 1.6
diff -u -w -r1.6 Makefile
--- kerberos5/usr.bin/k5admin/Makefile 13 Feb 2001 16:56:59 -0000 1.6
+++ kerberos5/usr.bin/k5admin/Makefile 23 Jan 2002 19:25:44 -0000
@@ -50,11 +50,13 @@
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \
${LIBSL} ${LIBREADLINE}
-NOMAN= yes
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kadmin
+
+k5admin.1: kadmin.1
+ ln -sf ${.OODATE} ${.TARGET}
kadm5/private.h: kadm5
cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
Index: kerberos5/usr.sbin/k5stash/Makefile
===================================================================
RCS file: /home/ncvs/src/kerberos5/usr.sbin/k5stash/Makefile,v
retrieving revision 1.8
diff -u -w -r1.8 Makefile
--- kerberos5/usr.sbin/k5stash/Makefile 27 Mar 2001 14:07:30 -0000 1.8
+++ kerberos5/usr.sbin/k5stash/Makefile 23 Jan 2002 19:25:44 -0000
@@ -24,8 +24,11 @@
-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-MAN= kstash.8
+MAN= k5stash.8
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kdc
+
+k5stash.8: kstash.8
+ ln -sf ${.OODATE} ${.TARGET}
--=-=-=--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5llmeo7sgr.fsf>