Attachment #35908 for bug #57810

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

Lines 7-14 Link Here

(-)./dict/Makefile (-2 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= dict	9	PORTNAME= dict
10	PORTVERSION= 1.8.0	10	PORTVERSION= 1.9.7
11	PORTREVISION= 1	11	PORTREVISION= 0
12	CATEGORIES= textproc	12	CATEGORIES= textproc
13	MASTER_SITES= ftp://ftp.dict.org/pub/dict/	13	MASTER_SITES= ftp://ftp.dict.org/pub/dict/
14	DISTNAME= ${PORTNAME}d-${PORTVERSION}	14	DISTNAME= ${PORTNAME}d-${PORTVERSION}

Line 1 Link Here

(-)./dict/distinfo (-1 / +1 lines)
1	MD5 (dictd-1.8.0.tar.gz) = ce54a5ea05429954e2f743ee0fa661b5	1	MD5 (dictd-1.9.7.tar.gz) = baa8f18dd0373e7053658be99d40d5db




--- 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@
 prefix=		@prefix@
-subdirs=        @allsubdirs@ regex # doc -- use rfc2229 instead
+subdirs=        @allsubdirs@ # regex # doc -- use rfc2229 instead
 exec_prefix=	@exec_prefix@
 man1_prefix=	@mandir@/man1
 man8_prefix=	@mandir@/man8
@@ -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=		    @LIBOBJS@ @LIBS@ -Lregex -lregex
+LDLIBS=		    @LIBOBJS@ @LIBS@ -lgnuregex
 
 EXES=	 	dict dictd dictzip dictfmt
 
@@ -114,17 +114,7 @@
 all $(EXES)::
 	@for subdir in `echo $(subdirs)`; do \
 		echo making in $$subdir; \
-	 	if [ "$$subdir" = "zlib" ]; then \
-			(cd $$subdir \
-			&& $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" libz.a) \
-			|| exit 1; \
-		elif [ "$$subdir" = "regex" ]; then \
-			(cd $$subdir \
-			&& $(MAKE) CC="$(CC) $(CFLAGS)" lib) \
-			|| exit 1; \
-		else \
-			(cd $$subdir && $(MAKE)) || exit 1; \
-		fi; \
+		(cd $$subdir && $(MAKE)) || exit 1; \
 	done
 
 all:: $(EXES) $(LIBRARIES) plugins




--- Makefile.in.orig	Fri Jan 12 01:24:29 2001
+++ Makefile.in	Mon Aug 20 17:22:10 2001
@@ -33,7 +33,7 @@
 srcdir=		@srcdir@
 VPATH=		@srcdir@
 prefix=		@prefix@
-subdirs=        @allsubdirs@ regex # doc -- use rfc2229 instead
+subdirs=        @allsubdirs@ # regex # doc -- use rfc2229 instead
 exec_prefix=	@exec_prefix@
 man1_prefix=	@mandir@/man1
 man8_prefix=	@mandir@/man8
@@ -57,9 +57,9 @@
 		-DDICT_CONFIG_PATH=\"$(conf)\"
 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@ -lgnuregex
 
 EXES=	 	dict dictd dictzip
 




--- configure.orig	Mon Mar 10 01:22:34 2003
+++ configure	Thu Oct  9 23:44:49 2003
@@ -3400,66 +3400,6 @@
 
 fi
 
-if test "x${USE_PLUGIN}" = "x1"; then
-
-for ac_header in ltdl.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3408: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 3414 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:3418: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:3424: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:3443: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-EOF
-
-cat >>confdefs.h <<\EOF
-#define HAVE_LTDL_H 1
-EOF
-
-else
-  { { echo "$as_me:3455: error: Install ltdl library and appropriate header files" >&5
-echo "$as_me: error: Install ltdl library and appropriate header files" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-done
-
-fi
-
 for ac_header in unistd.h strings.h limits.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -5023,7 +4963,7 @@
 EOF
 
 if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
-  LIBOBJS="$LIBOBJS lstat.$ac_objext"
+  LIBOBJS="$LIBOBJS -lc"
 fi
 
 echo "$as_me:5029: checking whether stat accepts an empty string" >&5




--- 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;


Return to bug 57810

Line 0 Link Here

(-)./dict/files/patch-Makefile_in (+42 lines)
	1	--- Makefile.in.orig Tue Mar 4 03:14:35 2003
	2	+++ Makefile.in Thu Oct 9 22:07:56 2003
	3	@@ -33,7 +33,7 @@
	4	srcdir= @srcdir@
	5	VPATH= @srcdir@
	6	prefix= @prefix@
	7	-subdirs= @allsubdirs@ regex # doc -- use rfc2229 instead
	8	+subdirs= @allsubdirs@ # regex # doc -- use rfc2229 instead
	9	exec_prefix= @exec_prefix@
	10	man1_prefix= @mandir@/man1
	11	man8_prefix= @mandir@/man8
	12	@@ -70,9 +70,9 @@
	13
	14	SCFLAGS= @SCFLAGS@
	15	LDFLAGS= @LDFLAGS@
	16	-XTRACFLAGS= @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. -Iregex
	17	+XTRACFLAGS= @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex
	18	XTRALDFLAGS= @WLDFLAGS@ @XTRALDFLAGS@
	19	-LDLIBS= @LIBOBJS@ @LIBS@ -Lregex -lregex
	20	+LDLIBS= @LIBOBJS@ @LIBS@ -lgnuregex
	21
	22	EXES= dict dictd dictzip dictfmt
	23
	24	@@ -114,17 +114,7 @@
	25	all $(EXES)::
	26	@for subdir in `echo $(subdirs)`; do \
	27	echo making in $$subdir; \
	28	- if [ "$$subdir" = "zlib" ]; then \
	29	- (cd $$subdir \
	30	- && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" libz.a) \
	31	- \|\| exit 1; \
	32	- elif [ "$$subdir" = "regex" ]; then \
	33	- (cd $$subdir \
	34	- && $(MAKE) CC="$(CC) $(CFLAGS)" lib) \
	35	- \|\| exit 1; \
	36	- else \
	37	- (cd $$subdir && $(MAKE)) \|\| exit 1; \
	38	- fi; \
	39	+ (cd $$subdir && $(MAKE)) \|\| exit 1; \
	40	done
	41
	42	all:: $(EXES) $(LIBRARIES) plugins

Lines 1-23 Link Here

(-)./dict/files/patch-ab (-23 lines)
1	--- Makefile.in.orig Fri Jan 12 01:24:29 2001
2	+++ Makefile.in Mon Aug 20 17:22:10 2001
3	@@ -33,7 +33,7 @@
4	srcdir= @srcdir@
5	VPATH= @srcdir@
6	prefix= @prefix@
7	-subdirs= @allsubdirs@ regex # doc -- use rfc2229 instead
8	+subdirs= @allsubdirs@ # regex # doc -- use rfc2229 instead
9	exec_prefix= @exec_prefix@
10	man1_prefix= @mandir@/man1
11	man8_prefix= @mandir@/man8
12	@@ -57,9 +57,9 @@
13	-DDICT_CONFIG_PATH=\"$(conf)\"
14	SCFLAGS= @SCFLAGS@
15	LDFLAGS= @LDFLAGS@
16	-XTRACFLAGS= @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. -Iregex
17	+XTRACFLAGS= @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex
18	XTRALDFLAGS= @WLDFLAGS@ @XTRALDFLAGS@
19	-LDLIBS= @LIBS@ -Lregex -lregex
20	+LDLIBS= @LIBS@ -lgnuregex
21
22	EXES= dict dictd dictzip
23

Line 0 Link Here

(-)./dict/files/patch-configure (+78 lines)
		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

Lines 1-13 Link Here

(-)./dict/files/patch-libmaa::configure (-7 / +7 lines)
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