Add a ebview-gtk2 0.3.1, which is a gtk2 based tool

to access CD-ROM dictionaries of EPWING, EB, EBG,EBXA,
EBXA-C formats.

PR:		ports/60402
Submitted by:	<faust@ua.airnet.ne.jp>
Reviewed by:	Ports Fury

8 files changed, 36 insertions, 109 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index d5815f2b6ec0..0835c40a09b9 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -51,6 +51,7 @@
     SUBDIR += ebd-fpw
     SUBDIR += eblook
     SUBDIR += ebview
+    SUBDIR += ebview-gtk2
     SUBDIR += ebw3
     SUBDIR += edict
     SUBDIR += edict-fpw
diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index cda9dc1dd683..0550bc682d7f 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -1,12 +1,13 @@
-# New ports collection makefile for:	ebview
-# Date Created:		28 Jan 2002
-# Whom:			Yoichi NAKAYAMA <yoichi@FreeBSD.org>
+# New ports collection makefile for:	ebview-gtk2
+# Date Created:				7 Dec 2003
+# Whom:					<faust@ua.airnet.ne.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ebview
-PORTVERSION=	0.2.1
+PORTVERSION=	0.3.1
+PKGNAMESUFFIX=	-gtk2
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,31 +17,25 @@ COMMENT=	Electronic Book Viewer
 
 LIB_DEPENDS=	eb.7:${PORTSDIR}/japanese/eb
 
-CONFLICTS=	ja-ebview-gtk2-*
+CONFLICTS=	ja-ebview-0*
 
-USE_GETOPT_LONG=	yes
-USE_GNOME=	imlib
+USE_GNOME=	gtk20 gnometarget
 USE_GMAKE=	yes
-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}"
-
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-
-pre-build:
-.for file in src/dictheading.c
-	cd ${WRKSRC} && ${MV} ${file} ${file}.pre_iconv \
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+post-patch:
+.for file in src/grep.c
+	@cd ${WRKSRC} && ${MV} ${file} ${file}.pre_iconv \
 		&& iconv -c -t ascii ${file}.pre_iconv > ${file} || ${TRUE}
 .endfor
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in ChangeLog README
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for file in ChangeLog README
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/ebview-gtk2/distinfo b/japanese/ebview-gtk2/distinfo
index fd29803bd409..1d874404cf6b 100644
--- a/japanese/ebview-gtk2/distinfo
+++ b/japanese/ebview-gtk2/distinfo
@@ -1 +1 @@
-MD5 (ebview-0.2.1.tar.gz) = 9b9965949495a83fcb6f8b2603329676
+MD5 (ebview-0.3.1.tar.gz) = 28927e10bb56c7598757ac4fded85806
diff --git a/japanese/ebview-gtk2/files/patch-config.h.in b/japanese/ebview-gtk2/files/patch-config.h.in
deleted file mode 100644
index 398ea43bc152..000000000000
--- a/japanese/ebview-gtk2/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-gtk2/files/patch-configure.in b/japanese/ebview-gtk2/files/patch-configure.in
deleted file mode 100644
index 371da331e1fd..000000000000
--- a/japanese/ebview-gtk2/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-gtk2/files/patch-src::ebview-client.c b/japanese/ebview-gtk2/files/patch-src::ebview-client.c
deleted file mode 100644
index 1e7efe467716..000000000000
--- a/japanese/ebview-gtk2/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-gtk2/files/patch-src::ebview.c b/japanese/ebview-gtk2/files/patch-src::ebview.c
deleted file mode 100644
index 7cd42ceafd68..000000000000
--- a/japanese/ebview-gtk2/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-gtk2/pkg-plist b/japanese/ebview-gtk2/pkg-plist
index c877b6439041..26f7fb0715bf 100644
--- a/japanese/ebview-gtk2/pkg-plist
+++ b/japanese/ebview-gtk2/pkg-plist
@@ -1,19 +1,22 @@
-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
+%%DATADIR%%/about.en
+%%DATADIR%%/about.jp
+%%DATADIR%%/endinglist-ja.xml
+%%DATADIR%%/endinglist.xml
+%%DATADIR%%/filter.xml
+%%DATADIR%%/help/en/index.html
+%%DATADIR%%/help/en/body.html
+%%DATADIR%%/help/en/menu.html
+%%DATADIR%%/help/ja/index.html
+%%DATADIR%%/help/ja/body.html
+%%DATADIR%%/help/ja/menu.html
+%%DATADIR%%/searchengines.xml
+%%DATADIR%%/shortcut.xml
 share/locale/ja/LC_MESSAGES/ebview.mo
-@dirrm share/ebview/help/ja
-@dirrm share/ebview/help/en
-@dirrm share/ebview/help
-@dirrm share/ebview
+@dirrm %%DATADIR%%/help/ja
+@dirrm %%DATADIR%%/help/en
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%