Improved init.d and conf.d files

6 files changed, 84 insertions, 8 deletions

diff --git a/dev-util/perforce/ChangeLog b/dev-util/perforce/ChangeLog
index 86d942ed22cf..18223e0ce725 100644
--- a/dev-util/perforce/ChangeLog
+++ b/dev-util/perforce/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-utils/perforce
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/perforce/ChangeLog,v 1.1 2003/10/01 08:59:03 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perforce/ChangeLog,v 1.2 2003/10/02 08:54:49 stuart Exp $
+
+*perforce-2002.2-r1 (02 Oct 2003)
+
+  02 Oct 2003; Stuart Herbert <stuart@gentoo.org> perforce-2002.2-r1.ebuild,
+  files/perforce-2002.2/conf.d/perforce,
+  files/perforce-2002.2/init.d/perforce:
+  Improved init.d and conf.d files; p4d should now start correctly, and log
+  output to /var/log/perforce
 
 *perforce-2002.2 (01 Oct 2003)
 
diff --git a/dev-util/perforce/Manifest b/dev-util/perforce/Manifest
index ed639513fdc8..70c7cb1f7f08 100644
--- a/dev-util/perforce/Manifest
+++ b/dev-util/perforce/Manifest
@@ -1,9 +1,9 @@
-MD5 c092a5c20bb194535ada0178239a61ea perforce-2002.2-r1.ebuild 1551
-MD5 99086890c944cdcf687a15a51ec135c2 ChangeLog 865
+MD5 909f003975e8033faf782816cff506f9 perforce-2002.2-r1.ebuild 1554
+MD5 e2c1c4664da0467bd35c39e4b9bf77c0 ChangeLog 865
 MD5 71da003bb2109fed15aff6635287c6a6 metadata.xml 222
 MD5 e5aec264816f36b4018634c7884a8e3b perforce-2002.2.ebuild 1476
 MD5 71ff013c747258365dfd982b619aaa15 files/digest-perforce-2002.2 342
 MD5 71ff013c747258365dfd982b619aaa15 files/digest-perforce-2002.2-r1 342
 MD5 7a54cc6c6d53acca3c67df75fb125100 files/perforce-2002.2/50perforce 95
 MD5 848a2cb4e6486e833a0015794c7456c8 files/perforce-2002.2/conf.d/perforce 70
-MD5 dc97948622d38569f6f62454b3df080b files/perforce-2002.2/init.d/perforce 1049
+MD5 462ed459d61f9d520fa525f1b720f295 files/perforce-2002.2/init.d/perforce 1070
diff --git a/dev-util/perforce/files/digest-perforce-2002.2-r1 b/dev-util/perforce/files/digest-perforce-2002.2-r1
new file mode 100644
index 000000000000..6fead41b6cf2
--- /dev/null
+++ b/dev-util/perforce/files/digest-perforce-2002.2-r1
@@ -0,0 +1,7 @@
+MD5 5c2e142eb435cca50fd9da52b211d08d p4d 1149668
+MD5 4ea793f730a10732fb285e3240094ea4 p4 458036
+MD5 9bc409ec61f48dfb21f17406c82af407 p4web 1615695
+MD5 1a205b563d2b6b8819c967f1a89389bd p4ftpd 591040
+MD5 a883a0a7638b1e15c9d133c8cd922f2c p4p 571171
+MD5 88b8b8c33e32092a96cb409bf635b40d p4.1 72954
+MD5 382614735981ad5a80b7b679b36f48c0 p4d.1 4343
diff --git a/dev-util/perforce/files/perforce-2002.2/conf.d/perforce b/dev-util/perforce/files/perforce-2002.2/conf.d/perforce
index a2b8662c3711..889d1b7941ca 100644
--- a/dev-util/perforce/files/perforce-2002.2/conf.d/perforce
+++ b/dev-util/perforce/files/perforce-2002.2/conf.d/perforce
@@ -1,3 +1,3 @@
 # Config file for /etc/init.d/perforce
 
