dictd (if you deside to use it) no longer uses supervise.

Also cleaned out a few old versions. (one of which had a nasty bug anyways.)

14 files changed, 11 insertions, 149 deletions

diff --git a/app-text/dictd/dictd-1.5.5-r1.ebuild b/app-text/dictd/dictd-1.5.5-r3.ebuild
index f62462ff51cf..8b9b5a475d7c 100644
--- a/app-text/dictd/dictd-1.5.5-r1.ebuild
+++ b/app-text/dictd/dictd-1.5.5-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.5.5-r1.ebuild,v 1.1 2001/06/04 00:39:52 michael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.5.5-r3.ebuild,v 1.1 2001/08/16 18:47:11 tadpol Exp $
 
 #P=
 A=${P}.tar.gz
@@ -45,12 +45,10 @@ src_install () {
 
     #startups for dictd
     exeinto /etc/rc.d/init.d
-    newexe ${FILESDIR}/${PVR}/svc-dictd svc-dictd
-    exeinto /var/lib/supervise/services/dictd
-    newexe ${FILESDIR}/${PVR}/dictd-run run
+    newexe ${FILESDIR}/${PVR}/rc.dictd dictd
 }
 
-pkg_postinst() {
+pkg_config() {
     # gotta start it at boot.
     . ${ROOT}/etc/rc.d/config/functions
     einfo ">>>  Generating symlinks"
diff --git a/app-text/dictd/dictd-1.5.5.ebuild b/app-text/dictd/dictd-1.5.5.ebuild
deleted file mode 100644
index 108de91b44fc..000000000000
--- a/app-text/dictd/dictd-1.5.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.5.5.ebuild,v 1.4 2001/06/04 00:39:52 michael Exp $
-
-#P=
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Dictionary Client/Server for the DICT protocol"
-SRC_URI="ftp://ftp.dict.org/pub/dict/${A}"
-HOMEPAGE="http://www.dict.org"
-
-DEPEND="virtual/glibc"
-
-
-src_compile() {
-    
-    try ./configure --prefix=/usr --mandir=/usr/share \
-        --with-etcdir=/etc/dict --host=${CHOST}
-    try make
-}
-
-src_install () {
-    # gotta set up the dirs for it....
-    dodir /usr/bin
-    dodir /usr/sbin
-    dodir /usr/share/man1
-    dodir /usr/share/man8
-
-    #Now install it.
-    try make prefix=${D}/usr man1_prefix=${D}/usr/share/man1 \
-             man8_prefix=${D}/usr/share/man8 conf=${D}/etc/dict install
-
-    #Install docs
-    dodoc README TODO COPYING ChangeLog ANNOUNCE
-    dodoc doc/dicf.ms doc/rfc.ms doc/rfc.sh doc/rfc2229.txt
-    dodoc doc/security.doc doc/toc.ms
-
-    #conf files.
-    dodir /etc/dict
-    insinto /etc/dict
-    doins ${FILESDIR}/${PVR}/dict.conf
-    doins ${FILESDIR}/${PVR}/dictd.conf
-    doins ${FILESDIR}/${PVR}/site.info
-
-    #startups for dictd
-    exeinto /etc/rc.d/init.d
-    newexe ${FILESDIR}/${PVR}/svc-dictd svc-dictd
-    exeinto /var/lib/supervise/services/dictd
-    newexe ${FILESDIR}/${PVR}/dictd-run run
-}
-
-pkg_postinst() {
-    # gotta start it at boot.
-    . ${ROOT}/etc/rc.d/config/functions
-    einfo ">>>  Generating symlinks"
-    ${ROOT}/usr/sbin/rc-update add svc-dictd
-}
-
-# vim: ai et sw=4 ts=4
diff --git a/app-text/dictd/files/1.5.5-r1/dictd-run b/app-text/dictd/files/1.5.5-r1/dictd-run
deleted file mode 100755
index 949d9712994c..000000000000
--- a/app-text/dictd/files/1.5.5-r1/dictd-run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# We abuse some debugging features here to get the desired behavior
-exec dictd -d nodetach < /dev/null > /dev/null 2>&1
diff --git a/app-text/dictd/files/1.5.5-r1/dict.conf b/app-text/dictd/files/1.5.5-r3/dict.conf
index e06c3d296ec3..e06c3d296ec3 100644
--- a/app-text/dictd/files/1.5.5-r1/dict.conf
+++ b/app-text/dictd/files/1.5.5-r3/dict.conf
diff --git a/app-text/dictd/files/1.5.5-r1/dictd.conf b/app-text/dictd/files/1.5.5-r3/dictd.conf
index 4cded974f973..4cded974f973 100644
--- a/app-text/dictd/files/1.5.5-r1/dictd.conf
+++ b/app-text/dictd/files/1.5.5-r3/dictd.conf
diff --git a/app-text/dictd/files/1.5.5-r1/svc-dictd b/app-text/dictd/files/1.5.5-r3/rc.dictd
index 731e738de49f..cd932537045b 100755..100644
--- a/app-text/dictd/files/1.5.5-r1/svc-dictd
+++ b/app-text/dictd/files/1.5.5-r3/rc.dictd
@@ -6,6 +6,8 @@
 SERVICE=dictd
 opts="start stop"
 
+EXEC=/usr/sbin/dictd
+EARGS="-s "
 
 DICTDCONF=/etc/dict/dictd.conf
 TMPCONF=/etc/dict/dictd.conf.$$
@@ -49,7 +51,7 @@ prepconfig() {
 		fi
 
 		#ok, go an index, and a dixtionary, append.
-		echo "database $DNAME { \"${DLIBDIR}/${DICT}\"" >> $TMPCONF
+		echo "database $DNAME { data \"${DLIBDIR}/${DICT}\"" >> $TMPCONF
 		echo "         index \"${DLIBDIR}/$i\" }" >> $TMPCONF
 
 		CNT=`expr $CNT + 1`
@@ -60,20 +62,16 @@ prepconfig() {
 }
 
 start() {
-    ebegin "Starting supervised ${SERVICE}"
+    ebegin "Starting ${SERVICE}"
     prepconfig
-	ln -sf ../services/${SERVICE} ${SVCDIR}/control/${SERVICE}
+    start-stop-daemon --start --quiet --exec $EXEC -- $EARGS
     eend $?
 }
 
 stop() {
-    ebegin "Stopping supervised ${SERVICE}"
-   	if [ -e ${SVCDIR}/control/${SERVICE} ]
-	then
-		/usr/bin/svc -dx ${SVCDIR}/control/${SERVICE}
-		rm ${SVCDIR}/control/${SERVICE}
-	fi
-	eend $?
+    ebegin "Stopping ${SERVICE}"
+    start-stop-daemon --stop --quiet --name ${SERVICE} --exec $EXEC
+    eend $?
 }
 
 doservice ${@}
diff --git a/app-text/dictd/files/1.5.5-r1/site.info b/app-text/dictd/files/1.5.5-r3/site.info
index 23bfdeb61102..23bfdeb61102 100644
--- a/app-text/dictd/files/1.5.5-r1/site.info
+++ b/app-text/dictd/files/1.5.5-r3/site.info
diff --git a/app-text/dictd/files/1.5.5/dict.conf b/app-text/dictd/files/1.5.5/dict.conf
deleted file mode 100644
index e06c3d296ec3..000000000000
--- a/app-text/dictd/files/1.5.5/dict.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# This is the configuration file for dict.
-# Usually all you will ever need here is the server keywords.
-# Refer to the dict manpage for other options.
-# It will only check the second server if the first fails
-server localhost
-server dict.org
diff --git a/app-text/dictd/files/1.5.5/dictd-run b/app-text/dictd/files/1.5.5/dictd-run
deleted file mode 100755
index 949d9712994c..000000000000
--- a/app-text/dictd/files/1.5.5/dictd-run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# We abuse some debugging features here to get the desired behavior
-exec dictd -d nodetach < /dev/null > /dev/null 2>&1
diff --git a/app-text/dictd/files/1.5.5/dictd.conf b/app-text/dictd/files/1.5.5/dictd.conf
deleted file mode 100644
index 50a05c311f3d..000000000000
--- a/app-text/dictd/files/1.5.5/dictd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Informational message
-site site.info
-
-# who's allowed.  You might want to change this.
-access {
-  allow *
-}
-
-# Dictionaries are listed below.  There are non here by default since you
-# need to install those seperately.  The ebuilds for each dictionary will
-# append themselves to this file.  If you add dictionaries by hand, make
-# sure that the following line IS NOT the last line in the file.
-
-#LASTLINE
diff --git a/app-text/dictd/files/1.5.5/site.info b/app-text/dictd/files/1.5.5/site.info
deleted file mode 100644
index 23bfdeb61102..000000000000
--- a/app-text/dictd/files/1.5.5/site.info
+++ /dev/null
@@ -1,6 +0,0 @@
-Welcome to your dictionary server dictd!
-
-This is an example site information file.  It should contain information
-about any restricted databases and how users can obtain access.  If may
-also contain other random data as you see fit.
-
diff --git a/app-text/dictd/files/1.5.5/svc-dictd b/app-text/dictd/files/1.5.5/svc-dictd
deleted file mode 100755
index 9fd50862e381..000000000000
--- a/app-text/dictd/files/1.5.5/svc-dictd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#RCUPDATE:3 4:75:This line is required for script management
-
-. /etc/rc.d/config/functions
-
-SERVICE=dictd
-opts="start stop"
-
-prepconfig() {
-	if [ ! -e /etc/dict/dictd.conf ]
-	then
-		eerror "dictd not started.  Config file not found."
-		exit 1
-	fi
-	# if no dictionaries, skip startup.
-	HASDICTS=`tail -1 /etc/dict/dictd.conf | grep LASTLINE`
-	if [ -n "$HASDICTS" ]; then
-		eerror "No dictionaries installed. No sense in running."
-		exit 1
-	fi
-}
-
-start() {
-    ebegin "Starting supervised ${SERVICE}"
-    prepconfig
-	ln -sf ../services/${SERVICE} ${SVCDIR}/control/${SERVICE}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping supervised ${SERVICE}"
-   	if [ -e ${SVCDIR}/control/${SERVICE} ]
-	then
-		/usr/bin/svc -dx ${SVCDIR}/control/${SERVICE}
-		rm ${SVCDIR}/control/${SERVICE}
-	fi
-	eend $?
-}
-
-doservice ${@}
-
diff --git a/app-text/dictd/files/digest-dictd-1.5.5-r1 b/app-text/dictd/files/digest-dictd-1.5.5-r1
deleted file mode 100644
index 875329fc7519..000000000000
--- a/app-text/dictd/files/digest-dictd-1.5.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 67307b6e5d0337f354b275c377506c63 dictd-1.5.5.tar.gz
diff --git a/app-text/dictd/files/digest-dictd-1.5.5 b/app-text/dictd/files/digest-dictd-1.5.5-r3
index 875329fc7519..875329fc7519 100644
--- a/app-text/dictd/files/digest-dictd-1.5.5
+++ b/app-text/dictd/files/digest-dictd-1.5.5-r3