Attachment #30845 for bug #51707

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




#

PORTNAME=	ebview
PORTVERSION=	0.2.1
PORTREVISION=	2
CATEGORIES=	japanese
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}


LIB_DEPENDS=	eb.7:${PORTSDIR}/japanese/eb

USE_GNOME=	imlib
USE_GETOPT_LONG=	yes
USE_GNOME=	imlib
USE_GMAKE=	yes
USE_AUTOMAKE_VER=	14
USE_AUTOCONF_VER=	253
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
		AUTOHEADER="${TRUE}"

Line 1 Link Here

(-)japanese/ebview/distinfo (-1 / +1 lines)
1	MD5 (ebview-0.2.0.tar.gz) = 265a37aef3e165f36f7bcae223395274	1	MD5 (ebview-0.2.1.tar.gz) = 9b9965949495a83fcb6f8b2603329676




--- config.h.in.orig	Sun Apr 13 13:02:31 2003
+++ config.h.in	Fri May  2 19:58:33 2003
@@ -77,6 +77,9 @@
 /* Define to 1 if you have the `getgid' function. */
 #undef HAVE_GETGID
 
+/* Define to 1 if you have the `getopt_long' function. */
+#undef HAVE_GETOPT_LONG
+
 /* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 




--- configure.in.orig	Sun Apr 13 12:29:30 2003
+++ configure.in	Fri May  2 20:01:19 2003
@@ -39,7 +39,7 @@
 AC_PROG_GCC_TRADITIONAL
 dnl AC_FUNC_SETVBUF_REVERSED
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(mkdir select strdup strtol)
+AC_CHECK_FUNCS(mkdir select strdup strtol getopt_long)
 
 _mozilla_include_place=/usr/include/mozilla
 AC_ARG_WITH(mozilla-includes,
-AM_PATH_IMLIB()
+AM_PATH_GTK(1.2.8,, AC_MSG_ERROR(Cannot find GTK+ 1.2.8), gmodule gthread)
+AM_PATH_GDK_IMLIB()
 eb_LIB_EB3
 
 dnl Checks for header files.




--- src/Makefile.am.orig	Sat Nov 16 15:33:46 2002
+++ src/Makefile.am	Sat Nov 30 09:38:43 2002
@@ -2,12 +2,12 @@
 
 AM_CPPFLAGS= @EBCONF_PTHREAD_CPPFLAGS@ @EBCONF_EBINCS@ \
              @EBCONF_ZLIBINCS@ @EBCONF_INTLINCS@
-AM_CFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
-AM_CXXFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ 
-ebview_LDADD = @GTK_LIBS@ @IMLIB_LIBS@ -lgdk_imlib -lpthread -lgthread \
+AM_CFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
+AM_CXXFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ 
+ebview_LDADD = @GTK_LIBS@ @GDK_IMLIB_LIBS@ \
                @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ 
 ebview_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@
-ebview_client_LDADD = @GTK_LIBS@ @IMLIB_LIBS@ -lgdk_imlib -lpthread \
+ebview_client_LDADD = @GTK_LIBS@ @GDK_IMLIB_LIBS@ \
                @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@
 ebview_client_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@
 




--- src/eb.c.orig	Mon Nov 18 18:13:06 2002
+++ src/eb.c	Mon Feb 24 02:06:33 2003
@@ -24,6 +24,7 @@
 #include <iconv.h>
 #include <langinfo.h>
 #include <wchar.h>
+#include <pthread.h>
 
 
 #define MAX_HITS            50
@@ -1746,7 +1747,8 @@
 	DICT_GROUP *group;
 	char word[65535];
 
-	strcpy(word, arg);
+	strncpy(word, arg, sizeof(word)-1);
+	word[sizeof(word)-1] = '\0';
 
 	group_item = g_list_first(group_list);
 	while(group_item != NULL){
@@ -1854,15 +1856,19 @@
 {
 	gint rc;
 	gint method;
+	pthread_attr_t thread_attr;
 
 	thread_running = 1;
 	hit_count = 0;
-	rc = pthread_create(&tid, NULL, ebook_search_thread, (void *)word);
+
+	pthread_attr_init(&thread_attr);
+	pthread_attr_setstacksize(&thread_attr, 256*1024);
+	rc = pthread_create(&tid, &thread_attr, ebook_search_thread, (void *)word);
 	if(rc != 0){
 		perror("pthread_create");
 		exit(1);
 	}
-
+	pthread_attr_destroy(&thread_attr);
 
 	method = ebook_search_method();
 	if(method == SEARCH_METHOD_FULL_TEXT){




--- src/ebview-client.c.orig	Sat Apr 26 21:59:23 2003
+++ src/ebview-client.c	Fri May  2 20:14:43 2003
@@ -30,7 +30,7 @@
 	/* The total length of the address includes the sun_family 
 	   element */
