View | Details | Raw Unified | Return to bug 57809
Collapse All | Expand All

(-)./dictd/Makefile (-2 / +2 lines)
Lines 7-14 Link Here
7
#
7
#
8
8
9
PORTNAME=	dictd
9
PORTNAME=	dictd
10
PORTVERSION=	1.8.0
10
PORTVERSION=	1.9.7
11
PORTREVISION=	1
11
PORTREVISION=	0
12
CATEGORIES+=	net textproc
12
CATEGORIES+=	net textproc
13
MASTER_SITES=	ftp://ftp.dict.org/pub/dict/ \
13
MASTER_SITES=	ftp://ftp.dict.org/pub/dict/ \
14
		${MASTER_SITE_SOURCEFORGE}
14
		${MASTER_SITE_SOURCEFORGE}
(-)./dictd/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (dictd-1.8.0.tar.gz) = ce54a5ea05429954e2f743ee0fa661b5
1
MD5 (dictd-1.9.7.tar.gz) = baa8f18dd0373e7053658be99d40d5db
(-)./dictd/files/patch-Makefile_in (-28 / +9 lines)
Lines 1-5 Link Here
1
--- Makefile.in.orig	Mon Jun 10 02:33:02 2002
1
--- Makefile.in.orig	Tue Mar  4 03:14:35 2003
2
+++ Makefile.in	Mon Jun 10 02:37:31 2002
2
+++ Makefile.in	Thu Oct  9 22:07:56 2003
3
@@ -33,7 +33,7 @@
3
@@ -33,7 +33,7 @@
4
 srcdir=		@srcdir@
4
 srcdir=		@srcdir@
5
 VPATH=		@srcdir@
5
 VPATH=		@srcdir@
Lines 9-27 Link Here
9
 exec_prefix=	@exec_prefix@
9
 exec_prefix=	@exec_prefix@
10
 man1_prefix=	@mandir@/man1
10
 man1_prefix=	@mandir@/man1
11
 man8_prefix=	@mandir@/man8
11
 man8_prefix=	@mandir@/man8
12
@@ -57,9 +57,9 @@
12
@@ -70,9 +70,9 @@
13
 		-DDICT_CONFIG_PATH=\"$(conf)\"
13
 
14
 SCFLAGS=        @SCFLAGS@
14
 SCFLAGS=        @SCFLAGS@
15
 LDFLAGS=        @LDFLAGS@
15
 LDFLAGS=        @LDFLAGS@
16
-XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. -Iregex
16
-XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. -Iregex
17
+XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex
17
+XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex
18
 XTRALDFLAGS=    @WLDFLAGS@ @XTRALDFLAGS@
18
 XTRALDFLAGS=    @WLDFLAGS@ @XTRALDFLAGS@
19
-LDLIBS=		@LIBS@ -Lregex -lregex
19
-LDLIBS=		    @LIBOBJS@ @LIBS@ -Lregex -lregex
20
+LDLIBS=		@LIBS@ -L%%PREFIX%%/lib -lltdl # -Lregex -lregex
20
+LDLIBS=		    @LIBOBJS@ @LIBS@ -L%%PREFIX%%/lib -lltdl # -Lregex -lregex
21
 
21
 
22
 EXES=	 	dict dictd dictzip
22
 EXES=	 	dict dictd dictzip dictfmt
23
 
23
 
24
@@ -75,17 +75,7 @@
24
@@ -114,17 +114,7 @@
25
 all $(EXES)::
25
 all $(EXES)::
26
 	@for subdir in `echo $(subdirs)`; do \
26
 	@for subdir in `echo $(subdirs)`; do \
27
 		echo making in $$subdir; \
27
 		echo making in $$subdir; \
Lines 39-61 Link Here
39
+		(cd $$subdir && $(MAKE)) || exit 1; \
39
+		(cd $$subdir && $(MAKE)) || exit 1; \
40
 	done
40
 	done
41
 
41
 
42
 all:: $(EXES)
