[arch-commits] Commit in dictd/repos (34 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon May 13 14:21:09 UTC 2013


    Date: Monday, May 13, 2013 @ 16:21:09
  Author: spupykin
Revision: 90655

archrelease: copy trunk to community-i686, community-x86_64

Added:
  dictd/repos/community-i686/PKGBUILD
    (from rev 90654, dictd/trunk/PKGBUILD)
  dictd/repos/community-i686/colorit.conf
    (from rev 90654, dictd/trunk/colorit.conf)
  dictd/repos/community-i686/dict.conf
    (from rev 90654, dictd/trunk/dict.conf)
  dictd/repos/community-i686/dictd.conf
    (from rev 90654, dictd/trunk/dictd.conf)
  dictd/repos/community-i686/dictd.confd
    (from rev 90654, dictd/trunk/dictd.confd)
  dictd/repos/community-i686/dictd.service
    (from rev 90654, dictd/trunk/dictd.service)
  dictd/repos/community-i686/dictd.xinetd
    (from rev 90654, dictd/trunk/dictd.xinetd)
  dictd/repos/community-i686/site.info
    (from rev 90654, dictd/trunk/site.info)
  dictd/repos/community-x86_64/PKGBUILD
    (from rev 90654, dictd/trunk/PKGBUILD)
  dictd/repos/community-x86_64/colorit.conf
    (from rev 90654, dictd/trunk/colorit.conf)
  dictd/repos/community-x86_64/dict.conf
    (from rev 90654, dictd/trunk/dict.conf)
  dictd/repos/community-x86_64/dictd.conf
    (from rev 90654, dictd/trunk/dictd.conf)
  dictd/repos/community-x86_64/dictd.confd
    (from rev 90654, dictd/trunk/dictd.confd)
  dictd/repos/community-x86_64/dictd.service
    (from rev 90654, dictd/trunk/dictd.service)
  dictd/repos/community-x86_64/dictd.xinetd
    (from rev 90654, dictd/trunk/dictd.xinetd)
  dictd/repos/community-x86_64/site.info
    (from rev 90654, dictd/trunk/site.info)
Deleted:
  dictd/repos/community-i686/PKGBUILD
  dictd/repos/community-i686/colorit.conf
  dictd/repos/community-i686/dict.conf
  dictd/repos/community-i686/dictd
  dictd/repos/community-i686/dictd.conf
  dictd/repos/community-i686/dictd.confd
  dictd/repos/community-i686/dictd.service
  dictd/repos/community-i686/dictd.xinetd
  dictd/repos/community-i686/site.info
  dictd/repos/community-x86_64/PKGBUILD
  dictd/repos/community-x86_64/colorit.conf
  dictd/repos/community-x86_64/dict.conf
  dictd/repos/community-x86_64/dictd
  dictd/repos/community-x86_64/dictd.conf
  dictd/repos/community-x86_64/dictd.confd
  dictd/repos/community-x86_64/dictd.service
  dictd/repos/community-x86_64/dictd.xinetd
  dictd/repos/community-x86_64/site.info

--------------------------------+
 /PKGBUILD                      |  110 +++++++++++++++++++++++++++++++++++++++
 /colorit.conf                  |   64 ++++++++++++++++++++++
 /dict.conf                     |   12 ++++
 /dictd.conf                    |   50 +++++++++++++++++
 /dictd.confd                   |   14 ++++
 /dictd.service                 |   22 +++++++
 /dictd.xinetd                  |   24 ++++++++
 /site.info                     |   12 ++++
 community-i686/PKGBUILD        |   58 --------------------
 community-i686/colorit.conf    |   32 -----------
 community-i686/dict.conf       |    6 --
 community-i686/dictd           |   92 --------------------------------
 community-i686/dictd.conf      |   25 --------
 community-i686/dictd.confd     |    7 --
 community-i686/dictd.service   |   11 ---
 community-i686/dictd.xinetd    |   12 ----
 community-i686/site.info       |    6 --
 community-x86_64/PKGBUILD      |   58 --------------------
 community-x86_64/colorit.conf  |   32 -----------
 community-x86_64/dict.conf     |    6 --
 community-x86_64/dictd         |   92 --------------------------------
 community-x86_64/dictd.conf    |   25 --------
 community-x86_64/dictd.confd   |    7 --
 community-x86_64/dictd.service |   11 ---
 community-x86_64/dictd.xinetd  |   12 ----
 community-x86_64/site.info     |    6 --
 26 files changed, 308 insertions(+), 498 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-i686/PKGBUILD	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: SmackleFunky <smacklefunky at optusnet.com.au>
-# Contributor: Enrico Morelli <morelli at cerm.unifi.it>
-
-pkgname=dictd
-pkgver=1.12.1
-pkgrel=1
-pkgdesc="Online dictionary client and server"
-url="http://sourceforge.net/projects/dict/"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('sh' 'zlib' 'libmaa')
-makedepends=('flex')
-backup=(etc/dict/dictd.conf
-	etc/dict/dict.conf
-	etc/dict/site.info
-	etc/conf.d/dictd
-	etc/xinetd.d/dictd
-	etc/dict/colorit.conf)
-options=('!emptydirs')
-source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz"
-	dictd
-	dict.conf
-	dictd.conf
-	dictd.confd
-	dictd.service
-	site.info
-	dictd.xinetd
-	colorit.conf)
-md5sums=('62696491174c22079f664830d07c0623'
-         '6542df4fc585773fc03f1a088730126b'
-         'fb72f7d8c55f84b1b37bbc8d33a8e55a'
-         '64cd6ffdb40fb3367224f91ac44926ac'
-         '838887fee38ae4cebd652d399b1f2266'
-         '574e316d1f08885882d7b3075e1ea522'
-         'b8cabf913876e544d919c7f20ff8db9e'
-         'b7dbc9529df13ff895dae2b4abd080d6'
-         '978c9c079a0fc8d7d42a4cd4000190e7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  install -D -m 0755 $srcdir/dictd $pkgdir/etc/rc.d/dictd
-  install -D -m 0644 $srcdir/dictd.xinetd $pkgdir/etc/xinetd.d/dictd
-  install -D -m 0644 $srcdir/dictd.conf $pkgdir/etc/dict/dictd.conf
-  install -D -m 0644 $srcdir/dict.conf $pkgdir/etc/dict/dict.conf
-  install -D -m 0644 $srcdir/site.info $pkgdir/etc/dict/site.info
-  install -D -m 0644 $srcdir/dictd.confd $pkgdir/etc/conf.d/dictd
-  install -D -m 0644 $srcdir/colorit.conf $pkgdir/etc/dict/colorit.conf
-  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
-}

