From 884a4ad94fa59850094c5950db62ec69ddccc9db Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Thu, 21 Nov 2002 10:02:56 +0000
Subject: - fix to run as daemon properly (from Sam Uong in pkg/19086) -
 convert to bsd.pkg.install.mk rc.d script and example   config installation -
 bump PKGREVISION

---
 net/bpalogin/MESSAGE           | 10 ----------
 net/bpalogin/Makefile          | 10 +++++-----
 net/bpalogin/distinfo          |  3 ++-
 net/bpalogin/files/bpalogin    | 28 ----------------------------
 net/bpalogin/files/bpalogin.sh | 28 ++++++++++++++++++++++++++++
 net/bpalogin/patches/patch-ab  | 15 +++++++++++++++
 6 files changed, 50 insertions(+), 44 deletions(-)
 delete mode 100644 net/bpalogin/MESSAGE
 delete mode 100755 net/bpalogin/files/bpalogin
 create mode 100755 net/bpalogin/files/bpalogin.sh
 create mode 100644 net/bpalogin/patches/patch-ab

(limited to 'net')

diff --git a/net/bpalogin/MESSAGE b/net/bpalogin/MESSAGE
deleted file mode 100644
index 1d8943845e0..00000000000
--- a/net/bpalogin/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:22 wiz Exp $
-
-${PKGNAME} has now been installed in ${PREFIX}.
-
-To use this package, you need to install a configuration file called
-bpalogin.conf in ${PKG_SYSCONFDIR} (an example configuration
-file is provided in ${PREFIX}/share/examples/bpalogin).
-
-===========================================================================
diff --git a/net/bpalogin/Makefile b/net/bpalogin/Makefile
index 6eae91541c3..7f12e3f188a 100644
--- a/net/bpalogin/Makefile
+++ b/net/bpalogin/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/12 08:20:32 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/11/21 10:02:56 grant Exp $
 #
 
 DISTNAME=	bpalogin-2.0.1-src
 PKGNAME=	${DISTNAME:S/-src//}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bpalogin/}
 
@@ -14,16 +15,15 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 ALL_TARGET=	bpalogin
 
-pre-install:
-	${SED} ${FILES_SUBST_SED} ${FILESDIR}/bpalogin			\
-		> ${WRKDIR}/bpalogin
+CONF_FILES+=	${PREFIX}/share/examples/bpalogin/bpalogin.conf \
+		${PKG_SYSCONFDIR}/bpalogin.conf
+RCD_SCRIPTS=	bpalogin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bpalogin ${PREFIX}/sbin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bpalogin
 	${INSTALL_DATA} ${WRKSRC}/bpalogin.conf				\
 		${PREFIX}/share/examples/bpalogin
-	${INSTALL_SCRIPT} ${WRKDIR}/bpalogin ${PREFIX}/etc/rc.d
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bpalogin/distinfo b/net/bpalogin/distinfo
index f1dbad3d1f3..143d94c75d3 100644
--- a/net/bpalogin/distinfo
+++ b/net/bpalogin/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/07/02 12:59:55 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/11/21 10:02:56 grant Exp $
 
 SHA1 (bpalogin-2.0.1-src.tar.gz) = c0f7008586a4076f3fd932c64862dad6eaff1340
 Size (bpalogin-2.0.1-src.tar.gz) = 20722 bytes
 SHA1 (patch-aa) = d324a6eaf1bc4f442c171f4bd057e3339c2fd258
+SHA1 (patch-ab) = f2567d35d7a733d48c64497ede9e70fdadf97741
diff --git a/net/bpalogin/files/bpalogin b/net/bpalogin/files/bpalogin
deleted file mode 100755
index b82a190bfeb..00000000000
--- a/net/bpalogin/files/bpalogin
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-#	$NetBSD: bpalogin,v 1.1.1.1 2002/04/12 08:20:32 rh Exp $
-#
-# bpalogin startup script
-#
-# PROVIDE: bpalogin
-# REQUIRE: DAEMON dhcpd
-
-if [ -f /etc/rc.subr ]
-then
-	. /etc/rc.subr
-fi
-
-name="bpalogin"
-rcvar=${name}
-command="@PREFIX@/sbin/${name}"
-command_args="-c @PKG_SYSCONFDIR@/${name}.conf & sleep 1"
-required_files="${command} @PKG_SYSCONFDIR@/${name}.conf"
-
-if [ -f /etc/rc.subr ]
-then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	${command} ${bpalogin_flags} ${command_args}
-fi
diff --git a/net/bpalogin/files/bpalogin.sh b/net/bpalogin/files/bpalogin.sh
new file mode 100755
index 00000000000..7113747b572
--- /dev/null
+++ b/net/bpalogin/files/bpalogin.sh
@@ -0,0 +1,28 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+#	$NetBSD: bpalogin.sh,v 1.1 2002/11/21 10:02:57 grant Exp $
+#
+# bpalogin startup script
+#
+# PROVIDE: bpalogin
+# REQUIRE: DAEMON dhcpd
+
+if [ -f /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="bpalogin"
+rcvar=${name}
+command="@PREFIX@/sbin/${name}"
+command_args="-c @PKG_SYSCONFDIR@/${name}.conf & sleep 1"
+required_files="@PKG_SYSCONFDIR@/${name}.conf"
+
+if [ -f /etc/rc.subr ]
+then
+	load_rc_config $name
+	run_rc_command "$1"
+else
+	@ECHO@ -n " ${name}"
+	${command} ${bpalogin_flags} ${command_args}
+fi
diff --git a/net/bpalogin/patches/patch-ab b/net/bpalogin/patches/patch-ab
new file mode 100644
index 00000000000..3c66df51d36
--- /dev/null
+++ b/net/bpalogin/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2002/11/21 10:02:58 grant Exp $
+
+--- unixmain.c.orig	Thu Sep 21 00:39:53 2000
++++ unixmain.c
+@@ -190,8 +190,8 @@ int main(int argc,char* argv[])
+ 		}
+ 	}
+ 
+-	if(makedaemon && fork())
+-		exit(0);
++	if(makedaemon)
++		daemon(0,0);
+ 
+ 	openlog("bpalogin",LOG_PID,LOG_DAEMON);
+ 
-- 
cgit v1.2.3