PKGREVISION++

- use CONSERVER_DEFAULTPORT and CONSERVER_DEFAULTHOST from
  bsd.pkg.defaults.mk, instead of using obscure local variables
- obey VARBASE
- whitespace and delint
- example configuration files were never installed to PKG_SYSCONFDIR, make it
  happen now (hi jlam!)
- replace test -e with -f in rc script, addresses part of PR pkg/26235

5 files changed, 34 insertions, 26 deletions

diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 8cff270b723..6d71ed4b767 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,33 +1,35 @@
-# $NetBSD: Makefile,v 1.12 2004/03/13 17:16:13 kristerw Exp $
+# $NetBSD: Makefile,v 1.13 2004/07/10 22:35:32 salo Exp $
 #
 
-DISTNAME=      conserver-7.2.7
-CATEGORIES=    comms
-MASTER_SITES=  ftp://ftp.conserver.com/conserver/
+DISTNAME=	conserver-7.2.7
+PKGREVISION=	1
+CATEGORIES=	comms
+MASTER_SITES=	ftp://ftp.conserver.com/conserver/
 
-MAINTAINER=    tech-pkg@NetBSD.org
-HOMEPAGE=      http://www.conserver.com/
-COMMENT=       Application that allows multiple users to watch serial consoles
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.conserver.com/
+COMMENT=	Application that allows multiple users to watch serial consoles
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
-USE_PKGINSTALL=		YES
+GNU_CONFIGURE=	YES
+USE_BUILDLINK3=	YES
+USE_PKGINSTALL=	YES
 
-GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-master=${DEFAULTHOST}
-CONFIGURE_ARGS+=	--with-port=${DEFAULTPORT}
+CONFIGURE_ARGS+=	--with-master=${CONSERVER_DEFAULTHOST}
+CONFIGURE_ARGS+=	--with-port=${CONSERVER_DEFAULTPORT}
 CONFIGURE_ARGS+=	--with-regex
 CONFIGURE_ARGS+=	--with-libwrap
+CONFIGURE_ARGS+=	--with-logfile=${VARBASE}/log/conserver
 
 .if ${MACHINE_ARCH} == alpha || ${MACHINE_ARCH} == sparc64 || \
 	${MACHINE_ARCH} == x86_64
 CONFIGURE_ARGS+=	--with-64bit
 .endif
 
-DEFAULTPORT?=	782
-DEFAULTHOST?=	localhost
+BUILD_DEFS+=	CONSERVER_DEFAULTPORT CONSERVER_DEFAULTHOST
+
 RCD_SCRIPTS=	conserver
 
 TEST_TARGET=	test
@@ -35,10 +37,16 @@ TEST_TARGET=	test
 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
+OWN_DIRS=	${VARBASE}/consoles
+
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	post-patch
+SUBST_FILES.conf=	conserver.cf/conserver.cf
+SUBST_SED.conf=		-e s,/var/consoles,${VARBASE}/consoles,
 
 pre-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 
 .include "../../security/tcp_wrappers/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/conserver/PLIST b/comms/conserver/PLIST
index 77d81ac52c5..2eb79e53b01 100644
--- a/comms/conserver/PLIST
+++ b/comms/conserver/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2004/04/23 22:07:53 reed Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/07/10 22:35:32 salo Exp $
 bin/console
 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
+share/examples/conserver/conserver.cf.example
+share/examples/conserver/conserver.passwd.example
 @dirrm share/examples/conserver
diff --git a/comms/conserver/distinfo b/comms/conserver/distinfo
index 83f2c3e3f47..aeef7f75837 100644
--- a/comms/conserver/distinfo
+++ b/comms/conserver/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/05/22 06:35:03 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/07/10 22:35:32 salo Exp $
 
 SHA1 (conserver-7.2.7.tar.gz) = e2dfe0d95ceab0e6c2db38161f540ec537d96132
 Size (conserver-7.2.7.tar.gz) = 200861 bytes
 SHA1 (patch-aa) = 01ab5e3430137e72b786164026785f91295232d4
-SHA1 (patch-ab) = e4fb98f61d6b6937e8989c9a15c2e7fbd26d8e05
+SHA1 (patch-ab) = 79125fed0be843528dd208664b90323cb23b9e8d
diff --git a/comms/conserver/files/conserver.sh b/comms/conserver/files/conserver.sh
index 4fe88a4e2bf..2c6188f5d86 100644
--- a/comms/conserver/files/conserver.sh
+++ b/comms/conserver/files/conserver.sh
@@ -1,11 +1,11 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: conserver.sh,v 1.3 2002/09/20 02:01:55 grant Exp $
+# $NetBSD: conserver.sh,v 1.4 2004/07/10 22:35:32 salo Exp $
 #
 # PROVIDE: conserver
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
        . /etc/rc.subr
 fi
@@ -18,7 +18,7 @@ pidfile="/var/run/conserver.pid"
 command_args="-d"              # _must_ start as daemon from rc.d;
                                # add more flags through ${${name}_flags}
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
        load_rc_config $name
        run_rc_command "$1"
diff --git a/comms/conserver/patches/patch-ab b/comms/conserver/patches/patch-ab
index 8fa4e6c1683..8d3ffb91515 100644
--- a/comms/conserver/patches/patch-ab
+++ b/comms/conserver/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/06/09 20:37:54 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2004/07/10 22:35:32 salo Exp $
 
 --- conserver.cf/Makefile.in.orig	Thu Jul 26 15:05:03 2001
 +++ conserver.cf/Makefile.in
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/09 20:37:54 jlam Exp $
  	$(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)$(exampledir)/conserver.cf
-+	$(INSTALL) conserver.passwd $(DESTDIR)$(exampledir)/conserver.passwd
++	$(BSD_INSTALL_DATA) conserver.cf $(DESTDIR)$(exampledir)/conserver.cf.example
++	$(BSD_INSTALL_DATA) conserver.passwd $(DESTDIR)$(exampledir)/conserver.passwd.example
  
  .PHONY: clean distclean install