From 7e33379c83ec36fbea2a0a955d43d201ae595d7f Mon Sep 17 00:00:00 2001 From: Dima Dorfman Date: Thu, 16 Oct 2003 09:56:30 +0000 Subject: Upgrade to 1.9.7. PR: 57809 Submitted by: Cheng-Lung Sung --- net/dictd/Makefile | 4 +- net/dictd/distinfo | 2 +- net/dictd/files/patch-Makefile_in | 37 ++++----------- net/dictd/files/patch-break-utf8 | 82 +++++++++++---------------------- net/dictd/files/patch-libmaa::configure | 14 +++--- net/dictd/files/patch-servparse.y | 10 ---- 6 files changed, 45 insertions(+), 104 deletions(-) delete mode 100644 net/dictd/files/patch-servparse.y diff --git a/net/dictd/Makefile b/net/dictd/Makefile index c0d9a3e5d369..9186e6de156a 100644 --- a/net/dictd/Makefile +++ b/net/dictd/Makefile @@ -7,8 +7,8 @@ # PORTNAME= dictd -PORTVERSION= 1.8.0 -PORTREVISION= 1 +PORTVERSION= 1.9.7 +PORTREVISION= 0 CATEGORIES+= net textproc MASTER_SITES= ftp://ftp.dict.org/pub/dict/ \ ${MASTER_SITE_SOURCEFORGE} diff --git a/net/dictd/distinfo b/net/dictd/distinfo index deb66b75ff33..9099a23611dc 100644 --- a/net/dictd/distinfo +++ b/net/dictd/distinfo @@ -1 +1 @@ -MD5 (dictd-1.8.0.tar.gz) = ce54a5ea05429954e2f743ee0fa661b5 +MD5 (dictd-1.9.7.tar.gz) = baa8f18dd0373e7053658be99d40d5db diff --git a/net/dictd/files/patch-Makefile_in b/net/dictd/files/patch-Makefile_in index 370b70fd1b01..2f601948ea8c 100644 --- a/net/dictd/files/patch-Makefile_in +++ b/net/dictd/files/patch-Makefile_in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Mon Jun 10 02:33:02 2002 -+++ Makefile.in Mon Jun 10 02:37:31 2002 +--- Makefile.in.orig Tue Mar 4 03:14:35 2003 ++++ Makefile.in Thu Oct 9 22:07:56 2003 @@ -33,7 +33,7 @@ srcdir= @srcdir@ VPATH= @srcdir@ @@ -9,19 +9,19 @@ exec_prefix= @exec_prefix@ man1_prefix= @mandir@/man1 man8_prefix= @mandir@/man8 -@@ -57,9 +57,9 @@ - -DDICT_CONFIG_PATH=\"$(conf)\" +@@ -70,9 +70,9 @@ + SCFLAGS= @SCFLAGS@ LDFLAGS= @LDFLAGS@ -XTRACFLAGS= @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. -Iregex +XTRACFLAGS= @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex XTRALDFLAGS= @WLDFLAGS@ @XTRALDFLAGS@ --LDLIBS= @LIBS@ -Lregex -lregex -+LDLIBS= @LIBS@ -L%%PREFIX%%/lib -lltdl # -Lregex -lregex +-LDLIBS= @LIBOBJS@ @LIBS@ -Lregex -lregex ++LDLIBS= @LIBOBJS@ @LIBS@ -L%%PREFIX%%/lib -lltdl # -Lregex -lregex - EXES= dict dictd dictzip + EXES= dict dictd dictzip dictfmt -@@ -75,17 +75,7 @@ +@@ -114,17 +114,7 @@ all $(EXES):: @for subdir in `echo $(subdirs)`; do \ echo making in $$subdir; \ @@ -39,23 +39,4 @@ + (cd $$subdir && $(MAKE)) || exit 1; \ done - all:: $(EXES) -@@ -116,11 +106,13 @@ - servscan.o: servscan.c servparse.o servparse.h $(HEADERS) - $(CC) -c $(XTRACFLAGS) $(CFLAGS) $(SCFLAGS) $< - --servparse.c: servparse.y -- $(YACC) -tdv $< -- cmp -s y.tab.h servparse.h || mv y.tab.h servparse.h -- cmp -s y.tab.c servparse.c || mv y.tab.c servparse.c -- -rm -f y.tab.h y.tab.c -+servparse.c: servparse.h -+ -+servparse.h: servparse.y -+ $(YACC) -tdv -b serv $< -+ cmp -s serv.tab.h servparse.h || mv serv.tab.h servparse.h -+ cmp -s serv.tab.c servparse.c || mv serv.tab.c servparse.c -+ -rm -f serv.tab.h serv.tab.c - - servparse.o: servparse.c $(HEADERS) - $(CC) -c $(XTRACFLAGS) $(CFLAGS) $(SCFLAGS) $< + all:: $(EXES) $(LIBRARIES) plugins diff --git a/net/dictd/files/patch-break-utf8 b/net/dictd/files/patch-break-utf8 index 33bf83184831..b36b99d874f0 100644 --- a/net/dictd/files/patch-break-utf8 +++ b/net/dictd/files/patch-break-utf8 @@ -1,17 +1,16 @@ -diff -ru ../dictd-freebsd/dictd.c ./dictd.c ---- ../dictd-freebsd/dictd.c Sun Nov 24 09:35:55 2002 -+++ ./dictd.c Sun Dec 1 22:29:55 2002 -@@ -662,6 +662,8 @@ +--- dictd.c.orig Mon Mar 10 01:07:36 2003 ++++ dictd.c Fri Oct 10 00:19:17 2003 +@@ -1064,6 +1064,8 @@ - static void set_utf8_mode (const char *locale) + static void set_utf8bit_mode (const char *loc) { +#include +#if __FreeBSD_version > 499999 char *locale_copy; - locale_copy = strdup (locale); + locale_copy = strdup (loc); strlwr_8bit (locale_copy); -@@ -671,6 +673,9 @@ - strstr (locale_copy, "utf8"); +@@ -1075,6 +1077,9 @@ + bit8_mode = !utf8_mode && (locale_copy [0] != 'c' || locale_copy [1] != 0); free (locale_copy); +#else @@ -20,10 +19,9 @@ diff -ru ../dictd-freebsd/dictd.c ./dictd.c } static void init (const char *fn) -diff -ru ../dictd-freebsd/index.c ./index.c ---- ../dictd-freebsd/index.c Sun Dec 1 22:12:49 2002 -+++ ./index.c Sun Dec 1 22:25:06 2002 -@@ -111,6 +111,10 @@ +--- index.c.orig Mon Mar 10 01:06:16 2003 ++++ index.c Fri Oct 10 00:20:22 2003 +@@ -123,6 +123,10 @@ const char *src, char *dest, int allchars_mode) { @@ -31,30 +29,30 @@ diff -ru ../dictd-freebsd/index.c ./index.c +#if __FreeBSD_version < 500000 + abort(); +#else - wint_t ucs4_char; - - while (src && src [0]){ -@@ -130,6 +134,7 @@ - *dest = 0; + wchar_t ucs4_char; + size_t len; + int len2; +@@ -154,6 +158,7 @@ + *dest = 0; - return (src != NULL); + return (src != NULL); +#endif } static void dict_table_init(void) -@@ -166,9 +171,11 @@ - p[i] = &s[2 * i]; - } +@@ -200,9 +205,11 @@ + p[i] = &s[2 * i]; + } /* Sort those strings in the locale */ +#if __FreeBSD_version > 499999 - if (utf8_mode) - qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_utf8); - else + if (utf8_mode) + qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_utf8); + else +#endif - qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_strcoll); + qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_strcoll); /* Extract our unordered arrays */ -@@ -1126,6 +1133,9 @@ +@@ -1258,6 +1265,9 @@ */ static int stranagram_utf8 (char *str) { @@ -62,9 +60,9 @@ diff -ru ../dictd-freebsd/index.c ./index.c + abort(); +#else size_t len; - char *p; + char *p; -@@ -1142,6 +1151,7 @@ +@@ -1280,6 +1290,7 @@ stranagram_8bit (str, -1); return 1; @@ -72,31 +70,3 @@ diff -ru ../dictd-freebsd/index.c ./index.c } /* makes anagram of utf-8 string 'str' */ -diff -ru ../dictd-freebsd/utf8_ucs4.c ./utf8_ucs4.c ---- ../dictd-freebsd/utf8_ucs4.c Sun Nov 24 09:35:55 2002 -+++ ./utf8_ucs4.c Sun Dec 1 22:44:40 2002 -@@ -1,3 +1,5 @@ -+#include -+#if __FreeBSD_version > 499999 - #include - #include - #include -@@ -210,3 +212,4 @@ - else - return (size_t) -1; - } -+#endif // __FreeBSD_version > 499999 -diff -ru ../dictd-freebsd/utf8_ucs4.h ./utf8_ucs4.h ---- ../dictd-freebsd/utf8_ucs4.h Sun Nov 24 09:35:55 2002 -+++ ./utf8_ucs4.h Sun Dec 1 22:26:15 2002 -@@ -1,3 +1,5 @@ -+#include -+#if __FreeBSD_version > 499999 - #ifndef _UTF8_UCS4_H_ - #define _UTF8_UCS4_H_ - -@@ -73,3 +75,4 @@ - __END_DECLS - - #endif // _UTF8_UCS4_H_ -+#endif // __FreeBSD_version > 499999 diff --git a/net/dictd/files/patch-libmaa::configure b/net/dictd/files/patch-libmaa::configure index 7ecd91ebd714..75ace37af66d 100644 --- a/net/dictd/files/patch-libmaa::configure +++ b/net/dictd/files/patch-libmaa::configure @@ -1,13 +1,13 @@ ---- libmaa/configure~ Mon Jan 29 01:00:16 2001 -+++ libmaa/configure Mon Jan 29 01:00:29 2001 -@@ -875,11 +875,8 @@ +--- libmaa/configure.orig Mon Mar 10 01:22:39 2003 ++++ libmaa/configure Thu Oct 9 22:16:29 2003 +@@ -1859,10 +1859,7 @@ # Check whether --with-cflags or --without-cflags was given. if test "${with_cflags+set}" = set; then withval="$with_cflags" -- +- -if test "x${withval}" = xyes; then CFLAGS="$withval" -fi -- -+ - fi + + fi; + diff --git a/net/dictd/files/patch-servparse.y b/net/dictd/files/patch-servparse.y deleted file mode 100644 index 0ec9bb86142e..000000000000 --- a/net/dictd/files/patch-servparse.y +++ /dev/null @@ -1,10 +0,0 @@ ---- servparse.y~ Wed Nov 20 20:04:50 2002 -+++ servparse.y Wed Nov 20 20:04:59 2002 -@@ -125,6 +125,7 @@ - ; - - Site : T_SITE T_STRING { $$ = $2; } -+ ; - - UserList : T_USERNAME T_STRING T_STRING - { $$ = hsh_create(NULL,NULL); -- cgit v1.2.3