Update comms/conserver to 7.2.1. This closes pkg/17152 by Eric Schnoebelen

<eric@cirr.com>.  Changes from version 7.1.3 include:

    - bugfixes
    - console names in conserver.passwd can be regular expressions
    - breaks recorded to console logs if 'b' option used
    - a broadcast messages to others on your console can now be
      sent via ^Ecb
    - TCP traffic now escaped according to Telnet protocol
    - the HUP signal now triggers a read of the configuration file and
      adjustment of consoles
    - Up to nine break sequences can be defined in the
      configuration file and assigned to consoles individually,
      accessed via new ^ecl[?0-9] escape sequences
    - new options
	- -W client option for showing who's attached to a single
	  conserver master
	- -m server option for setting the maximum consoles per process
	- -i client option (and ^Eci) that displays console
	  information in a machine-parseable format
	- two debug levels (second level by using two -D options)
	- -o and -O server flags for automatically reconnecting
	  downed consoles

5 files changed, 48 insertions, 32 deletions

diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 05da69d389b..fa45795787a 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/09 16:35:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2002/06/09 20:37:53 jlam Exp $
 # FreeBSD Id: ports/comms/conserver-com/Makefile,v 1.1 2001/12/09 14:40:12 kur iyama Exp
 
-DISTNAME=      conserver-7.1.3
+DISTNAME=      conserver-7.2.1
 CATEGORIES=    comms
 MASTER_SITES=  ftp://ftp.conserver.com/conserver/
 
@@ -9,29 +9,38 @@ MAINTAINER=    packages@netbsd.org
 HOMEPAGE=      http://www.conserver.com/
 COMMENT=       Application that allows multiple users to watch serial consoles
 
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS=		--with-master=${DEFAULTHOST} \
-			--with-port=${DEFAULTPORT} \
-			--with-libwrap
+USE_BUILDLINK_ONLY=	YES
 
-DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-master=${DEFAULTHOST}
+CONFIGURE_ARGS+=	--with-port=${DEFAULTPORT}
+CONFIGURE_ARGS+=	--with-regex
+CONFIGURE_ARGS+=	--with-libwrap
 
-DEFAULTPORT?=  782
-DEFAULTHOST?=  localhost
-RCD_SCRIPTS=   conserver
+DEFAULTPORT?=	782
+DEFAULTHOST?=	localhost
+RCD_SCRIPTS=	conserver
+
+EGDIR=		${PREFIX}/share/examples/conserver
+CONF_FILES=	${EGDIR}/conserver.cf.example ${PKG_SYSCONFDIR}/conserver.cf
+CONF_FILES+=	${EGDIR}/conserver.passwd.example ${PKG_SYSCONFDIR}/conserver.passwd
+OWN_DIRS=	/var/consoles
 
 pre-install:
-	for script in ${RCD_SCRIPTS}; do                        \
-		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh \
-		>${WRKDIR}/$${script};                          \
+	@for script in ${RCD_SCRIPTS}; do				\
+		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\
+			> ${WRKDIR}/$${script};				\
 	done
+	${INSTALL_DATA_DIR} ${EGDIR}
 
 post-install:
-	for script in ${RCD_SCRIPTS} ; do                       \
-		${INSTALL_SCRIPT} ${WRKDIR}/$${script}          \
-		${PREFIX}/etc/rc.d/$${script};                  \
+	for script in ${RCD_SCRIPTS}; do				\
+		${INSTALL_SCRIPT} ${WRKDIR}/$${script}			\
+			${PREFIX}/etc/rc.d/$${script};			\
 	done
-	${MKDIR} /var/console
+
+.include "../../security/tcp_wrappers/buildlink.mk"
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/conserver/PLIST b/comms/conserver/PLIST
index 56d724deca1..d653cbc5f89 100644
--- a/comms/conserver/PLIST
+++ b/comms/conserver/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/09 16:35:25 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/06/09 20:37:53 jlam Exp $
 bin/console
