[pkgsrc/trunk]: pkgsrc/misc/screen This will install two screenrc examples (a...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/30d6e3d22723
branches:  trunk
changeset: 504999:30d6e3d22723
user:      reed <reed%pkgsrc.org@localhost>
date:      Wed Dec 28 17:53:24 2005 +0000

description:
This will install two screenrc examples (and changes name of one) and
fixes man page to point to them.

Update patch-ap for doc/screen.1 so the location of examples files
is corrected.

Now install both examples. Update PLISTs. Note that the
screenrc example is now called screenrc and etcscreenrc is
etcscreenrc (makes sense).

Mention both examples in MESSAGE.

Bump PKGREVISION.

This will solve problem for PR #32391.

Okayed by maintainer.

diffstat:

 misc/screen/MESSAGE          |   7 ++++---
 misc/screen/Makefile         |   7 +++++--
 misc/screen/PLIST            |   3 ++-
 misc/screen/PLIST.SunOS      |   3 ++-
 misc/screen/distinfo         |   4 ++--
 misc/screen/patches/patch-ap |  21 +++++++++++++++------
 6 files changed, 30 insertions(+), 15 deletions(-)

diffs (138 lines):

diff -r d6fd72dc3d9e -r 30d6e3d22723 misc/screen/MESSAGE
--- a/misc/screen/MESSAGE       Wed Dec 28 17:51:58 2005 +0000
+++ b/misc/screen/MESSAGE       Wed Dec 28 17:53:24 2005 +0000
@@ -1,13 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/12/01 22:47:02 grant Exp $
+$NetBSD: MESSAGE,v 1.5 2005/12/28 17:53:24 reed Exp $
 
 You may want to create and edit the file:
 
        ${PKG_SYSCONFDIR}/screenrc
 
-to customize screen globally. An example configuration file has been
-installed in:
+to customize screen globally. Example configuration files have been
+installed to:
 
        ${PREFIX}/share/examples/screen/screenrc
+       ${PREFIX}/share/examples/screen/etcscreenrc
 
 ===========================================================================
diff -r d6fd72dc3d9e -r 30d6e3d22723 misc/screen/Makefile
--- a/misc/screen/Makefile      Wed Dec 28 17:51:58 2005 +0000
+++ b/misc/screen/Makefile      Wed Dec 28 17:53:24 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2005/10/23 23:09:59 rillig Exp $
+# $NetBSD: Makefile,v 1.63 2005/12/28 17:53:24 reed Exp $
 
 DISTNAME=      screen-4.0.2
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    misc shells
 MASTER_SITES=  ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
                ${MASTER_SITE_GNU:=screen/}
@@ -17,6 +17,7 @@
 USE_PKGINSTALL=                YES
 INFO_FILES=            screen.info
 PLIST_SUBST+=          DISTNAME=${DISTNAME:Q}
+FILES_SUBST+=          EXAMPLES=${PREFIX:Q}/share/examples/screen
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-sys-screenrc=${PKG_SYSCONFDIR}/screenrc
@@ -36,6 +37,8 @@
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen
        ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc                       \
+               ${PREFIX}/share/examples/screen/etcscreenrc
+       ${INSTALL_DATA} ${WRKSRC}/etc/screenrc                          \
                ${PREFIX}/share/examples/screen/screenrc
 .if ${OPSYS} == "SunOS"
        cd ${WRKSRC}/terminfo &&                                        \
diff -r d6fd72dc3d9e -r 30d6e3d22723 misc/screen/PLIST
--- a/misc/screen/PLIST Wed Dec 28 17:51:58 2005 +0000
+++ b/misc/screen/PLIST Wed Dec 28 17:53:24 2005 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2004/01/06 16:30:39 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/12/28 17:53:24 reed Exp $
 bin/screen
 bin/${DISTNAME}
 man/man1/screen.1
 @unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
+share/examples/screen/etcscreenrc
 share/examples/screen/screenrc
 share/screen/utf8encodings/01
 share/screen/utf8encodings/02
diff -r d6fd72dc3d9e -r 30d6e3d22723 misc/screen/PLIST.SunOS
--- a/misc/screen/PLIST.SunOS   Wed Dec 28 17:51:58 2005 +0000
+++ b/misc/screen/PLIST.SunOS   Wed Dec 28 17:53:24 2005 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST.SunOS,v 1.10 2004/01/06 16:30:40 wiz Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.11 2005/12/28 17:53:24 reed Exp $
 bin/screen
 bin/${DISTNAME}
 man/man1/screen.1
 @unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
+share/examples/screen/etcscreenrc
 share/examples/screen/screenrc
 share/lib/terminfo/s/screen
 share/lib/terminfo/s/screen-bce
diff -r d6fd72dc3d9e -r 30d6e3d22723 misc/screen/distinfo
--- a/misc/screen/distinfo      Wed Dec 28 17:51:58 2005 +0000
+++ b/misc/screen/distinfo      Wed Dec 28 17:53:24 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2005/12/10 23:28:13 rillig Exp $
+$NetBSD: distinfo,v 1.27 2005/12/28 17:53:24 reed Exp $
 
 SHA1 (screen-4.0.2.tar.gz) = 461eb9d5edc211e1480d7b5e94d89c4d9ba3643f
 RMD160 (screen-4.0.2.tar.gz) = 42aea3d27ed25104f2a48606ea73234b715e480f
@@ -14,5 +14,5 @@
 SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9
 SHA1 (patch-an) = 79d84b0caaad6044cf81c0fcfc1cd8470c9378d8
 SHA1 (patch-ao) = 81b0d64dd5918cd4d6fbc02dff0470a441a200d4
-SHA1 (patch-ap) = e44fa5dd2cadb307f12291ed67ca3f1cc03f8297
+SHA1 (patch-ap) = fd3717b70f3ade08de486e4ffad9cac39c11d3bf
 SHA1 (patch-aq) = 997a0ce76086f1dd966868b1fc9ca3bb96b4b4fb
diff -r d6fd72dc3d9e -r 30d6e3d22723 misc/screen/patches/patch-ap
--- a/misc/screen/patches/patch-ap      Wed Dec 28 17:51:58 2005 +0000
+++ b/misc/screen/patches/patch-ap      Wed Dec 28 17:53:24 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1 2002/12/23 13:13:05 grant Exp $
+$NetBSD: patch-ap,v 1.2 2005/12/28 17:53:24 reed 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
+--- doc/screen.1.orig  2003-12-05 05:51:57.000000000 -0800
++++ doc/screen.1       2005-12-27 13:54:30.000000000 -0800
+@@ -581,7 +581,7 @@
  
  .SH CUSTOMIZATION
  The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to
@@ -11,7 +11,7 @@
  .I screen
  is installed setuid-root, then the administrator
  should compile
-@@ -589,7 +589,7 @@ in the environment variable $SCREENDIR.
+@@ -594,7 +594,7 @@
  When
  .I screen
  is invoked, it executes initialization commands from the files
@@ -20,7 +20,16 @@
  \*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 
+@@ -624,7 +624,7 @@
+ protected from variable substitution.
+ .PP
+ Two configuration files are shipped as examples with your screen distribution:
+-\*Qetc/screenrc\*U and \*Qetc/etcscreenrc\*U. They contain a number of
++\*Q@EXAMPLES@/screenrc\*U and \*Q@EXAMPLES@/etcscreenrc\*U. They contain a number of
+ useful examples for various commands.
+ .PP
+ Customization can also be done 'on-line'. To enter the command mode type
+@@ -4416,14 +4416,14 @@
  .I screen
  distribution package for private and global initialization files.
  .IP $SYSSCREENRC