diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-02-16 16:23:54 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-02-16 16:23:54 +0000 |
| commit | 9b7d66dd614cbd7d82a8512379216218ac547d5d (patch) | |
| tree | 4e19b8af089b1243473dd8f01d3334a38ca0d3c6 | |
| parent | de65759ae10a0dde57d4be5019cd5abfb3dfe4bc (diff) | |
| download | mandoc-9b7d66dd614cbd7d82a8512379216218ac547d5d.tar.gz mandoc-9b7d66dd614cbd7d82a8512379216218ac547d5d.tar.zst mandoc-9b7d66dd614cbd7d82a8512379216218ac547d5d.zip | |
Delete the -V option. It serves no purpose but keeps confusing people.
Keeping track of the versions of installed software is the job of
the package manager, not of the individual binaries. If individual
binaries include version numbers, that tends to goad people into
writing broken configuration tests that inspect version numbers
instead of properly testing for features.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | apropos.1 | 8 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | main.c | 22 | ||||
| -rw-r--r-- | man.1 | 10 | ||||
| -rw-r--r-- | mandoc.1 | 8 |
6 files changed, 18 insertions, 40 deletions
@@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.455 2015/02/16 14:56:22 schwarze Exp $ +# $Id: Makefile,v 1.456 2015/02/16 16:23:54 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -15,6 +15,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +VERSION = 1.13.2 + # === LIST OF FILES ==================================================== TESTSRCS = test-dirent-namlen.c \ @@ -1,4 +1,4 @@ -.\" $Id: apropos.1,v 1.36 2014/10/25 01:03:52 schwarze Exp $ +.\" $Id: apropos.1,v 1.37 2015/02/16 16:23:54 schwarze Exp $ .\" .\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> .\" Copyright (c) 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: October 25 2014 $ +.Dd $Mdocdate: February 16 2015 $ .Dt APROPOS 1 .Os .Sh NAME @@ -24,7 +24,7 @@ .Nd search manual page databases .Sh SYNOPSIS .Nm -.Op Fl acfhklVw +.Op Fl acfhklw .Op Fl C Ar file .Op Fl M Ar path .Op Fl m Ar path @@ -162,8 +162,6 @@ By default, pages from all sections are shown. See .Xr man 1 for a listing of sections. -.It Fl V -Print version and exit. .It Fl w Instead of showing title lines, show the pathnames of the matching manual pages, just like @@ -31,10 +31,6 @@ echo "config.log: writing..." # Initialize all variables here, # such that nothing can leak in from the environment. -VERSION="1.13.2" -echo "VERSION=\"${VERSION}\"" 1>&2 -echo "VERSION=\"${VERSION}\"" 1>&3 - OSNAME= CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -` @@ -277,7 +273,6 @@ __HEREDOC__ [ ${HAVE_FGETLN} -eq 0 ] && echo "#include <stdio.h>" echo -echo "#define VERSION \"${VERSION}\"" [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\"" [ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\"" @@ -387,7 +382,6 @@ INSTALL_TARGETS="base-install" [ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} cgi-install" cat << __HEREDOC__ -VERSION = ${VERSION} BUILD_TARGETS = ${BUILD_TARGETS} INSTALL_TARGETS = ${INSTALL_TARGETS} CFLAGS = ${CFLAGS} @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.220 2015/02/10 08:05:30 schwarze Exp $ */ +/* $Id: main.c,v 1.221 2015/02/16 16:23:54 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -103,7 +103,6 @@ static enum mandoclevel passthrough(const char *, int, int); static void spawn_pager(void); static int toptions(struct curparse *, char *); static void usage(enum argmode) __attribute__((noreturn)); -static void version(void) __attribute__((noreturn)); static int woptions(struct curparse *, char *); static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; @@ -257,9 +256,6 @@ main(int argc, char *argv[]) case 'w': outmode = OUTMODE_FLN; break; - case 'V': - version(); - /* NOTREACHED */ default: show_usage = 1; break; @@ -486,37 +482,29 @@ out: } static void -version(void) -{ - - printf("mandoc %s\n", VERSION); - exit((int)MANDOCLEVEL_OK); -} - -static void usage(enum argmode argmode) { switch (argmode) { case ARG_FILE: - fputs("usage: mandoc [-acfhklV] [-Ios=name] " + fputs("usage: mandoc [-acfhkl] [-Ios=name] " "[-Kencoding] [-mformat] [-Ooption]\n" "\t [-Toutput] [-Wlevel] [file ...]\n", stderr); break; case ARG_NAME: - fputs("usage: man [-acfhklVw] [-C file] [-I os=name] " + fputs("usage: man [-acfhklw] [-C file] [-I os=name] " "[-K encoding] [-M path] [-m path]\n" "\t [-O option=value] [-S subsection] [-s section] " "[-T output] [-W level]\n" "\t [section] name ...\n", stderr); break; case ARG_WORD: - fputs("usage: whatis [-acfhklVw] [-C file] " + fputs("usage: whatis [-acfhklw] [-C file] " "[-M path] [-m path] [-O outkey] [-S arch]\n" "\t [-s section] name ...\n", stderr); break; case ARG_EXPR: - fputs("usage: apropos [-acfhklVw] [-C file] " + fputs("usage: apropos [-acfhklw] [-C file] " "[-M path] [-m path] [-O outkey] [-S arch]\n" "\t [-s section] expression ...\n", stderr); break; @@ -1,4 +1,4 @@ -.\" $Id: man.1,v 1.12 2015/01/20 21:16:51 schwarze Exp $ +.\" $Id: man.1,v 1.13 2015/02/16 16:23:54 schwarze Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ .\" .\" @(#)man.1 8.2 (Berkeley) 1/2/94 .\" -.Dd $Mdocdate: January 20 2015 $ +.Dd $Mdocdate: February 16 2015 $ .Dt MAN 1 .Os .Sh NAME @@ -39,7 +39,7 @@ .Nd display manual pages .Sh SYNOPSIS .Nm man -.Op Fl acfhklVw +.Op Fl acfhklw .Op Fl C Ar file .Op Fl I Cm os Ns = Ns Ar name .Op Fl K Ar encoding @@ -291,8 +291,6 @@ and are described in the .Xr mandoc 1 manual. -.It Fl V -Print version and exit. .It Fl W Ar level Specify the minimum message .Ar level @@ -416,7 +414,7 @@ utility is compliant with the specification. .Pp The flags -.Op Fl aCcfhIKlMmOSsTVWw , +.Op Fl aCcfhIKlMmOSsTWw , as well as the environment variables .Ev MACHINE , .Ev MANPAGER , @@ -1,4 +1,4 @@ -.\" $Id: mandoc.1,v 1.152 2015/02/07 15:15:20 schwarze Exp $ +.\" $Id: mandoc.1,v 1.153 2015/02/16 16:23:54 schwarze Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> .\" Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: February 7 2015 $ +.Dd $Mdocdate: February 16 2015 $ .Dt MANDOC 1 .Os .Sh NAME @@ -23,7 +23,7 @@ .Nd format and display UNIX manuals .Sh SYNOPSIS .Nm mandoc -.Op Fl acfhklV +.Op Fl acfhkl .Sm off .Op Fl I Cm os Li = Ar name .Sm on @@ -150,8 +150,6 @@ See for available formats. Defaults to .Fl T Ns Cm locale . -.It Fl V -Print version and exit. .It Fl W Ns Ar level Specify the minimum message .Ar level |