42
 all:: $(EXES) $(LIBRARIES) plugins
43
@@ -116,11 +106,13 @@
44
 servscan.o: servscan.c servparse.o servparse.h $(HEADERS)
45
 	$(CC) -c $(XTRACFLAGS) $(CFLAGS) $(SCFLAGS) $<
46
 
47
-servparse.c: servparse.y
48
-	$(YACC) -tdv $<
49
-	cmp -s y.tab.h servparse.h || mv y.tab.h servparse.h
50
-	cmp -s y.tab.c servparse.c || mv y.tab.c servparse.c
51
-	-rm -f y.tab.h y.tab.c
52
+servparse.c: servparse.h
53
+
54
+servparse.h: servparse.y
55
+	$(YACC) -tdv -b serv $<
56
+	cmp -s serv.tab.h servparse.h || mv serv.tab.h servparse.h
57
+	cmp -s serv.tab.c servparse.c || mv serv.tab.c servparse.c
58
+	-rm -f serv.tab.h serv.tab.c
59
 
60
 servparse.o: servparse.c $(HEADERS)
61
 	$(CC) -c $(XTRACFLAGS) $(CFLAGS) $(SCFLAGS) $<
(-)./dictd/files/patch-break-utf8 (-56 / +26 lines)
Lines 1-17 Link Here
1
diff -ru ../dictd-freebsd/dictd.c ./dictd.c
1
--- dictd.c.orig	Mon Mar 10 01:07:36 2003
2
--- ../dictd-freebsd/dictd.c	Sun Nov 24 09:35:55 2002
2
+++ dictd.c	Fri Oct 10 00:19:17 2003
3
+++ ./dictd.c	Sun Dec  1 22:29:55 2002
3
@@ -1064,6 +1064,8 @@
4
@@ -662,6 +662,8 @@
5
 
4
 
6
 static void set_utf8_mode (const char *locale)
5
 static void set_utf8bit_mode (const char *loc)
7
 {
6
 {
8
+#include <osreldate.h>
7
+#include <osreldate.h>
9
+#if __FreeBSD_version > 499999
8
+#if __FreeBSD_version > 499999
10
    char *locale_copy;
9
    char *locale_copy;
11
    locale_copy = strdup (locale);
10
    locale_copy = strdup (loc);
12
    strlwr_8bit (locale_copy);
11
    strlwr_8bit (locale_copy);
13
@@ -671,6 +673,9 @@
12
@@ -1075,6 +1077,9 @@
14
        strstr (locale_copy, "utf8");
13
    bit8_mode = !utf8_mode && (locale_copy [0] != 'c' || locale_copy [1] != 0);
15
 
14
 
16
    free (locale_copy);
15
    free (locale_copy);
17
+#else
16
+#else
Lines 20-29 Link Here
20
 }
19
 }
21
 
20
 
22
 static void init (const char *fn)
21
 static void init (const char *fn)
23
diff -ru ../dictd-freebsd/index.c ./index.c
22
--- index.c.orig	Mon Mar 10 01:06:16 2003
24
--- ../dictd-freebsd/index.c	Sun Dec  1 22:12:49 2002
23
+++ index.c	Fri Oct 10 00:20:22 2003
25
+++ ./index.c	Sun Dec  1 22:25:06 2002
24
@@ -123,6 +123,10 @@
26
@@ -111,6 +111,10 @@
27
    const char *src, char *dest,
25
    const char *src, char *dest,
28
    int allchars_mode)
26
    int allchars_mode)
29
 {
27
 {
Lines 31-60 Link Here
31
+#if __FreeBSD_version < 500000
29
+#if __FreeBSD_version < 500000
32
+    abort();
30
+    abort();
33
+#else
31
+#else
34
     wint_t      ucs4_char;
32
    wchar_t      ucs4_char;
35
 
33
    size_t len;
36
     while (src && src [0]){
34
    int    len2;
37
@@ -130,6 +134,7 @@
35
@@ -154,6 +158,7 @@
38
     *dest = 0;
36
    *dest = 0;
39
 
37
 
40
     return (src != NULL);
38
    return (src != NULL);
41
+#endif
39
+#endif
42
 }
40
 }
43
 
41
 
44
 static void dict_table_init(void)
42
 static void dict_table_init(void)
45
@@ -166,9 +171,11 @@
43
@@ -200,9 +205,11 @@
46
 	p[i]         = &s[2 * i];
44
       p[i]         = &s[2 * i];
47
     }
