diff options
Diffstat (limited to 'app-text/dictd/files')
20 files changed, 621 insertions, 0 deletions
diff --git a/app-text/dictd/files/1.10.11/colorit.conf b/app-text/dictd/files/1.10.11/colorit.conf new file mode 100644 index 0000000..22b00e9 --- /dev/null +++ b/app-text/dictd/files/1.10.11/colorit.conf @@ -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) diff --git a/app-text/dictd/files/1.10.11/dict.conf b/app-text/dictd/files/1.10.11/dict.conf new file mode 100644 index 0000000..e06c3d2 --- /dev/null +++ b/app-text/dictd/files/1.10.11/dict.conf @@ -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 diff --git a/app-text/dictd/files/1.10.11/dictd.conf b/app-text/dictd/files/1.10.11/dictd.conf new file mode 100644 index 0000000..16e41e5 --- /dev/null +++ b/app-text/dictd/files/1.10.11/dictd.conf @@ -0,0 +1,22 @@ +# dictd configuration file + +global { + # Informational message + site site.info +} + +# who's allowed. You might want to change this. +access { + allow * +} + +# Dictionaries are listed below. During dictd startup the initrc script will +# scan ${DLIBDIR} (see /etc/conf.d/dictd) and adds all of the dictionaries it +# finds here. +# +# NOTE: Initrc script will wipe everything below #LASTLINE and replace it with +# what it finds. So add all of your things above. If this is a problem, report +# bug at https://bugs.gentoo.org, please. +# +# Do not remove next line! +#LASTLINE diff --git a/app-text/dictd/files/1.10.11/dictd.confd b/app-text/dictd/files/1.10.11/dictd.confd new file mode 100644 index 0000000..4db9f00 --- /dev/null +++ b/app-text/dictd/files/1.10.11/dictd.confd @@ -0,0 +1,5 @@ +# If have problems starting dictd in an UTF-8 locale, add an appropriate +# --locale switch to DICTD_OPTS, e. g. "--locale=en_US.utf8" +DICTD_OPTS="-s " +DICTDCONF=/etc/dict/dictd.conf +DLIBDIR=/usr/lib/dict diff --git a/app-text/dictd/files/1.10.11/dictd.initd b/app-text/dictd/files/1.10.11/dictd.initd new file mode 100644 index 0000000..6bf1b1c --- /dev/null +++ b/app-text/dictd/files/1.10.11/dictd.initd @@ -0,0 +1,75 @@ +#!/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.3 2008/11/08 18:36:21 pva Exp $ + +DICTD_PID="/var/run/dictd.pid" + +prepconfig() { + local TMPCONF INDEXFILES CNT DNAME DICT + if [ ! -e "${DICTDCONF}" ]; then + eerror "Config file ${DICTDCONF} 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 found at ${DLIBDIR}." + eerror "Please, emerge at least one of app-dicts/dictd-* dictionaries." + return 1 + fi + + TMPCONF=$(mktemp -t dictd.conf.XXXXXXXXXX) + cat ${DICTDCONF} | sed -e '/^#LASTLINE/,$d' > ${TMPCONF} + echo "#LASTLINE" >> ${TMPCONF} + + CNT=0 + for i in ${INDEXFILES}; do + DNAME=$(echo $i | sed -e 's/[.]index$//') + #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 + ewarn "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}" + chown 0:dictd "${DICTDCONF}" + chmod g+r "${DICTDCONF}" + einfo "Done, ${CNT} dictionaries found." +} + +depend() { + need localmount +} + +start() { + prepconfig || return 1 + ebegin "Starting dictd" + 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 --pidfile ${DICTD_PID} --exec /usr/sbin/dictd + eend $? +} diff --git a/app-text/dictd/files/1.10.11/site.info b/app-text/dictd/files/1.10.11/site.info new file mode 100644 index 0000000..23bfdeb --- /dev/null +++ b/app-text/dictd/files/1.10.11/site.info @@ -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. + diff --git a/app-text/dictd/files/1.9.11-r1/dict.conf b/app-text/dictd/files/1.9.11-r1/dict.conf new file mode 100644 index 0000000..e06c3d2 --- /dev/null +++ b/app-text/dictd/files/1.9.11-r1/dict.conf @@ -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 diff --git a/app-text/dictd/files/1.9.11-r1/dictd b/app-text/dictd/files/1.9.11-r1/dictd new file mode 100755 index 0000000..270e4b5 --- /dev/null +++ b/app-text/dictd/files/1.9.11-r1/dictd @@ -0,0 +1,72 @@ +#!/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.9.11-r1/dictd,v 1.3 2004/07/14 21:37:57 agriffis 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} + 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.9.11-r1/dictd.conf b/app-text/dictd/files/1.9.11-r1/dictd.conf new file mode 100644 index 0000000..4cded97 --- /dev/null +++ b/app-text/dictd/files/1.9.11-r1/dictd.conf @@ -0,0 +1,22 @@ +# dictd configuration file. +# whipped up by michael conrad tilstra <michael@gentoo.org> + +# 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.9.11-r1/dictd.confd b/app-text/dictd/files/1.9.11-r1/dictd.confd new file mode 100644 index 0000000..91b9d43 --- /dev/null +++ b/app-text/dictd/files/1.9.11-r1/dictd.confd @@ -0,0 +1,7 @@ +# Config file for /etc/init.d/dictd + +EARGS="-s " +DICTDCONF=/etc/dict/dictd.conf +DLIBDIR=/usr/lib/dict +TMPCONF=/etc/dict/dictd.conf.$$ + diff --git a/app-text/dictd/files/1.9.11-r1/site.info b/app-text/dictd/files/1.9.11-r1/site.info new file mode 100644 index 0000000..23bfdeb --- /dev/null +++ b/app-text/dictd/files/1.9.11-r1/site.info @@ -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. + diff --git a/app-text/dictd/files/dictd-1.10.11-automatic-plugins_build-failure.patch b/app-text/dictd/files/dictd-1.10.11-automatic-plugins_build-failure.patch new file mode 100644 index 0000000..a3d14a9 --- /dev/null +++ b/app-text/dictd/files/dictd-1.10.11-automatic-plugins_build-failure.patch @@ -0,0 +1,133 @@ +https://sourceforge.net/tracker/index.php?func=detail&aid=2218879&group_id=605&atid=300605 + +=== modified file 'Makefile.in' +--- Makefile.in 2008-11-03 11:47:00 +0000 ++++ Makefile.in 2008-11-03 14:01:26 +0000 +@@ -58,7 +58,7 @@ + EXEEXT=@EXEEXT@ + + CONF_DIR=@sysconfdir@/ +-PLUGIN_DIR=${libexecdir}/ ++PLUGIN_DIR=${libexecdir} + DICT_DIR=${datadir}/ + + CC= @CC@ +@@ -80,6 +80,8 @@ + + LDFLAGS= @LDFLAGS@ @LIBS@ + LIBOBJS= @LIBOBJS@ ++MAALIB= @MAALIB@ ++MAACPPFLAGS= @MAACPPFLAGS@ + EXES= dict dictd dictzip dictfmt + + all: $(EXES) $(LIBRARIES) +@@ -155,19 +157,19 @@ + endif + + %.o: %.c +- $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $< -o $@ ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $(MAACPPFLAGS) $< -o $@ + %.o: %.cpp +- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CFLAGS) $< -o $@ ++ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CFLAGS) $(MAACPPFLAGS) $< -o $@ + + %: %.o + $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \ + $(filter-out local_regex local_zlib local_libmaa, $^) \ +- $(OBJS) $(LDFLAGS) -lz ++ $(OBJS) $(LDFLAGS) $(MAALIB) -lz + + dictd: dictd.o + $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \ + $(filter-out local_regex local_zlib local_libmaa, $^) \ +- $(DBILIB) $(OBJS) $(LDFLAGS) -lz ++ $(DBILIB) $(OBJS) $(LDFLAGS) $(MAALIB) -lz + + include $(srcdir)/deps + +@@ -197,14 +199,14 @@ + $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -module \ + $(filter-out local_regex local_zlib local_libmaa, $(^:.o=.lo)) \ + -rpath "${PLUGIN_DIR}" \ +- $(LDFLAGS) $(JUDYLIB) ++ $(LDFLAGS) + + dictdplugin_dbi.la : heap.o dictdplugin_dbi.o str.o \ + plugins_common.o $(LIBOBJS) + $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -module \ + $(filter-out local_regex local_zlib local_libmaa, $(^:.o=.lo)) \ + -rpath "${PLUGIN_DIR}" \ +- $(LDFLAGS) $(DBILIB) -ldl ++ $(LDFLAGS) -ldl + + .PHONY: plugins + plugins: $(PLUGINS) + +=== modified file 'configure.in' +--- configure.in 2008-11-03 11:47:00 +0000 ++++ configure.in 2008-11-03 13:56:42 +0000 +@@ -215,14 +215,14 @@ + echo Checking for libraries + + if test "$local_libmaa" = 0; then +- AC_CHECK_LIB(maa,maa_shutdown,XLDFLAGS="$XLDFLAGS -lmaa",local_libmaa=1) ++ AC_CHECK_LIB(maa,maa_shutdown,MAALIB="-lmaa",local_libmaa=1) + fi + + if test "$local_libmaa" = 1; then + AC_MSG_CHECKING(for libmaa in local source tree) + if test -d libmaa; then +- XLDFLAGS="$XLDFLAGS -Llibmaa -lmaa" +- XCPPFLAGS="$XCPPFLAGS -Ilibmaa" ++ MAALIB="-Llibmaa -lmaa" ++ MAACPPFLAGS="$XCPPFLAGS -Ilibmaa" + + AC_CONFIG_SUBDIRS(libmaa) + +@@ -234,8 +234,21 @@ + fi + fi + +-AC_CHECK_LIB(Judy, JudySLNext, [JUDYLIB=-lJudy]) +-AC_CHECK_LIB(dbi, dbi_shutdown, [DBILIB=-ldbi]) ++AC_ARG_WITH(dbi, ++[ --with-dbi build libdbi plugin if possible (plugin support should be enabled)], ++[ ++if test "x${withval}" != xno; then ++ AC_CHECK_LIB(dbi, dbi_shutdown, [DBILIB=-ldbi]) ++fi ++]) ++ ++AC_ARG_WITH(judy, ++[ --with-judy build judy plugin if possible (plugin support should be enabled)], ++[ ++if test "x${withval}" != xno; then ++ AC_CHECK_LIB(Judy, JudySLNext, [JUDYLIB=-lJudy]) ++fi ++]) + + AC_CHECK_LIB(socket,main) + AC_CHECK_LIB(c,inet_ntoa, +@@ -364,12 +377,10 @@ + LIBEXECDIR=`eval3 $libexecdir` + DATADIR=`eval3 $datadir` + +-CPPFLAGS="$CPPFLAGS $XCPPFLAGS" + CFLAGS="$CFLAGS $XCFLAGS" + LDFLAGS="$LDFLAGS $XLDFLAGS" + + AC_SUBST(DICT_VERSION) +-AC_SUBST(CPPFLAGS) + AC_SUBST(CFLAGS) + AC_SUBST(USE_PLUGIN) + AC_SUBST(EXEEXT) +@@ -380,6 +391,8 @@ + AC_SUBST(JUDYLIB) + AC_SUBST(DBILIB) + AC_SUBST(LIBTOOL) ++AC_SUBST(MAALIB) ++AC_SUBST(MAACPPFLAGS) + + AC_SUBST(SYSCONFDIR) + AC_SUBST(BINDIR) + diff --git a/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch b/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch new file mode 100644 index 0000000..a78d13c --- /dev/null +++ b/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch @@ -0,0 +1,14 @@ +Made 'colorit -pp -' work + +Index: dictd/colorit.in +=================================================================== +--- dictd.orig/colorit.in 2008-01-23 23:38:35.000000000 +0100 ++++ dictd/colorit.in 2008-01-23 23:39:25.000000000 +0100 +@@ -167,6 +167,7 @@ + + function process_config (){ + if (pp == ""){ ++ pipe = "cat < \"" config_file "\"" + while (0 < (ret = (pipe | getline))){ + process_config_line() + } diff --git a/app-text/dictd/files/dictd-1.10.11-dictd.8-man.patch b/app-text/dictd/files/dictd-1.10.11-dictd.8-man.patch new file mode 100644 index 0000000..1a49a47 --- /dev/null +++ b/app-text/dictd/files/dictd-1.10.11-dictd.8-man.patch @@ -0,0 +1,24 @@ +Use @SYSCONFDIR@ instead of /etc/ + +Index: dictd/dictd.8.in +=================================================================== +--- dictd.orig/dictd.8.in 2008-01-25 21:25:49.000000000 +0100 ++++ dictd/dictd.8.in 2008-01-25 21:26:42.000000000 +0100 +@@ -120,7 +120,7 @@ + .TP + .BI \-c " file\fR or " \-\-config " file" + Specify configuration file. The default is +-.I /etc/dictd.conf ++.I @SYSCONFDIR@/dictd.conf + , but may be changed in the + .I defs.h + file at compile time (DICTD_CONFIG_FILE). +@@ -283,7 +283,7 @@ + .TP + .B Introduction + The configuration file defaults to +-.I /etc/dictd.conf ++.I @SYSCONFDIR@/dictd.conf + but can be specified on the command line with the + .B \-c + option (see above). diff --git a/app-text/dictd/files/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch b/app-text/dictd/files/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch new file mode 100644 index 0000000..1b1753b --- /dev/null +++ b/app-text/dictd/files/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch @@ -0,0 +1,15 @@ +Patch for #454819: FTBFS with GCC 4.3: missing #includes + + +Index: dictd/dictdplugin_popen.cpp +=================================================================== +--- dictd.orig/dictdplugin_popen.cpp 2008-01-20 21:58:30.000000000 +0100 ++++ dictd/dictdplugin_popen.cpp 2008-01-20 21:59:06.000000000 +0100 +@@ -43,6 +43,7 @@ + #include <stdio.h> + #include <errno.h> + #include <string> ++#include <climits> + #include <unistd.h> + #include <sstream> + #include <list> diff --git a/app-text/dictd/files/dictd-1.10.11-dictl-konwert.patch b/app-text/dictd/files/dictd-1.10.11-dictl-konwert.patch new file mode 100644 index 0000000..254fdd1 --- /dev/null +++ b/app-text/dictd/files/dictd-1.10.11-dictl-konwert.patch @@ -0,0 +1,35 @@ +Patch for #401666: dictl: doesn't work with DICTL_USE_KONWERT + +Index: dictd/dictl.in +=================================================================== +--- dictd.orig/dictl.in 2008-01-20 17:58:41.000000000 +0100 ++++ dictd/dictl.in 2008-01-20 18:02:40.000000000 +0100 +@@ -24,11 +24,25 @@ + # `iconv --help' gives more options than `man iconv' (on my SuSE 9.0 system at least) + # the -c makes iconv omit invalid characters from output + iconv -c -f $1 -t $2 +- else if test "$DICTL_USE_KONWERT"; then +- konwert $1-$2 ++ elif test "$DICTL_USE_KONWERT"; then ++ sedexpr=' ++ /(CP)?(437|8(5[0257]|6[0-69]|74))/ { s//cp\2/; q } ++ /8859_([1-9])/ { s//iso\1/; q } ++ /ANSI_X3.4(-19(68|86))?/ { s//ascii/; q } ++ /(US-)?ASCII/ { s//ascii/; q } ++ /(CP|WINDOWS-)(125[0-8])/ { s//cp\1/; q } ++ /ISO([-_]?8859-|8859)([1-9]|1[01345])/ { s//iso\2/; q } ++ /KOI8-?R/ { s//koi8r/; q } ++ /KOI8-?U/ { s//koi8u/; q } ++ /UTF-?8/ { s//utf8/; q } ++ /VISCII/ { s//viscii/; q } ++ /.*/ { s///; q }' ++ from=`echo "$1" | tr a-z A-Z | sed -r -e "$sedexpr"` ++ to=`echo "$2" | tr a-z A-Z | sed -r -e "$sedexpr"` ++ konwert "$from-$to" + else + recode -f $1..$2 +- fi fi ++ fi + } + + ##################################### diff --git a/app-text/dictd/files/dictd-1.10.11-dictl-translit.patch b/app-text/dictd/files/dictd-1.10.11-dictl-translit.patch new file mode 100644 index 0000000..6341120 --- /dev/null +++ b/app-text/dictd/files/dictd-1.10.11-dictl-translit.patch @@ -0,0 +1,16 @@ +Patch for #378792: dictl should use iconv's //translit suffix + + +Index: dictd/dictl.in +=================================================================== +--- dictd.orig/dictl.in 2008-01-21 22:28:01.000000000 +0100 ++++ dictd/dictl.in 2008-01-21 22:28:20.000000000 +0100 +@@ -23,7 +23,7 @@ + if test "$DICTL_USE_ICONV"; then + # `iconv --help' gives more options than `man iconv' (on my SuSE 9.0 system at least) + # the -c makes iconv omit invalid characters from output +- iconv -c -f $1 -t $2 ++ iconv -c -f $1 -t $2//TRANSLIT + elif test "$DICTL_USE_KONWERT"; then + sedexpr=' + /(CP)?(437|8(5[0257]|6[0-69]|74))/ { s//cp\2/; q } diff --git a/app-text/dictd/files/dictd-1.11.0-automagic-plugins.patch b/app-text/dictd/files/dictd-1.11.0-automagic-plugins.patch new file mode 100644 index 0000000..cb7b3b0 --- /dev/null +++ b/app-text/dictd/files/dictd-1.11.0-automagic-plugins.patch @@ -0,0 +1,28 @@ +=== modified file 'configure.in' +--- configure.in 2008-12-08 18:15:58 +0000 ++++ configure.in 2008-12-08 18:17:44 +0000 +@@ -146,8 +146,21 @@ + AC_CHECK_LIB(maa,maa_shutdown,MAALIB="-lmaa", + [AC_MSG_ERROR([Libmaa not found])]) + +-AC_CHECK_LIB(Judy, JudySLNext, [JUDYLIB=-lJudy]) +-AC_CHECK_LIB(dbi, dbi_shutdown, [DBILIB=-ldbi]) ++AC_ARG_WITH(dbi, ++[ --with-dbi build libdbi plugin if possible (plugin support should be enabled)], ++[ ++if test "x${withval}" != xno; then ++ AC_CHECK_LIB(dbi, dbi_shutdown, [DBILIB=-ldbi]) ++fi ++]) ++ ++AC_ARG_WITH(judy, ++[ --with-judy build judy plugin if possible (plugin support should be enabled)], ++[ ++if test "x${withval}" != xno; then ++ AC_CHECK_LIB(Judy, JudySLNext, [JUDYLIB=-lJudy]) ++fi ++]) + + AC_CHECK_LIB(socket,main) + AC_CHECK_LIB(c,inet_ntoa, + diff --git a/app-text/dictd/files/dictd-1.11.0-avoid-libs-in-LDFLAGS.patch b/app-text/dictd/files/dictd-1.11.0-avoid-libs-in-LDFLAGS.patch new file mode 100644 index 0000000..7251023 --- /dev/null +++ b/app-text/dictd/files/dictd-1.11.0-avoid-libs-in-LDFLAGS.patch @@ -0,0 +1,67 @@ +=== modified file 'Makefile.in' +--- Makefile.in 2008-12-08 18:10:53 +0000 ++++ Makefile.in 2008-12-08 18:14:38 +0000 +@@ -78,6 +78,7 @@ + + LDFLAGS= @LDFLAGS@ @LIBS@ + LIBOBJS= @LIBOBJS@ ++MAALIB= @MAALIB@ + EXES= dict dictd dictzip dictfmt + + all: $(EXES) $(LIBRARIES) +@@ -158,12 +159,12 @@ + %: %.o + $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \ + $(filter-out local_regex local_zlib local_libmaa, $^) \ +- $(OBJS) $(LDFLAGS) -lz ++ $(OBJS) $(LDFLAGS) $(MAALIB) -lz + + dictd: dictd.o + $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \ + $(filter-out local_regex local_zlib local_libmaa, $^) \ +- $(DBILIB) $(OBJS) $(LDFLAGS) -lz ++ $(DBILIB) $(OBJS) $(LDFLAGS) $(MAALIB) -lz + + include $(srcdir)/deps + + +=== modified file 'configure.in' +--- configure.in 2008-12-08 18:10:53 +0000 ++++ configure.in 2008-12-08 18:08:55 +0000 +@@ -143,26 +143,8 @@ + echo . + echo Checking for libraries + +-if test "$local_libmaa" = 0; then +- AC_CHECK_LIB(maa,maa_shutdown,XLDFLAGS="$XLDFLAGS -lmaa", ++AC_CHECK_LIB(maa,maa_shutdown,MAALIB="-lmaa", + [AC_MSG_ERROR([Libmaa not found])]) +-fi +- +-if test "$local_libmaa" = 1; then +- AC_MSG_CHECKING(for libmaa in local source tree) +- if test -d libmaa; then +- XLDFLAGS="$XLDFLAGS -Llibmaa -lmaa" +- XCPPFLAGS="$XCPPFLAGS -Ilibmaa" +- +- AC_CONFIG_SUBDIRS(libmaa) +- +- allsubdirs="$allsubdirs libmaa" +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([Libmaa not found, cannot continue]) +- fi +-fi + + AC_CHECK_LIB(Judy, JudySLNext, [JUDYLIB=-lJudy]) + AC_CHECK_LIB(dbi, dbi_shutdown, [DBILIB=-ldbi]) +@@ -316,6 +298,7 @@ + AC_SUBST(JUDYLIB) + AC_SUBST(DBILIB) + AC_SUBST(LIBTOOL) ++AC_SUBST(MAALIB) + + AC_SUBST(SYSCONFDIR) + AC_SUBST(BINDIR) + diff --git a/app-text/dictd/files/dictd-1.11.0-plugins-install-fix-and-cleanup.patch b/app-text/dictd/files/dictd-1.11.0-plugins-install-fix-and-cleanup.patch new file mode 100644 index 0000000..40837f4 --- /dev/null +++ b/app-text/dictd/files/dictd-1.11.0-plugins-install-fix-and-cleanup.patch @@ -0,0 +1,30 @@ +=== modified file 'Makefile.in' +--- Makefile.in 2008-12-08 18:15:58 +0000 ++++ Makefile.in 2008-12-08 18:24:44 +0000 +@@ -56,7 +56,7 @@ + EXEEXT=@EXEEXT@ + + CONF_DIR=@sysconfdir@/ +-PLUGIN_DIR=${libexecdir}/ ++PLUGIN_DIR=${libexecdir} + DICT_DIR=${datadir}/ + + CC= @CC@ + +=== modified file 'configure.in' +--- configure.in 2008-12-08 18:20:10 +0000 ++++ configure.in 2008-12-08 18:24:03 +0000 +@@ -295,12 +295,10 @@ + LIBEXECDIR=`eval3 $libexecdir` + DATADIR=`eval3 $datadir` + +-CPPFLAGS="$CPPFLAGS $XCPPFLAGS" + CFLAGS="$CFLAGS $XCFLAGS" + LDFLAGS="$LDFLAGS $XLDFLAGS" + + AC_SUBST(DICT_VERSION) +-AC_SUBST(CPPFLAGS) + AC_SUBST(CFLAGS) + AC_SUBST(USE_PLUGIN) + AC_SUBST(EXEEXT) + |