Copied: dictd/repos/community-i686/PKGBUILD (from rev 90654, dictd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: SmackleFunky <smacklefunky at optusnet.com.au>
+# Contributor: Enrico Morelli <morelli at cerm.unifi.it>
+
+pkgname=dictd
+pkgver=1.12.1
+pkgrel=2
+pkgdesc="Online dictionary client and server"
+url="http://sourceforge.net/projects/dict/"
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('sh' 'zlib' 'libmaa')
+makedepends=('flex')
+backup=(etc/dict/dictd.conf
+	etc/dict/dict.conf
+	etc/dict/site.info
+	etc/conf.d/dictd
+	etc/xinetd.d/dictd
+	etc/dict/colorit.conf)
+options=('!emptydirs')
+source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz"
+	dict.conf
+	dictd.conf
+	dictd.confd
+	dictd.service
+	site.info
+	dictd.xinetd
+	colorit.conf)
+md5sums=('62696491174c22079f664830d07c0623'
+         'fb72f7d8c55f84b1b37bbc8d33a8e55a'
+         '64cd6ffdb40fb3367224f91ac44926ac'
+         '838887fee38ae4cebd652d399b1f2266'
+         '574e316d1f08885882d7b3075e1ea522'
+         'b8cabf913876e544d919c7f20ff8db9e'
+         'b7dbc9529df13ff895dae2b4abd080d6'
+         '978c9c079a0fc8d7d42a4cd4000190e7')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m 0644 $srcdir/dictd.xinetd $pkgdir/etc/xinetd.d/dictd
+  install -D -m 0644 $srcdir/dictd.conf $pkgdir/etc/dict/dictd.conf
+  install -D -m 0644 $srcdir/dict.conf $pkgdir/etc/dict/dict.conf
+  install -D -m 0644 $srcdir/site.info $pkgdir/etc/dict/site.info
+  install -D -m 0644 $srcdir/dictd.confd $pkgdir/etc/conf.d/dictd
+  install -D -m 0644 $srcdir/colorit.conf $pkgdir/etc/dict/colorit.conf
+  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+}

