ensure the screen man page has the proper path to the screenrc file.

--
Pointed out by: art@
This commit is contained in:
brad 2002-08-21 20:12:02 +00:00
parent d601ffb473
commit 41eba28a9b
2 changed files with 81 additions and 2 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.40 2002/03/23 23:54:05 brad Exp $
# $OpenBSD: Makefile,v 1.41 2002/08/21 20:12:02 brad Exp $
COMMENT= "multi-screen window manager"
VERSION= 3.9.11
DISTNAME= screen-${VERSION}
CATEGORIES= misc
NEED_VERSION= 1.500
MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/
HOMEPAGE= http://www.gnu.org/software/screen/
@ -37,6 +36,11 @@ ALL_TARGET= screen screen.info
post-extract:
@rm -f ${WRKSRC}/doc/screen.info*
pre-build:
@mv -f ${WRKSRC}/doc/screen.1 ${WRKSRC}/doc/screen.1.new
@sed -e s#!!sysconfdir!!#${SYSCONFDIR}#g \
${WRKSRC}/doc/screen.1.new > ${WRKSRC}/doc/screen.1
post-install:
@chmod 755 ${PREFIX}/bin/screen-${VERSION}
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen

View File

@ -0,0 +1,75 @@
$OpenBSD: patch-doc_screen_1,v 1.1 2002/08/21 20:12:02 brad Exp $
--- doc/screen.1.orig Wed Aug 21 15:41:38 2002
+++ doc/screen.1 Wed Aug 21 15:56:18 2002
@@ -99,7 +99,7 @@ create the new window.
The above example would start the emacs editor (editing prog.c) and switch
to its window.
.PP
-If \*Q/etc/utmp\*U is writable by
+If \*Q/var/run/utmp\*U is writable by
.IR screen ,
an appropriate record will be written to this file for each window, and
removed when the window is terminated.
@@ -228,7 +228,7 @@ See the \*Qdefflow\*U .screenrc command
The use of this option is discouraged.
.TP 5
.BR \-l " and " \-ln
-turns login mode on or off (for /etc/utmp updating).
+turns login mode on or off (for /var/run/utmp updating).
This can also be defined through the \*Qdeflogin\*U .screenrc command.
.TP 5
.BR \-ls " and " \-list
@@ -589,7 +589,7 @@ in the environment variable $SCREENDIR.
When
.I screen
is invoked, it executes initialization commands from the files
-\*Q/usr/local/etc/screenrc\*U and
+\*Q!!sysconfdir!!/screenrc\*U and
\*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's
defaults\*U that can be overridden in the following ways: for the
global screenrc file
@@ -1601,7 +1601,7 @@ and then compile the entry with
The echo command may be used to annoy
.I screen
users with a 'message of the
-day'. Typically installed in a global /local/etc/screenrc.
+day'. Typically installed in a global !!sysconfdir!!/screenrc.
The option \*Q-n\*U may be used to suppress the line feed.
See also \*Qsleep\*U.
Echo is also useful for online checking of environment variables.
@@ -4271,12 +4271,12 @@ Examples in the
.I screen
distribution package for private and global initialization files.
.IP $SYSSCREENRC
-.IP /usr/local/etc/screenrc
+.IP !!sysconfdir!!/screenrc
.I screen
initialization commands
.IP $SCREENRC
.IP $HOME/.screenrc
-Read in after /usr/local/etc/screenrc
+Read in after !!sysconfdir!!/screenrc
.IP $SCREENDIR/S-<login>
.IP /local/screens/S-<login>
Socket directories (default)
@@ -4297,7 +4297,7 @@ Output log files created by the log func
or
.IP /etc/termcap
Terminal capability databases
-.IP /etc/utmp
+.IP /var/run/utmp
Login records
.IP $LOCKPRG
Program that locks a terminal.
@@ -4410,9 +4410,9 @@ does not make use of hardware tabs.
must be installed as set-uid with owner root on most systems in order
to be able to correctly change the owner of the tty device file for
each window.
-Special permission may also be required to write the file \*Q/etc/utmp\*U.
+Special permission may also be required to write the file \*Q/var/run/utmp\*U.
.IP \(bu
-Entries in \*Q/etc/utmp\*U are not removed when
+Entries in \*Q/var/run/utmp\*U are not removed when
.I screen
is killed with SIGKILL.
This will cause some programs (like "w" or "rwho")