+#include <unistd.h>
 #include <sys/un.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <sys/socket.h>
 
 #include "../config.h"
 
-#ifdef __FreeBSD__
+#ifndef HAVE_GETOPT_LONG
         addrLength = sizeof(address.sun_len) + sizeof(address.sun_family) + strlen(address.sun_path) + 1;
         address.sun_len = addrLength;
 #else




--- src/ebview.c.orig	Sun Apr 13 18:43:30 2003
+++ src/ebview.c	Fri May  2 20:31:01 2003
@@ -20,9 +20,16 @@
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <getopt.h>
 #include <pthread.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+#ifdef HAVE_GETOPT_LONG
+#include <getopt.h>
+#endif
+
 #include "defs.h"
 #include "global.h"
 
@@ -200,7 +207,7 @@
 	optind = 0;
 
 	while(1){
-#ifdef __FreeBSD__
+#ifndef HAVE_GETOPT_LONG
 		c = getopt(g_argc, g_argv, "sprig:");
 #else 
 		c = getopt_long(g_argc, g_argv, "sprig:",
@@ -364,7 +371,7 @@
 	/* The total length of the address includes the sun_family 
 	   element */
 
-#ifdef __FreeBSD__
+#ifndef HAVE_GETOPT_LONG
         addrLength = sizeof(address.sun_len) + sizeof(address.sun_family) + strlen(address.sun_path) + 1;
         address.sun_len = addrLength;
 #else




--- util/Makefile.am.orig	Sat Nov 16 15:33:50 2002
+++ util/Makefile.am	Sat Nov 30 09:52:44 2002
@@ -2,9 +2,9 @@
 
 AM_CPPFLAGS= @EBCONF_PTHREAD_CPPFLAGS@ @EBCONF_EBINCS@ \
              @EBCONF_ZLIBINCS@ @EBCONF_INTLINCS@
-AM_CFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
-AM_CXXFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ 
-ebdump_LDADD = @GTK_LIBS@ @IMLIB_LIBS@\
+AM_CFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
+AM_CXXFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ 
+ebdump_LDADD = @GTK_LIBS@ @GDK_IMLIB_LIBS@\
                @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ 
 ebdump_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@


Return to bug 51707

Lines 6-13 Link Here

(-)japanese/ebview/Makefile (-5 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= ebview	8	PORTNAME= ebview
9	PORTVERSION= 0.2.0	9	PORTVERSION= 0.2.1
10	PORTREVISION= 2
11	CATEGORIES= japanese	10	CATEGORIES= japanese
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 17-28 Link Here
17		16
18	LIB_DEPENDS= eb.7:${PORTSDIR}/japanese/eb	17	LIB_DEPENDS= eb.7:${PORTSDIR}/japanese/eb
19		18
20	USE_GNOME= imlib
21	USE_GETOPT_LONG= yes	19	USE_GETOPT_LONG= yes
22	USE_REINPLACE= yes	20	USE_GNOME= imlib
23	USE_GMAKE= yes	21	USE_GMAKE= yes
24	USE_AUTOMAKE_VER= 14
25	USE_AUTOCONF_VER= 253	22	USE_AUTOCONF_VER= 253
		23	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
26	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	24	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
27	MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \	25	MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
28	AUTOHEADER="${TRUE}"	26	AUTOHEADER="${TRUE}"

Line 0 Link Here

(-)japanese/ebview/files/patch-config.h.in (+12 lines)
	1	--- config.h.in.orig Sun Apr 13 13:02:31 2003
	2	+++ config.h.in Fri May 2 19:58:33 2003
	3	@@ -77,6 +77,9 @@
	4	/* Define to 1 if you have the `getgid' function. */
	5	#undef HAVE_GETGID
	6
	7	+/* Define to 1 if you have the `getopt_long' function. */
	8	+#undef HAVE_GETOPT_LONG
	9	+
	10	/* Define to 1 if you have the `getpagesize' function. */
	11	#undef HAVE_GETPAGESIZE
	12

Lines 1-13 Link Here

(-)japanese/ebview/files/patch-configure.in (-12 / +10 lines)
1	--- configure.in.orig Tue Nov 19 15:04:30 2002	1	--- configure.in.orig Sun Apr 13 12:29:30 2003
2	+++ configure.in Sat Nov 30 09:27:26 2002	2	+++ configure.in Fri May 2 20:01:19 2003
3	@@ -14,8 +14,8 @@	3	@@ -39,7 +39,7 @@
4	AM_GNU_GETTEXT	4	AC_PROG_GCC_TRADITIONAL
		5	dnl AC_FUNC_SETVBUF_REVERSED
		6	AC_TYPE_SIGNAL
		7	-AC_CHECK_FUNCS(mkdir select strdup strtol)
		8	+AC_CHECK_FUNCS(mkdir select strdup strtol getopt_long)
5		9
6	dnl Checks for libraries.	10	_mozilla_include_place=/usr/include/mozilla
7	-AM_PATH_GTK(1.2.8)	11	AC_ARG_WITH(mozilla-includes,
8	-AM_PATH_IMLIB()
9	+AM_PATH_GTK(1.2.8,, AC_MSG_ERROR(Cannot find GTK+ 1.2.8), gmodule gthread)
10	+AM_PATH_GDK_IMLIB()
11	eb_LIB_EB3
12
13	dnl Checks for header files.

Lines 1-19 Link Here

(-)japanese/ebview/files/patch-src::Makefile.am (-19 lines)
1	--- src/Makefile.am.orig Sat Nov 16 15:33:46 2002
2	+++ src/Makefile.am Sat Nov 30 09:38:43 2002
3	@@ -2,12 +2,12 @@
4
5	AM_CPPFLAGS= @EBCONF_PTHREAD_CPPFLAGS@ @EBCONF_EBINCS@ \
6	@EBCONF_ZLIBINCS@ @EBCONF_INTLINCS@
7	-AM_CFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
8	-AM_CXXFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
9	-ebview_LDADD = @GTK_LIBS@ @IMLIB_LIBS@ -lgdk_imlib -lpthread -lgthread \
10	+AM_CFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
11	+AM_CXXFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
12	+ebview_LDADD = @GTK_LIBS@ @GDK_IMLIB_LIBS@ \
13	@EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@
14	ebview_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@
15	-ebview_client_LDADD = @GTK_LIBS@ @IMLIB_LIBS@ -lgdk_imlib -lpthread \
16	+ebview_client_LDADD = @GTK_LIBS@ @GDK_IMLIB_LIBS@ \
17	@EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@
18	ebview_client_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@
19

Lines 1-42 Link Here

(-)japanese/ebview/files/patch-src::eb.c (-42 lines)
1	--- src/eb.c.orig Mon Nov 18 18:13:06 2002
2	+++ src/eb.c Mon Feb 24 02:06:33 2003
3	@@ -24,6 +24,7 @@
4	#include <iconv.h>
5	#include <langinfo.h>
6	#include <wchar.h>
7	+#include <pthread.h>
8
9
10	#define MAX_HITS 50
11	@@ -1746,7 +1747,8 @@
12	DICT_GROUP *group;
13	char word[65535];
14
15	- strcpy(word, arg);
16	+ strncpy(word, arg, sizeof(word)-1);
17	+ word[sizeof(word)-1] = '\0';
18
19	group_item = g_list_first(group_list);
20	while(group_item != NULL){
21	@@ -1854,15 +1856,19 @@
22	{
23	gint rc;
24	gint method;
25	+ pthread_attr_t thread_attr;
26
27	thread_running = 1;
28	hit_count = 0;
29	- rc = pthread_create(&tid, NULL, ebook_search_thread, (void *)word);
30	+
31	+ pthread_attr_init(&thread_attr);
32	+ pthread_attr_setstacksize(&thread_attr, 256*1024);
33	+ rc = pthread_create(&tid, &thread_attr, ebook_search_thread, (void *)word);
34	if(rc != 0){
35	perror("pthread_create");
36	exit(1);
37	}
38	-
39	+ pthread_attr_destroy(&thread_attr);
40
41	method = ebook_search_method();
42	if(method == SEARCH_METHOD_FULL_TEXT){

Lines 1-13 Link Here

(-)japanese/ebview/files/patch-src::ebview-client.c (-12 / +10 lines)
1	--- src/ebview-client.c.orig Sat Nov 16 15:33:47 2002	1	--- src/ebview-client.c.orig Sat Apr 26 21:59:23 2003
2	+++ src/ebview-client.c Sat Nov 30 09:49:47 2002	2	+++ src/ebview-client.c Fri May 2 20:14:43 2003
3	@@ -1,8 +1,8 @@	3	@@ -30,7 +30,7 @@
4	#include <stdio.h>	4	/* The total length of the address includes the sun_family
5	-#include <sys/socket.h>	5	element */
6	+#include <unistd.h>
7	#include <sys/un.h>
8	#include <sys/types.h>
9	-#include <unistd.h>
10	+#include <sys/socket.h>
11
12	#include "../config.h"
13		6
		7	-#ifdef __FreeBSD__
		8	+#ifndef HAVE_GETOPT_LONG
		9	addrLength = sizeof(address.sun_len) + sizeof(address.sun_family) + strlen(address.sun_path) + 1;
		10	address.sun_len = addrLength;
		11	#else

Line 0 Link Here

(-)japanese/ebview/files/patch-src::ebview.c (+38 lines)
	1	--- src/ebview.c.orig Sun Apr 13 18:43:30 2003
	2	+++ src/ebview.c Fri May 2 20:31:01 2003
	3	@@ -20,9 +20,16 @@
	4	#include <sys/wait.h>
	5	#include <sys/socket.h>
	6	#include <sys/un.h>
	7	-#include <getopt.h>
	8	#include <pthread.h>
	9
	10	+#ifdef HAVE_CONFIG_H
	11	+#include "../config.h"
	12	+#endif
	13	+
	14	+#ifdef HAVE_GETOPT_LONG
	15	+#include <getopt.h>
	16	+#endif
	17	+
	18	#include "defs.h"
	19	#include "global.h"
	20
	21	@@ -200,7 +207,7 @@
	22	optind = 0;
	23
	24	while(1){
	25	-#ifdef __FreeBSD__
	26	+#ifndef HAVE_GETOPT_LONG
	27	c = getopt(g_argc, g_argv, "sprig:");
	28	#else
	29	c = getopt_long(g_argc, g_argv, "sprig:",
	30	@@ -364,7 +371,7 @@
	31	/* The total length of the address includes the sun_family
	32	element */
	33
	34	-#ifdef __FreeBSD__
	35	+#ifndef HAVE_GETOPT_LONG
	36	addrLength = sizeof(address.sun_len) + sizeof(address.sun_family) + strlen(address.sun_path) + 1;
	37	address.sun_len = addrLength;
	38	#else

Lines 1-15 Link Here

(-)japanese/ebview/files/patch-util::Makefile.am (-15 lines)
1	--- util/Makefile.am.orig Sat Nov 16 15:33:50 2002
2	+++ util/Makefile.am Sat Nov 30 09:52:44 2002
3	@@ -2,9 +2,9 @@
4
5	AM_CPPFLAGS= @EBCONF_PTHREAD_CPPFLAGS@ @EBCONF_EBINCS@ \
6	@EBCONF_ZLIBINCS@ @EBCONF_INTLINCS@
7	-AM_CFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
8	-AM_CXXFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
9	-ebdump_LDADD = @GTK_LIBS@ @IMLIB_LIBS@\
10	+AM_CFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
11	+AM_CXXFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
12	+ebdump_LDADD = @GTK_LIBS@ @GDK_IMLIB_LIBS@\
13	@EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@
14	ebdump_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@
15