diff -urN /usr/ports/japanese/ebview/Makefile japanese/ebview/Makefile --- /usr/ports/japanese/ebview/Makefile Fri May 2 17:04:49 2003 +++ japanese/ebview/Makefile Fri May 2 20:38:55 2003 @@ -6,8 +6,7 @@ # PORTNAME= ebview -PORTVERSION= 0.2.0 -PORTREVISION= 2 +PORTVERSION= 0.2.1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,12 +16,11 @@ LIB_DEPENDS= eb.7:${PORTSDIR}/japanese/eb -USE_GNOME= imlib USE_GETOPT_LONG= yes -USE_REINPLACE= 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}" diff -urN /usr/ports/japanese/ebview/distinfo japanese/ebview/distinfo --- /usr/ports/japanese/ebview/distinfo Mon Jan 6 15:59:36 2003 +++ japanese/ebview/distinfo Fri May 2 06:34:54 2003 @@ -1 +1 @@ -MD5 (ebview-0.2.0.tar.gz) = 265a37aef3e165f36f7bcae223395274 +MD5 (ebview-0.2.1.tar.gz) = 9b9965949495a83fcb6f8b2603329676 diff -urN /usr/ports/japanese/ebview/files/patch-config.h.in japanese/ebview/files/patch-config.h.in --- /usr/ports/japanese/ebview/files/patch-config.h.in Thu Jan 1 09:00:00 1970 +++ japanese/ebview/files/patch-config.h.in Fri May 2 19:58:46 2003 @@ -0,0 +1,12 @@ +--- 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 + diff -urN /usr/ports/japanese/ebview/files/patch-configure.in japanese/ebview/files/patch-configure.in --- /usr/ports/japanese/ebview/files/patch-configure.in Fri Jan 3 02:45:30 2003 +++ japanese/ebview/files/patch-configure.in Fri May 2 20:01:29 2003 @@ -1,13 +1,11 @@ ---- configure.in.orig Tue Nov 19 15:04:30 2002 -+++ configure.in Sat Nov 30 09:27:26 2002 -@@ -14,8 +14,8 @@ - AM_GNU_GETTEXT +--- 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) - dnl Checks for libraries. --AM_PATH_GTK(1.2.8) --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. + _mozilla_include_place=/usr/include/mozilla + AC_ARG_WITH(mozilla-includes, diff -urN /usr/ports/japanese/ebview/files/patch-src::Makefile.am japanese/ebview/files/patch-src::Makefile.am --- /usr/ports/japanese/ebview/files/patch-src::Makefile.am Fri Jan 3 02:45:30 2003 +++ japanese/ebview/files/patch-src::Makefile.am Thu Jan 1 09:00:00 1970 @@ -1,19 +0,0 @@ ---- 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@ - diff -urN /usr/ports/japanese/ebview/files/patch-src::eb.c japanese/ebview/files/patch-src::eb.c --- /usr/ports/japanese/ebview/files/patch-src::eb.c Sat Apr 12 22:50:25 2003 +++ japanese/ebview/files/patch-src::eb.c Thu Jan 1 09:00:00 1970 @@ -1,42 +0,0 @@ ---- 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 - #include - #include -+#include - - - #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){ diff -urN /usr/ports/japanese/ebview/files/patch-src::ebview-client.c japanese/ebview/files/patch-src::ebview-client.c --- /usr/ports/japanese/ebview/files/patch-src::ebview-client.c Fri Jan 3 02:45:30 2003 +++ japanese/ebview/files/patch-src::ebview-client.c Fri May 2 20:14:57 2003 @@ -1,13 +1,11 @@ ---- src/ebview-client.c.orig Sat Nov 16 15:33:47 2002 -+++ src/ebview-client.c Sat Nov 30 09:49:47 2002 -@@ -1,8 +1,8 @@ - #include --#include -+#include - #include - #include --#include -+#include - - #include "../config.h" +--- 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 */ +-#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 diff -urN /usr/ports/japanese/ebview/files/patch-src::ebview.c japanese/ebview/files/patch-src::ebview.c --- /usr/ports/japanese/ebview/files/patch-src::ebview.c Thu Jan 1 09:00:00 1970 +++ japanese/ebview/files/patch-src::ebview.c Fri May 2 20:31:17 2003 @@ -0,0 +1,38 @@ +--- 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 + #include + #include +-#include + #include + ++#ifdef HAVE_CONFIG_H ++#include "../config.h" ++#endif ++ ++#ifdef HAVE_GETOPT_LONG ++#include ++#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 diff -urN /usr/ports/japanese/ebview/files/patch-util::Makefile.am japanese/ebview/files/patch-util::Makefile.am --- /usr/ports/japanese/ebview/files/patch-util::Makefile.am Fri Jan 3 02:45:30 2003 +++ japanese/ebview/files/patch-util::Makefile.am Thu Jan 1 09:00:00 1970 @@ -1,15 +0,0 @@ ---- 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@ -