45
    }
48
                                 /* Sort those strings in the locale */
46
                                 /* Sort those strings in the locale */
49
+#if __FreeBSD_version > 499999
47
+#if __FreeBSD_version > 499999
50
     if (utf8_mode)
48
    if (utf8_mode)
51
 	qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_utf8);
49
       qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_utf8);
52
     else
50
    else
53
+#endif
51
+#endif
54
 	qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_strcoll);
52
       qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_strcoll);
55
 
53
 
56
                                 /* Extract our unordered arrays */
54
                                 /* Extract our unordered arrays */
57
@@ -1126,6 +1133,9 @@
55
@@ -1258,6 +1265,9 @@
58
 */
56
 */
59
 static int stranagram_utf8 (char *str)
57
 static int stranagram_utf8 (char *str)
60
 {
58
 {
Lines 62-70 Link Here
62
+    abort();
60
+    abort();
63
+#else
61
+#else
64
    size_t len;
62
    size_t len;
65
    char *p;
63
    char   *p;
66
 
64
 
67
@@ -1142,6 +1151,7 @@
65
@@ -1280,6 +1290,7 @@
68
 
66
 
69
    stranagram_8bit (str, -1);
67
    stranagram_8bit (str, -1);
70
    return 1;
68
    return 1;
Lines 72-102 Link Here
72
 }
70
 }
73
 
71
 
74
 /* makes anagram of utf-8 string 'str' */
72
 /* makes anagram of utf-8 string 'str' */
75
diff -ru ../dictd-freebsd/utf8_ucs4.c ./utf8_ucs4.c
76
--- ../dictd-freebsd/utf8_ucs4.c	Sun Nov 24 09:35:55 2002
77
+++ ./utf8_ucs4.c	Sun Dec  1 22:44:40 2002
78
@@ -1,3 +1,5 @@
79
+#include <osreldate.h>
80
+#if __FreeBSD_version > 499999
81
 #include <wctype.h>
82
 #include <stdlib.h>
83
 #include <ctype.h>
84
@@ -210,3 +212,4 @@
85
     else
86
 	return (size_t) -1;
87
 }
88
+#endif // __FreeBSD_version > 499999
89
diff -ru ../dictd-freebsd/utf8_ucs4.h ./utf8_ucs4.h
90
--- ../dictd-freebsd/utf8_ucs4.h	Sun Nov 24 09:35:55 2002
91
+++ ./utf8_ucs4.h	Sun Dec  1 22:26:15 2002
92
@@ -1,3 +1,5 @@
93
+#include <osreldate.h>
94
+#if __FreeBSD_version > 499999
95
 #ifndef _UTF8_UCS4_H_
96
 #define _UTF8_UCS4_H_
97
 
98
@@ -73,3 +75,4 @@
99
 __END_DECLS
100
 
101
 #endif // _UTF8_UCS4_H_
102
+#endif // __FreeBSD_version > 499999
(-)./dictd/files/patch-configure (+78 lines)
Line 0 Link Here
1
--- configure.orig	Mon Mar 10 01:22:34 2003
2
+++ configure	Thu Oct  9 23:44:49 2003
3
@@ -3400,66 +3400,6 @@
4
 
5
 fi
6
 
