16 files changed, 1 insertions, 257 deletions
diff --git a/MOVED b/MOVED
index 33b14fb6a1c7..36f6268ba671 100644
--- a/MOVED
+++ b/MOVED
@@ -7338,3 +7338,4 @@ graphics/gtkgraph||2014-12-25|Abandonware, depends on imlib
 graphics/imagesort||2014-12-25|Abandonware, depends on imlib
 graphics/picturebook||2014-12-25|Abandonware, depends on imlib
 graphics/show||2014-12-25|Abandonware, depends on imlib
+japanese/ebview|japanese/ebview-gtk2|2014-12-25|Use GTK2 version
diff --git a/japanese/Makefile b/japanese/Makefile
index e629f197d65a..2f56d3d38e87 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -42,7 +42,6 @@
     SUBDIR += ebd-fpw
     SUBDIR += eblook
     SUBDIR += ebnetd
-    SUBDIR += ebview
     SUBDIR += ebview-gtk2
     SUBDIR += edict
     SUBDIR += edict-fpw
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
deleted file mode 100644
index 3a672d471468..000000000000
--- a/japanese/ebview/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	ebview
-PORTVERSION=	0.2.1
-PORTREVISION=	17
-CATEGORIES=	japanese
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Electronic Book Viewer
-
-LICENSE=	GPLv2 # (or later)
-
-LIB_DEPENDS=	libeb.so:${PORTSDIR}/japanese/eb
-
-OPTIONS_DEFINE=	DOCS
-
-CONFLICTS=	ja-ebview-gtk2-[0-9]*
-
-USES=		gettext gmake
-USE_GNOME=	imlib
-USE_AUTOTOOLS=	autoconf
-MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
-		AUTOHEADER="${TRUE}"
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|// .*||' ${WRKSRC}/src/dictheading.c
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ChangeLog README
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
-.endfor
-
-.include <bsd.port.mk>
diff --git a/japanese/ebview/distinfo b/japanese/ebview/distinfo
deleted file mode 100644
index 5e56bb044705..000000000000
--- a/japanese/ebview/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ebview-0.2.1.tar.gz) = 05dc2a9e25ddd03d77750dd1941e97f48074e911c16659647f08f1ad44280333
-SIZE (ebview-0.2.1.tar.gz) = 476966
diff --git a/japanese/ebview/files/patch-aclocal.m4 b/japanese/ebview/files/patch-aclocal.m4
deleted file mode 100644
index bf7c0fbc78d3..000000000000
--- a/japanese/ebview/files/patch-aclocal.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.orig	2003-04-12 20:59:34.000000000 -0700
-+++ aclocal.m4	2007-09-22 20:58:23.000000000 -0700
-@@ -6989,8 +6989 @@
- ])
--
--dnl *
--dnl * Check for ssize_t.
--dnl *
--AC_DEFUN(AC_TYPE_SSIZE_T,
--[AC_CHECK_TYPE(ssize_t, int)])
--
diff --git a/japanese/ebview/files/patch-config.h.in b/japanese/ebview/files/patch-config.h.in
deleted file mode 100644
index 398ea43bc152..000000000000
--- a/japanese/ebview/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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 --git a/japanese/ebview/files/patch-configure.in b/japanese/ebview/files/patch-configure.in
deleted file mode 100644
index 371da331e1fd..000000000000
--- a/japanese/ebview/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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,
diff --git a/japanese/ebview/files/patch-data__Makefile.in b/japanese/ebview/files/patch-data__Makefile.in
deleted file mode 100644
index 3c63c23b105e..000000000000
--- a/japanese/ebview/files/patch-data__Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- data/Makefile.in.orig
-+++ data/Makefile.in
-@@ -46,13 +46,13 @@
- 
- install:
- 	if test -r $(MKINSTALLDIRS); then \
--		$(MKINSTALLDIRS) $(packagedatadir); \
-+		$(MKINSTALLDIRS) $(DESTDIR)$(packagedatadir); \
- 	else \
--		$(top_srcdir)/mkinstalldirs $(packagedatadir); \
-+		$(top_srcdir)/mkinstalldirs $(DESTDIR)$(packagedatadir); \
- 	fi; \
- 	data="$(data)"; \
- 	for file in $$data; do \
--		$(INSTALL_DATA) $(srcdir)/$$file $(packagedatadir)/$$file; \
-+		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(packagedatadir)/$$file; \
- 	done; \
- 
- # Define this as empty until I found a useful application.
diff --git a/japanese/ebview/files/patch-help__Makefile.in b/japanese/ebview/files/patch-help__Makefile.in
deleted file mode 100644
index 310791a99619..000000000000
--- a/japanese/ebview/files/patch-help__Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- help/Makefile.in.orig
-+++ help/Makefile.in
-@@ -49,15 +49,15 @@
- 	dir="$(dir)"; \
- 	for lang in $$dir; do \
- 		if test -r $(MKINSTALLDIRS); then \
--			$(MKINSTALLDIRS) $(packagedatadir)/help/$$lang; \
-+			$(MKINSTALLDIRS) $(DESTDIR)$(packagedatadir)/help/$$lang; \
- 		else \
--			$(top_srcdir)/mkinstalldirs $(packagedatadir)/help/$$lang; \
-+			$(top_srcdir)/mkinstalldirs $(DESTDIR)$(packagedatadir)/help/$$lang; \
- 		fi; \
- 	done; \
- 	data="$(data)"; \
- 	for lang in $$dir; do \
- 		for file in $$data; do \
--			$(INSTALL_DATA) $(srcdir)/$$lang/$$file $(packagedatadir)/help/$$lang/$$file; \
-+			$(INSTALL_DATA) $(srcdir)/$$lang/$$file $(DESTDIR)$(packagedatadir)/help/$$lang/$$file; \
- 		done; \
- 	done; \
- 
diff --git a/japanese/ebview/files/patch-po__Makefile.in.in b/japanese/ebview/files/patch-po__Makefile.in.in
deleted file mode 100644
index d7499d9797af..000000000000
--- a/japanese/ebview/files/patch-po__Makefile.in.in
+++ /dev/null
@@ -1,52 +0,0 @@
---- po/Makefile.in.in.orig
-+++ po/Makefile.in.in
-@@ -111,9 +111,9 @@
- install-data-no: all
- install-data-yes: all
- 	if test -r "$(MKINSTALLDIRS)"; then \
--	  $(MKINSTALLDIRS) $(datadir); \
-+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- 	else \
--	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- 	fi
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
-@@ -125,27 +125,27 @@
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
--	    $(MKINSTALLDIRS) $$dir; \
-+	    $(MKINSTALLDIRS) $(DESTDIR)$$dir; \
- 	  else \
--	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
- 	  fi; \
- 	  if test -r $$cat; then \
--	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
--	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-+	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
-+	    echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- 	  else \
--	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-+	    $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
- 	    echo "installing $(srcdir)/$$cat as" \
--		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-+		 "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- 	  fi; \
- 	  if test -r $$cat.m; then \
--	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
--	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-+	    $(INSTALL_DATA) $$cat.m $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-+	    echo "installing $$cat.m as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- 	  else \
- 	    if test -r $(srcdir)/$$cat.m ; then \
- 	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
--		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-+		$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- 	      echo "installing $(srcdir)/$$cat as" \
--		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-+		   "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- 	    else \
- 	      true; \
- 	    fi; \
diff --git a/japanese/ebview/files/patch-src__ebview-client.c b/japanese/ebview/files/patch-src__ebview-client.c
deleted file mode 100644
index 1e7efe467716..000000000000
--- a/japanese/ebview/files/patch-src__ebview-client.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 --git a/japanese/ebview/files/patch-src__ebview.c b/japanese/ebview/files/patch-src__ebview.c
deleted file mode 100644
index 7cd42ceafd68..000000000000
--- a/japanese/ebview/files/patch-src__ebview.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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
diff --git a/japanese/ebview/files/patch-src_eb.c b/japanese/ebview/files/patch-src_eb.c
deleted file mode 100644
index fc598b12a084..000000000000
--- a/japanese/ebview/files/patch-src_eb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/eb.c.orig	2007-12-28 00:09:02.000000000 +0900
-+++ src/eb.c	2007-12-28 00:22:34.000000000 +0900
-@@ -48,7 +48,6 @@
- static GtkWidget *label_match;
- static GtkWidget *progress;
- static pthread_t tid;
--static gint tag_timeout;
- static gint thread_running = 0;
- static gint hit_count=0;
- static gfloat search_progress;
diff --git a/japanese/ebview/files/patch-src_websearch.c b/japanese/ebview/files/patch-src_websearch.c
deleted file mode 100644
index d894a42e2889..000000000000
--- a/japanese/ebview/files/patch-src_websearch.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/websearch.c.orig	2007-12-28 00:10:21.000000000 +0900
-+++ src/websearch.c	2007-12-28 00:28:26.000000000 +0900
-@@ -33,7 +33,6 @@
- void web_search();
- void split_word(gchar *word, gchar **keywords);
- 
--static GtkWidget *web_tree;
- static GtkCTreeNode *current_node;
- static GtkItemFactory *tree_item_factory;
- static GtkItemFactoryEntry tree_menu_items[] = {
diff --git a/japanese/ebview/pkg-descr b/japanese/ebview/pkg-descr
deleted file mode 100644
index 2ff8a9ffa8b4..000000000000
--- a/japanese/ebview/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Ebview is a gtk based tool to access CD-ROM dictionaries of
-EPWING, EB, EBG,EBXA, EBXA-C formats.
-
-WWW: http://ebview.sourceforge.net/
diff --git a/japanese/ebview/pkg-plist b/japanese/ebview/pkg-plist
deleted file mode 100644
index 1a5fd711ce78..000000000000
--- a/japanese/ebview/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/ebdump
-bin/ebview
-bin/ebview-client
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-share/ebview/about.en
-share/ebview/about.jp
-share/ebview/endinglist-ja.xml
-share/ebview/endinglist.xml
-share/ebview/help/en/index.html
-share/ebview/help/ja/index.html
-share/ebview/searchengines.xml
-share/ebview/shortcut.xml
-share/locale/ja/LC_MESSAGES/ebview.mo