Deleted: community-i686/colorit.conf
===================================================================
--- community-i686/colorit.conf	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-i686/colorit.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,32 +0,0 @@
-dnl /etc/dictd/colorit.conf   vim:ft=m4
-dnl
-dnl Sample configuration file for colorit(1) program
-dnl
-divert(-1)
-dnl
-dnl Define some useful color variables
-dnl
-define(`black',   `0')
-define(`red',     `1')
-define(`green',   `2')
-define(`brown',   `3')
-define(`blue',    `4')
-define(`magenta', `5')
-define(`cyan',    `6')
-define(`white',   `7')
-dnl
-dnl Mark macro arguments: regexp foreground-color [background-color]
-dnl
-define(`mark', ``mark "$1"''  `ifelse(`$#', `3', ``"\033[3$2;4$3m"'', ``"\033[3$2m"'')' `"\033[m"')
-dnl
-divert
-mark(`^From.*$',red,cyan)
-mark(`^  [^ ]+',green)
-mark(`^ *Note:',red)
-mark(`{[^{]+}',green)
-mark(`^ *\[[^\[]+\]', cyan)
-mark(`^[    ]*(adj|n|v|adv)? *[0-9]+[\.:]',cyan)
-mark(`^ *\([a-z]+\)',cyan)
-mark(`(Syn|Ant|syn|ant):', blue, white)
-mark(` (t|i|a|adj|adv|n|v)\. ',cyan)
-mark(` (t|i|a|adj|adv|n|v)\.$',cyan)

Copied: dictd/repos/community-i686/colorit.conf (from rev 90654, dictd/trunk/colorit.conf)
===================================================================
--- community-i686/colorit.conf	                        (rev 0)
+++ community-i686/colorit.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,32 @@
+dnl /etc/dictd/colorit.conf   vim:ft=m4
+dnl
+dnl Sample configuration file for colorit(1) program
+dnl
+divert(-1)
+dnl
+dnl Define some useful color variables
+dnl
+define(`black',   `0')
+define(`red',     `1')
+define(`green',   `2')
+define(`brown',   `3')
+define(`blue',    `4')
+define(`magenta', `5')
+define(`cyan',    `6')
+define(`white',   `7')
+dnl
+dnl Mark macro arguments: regexp foreground-color [background-color]
+dnl
+define(`mark', ``mark "$1"''  `ifelse(`$#', `3', ``"\033[3$2;4$3m"'', ``"\033[3$2m"'')' `"\033[m"')
+dnl
+divert
+mark(`^From.*$',red,cyan)
+mark(`^  [^ ]+',green)
+mark(`^ *Note:',red)
+mark(`{[^{]+}',green)
+mark(`^ *\[[^\[]+\]', cyan)
+mark(`^[    ]*(adj|n|v|adv)? *[0-9]+[\.:]',cyan)
+mark(`^ *\([a-z]+\)',cyan)
+mark(`(Syn|Ant|syn|ant):', blue, white)
+mark(` (t|i|a|adj|adv|n|v)\. ',cyan)
+mark(` (t|i|a|adj|adv|n|v)\.$',cyan)

Deleted: community-i686/dict.conf
===================================================================
--- community-i686/dict.conf	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-i686/dict.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -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

Copied: dictd/repos/community-i686/dict.conf (from rev 90654, dictd/trunk/dict.conf)
===================================================================
--- community-i686/dict.conf	                        (rev 0)
+++ community-i686/dict.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,6 @@
+# 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

Deleted: community-i686/dictd
===================================================================
--- community-i686/dictd	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-i686/dictd	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/dictd
-. /etc/rc.conf
-
-. /etc/rc.d/functions
-
-preconfiguration() {
-	stat_busy "Check dictd configuration"
-	if [ ! -e ${DICTD_CONF} ];  then
-		echo "No configuration"
-		stat_fail 
-		exit 1
-	fi
-	stat_done
-
-	# The new way of doing this is to scan /usr/lib/dict and tweek the conf
-	stat_busy "Scanning for dictionaries..."
-	if [ ! -d "${DICTD_DICTDIR}" ]; then
- 		echo "No dictionaries found"
-		stat_fail
-		exit 1
-	fi
-	stat_done
-	pushd ${DICTD_DICTDIR} >/dev/null
-	INDEXFILES=`ls *.index`
-	if [ -z "$INDEXFILES" ]; then
- 		echo "No dictionaries found"
-		stat_fail 
-		exit 1
-	fi
-
-	cat $DICTD_CONF | sed -e '/^#LASTLINE/,$d' > $DICTD_TMPCONF
-	echo "#LASTLINE" >> $DICTD_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
-			echo "Index $i has no matching dictionaray..."
-		fi
-
-		#ok, go an index, and a dixtionary, append.
-		echo "database $DNAME { data \"${DICTD_DICTDIR}/${DICT}\"" >> $DICTD_TMPCONF
-		echo "         index \"${DICTD_DICTDIR}/$i\" }" >> $DICTD_TMPCONF
-
-		CNT=`expr $CNT + 1`
-	done
-	popd >/dev/null
-	mv ${DICTD_TMPCONF} ${DICTD_CONF}
-	echo "$CNT dictionary indexes found."
-}
-
-PID=`pidof -o %PPID /usr/sbin/dictd`
-
-case "$1" in 
-  start)
-  	preconfiguration || exit 1
-	stat_busy "Start dictd daemon"
-	/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS
-	if [  $? -gt 0 ]; then
-	      stat_fail
-	else
-	      add_daemon dictd
-  	      stat_done
-    	fi
-    ;;
-
-   stop)
-	stat_busy "Stop dictd daemon"
-	kill $PID 2>/dev/null 1>/dev/null
-	if [ $? -gt 0 ]; then
-	    stat_fail
-	else
-	    rm_daemon dictd
-	    stat_done
-	fi
-	;;
-  restart)
-	 $0 stop
-	sleep 1
-	$0 start
-	;;
-  *)
-	echo "usage: $0 {start|stop|restart}"
-esac

Deleted: community-i686/dictd.conf
===================================================================
--- community-i686/dictd.conf	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-i686/dictd.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,25 +0,0 @@
-# dictd configuration file.
-# whipped up by michael conrad tilstra <michael at gentoo.org>
-
-# Informational message
-
-global {
-    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

Copied: dictd/repos/community-i686/dictd.conf (from rev 90654, dictd/trunk/dictd.conf)
===================================================================
--- community-i686/dictd.conf	                        (rev 0)
+++ community-i686/dictd.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,25 @@
+# dictd configuration file.
+# whipped up by michael conrad tilstra <michael at gentoo.org>
+
+# Informational message
+
+global {
+    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

Deleted: community-i686/dictd.confd
===================================================================
--- community-i686/dictd.confd	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-i686/dictd.confd	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,7 +0,0 @@
-# Config file for /etc/rc.d/dictd
-
-DICTD_CONF=/etc/dict/dictd.conf
-DICTD_DICTDIR=/usr/share/dictd
-DICTD_TMPCONF=/etc/dict/dictd.conf.$$
-DICTD_EARGS="-s"
-DICTD_ARGS="--locale en_US.UTF-8"

Copied: dictd/repos/community-i686/dictd.confd (from rev 90654, dictd/trunk/dictd.confd)
===================================================================
--- community-i686/dictd.confd	                        (rev 0)
+++ community-i686/dictd.confd	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,7 @@
+# Config file for /etc/rc.d/dictd
+
+DICTD_CONF=/etc/dict/dictd.conf
+DICTD_DICTDIR=/usr/share/dictd
+DICTD_TMPCONF=/etc/dict/dictd.conf.$$
+DICTD_EARGS="-s"
+DICTD_ARGS="--locale en_US.UTF-8"

Deleted: community-i686/dictd.service
===================================================================
--- community-i686/dictd.service	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-i686/dictd.service	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Dictd Dictionary Server Daemon
-After=network.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/conf.d/dictd
-ExecStart=/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS
-
-[Install]
-WantedBy=multi-user.target

Copied: dictd/repos/community-i686/dictd.service (from rev 90654, dictd/trunk/dictd.service)
===================================================================
--- community-i686/dictd.service	                        (rev 0)
+++ community-i686/dictd.service	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Dictd Dictionary Server Daemon
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/conf.d/dictd
+ExecStart=/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/dictd.xinetd
===================================================================
--- community-i686/dictd.xinetd	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-i686/dictd.xinetd	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,12 +0,0 @@
-service dict
-{
-        disable = yes
-	type = UNLISTED
-	port = 2628
-	socket_type = stream
-	protocol = tcp
-	wait = no
-	user = daemon
-	server = /usr/sbin/dictd
-	server_args = -c /etc/dict/dictd.conf -i --locale en_US.UTF-8
-}

Copied: dictd/repos/community-i686/dictd.xinetd (from rev 90654, dictd/trunk/dictd.xinetd)
===================================================================
--- community-i686/dictd.xinetd	                        (rev 0)
+++ community-i686/dictd.xinetd	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,12 @@
+service dict
+{
+        disable = yes
+	type = UNLISTED
+	port = 2628
+	socket_type = stream
+	protocol = tcp
+	wait = no
+	user = daemon
+	server = /usr/sbin/dictd
+	server_args = -c /etc/dict/dictd.conf -i --locale en_US.UTF-8
+}

Deleted: community-i686/site.info
===================================================================
--- community-i686/site.info	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-i686/site.info	2013-05-13 14:21:09 UTC (rev 90655)
@@ -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.
-

Copied: dictd/repos/community-i686/site.info (from rev 90654, dictd/trunk/site.info)
===================================================================
--- community-i686/site.info	                        (rev 0)
+++ community-i686/site.info	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,6 @@
+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.
+

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-x86_64/PKGBUILD	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: SmackleFunky <smacklefunky at optusnet.com.au>
-# Contributor: Enrico Morelli <morelli at cerm.unifi.it>
-
-pkgname=dictd
-pkgver=1.12.1
-pkgrel=1
-pkgdesc="Online dictionary client and server"
-url="http://sourceforge.net/projects/dict/"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('sh' 'zlib' 'libmaa')
-makedepends=('flex')
-backup=(etc/dict/dictd.conf
-	etc/dict/dict.conf
-	etc/dict/site.info
-	etc/conf.d/dictd
-	etc/xinetd.d/dictd
-	etc/dict/colorit.conf)
-options=('!emptydirs')
-source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz"
-	dictd
-	dict.conf
-	dictd.conf
-	dictd.confd
-	dictd.service
-	site.info
-	dictd.xinetd
-	colorit.conf)
-md5sums=('62696491174c22079f664830d07c0623'
-         '6542df4fc585773fc03f1a088730126b'
-         'fb72f7d8c55f84b1b37bbc8d33a8e55a'
-         '64cd6ffdb40fb3367224f91ac44926ac'
-         '838887fee38ae4cebd652d399b1f2266'
-         '574e316d1f08885882d7b3075e1ea522'
-         'b8cabf913876e544d919c7f20ff8db9e'
-         'b7dbc9529df13ff895dae2b4abd080d6'
-         '978c9c079a0fc8d7d42a4cd4000190e7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  install -D -m 0755 $srcdir/dictd $pkgdir/etc/rc.d/dictd
-  install -D -m 0644 $srcdir/dictd.xinetd $pkgdir/etc/xinetd.d/dictd
-  install -D -m 0644 $srcdir/dictd.conf $pkgdir/etc/dict/dictd.conf
-  install -D -m 0644 $srcdir/dict.conf $pkgdir/etc/dict/dict.conf
-  install -D -m 0644 $srcdir/site.info $pkgdir/etc/dict/site.info
-  install -D -m 0644 $srcdir/dictd.confd $pkgdir/etc/conf.d/dictd
-  install -D -m 0644 $srcdir/colorit.conf $pkgdir/etc/dict/colorit.conf
-  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
-}

Copied: dictd/repos/community-x86_64/PKGBUILD (from rev 90654, dictd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: SmackleFunky <smacklefunky at optusnet.com.au>
+# Contributor: Enrico Morelli <morelli at cerm.unifi.it>
+
+pkgname=dictd
+pkgver=1.12.1
+pkgrel=2
+pkgdesc="Online dictionary client and server"
+url="http://sourceforge.net/projects/dict/"
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('sh' 'zlib' 'libmaa')
+makedepends=('flex')
+backup=(etc/dict/dictd.conf
+	etc/dict/dict.conf
+	etc/dict/site.info
+	etc/conf.d/dictd
+	etc/xinetd.d/dictd
+	etc/dict/colorit.conf)
+options=('!emptydirs')
+source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz"
+	dict.conf
+	dictd.conf
+	dictd.confd
+	dictd.service
+	site.info
+	dictd.xinetd
+	colorit.conf)
+md5sums=('62696491174c22079f664830d07c0623'
+         'fb72f7d8c55f84b1b37bbc8d33a8e55a'
+         '64cd6ffdb40fb3367224f91ac44926ac'
+         '838887fee38ae4cebd652d399b1f2266'
+         '574e316d1f08885882d7b3075e1ea522'
+         'b8cabf913876e544d919c7f20ff8db9e'
+         'b7dbc9529df13ff895dae2b4abd080d6'
+         '978c9c079a0fc8d7d42a4cd4000190e7')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m 0644 $srcdir/dictd.xinetd $pkgdir/etc/xinetd.d/dictd
+  install -D -m 0644 $srcdir/dictd.conf $pkgdir/etc/dict/dictd.conf
+  install -D -m 0644 $srcdir/dict.conf $pkgdir/etc/dict/dict.conf
+  install -D -m 0644 $srcdir/site.info $pkgdir/etc/dict/site.info
+  install -D -m 0644 $srcdir/dictd.confd $pkgdir/etc/conf.d/dictd
+  install -D -m 0644 $srcdir/colorit.conf $pkgdir/etc/dict/colorit.conf
+  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+}

Deleted: community-x86_64/colorit.conf
===================================================================
--- community-x86_64/colorit.conf	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-x86_64/colorit.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,32 +0,0 @@
-dnl /etc/dictd/colorit.conf   vim:ft=m4
-dnl
-dnl Sample configuration file for colorit(1) program
-dnl
-divert(-1)
-dnl
-dnl Define some useful color variables
-dnl
-define(`black',   `0')
-define(`red',     `1')
-define(`green',   `2')
-define(`brown',   `3')
-define(`blue',    `4')
-define(`magenta', `5')
-define(`cyan',    `6')
-define(`white',   `7')
-dnl
-dnl Mark macro arguments: regexp foreground-color [background-color]
-dnl
-define(`mark', ``mark "$1"''  `ifelse(`$#', `3', ``"\033[3$2;4$3m"'', ``"\033[3$2m"'')' `"\033[m"')
-dnl
-divert
-mark(`^From.*$',red,cyan)
-mark(`^  [^ ]+',green)
-mark(`^ *Note:',red)
-mark(`{[^{]+}',green)
-mark(`^ *\[[^\[]+\]', cyan)
-mark(`^[    ]*(adj|n|v|adv)? *[0-9]+[\.:]',cyan)
-mark(`^ *\([a-z]+\)',cyan)
-mark(`(Syn|Ant|syn|ant):', blue, white)
-mark(` (t|i|a|adj|adv|n|v)\. ',cyan)
-mark(` (t|i|a|adj|adv|n|v)\.$',cyan)

Copied: dictd/repos/community-x86_64/colorit.conf (from rev 90654, dictd/trunk/colorit.conf)
===================================================================
--- community-x86_64/colorit.conf	                        (rev 0)
+++ community-x86_64/colorit.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,32 @@
+dnl /etc/dictd/colorit.conf   vim:ft=m4
+dnl
+dnl Sample configuration file for colorit(1) program
+dnl
+divert(-1)
+dnl
+dnl Define some useful color variables
+dnl
+define(`black',   `0')
+define(`red',     `1')
+define(`green',   `2')
+define(`brown',   `3')
+define(`blue',    `4')
+define(`magenta', `5')
+define(`cyan',    `6')
+define(`white',   `7')
+dnl
+dnl Mark macro arguments: regexp foreground-color [background-color]
+dnl
+define(`mark', ``mark "$1"''  `ifelse(`$#', `3', ``"\033[3$2;4$3m"'', ``"\033[3$2m"'')' `"\033[m"')
+dnl
+divert
+mark(`^From.*$',red,cyan)
+mark(`^  [^ ]+',green)
+mark(`^ *Note:',red)
+mark(`{[^{]+}',green)
+mark(`^ *\[[^\[]+\]', cyan)
+mark(`^[    ]*(adj|n|v|adv)? *[0-9]+[\.:]',cyan)
+mark(`^ *\([a-z]+\)',cyan)
+mark(`(Syn|Ant|syn|ant):', blue, white)
+mark(` (t|i|a|adj|adv|n|v)\. ',cyan)
+mark(` (t|i|a|adj|adv|n|v)\.$',cyan)

Deleted: community-x86_64/dict.conf
===================================================================
--- community-x86_64/dict.conf	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-x86_64/dict.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -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

Copied: dictd/repos/community-x86_64/dict.conf (from rev 90654, dictd/trunk/dict.conf)
===================================================================
--- community-x86_64/dict.conf	                        (rev 0)
+++ community-x86_64/dict.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,6 @@
+# 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

Deleted: community-x86_64/dictd
===================================================================
--- community-x86_64/dictd	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-x86_64/dictd	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/dictd
-. /etc/rc.conf
-
-. /etc/rc.d/functions
-
-preconfiguration() {
-	stat_busy "Check dictd configuration"
-	if [ ! -e ${DICTD_CONF} ];  then
-		echo "No configuration"
-		stat_fail 
-		exit 1
-	fi
-	stat_done
-
-	# The new way of doing this is to scan /usr/lib/dict and tweek the conf
-	stat_busy "Scanning for dictionaries..."
-	if [ ! -d "${DICTD_DICTDIR}" ]; then
- 		echo "No dictionaries found"
-		stat_fail
-		exit 1
-	fi
-	stat_done
-	pushd ${DICTD_DICTDIR} >/dev/null
-	INDEXFILES=`ls *.index`
-	if [ -z "$INDEXFILES" ]; then
- 		echo "No dictionaries found"
-		stat_fail 
-		exit 1
-	fi
-
-	cat $DICTD_CONF | sed -e '/^#LASTLINE/,$d' > $DICTD_TMPCONF
-	echo "#LASTLINE" >> $DICTD_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
-			echo "Index $i has no matching dictionaray..."
-		fi
-
-		#ok, go an index, and a dixtionary, append.
-		echo "database $DNAME { data \"${DICTD_DICTDIR}/${DICT}\"" >> $DICTD_TMPCONF
-		echo "         index \"${DICTD_DICTDIR}/$i\" }" >> $DICTD_TMPCONF
-
-		CNT=`expr $CNT + 1`
-	done
-	popd >/dev/null
-	mv ${DICTD_TMPCONF} ${DICTD_CONF}
-	echo "$CNT dictionary indexes found."
-}
-
-PID=`pidof -o %PPID /usr/sbin/dictd`
-
-case "$1" in 
-  start)
-  	preconfiguration || exit 1
-	stat_busy "Start dictd daemon"
-	/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS
-	if [  $? -gt 0 ]; then
-	      stat_fail
-	else
-	      add_daemon dictd
-  	      stat_done
-    	fi
-    ;;
-
-   stop)
-	stat_busy "Stop dictd daemon"
-	kill $PID 2>/dev/null 1>/dev/null
-	if [ $? -gt 0 ]; then
-	    stat_fail
-	else
-	    rm_daemon dictd
-	    stat_done
-	fi
-	;;
-  restart)
-	 $0 stop
-	sleep 1
-	$0 start
-	;;
-  *)
-	echo "usage: $0 {start|stop|restart}"
-esac

Deleted: community-x86_64/dictd.conf
===================================================================
--- community-x86_64/dictd.conf	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-x86_64/dictd.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,25 +0,0 @@
-# dictd configuration file.
-# whipped up by michael conrad tilstra <michael at gentoo.org>
-
-# Informational message
-
-global {
-    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

Copied: dictd/repos/community-x86_64/dictd.conf (from rev 90654, dictd/trunk/dictd.conf)
===================================================================
--- community-x86_64/dictd.conf	                        (rev 0)
+++ community-x86_64/dictd.conf	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,25 @@
+# dictd configuration file.
+# whipped up by michael conrad tilstra <michael at gentoo.org>
+
+# Informational message
+
+global {
+    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

Deleted: community-x86_64/dictd.confd
===================================================================
--- community-x86_64/dictd.confd	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-x86_64/dictd.confd	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,7 +0,0 @@
-# Config file for /etc/rc.d/dictd
-
-DICTD_CONF=/etc/dict/dictd.conf
-DICTD_DICTDIR=/usr/share/dictd
-DICTD_TMPCONF=/etc/dict/dictd.conf.$$
-DICTD_EARGS="-s"
-DICTD_ARGS="--locale en_US.UTF-8"

Copied: dictd/repos/community-x86_64/dictd.confd (from rev 90654, dictd/trunk/dictd.confd)
===================================================================
--- community-x86_64/dictd.confd	                        (rev 0)
+++ community-x86_64/dictd.confd	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,7 @@
+# Config file for /etc/rc.d/dictd
+
+DICTD_CONF=/etc/dict/dictd.conf
+DICTD_DICTDIR=/usr/share/dictd
+DICTD_TMPCONF=/etc/dict/dictd.conf.$$
+DICTD_EARGS="-s"
+DICTD_ARGS="--locale en_US.UTF-8"

Deleted: community-x86_64/dictd.service
===================================================================
--- community-x86_64/dictd.service	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-x86_64/dictd.service	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Dictd Dictionary Server Daemon
-After=network.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/conf.d/dictd
-ExecStart=/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS
-
-[Install]
-WantedBy=multi-user.target

Copied: dictd/repos/community-x86_64/dictd.service (from rev 90654, dictd/trunk/dictd.service)
===================================================================
--- community-x86_64/dictd.service	                        (rev 0)
+++ community-x86_64/dictd.service	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Dictd Dictionary Server Daemon
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/conf.d/dictd
+ExecStart=/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/dictd.xinetd
===================================================================
--- community-x86_64/dictd.xinetd	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-x86_64/dictd.xinetd	2013-05-13 14:21:09 UTC (rev 90655)
@@ -1,12 +0,0 @@
-service dict
-{
-        disable = yes
-	type = UNLISTED
-	port = 2628
-	socket_type = stream
-	protocol = tcp
-	wait = no
-	user = daemon
-	server = /usr/sbin/dictd
-	server_args = -c /etc/dict/dictd.conf -i --locale en_US.UTF-8
-}

Copied: dictd/repos/community-x86_64/dictd.xinetd (from rev 90654, dictd/trunk/dictd.xinetd)
===================================================================
--- community-x86_64/dictd.xinetd	                        (rev 0)
+++ community-x86_64/dictd.xinetd	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,12 @@
+service dict
+{
+        disable = yes
+	type = UNLISTED
+	port = 2628
+	socket_type = stream
+	protocol = tcp
+	wait = no
+	user = daemon
+	server = /usr/sbin/dictd
+	server_args = -c /etc/dict/dictd.conf -i --locale en_US.UTF-8
+}

Deleted: community-x86_64/site.info
===================================================================
--- community-x86_64/site.info	2013-05-13 14:20:29 UTC (rev 90654)
+++ community-x86_64/site.info	2013-05-13 14:21:09 UTC (rev 90655)
@@ -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.
-

Copied: dictd/repos/community-x86_64/site.info (from rev 90654, dictd/trunk/site.info)
===================================================================
--- community-x86_64/site.info	                        (rev 0)
+++ community-x86_64/site.info	2013-05-13 14:21:09 UTC (rev 90655)
@@ -0,0 +1,6 @@
+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.
+




More information about the arch-commits mailing list