7
-if test "x${USE_PLUGIN}" = "x1"; then
8
-
9
-for ac_header in ltdl.h
10
-do
11
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
12
-echo "$as_me:3408: checking for $ac_header" >&5
13
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
14
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
15
-  echo $ECHO_N "(cached) $ECHO_C" >&6
16
-else
17
-  cat >conftest.$ac_ext <<_ACEOF
18
-#line 3414 "configure"
19
-#include "confdefs.h"
20
-#include <$ac_header>
21
-_ACEOF
22
-if { (eval echo "$as_me:3418: \"$ac_cpp conftest.$ac_ext\"") >&5
23
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
24
-  ac_status=$?
25
-  egrep -v '^ *\+' conftest.er1 >conftest.err
26
-  rm -f conftest.er1
27
-  cat conftest.err >&5
28
-  echo "$as_me:3424: \$? = $ac_status" >&5
29
-  (exit $ac_status); } >/dev/null; then
30
-  if test -s conftest.err; then
31
-    ac_cpp_err=$ac_c_preproc_warn_flag
32
-  else
33
-    ac_cpp_err=
34
-  fi
35
-else
36
-  ac_cpp_err=yes
37
-fi
38
-if test -z "$ac_cpp_err"; then
39
-  eval "$as_ac_Header=yes"
40
-else
41
-  echo "$as_me: failed program was:" >&5
42
-  cat conftest.$ac_ext >&5
43
-  eval "$as_ac_Header=no"
44
-fi
45
-rm -f conftest.err conftest.$ac_ext
46
-fi
47
-echo "$as_me:3443: result: `eval echo '${'$as_ac_Header'}'`" >&5
48
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
49
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
50
-  cat >>confdefs.h <<EOF
51
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
52
-EOF
53
-
54
-cat >>confdefs.h <<\EOF
55
-#define HAVE_LTDL_H 1
56
-EOF
57
-
58
-else
59
-  { { echo "$as_me:3455: error: Install ltdl library and appropriate header files" >&5
60
-echo "$as_me: error: Install ltdl library and appropriate header files" >&2;}
61
-   { (exit 1); exit 1; }; }
62
-fi
63
-done
64
-
65
-fi
66
-
67
 for ac_header in unistd.h strings.h limits.h
68
 do
69
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
70
@@ -5023,7 +4963,7 @@
71
 EOF
72
 
73
 if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
74
-  LIBOBJS="$LIBOBJS lstat.$ac_objext"
75
+  LIBOBJS="$LIBOBJS -lc"
76
 fi
77
 
78
 echo "$as_me:5029: checking whether stat accepts an empty string" >&5
(-)./dictd/files/patch-libmaa::configure (-7 / +7 lines)
Lines 1-13 Link Here
1
--- libmaa/configure~	Mon Jan 29 01:00:16 2001
1
--- libmaa/configure.orig	Mon Mar 10 01:22:39 2003
2
+++ libmaa/configure	Mon Jan 29 01:00:29 2001
2
+++ libmaa/configure	Thu Oct  9 22:16:29 2003
3
@@ -875,11 +875,8 @@
3
@@ -1859,10 +1859,7 @@
4
 # Check whether --with-cflags or --without-cflags was given.
4
 # Check whether --with-cflags or --without-cflags was given.
5
 if test "${with_cflags+set}" = set; then
5
 if test "${with_cflags+set}" = set; then
6
   withval="$with_cflags"
6
   withval="$with_cflags"
7
-  
7
-
8
-if test "x${withval}" = xyes; then
8
-if test "x${withval}" = xyes; then
9
     CFLAGS="$withval"
9
     CFLAGS="$withval"
10
-fi
10
-fi
11
-
11
 
12
+  
12
 fi;
13
 fi
13
 
(-)./dictd/files/patch-servparse.y (-10 lines)
Lines 1-10 Link Here
1
--- servparse.y~	Wed Nov 20 20:04:50 2002
2
+++ servparse.y	Wed Nov 20 20:04:59 2002
3
@@ -125,6 +125,7 @@
4
                ;
5
 
6
 Site : T_SITE T_STRING { $$ = $2; }
7
+     ;
8
 
9
 UserList : T_USERNAME T_STRING T_STRING
10
            { $$ = hsh_create(NULL,NULL);

Return to bug 57809