From 79605cf0a3bc532e955ae8d3a7db3e176b67fae4 Mon Sep 17 00:00:00 2001
From: pvalchev <pvalchev@openbsd.org>
Date: Wed, 9 Jul 2003 07:17:15 +0000
Subject: [PATCH] - connect to "localhost" by default - mention the need for an
 entry to be added to /etc/services manually - create (empty) log file
 directory - add proper deinstall steps for above based on a diff from
 wilfried

---
 comms/conserver/Makefile      |  5 +++--
 comms/conserver/pkg/DEINSTALL |  6 +++++-
 comms/conserver/pkg/INSTALL   | 11 +++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 02802a1a345..3867470697f 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2003/06/23 00:02:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.24 2003/07/09 07:17:15 pvalchev Exp $
 
 COMMENT=	"manage remote serial consoles via TCP/IP"
 
@@ -19,7 +19,8 @@ MASTER_SITES=	ftp://ftp.conserver.com/conserver/
 
 AUTOCONF_NEW=	Yes
 CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS=	--with-64bit
+CONFIGURE_ARGS=	--with-64bit \
+		--with-master=localhost
 
 REGRESS_TARGET=	test
 
diff --git a/comms/conserver/pkg/DEINSTALL b/comms/conserver/pkg/DEINSTALL
index 827e4911c22..15aa7a520b2 100644
--- a/comms/conserver/pkg/DEINSTALL
+++ b/comms/conserver/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2003/05/27 18:59:17 pvalchev Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2003/07/09 07:17:15 pvalchev Exp $
 #
 # conserver de-installation
 
@@ -8,6 +8,8 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/conserver.cf
 PASSWD_FILE=${SYSCONFDIR}/conserver.passwd
+LOG_DIR=/var/consoles
+SERVICES=/etc/services
 
 if [ -f $CONFIG_FILE ]; then
     echo
@@ -17,6 +19,8 @@ if [ -f $CONFIG_FILE ]; then
     echo "|"
     echo "|           rm -f $CONFIG_FILE"
     echo "|           rm -f $PASSWD_FILE"
+    echo "|           rm -rf $LOG_DIR"
+    echo "| and remove the conserver line from $SERVICES."
     echo "|"
     echo "| Do not do this if you plan on re-installing $1"
     echo "| at some future time."
diff --git a/comms/conserver/pkg/INSTALL b/comms/conserver/pkg/INSTALL
index dbee6786ee1..8dabefd0c18 100644
--- a/comms/conserver/pkg/INSTALL
+++ b/comms/conserver/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.2 2003/05/27 18:59:17 pvalchev Exp $
+# $OpenBSD: INSTALL,v 1.3 2003/07/09 07:17:15 pvalchev Exp $
 #
 # Pre/post-installation setup of conserver
 
@@ -13,6 +13,8 @@ PASSWD_FILE=${SYSCONFDIR}/conserver.passwd
 SAMPLE_DIR=$PREFIX/share/examples/conserver
 SAMPLE_CONFIG_FILE=$SAMPLE_DIR/conserver.cf
 SAMPLE_PASSWD_FILE=$SAMPLE_DIR/conserver.passwd
+LOG_DIR=/var/consoles
+SERVICES=/etc/services
 
 # Function: tell the user what s/he needs to do to use the port just installed
 #
@@ -23,7 +25,9 @@ do_notice()
     echo "| The existing $1 configuration files, $CONFIG_FILE and"
     echo "| $PASSWD_FILE have NOT been changed.  You may want to"
     echo "| compare them to the current sample files in $SAMPLE_DIR,"
-    echo "| and update your configuration as needed."
+    echo "| and update your configuration as needed.  Make sure"
+    echo "| a line similar to this also exists in $SERVICES:"
+    echo "| console	782/tcp conserver	# console server"
     echo "+---------------"
     echo
 }
@@ -41,6 +45,8 @@ do_install()
     echo "| have been installed.  Please view these files and change"
     echo "| the configuration to meet your needs."
     echo "| Refer to $SAMPLE_DIR/README.OpenBSD"
+    echo "| You need to add a line similar to this to $SERVICES:"
+    echo "| console	782/tcp conserver	# console server"
     echo "+---------------"
     echo
 
@@ -65,6 +71,7 @@ case $2 in
 	else
 	    do_install $1
 	fi
+	mkdir -p $LOG_DIR
 	;;
     *)
 	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2