-P4D="-q"
+P4D="-q -L /var/log/perforce"
diff --git a/dev-util/perforce/files/perforce-2002.2/init.d/perforce b/dev-util/perforce/files/perforce-2002.2/init.d/perforce
index a06b4e07f29e..bffc8c6fb941 100644
--- a/dev-util/perforce/files/perforce-2002.2/init.d/perforce
+++ b/dev-util/perforce/files/perforce-2002.2/init.d/perforce
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/perforce/files/perforce-2002.2/init.d/perforce,v 1.1 2003/10/01 08:59:03 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perforce/files/perforce-2002.2/init.d/perforce,v 1.2 2003/10/02 08:54:49 stuart Exp $
 #
 # NB: Configuration is in /etc/conf.d/perforce
 
@@ -18,9 +18,9 @@ start() {
     # depot root
     P4D="`echo ${P4D} | sed -e 's#-d##' -e 's#-r [^[:space:]]*##'`"
     start-stop-daemon --start --quiet --chuid perforce:perforce \
-                      --pidfile ${PIDFILE} --make-pidfile --background \
+                      --pidfile ${PIDFILE} --make-pidfile \
                       --exec /usr/sbin/p4d \
-                      -- ${P4D} -r /var/lib/perforce
+                      -- ${P4D} -d -r /var/lib/perforce
     eend $?
 }
 
diff --git a/dev-util/perforce/perforce-2002.2-r1.ebuild b/dev-util/perforce/perforce-2002.2-r1.ebuild
new file mode 100644
index 000000000000..289d5b3ad322
--- /dev/null
+++ b/dev-util/perforce/perforce-2002.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perforce/perforce-2002.2-r1.ebuild,v 1.1 2003/10/02 08:54:49 stuart Exp $
+
+DESCRIPTION="Commercial version control system"
+HOMEPAGE="http://www.perforce.com/"
+URI_BASE="ftp://ftp.perforce.com/perforce/r02.2/"
+BIN_BASE="$URI_BASE/bin.linux24x86"
+DOC_BASE="$URI_BASE/doc"
+SRC_URI="$BIN_BASE/p4d $BIN_BASE/p4 $BIN_BASE/p4web $BIN_BASE/p4ftpd $BIN_BASE/p4p $DOC_BASE/man/p4.1 $DOC_BASE/man/p4d.1"
+LICENSE="perforce.pdf"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="virtual/glibc"
+#RDEPEND=""
+S=${WORKDIR}
+RESTRICT="nomirror nostrip"
+MY_FILES=$FILESDIR/perforce-2002.2/
+
+src_unpack ()
+{
+	# we have to copy all of the files from $DISTDIR, otherwise we get
+	# sandbox violations when trying to install
+
+	for x in p4 p4web p4d p4ftpd p4p p4.1 p4d.1 ; do
+		cp ${DISTDIR}/$x .
+	done
+}
+
+src_install()
+{
+	enewuser perforce
+	enewgroup perforce
+
+	dobin  p4
+	dosbin p4d
+	dosbin p4web
+	dosbin p4p
+	dosbin p4ftpd
+
+	fowners perforce.perforce /usr/sbin/p4d
+	fowners perforce.perforce /usr/sbin/p4p
+	fowners perforce.perforce /usr/sbin/p4ftpd
+	fowners perforce.perforce /usr/sbin/p4web
+
+	touch ${D}/var/log/perforce
+	fowners perforce.perforce /var/log/perforce
+
+	doman p4.1 p4d.1
+
+	keepdir /var/lib/perforce
+	fowners perforce.perforce /var/lib/perforce
+
+	exeinto /etc/init.d
+	doexe ${MY_FILES}/init.d/perforce
+	insinto /etc/conf.d
+	doins ${MY_FILES}/conf.d/perforce
+	insinto /etc/env.d
+	doins ${MY_FILES}/50perforce
+}