Disabled tests on bid-endian architectures, bug #244246, updated init script to make it more steady, bug #245593 thank Erik Hahn for report and fix.

(Portage version: 2.2_rc13/cvs/Linux 2.6.26-openvz.git-35f41f1 i686)

6 files changed, 6 insertions, 124 deletions

diff --git a/app-text/dictd/files/1.10.11/dictd.initd b/app-text/dictd/files/1.10.11/dictd.initd
index 53e491fbe731..6bf1b1c218af 100644
--- a/app-text/dictd/files/1.10.11/dictd.initd
+++ b/app-text/dictd/files/1.10.11/dictd.initd
@@ -1,7 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.10.11/dictd.initd,v 1.2 2008/09/14 08:59:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.10.11/dictd.initd,v 1.3 2008/11/08 18:36:21 pva Exp $
+
+DICTD_PID="/var/run/dictd.pid"
 
 prepconfig() {
 	local TMPCONF INDEXFILES CNT DNAME DICT
@@ -61,12 +63,13 @@ depend() {
 start() {
 	prepconfig || return 1
 	ebegin "Starting dictd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/dictd -- ${DICTD_OPTS}
+	start-stop-daemon --start --quiet --pidfile ${DICTD_PID} --exec \
+			/usr/sbin/dictd -- --pid-file ${DICTD_PID} ${DICTD_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping dictd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/dictd
+	start-stop-daemon --stop --quiet --pidfile ${DICTD_PID} --exec /usr/sbin/dictd
 	eend $?
 }
diff --git a/app-text/dictd/files/1.10.9/dict.conf b/app-text/dictd/files/1.10.9/dict.conf
deleted file mode 100644
index e06c3d296ec3..000000000000
--- a/app-text/dictd/files/1.10.9/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.10.9/dictd b/app-text/dictd/files/1.10.9/dictd
deleted file mode 100644
index dfb4499eae02..000000000000
--- a/app-text/dictd/files/1.10.9/dictd
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.10.9/dictd,v 1.2 2007/09/02 12:16:07 philantrop Exp $
-
-# NB: Config is in /etc/conf.d/dictd
-
-
-prepconfig() {
-	if [ ! -e ${DICTDCONF} ]
-	then
-		eerror "dictd not started.  Config file not found."
-		return 1
-	fi
-	# if no dictionaries, skip startup.
-
-	# The new way of doing this is to scan /usr/lib/dict and tweek the conf
-	einfo "Scanning for dictionaries..."
-	if [ ! -d "${DLIBDIR}" ]; then
-		eerror "${DLIBDIR} doesn't exist, no dictionaries found."
-		return 1
-	fi
-	pushd ${DLIBDIR} >/dev/null
-	INDEXFILES=`ls *.index`
-	if [ -z "$INDEXFILES" ]; then
-		eerror "No dictionaries installed."
-		return 1
-	fi
-
-	cat $DICTDCONF | sed -e '/^#LASTLINE/,$d' > $TMPCONF
-	echo "#LASTLINE" >> $TMPCONF
-
-	CNT=0
-	for i in $INDEXFILES
-	do
-		DNAME=`echo $i | awk -F . '{print $1;}'`
-		#two possible names for a matching dictionary, check which is there.
-		if [ -f ${DNAME}.dict.dz ]; then
-			DICT=${DNAME}.dict.dz
-		elif [ -f ${DNAME}.dict ];then
-			DICT=${DNAME}.dict
-		else
-			einfo "Index $i has no matching dictionaray..."
-		fi
-
-		#ok, go an index, and a dixtionary, append.
-		echo "database $DNAME { data \"${DLIBDIR}/${DICT}\"" >> $TMPCONF
-		echo "         index \"${DLIBDIR}/$i\" }" >> $TMPCONF
-
-		CNT=`expr $CNT + 1`
-	done
-	popd >/dev/null
-	mv ${TMPCONF} ${DICTDCONF}
-	if [ -n "${DICTDCONF_MOD}" ]; then
-		chmod ${DICTDCONF_MOD} ${DICTDCONF}
-	fi
-	einfo "Done, $CNT dictionary indexes found."
-}
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting dictd"
-	prepconfig || return 1
-	start-stop-daemon --start --quiet --exec /usr/sbin/dictd -- $EARGS
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping dictd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/dictd
-	eend $?
-}
diff --git a/app-text/dictd/files/1.10.9/dictd.conf b/app-text/dictd/files/1.10.9/dictd.conf
deleted file mode 100644
index 2f9426675dda..000000000000
--- a/app-text/dictd/files/1.10.9/dictd.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# dictd configuration file.
-# whipped up by michael conrad tilstra <michael@gentoo.org>
-
-global {
-	# Informational message
-	site site.info
-}
-
-# who's allowed.  You might want to change this.
-access {
-  allow *
-}
-
-# Dictionaries are listed below.
-# The initrc script scans /usr/lib/dict and adds all of the dictionaries
-# it finds here.  
-# 
-# The initrc script will delete everything after the the last line and
-# replace it with what it finds.  So add all of your things above.
-# 
-# If this is a problem for people, contact me and
-# we can work out a different method.
-#
-#LASTLINE
diff --git a/app-text/dictd/files/1.10.9/dictd.confd b/app-text/dictd/files/1.10.9/dictd.confd
deleted file mode 100644
index ce35be86ac17..000000000000
--- a/app-text/dictd/files/1.10.9/dictd.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/dictd
-
-# Should you have problems starting dictd in an UTF-8 locale, add an appropriate
-# --locale switch to EARGS, e. g. "--locale=en_US.utf8"
-EARGS="-s "
-DICTDCONF=/etc/dict/dictd.conf
-# Set DICTDCONF_MOD if you have a custom umask. cf. bug 90657 on bugs.gentoo.org 
-DICTDCONF_MOD=""
-DLIBDIR=/usr/lib/dict
-TMPCONF=/etc/dict/dictd.conf.$$
diff --git a/app-text/dictd/files/1.10.9/site.info b/app-text/dictd/files/1.10.9/site.info
deleted file mode 100644
index 23bfdeb61102..000000000000
--- a/app-text/dictd/files/1.10.9/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.
-