Fix paths in man page and example screenrc (for pkgsrc).

4 files changed, 64 insertions, 2 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 16221f1ba9f..951072ee6a3 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/11/14 23:33:12 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2002/12/23 13:13:02 grant Exp $
 
 DISTNAME=	screen-3.9.13
 CATEGORIES=	misc
@@ -24,6 +24,13 @@ CONFIGURE_ARGS+=	--enable-telnet
 PLIST_SRC=	${PKGDIR}/PLIST.${OPSYS}
 .endif
 
+post-patch:
+	@for file in etc/etcscreenrc doc/screen.1; do 			\
+	${MV} ${WRKSRC}/$$file ${WRKSRC}/$$file.orig;			\
+	${SED} ${FILES_SUBST_SED}					\
+		${WRKSRC}/$$file.orig > ${WRKSRC}/$$file;		\
+	done
+
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc			\
@@ -35,4 +42,5 @@ post-install:
 .endif
 
 .include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 03a0920f938..151d68d5f67 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/11/04 22:39:18 hubertf Exp $
+$NetBSD: distinfo,v 1.10 2002/12/23 13:13:03 grant Exp $
 
 SHA1 (screen-3.9.13.tar.gz) = b4b8fff955b19ddb88a1ec4ee8dd371e20b3caf4
 Size (screen-3.9.13.tar.gz) = 728037 bytes
@@ -11,3 +11,5 @@ SHA1 (patch-ak) = 1e83c3406fb862e15f0fd5b90da8cf5310fbb68b
 SHA1 (patch-al) = 2f042d43030a9166f4c1bf19e4d473d1031aba4e
 SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9
 SHA1 (patch-an) = 9c5f451edb228f10daf593eba79f1fb11b4ffb24
+SHA1 (patch-ao) = 81b0d64dd5918cd4d6fbc02dff0470a441a200d4
+SHA1 (patch-ap) = e44fa5dd2cadb307f12291ed67ca3f1cc03f8297
diff --git a/misc/screen/patches/patch-ao b/misc/screen/patches/patch-ao
new file mode 100644
index 00000000000..f110168332a
--- /dev/null
+++ b/misc/screen/patches/patch-ao
@@ -0,0 +1,12 @@
+$NetBSD: patch-ao,v 1.1 2002/12/23 13:13:04 grant Exp $
+
+--- etc/etcscreenrc.orig	Sun Apr 29 01:25:34 2001
++++ etc/etcscreenrc
+@@ -1,6 +1,6 @@
+ #
+ # This is an example for the global screenrc file.
+-# You may want to install this file as /usr/local/etc/screenrc.
++# You may want to install this file as @PKG_SYSCONFDIR@/screenrc.
+ # Check config.h for the exact location.
+ #
+ # Flaws of termcap and standard settings are done here.
diff --git a/misc/screen/patches/patch-ap b/misc/screen/patches/patch-ap
new file mode 100644
index 00000000000..5bcc655b0af
--- /dev/null
+++ b/misc/screen/patches/patch-ap
@@ -0,0 +1,40 @@
+$NetBSD: patch-ap,v 1.1 2002/12/23 13:13:05 grant Exp $
+
+--- doc/screen.1.orig	Thu Sep  5 22:08:06 2002
++++ doc/screen.1
+@@ -576,7 +576,7 @@ Show a listing of all currently attached
+ 
+ .SH CUSTOMIZATION
+ The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to
+-/tmp/screens or preferably to /usr/local/screens chosen at compile-time. If
++/tmp/screens. This is chosen at compile-time. If
+ .I screen
+ is installed setuid-root, then the administrator
+ should compile
+@@ -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@PKG_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 
+@@ -4298,14 +4298,14 @@ Examples in the 
+ .I screen
+ distribution package for private and global initialization files.
+ .IP $SYSSCREENRC 
+-.IP /usr/local/etc/screenrc
++.IP @PKG_SYSCONFDIR@/screenrc
+ .I screen
+ initialization commands
+ .IP $SCREENRC
+ .IP $HOME/.screenrc
+-Read in after /usr/local/etc/screenrc
++Read in after @PKG_SYSCONFDIR@/screenrc
+ .IP $SCREENDIR/S-<login>
+-.IP /local/screens/S-<login>
++.IP /tmp/screens/S-<login>
+ Socket directories (default)
+ .IP /usr/tmp/screens/S-<login>
+ Alternate socket directories.