- move config file from lib/screen to share/examples/screen

- ${FOO} -> $FOO in INSTALL/DEINSTALL

misc/screen/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2000/07/04 19:33:08 brad Exp $
+# $OpenBSD: Makefile,v 1.24 2000/08/04 18:25:24 brad Exp $
 
 DISTNAME=	screen-3.9.5
 PKGNAME=	screen-3.9.5p1
@@ -19,8 +19,10 @@ CONFIGURE_STYLE= gnu dest
 
 post-install:
 	@cd ${PREFIX}/bin && ln -sf screen-3.9.5 screen
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/screen
-	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc ${PREFIX}/lib/screen/screenrc
-	${INSTALL_DATA} ${WRKSRC}/terminfo/screencap ${PREFIX}/lib/screen
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen
+	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
+	 ${PREFIX}/share/examples/screen/screenrc-sample
+	${INSTALL_DATA} ${WRKSRC}/terminfo/screencap \
+	 ${PREFIX}/share/examples/screen/screencap
 
 .include <bsd.port.mk>

misc/screen/pkg/DEINSTALL

@@ -1,20 +1,20 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 1999/09/26 20:51:22 espie Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2000/08/04 18:25:24 brad Exp $
 #
 # screen de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-SCREENRC=/etc/screenrc
+CONFIG_FILE=/etc/screenrc
 
-if [ -e ${SCREENRC} ]; then
+if [ -e $CONFIG_FILE ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
     echo "| this step as root:"
     echo "|"
-    echo "|           rm -f ${SCREENRC}"
+    echo "|           rm -f $CONFIG_FILE"
     echo "|"
     echo "| Do not do this if you plan on re-installing $1"
     echo "| at some future time."

misc/screen/pkg/INSTALL

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.2 1999/09/26 20:51:21 espie Exp $
+# $OpenBSD: INSTALL,v 1.3 2000/08/04 18:25:25 brad Exp $
 #
 # Pre/post-installation setup of screen
 
@@ -8,38 +8,33 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-SCREENRC=/etc/screenrc
+CONFIG_FILE=/etc/screenrc
+SAMPLE_CONFIG_DIR=$PREFIX/share/examples/screen
 
-# Function: tell the user what s/he needs to do to use the port just installed
-#
 do_notice()
 {
     echo
     echo "+---------------"
-    echo "| The file ${SCREENRC} exists on your system.  It has"
+    echo "| The file $CONFIG_FILE exists on your system.  It has"
     echo "| NOT been updated.  Please look at the file "
-    echo "| ${PREFIX}/lib/screen/screenrc"
+    echo "| $SAMPLE_CONFIG_DIR/screenrc-sample"
     echo "| and add any desired (but missing) entries into your"
-    echo "| current ${SCREENRC}"
+    echo "| current $CONFIG_FILE"
 }
 
-# Function: install the screenrc where it is supposed to be.
-#
 do_install()
 {
-    cp ${PREFIX}/lib/screen/screenrc /etc
+    install -o root -g wheel $SAMPLE_CONFIG_DIR/screenrc-sample $CONFIG_FILE
     echo
     echo "+---------------"
     echo "| The file ${SCREENRC} has been created on your system."
     echo "| You may want to verify/edit its contents"
 }
 
-# Function: tell people about the screencap file
-#
 do_screencap()
 {
     echo "|"
-    echo "| The file ${PREFIX}/lib/screen/screencap contains a"
+    echo "| The file $SAMPLE_CONFIG_DIR/screencap contains a"
     echo "| termcap like description of the screen virtual terminal."
     echo "| You may use it to update your terminal database."
     echo "| See termcap(5)."
@@ -61,7 +56,7 @@ case $2 in
 	: nothing to pre-install for this port
 	;;
     POST-INSTALL)
-	if [ -e ${SCREENRC} ]; then
+	if [ -e $CONFIG_FILE ]; then
 	    do_notice $1
 	else
 	    do_install $1
@@ -75,4 +70,3 @@ case $2 in
 esac
 
 exit 0
-

misc/screen/pkg/PLIST

@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.10 2000/06/23 18:59:40 brad Exp $
+@comment $OpenBSD: PLIST,v 1.11 2000/08/04 18:25:25 brad Exp $
 bin/screen
 bin/screen-3.9.5
 man/man1/screen.1
 @unexec install-info --delete %D/info/screen.info %D/info/dir
 info/screen.info
 @exec install-info %D/info/screen.info %D/info/dir
-lib/screen/screencap
-lib/screen/screenrc
-@dirrm lib/screen
+share/examples/screen/screencap
+share/examples/screen/screenrc-sample
+@dirrm share/examples/screen