-etc/conserver.cf.example
-etc/conserver.passwd.example
 etc/rc.d/conserver
 man/man1/console.1
 man/man5/conserver.cf.5
 man/man5/conserver.passwd.5
 man/man8/conserver.8
 sbin/conserver
+share/examples/conserver/conserver.cf
+share/examples/conserver/conserver.passwd
diff --git a/comms/conserver/distinfo b/comms/conserver/distinfo
index 3b3cbb6c786..f3964c7c3a6 100644
--- a/comms/conserver/distinfo
+++ b/comms/conserver/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/09 16:35:25 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2002/06/09 20:37:53 jlam Exp $
 
-SHA1 (conserver-7.1.3.tar.gz) = 798bacc990220a9b74cdd322eaf7f4e05060e3fe
-Size (conserver-7.1.3.tar.gz) = 129744 bytes
+SHA1 (conserver-7.2.1.tar.gz) = a517c7ba8f1ee770bdb435921f959632408b6812
+Size (conserver-7.2.1.tar.gz) = 150276 bytes
 SHA1 (patch-aa) = 01ab5e3430137e72b786164026785f91295232d4
-SHA1 (patch-ab) = 6eb570c2dde7df4b1f413c242b7e2d06f6e23dc8
+SHA1 (patch-ab) = e4fb98f61d6b6937e8989c9a15c2e7fbd26d8e05
diff --git a/comms/conserver/files/conserver.sh b/comms/conserver/files/conserver.sh
index 80fe5ee8b92..a86aaf1761f 100644
--- a/comms/conserver/files/conserver.sh
+++ b/comms/conserver/files/conserver.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: conserver.sh,v 1.1.1.1 2002/05/09 16:35:25 hubertf Exp $
+# $NetBSD: conserver.sh,v 1.2 2002/06/09 20:37:54 jlam Exp $
 #
 # PROVIDE: conserver
 # REQUIRE: DAEMON
@@ -15,7 +15,6 @@ rcvar=$name
 command="@PREFIX@/sbin/${name}"
 required_files="@PKG_SYSCONFDIR@/conserver.cf"
 pidfile="/var/run/conserver.pid"
-extra_commands=""
 command_args="-d"              # _must_ start as daemon from rc.d;
                                # add more flags through ${${name}_flags}
 
@@ -25,5 +24,5 @@ then
        run_rc_command "$1"
 else
        @ECHO@ -n ' ${name}'
-       ${command} ${smbd_flags} ${command_args}
+       ${command} ${conserver_flags} ${command_args}
 fi
diff --git a/comms/conserver/patches/patch-ab b/comms/conserver/patches/patch-ab
index 37e54262ba0..8fa4e6c1683 100644
--- a/comms/conserver/patches/patch-ab
+++ b/comms/conserver/patches/patch-ab
@@ -1,12 +1,20 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/09 16:35:25 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2002/06/09 20:37:54 jlam Exp $
 
---- conserver.cf/Makefile.in.orig	Wed May  8 14:03:04 2002
+--- conserver.cf/Makefile.in.orig	Thu Jul 26 15:05:03 2001
 +++ conserver.cf/Makefile.in
-@@ -24,5 +24,7 @@
+@@ -3,6 +3,7 @@
+ prefix = @prefix@
+ mandir = @mandir@
+ sysconfdir = @sysconfdir@
++exampledir = $(prefix)/share/examples/conserver
+ 
+ ### Installation programs and flags
+ INSTALL = @INSTALL@
+@@ -24,5 +25,7 @@
  	$(MKDIR) $(DESTDIR)$(mandir)/man5
  	$(INSTALL) conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
  	$(INSTALL) conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
-+	$(INSTALL) conserver.cf $(DESTDIR)$(sysconfdir)/conserver.cf.example
-+	$(INSTALL) conserver.passwd $(DESTDIR)$(sysconfdir)/conserver.passwd.example
++	$(INSTALL) conserver.cf $(DESTDIR)$(exampledir)/conserver.cf
++	$(INSTALL) conserver.passwd $(DESTDIR)$(exampledir)/conserver.passwd
  
  .PHONY: clean distclean install