# HG changeset patch # User meillo@marmaro.de # Date 1276965063 -7200 # Node ID 0707a9ae145d63addd89cb9f577f810b651ddf55 # Parent ffeff2c33799c8cf9a4163d3e0adf8e3031e7bea mservdetect should be listed in man section 1 if it resides in /.../bin/ improved the manpage a bit too diff -r ffeff2c33799 -r 0707a9ae145d man/Makefile.am --- a/man/Makefile.am Sat Jun 19 18:08:55 2010 +0200 +++ b/man/Makefile.am Sat Jun 19 18:31:03 2010 +0200 @@ -1,1 +1,1 @@ -man_MANS=masqmail.8 mservdetect.8 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 +man_MANS=masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 diff -r ffeff2c33799 -r 0707a9ae145d man/Makefile.in --- a/man/Makefile.in Sat Jun 19 18:08:55 2010 +0200 +++ b/man/Makefile.in Sat Jun 19 18:31:03 2010 +0200 @@ -64,8 +64,10 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ + "$(DESTDIR)$(man8dir)" man5dir = $(mandir)/man5 -am__installdirs = "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) @@ -174,7 +176,7 @@ with_logdir = @with_logdir@ with_spooldir = @with_spooldir@ with_user = @with_user@ -man_MANS = masqmail.8 mservdetect.8 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 +man_MANS = masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5 all: all-am .SUFFIXES: @@ -208,6 +210,44 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +install-man1: $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list=''; test -n "$(man1dir)" || exit 0; \ + { for i in $$list; do echo "$$i"; done; \ + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } + +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list=''; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + test -z "$$files" || { \ + echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } install-man5: $(man_MANS) @$(NORMAL_INSTALL) test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" @@ -338,7 +378,7 @@ check: check-am all-am: Makefile $(MANS) installdirs: - for dir in "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -402,7 +442,7 @@ install-info-am: -install-man: install-man5 install-man8 +install-man: install-man1 install-man5 install-man8 install-pdf: install-pdf-am @@ -432,7 +472,7 @@ uninstall-am: uninstall-man -uninstall-man: uninstall-man5 uninstall-man8 +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 .MAKE: install-am install-strip @@ -441,12 +481,12 @@ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ - install-man5 install-man8 install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-man1 install-man5 install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am uninstall-man \ - uninstall-man5 uninstall-man8 + uninstall-man1 uninstall-man5 uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -r ffeff2c33799 -r 0707a9ae145d man/mservdetect.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/man/mservdetect.1 Sat Jun 19 18:31:03 2010 +0200 @@ -0,0 +1,50 @@ +.TH mservdetect 1 2010-06-19 masqmail-0.2.22 "User Commands" + +.SH NAME +mservdetect \- Helper for masqmail and masqdialer + + +.SH SYNOPSIS +\fB/usr/bin/masqmail \fIhost port\fR + + +.SH DESCRIPTION + +Mservdetect is a small helper application for masqmail to detect its online status +if the modem server masqdialer is used. +It connects to the\fIhost\fR at \fIport\fR and prints the connection name to stdout. + +If you want to use it, set \fBonline_detect\fR=\fIpipe\fR and +\fBonline_pipe\fR=\fI"/usr/bin/mservdetect host port"\fR in +masqmail.conf. + +.SH OPTIONS + +.TP +\fBhost\fR + +The hostname where the masqdialer server is running. + +.TP +\fBport\fR + +The port number where the masqdialer server is listening. + + +.SH AUTHOR + +Masqmail was written by Oliver Kurth. +It is now maintained by Markus Schnalke . + +You will find the newest version of masqmail at \fBhttp://prog.marmaro.de/masqmail/\fR. +There is also a mailing list, you will find information about it at masqmail's main site. + + +.SH BUGS + +Please report bugs to the mailing list. + + +.SH SEE ALSO + +\fBmasqmail(8)\fR, \fBmasqmail.conf(5)\fR diff -r ffeff2c33799 -r 0707a9ae145d man/mservdetect.8 --- a/man/mservdetect.8 Sat Jun 19 18:08:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -.TH mservdetect 8 2010-05-07 masqmail-0.2.22 "Maintenance Commands" - -.SH NAME -mservdetect \- Helper for masqmail and masqdialer - - -.SH SYNOPSIS -\fB/usr/bin/masqmail \fIhost port\fR - - -.SH DESCRIPTION - -Mservdetect is a small helper application for masqmail to detect its online status -if the modem server masqdialer is used. -It connects to the\fIhost\fR at \fIport\fR and prints the connection name to stdout. - -If you want to use it, set \fBonline_detect\fR=\fIpipe\fR and -\fBonline_pipe\fR=\fI"/usr/bin/mservdetect host port"\fR. - -.SH OPTIONS - -.TP -\fBhost\fR - -The hostname where the masqdialer server is running. - -.TP -\fBport\fR - -The port number where the masqdialer server is listening. - - -.SH AUTHOR - -Masqmail was written by Oliver Kurth. -It is now maintained by Markus Schnalke . - -You will find the newest version of masqmail at \fBhttp://prog.marmaro.de/masqmail/\fR. -There is also a mailing list, you will find information about it at masqmail's main site. - - -.SH BUGS - -Please report bugs to the mailing list. - - -.SH SEE ALSO - -\fBmasqmail.conf(5)\fR