January 10, 2011

	A new gWaei release for the new year! 1.5.2 is out! Go get it!

	Updates of the website have been sparse, but development of gWaei
	has continued regardless. A number of bug fixes have made it in
	again, and finally I am going around making updates to the README
	documentation again. gWaei 1.5.2 should be good an ready for
	package maintainers when Gnome 2.31 comes to their machines and
	when Gnome 3.0 is finally released.

	    * Searches when using & in the query work again instead of
	      being truncated as you type.
	    * The interface is now more responsive when a search is
	      carried out by edits to thread locking.
	    * Exact matching for the console version of gWaei was readded
	      because it is truly needed there
	    * The sandboxing issue caused by gtk-update-icon-cache for the
	      package maintainers.
	    * The README has been updated as it was woefully out of date.


November 4, 2010
	Release of the first Public Binary of gWaei for Windows! Go get it!

	Real progress has been made on a usable native gWaei binary for
	Windows. It still needs some love, but it means the worst of the
	port is over. I am currently looking for someone who wants to be a
	Windows port maintainer. If you are interested and ready to learn,
	I would be happy to have you aboard. Just contact us through our
	IRC channel or email me.

	What is still missing from the Windows version are:

	    * Spellcheck support through libsexy/enchant
	    * Preferences which will become possible once the code is ported
	      to GSettings from GConf
	    * Proper multithreading during searches
	    * Various polish issues

	Otherwise, the program is working pretty well and it is exciting
	seeing gWaei make it to more platforms.


May 10, 2010
	Version 1.4.0 of gWaei is out! Go get it!

	A fair amount more background reworking had went into this
	release, and much of the interface has been tweaked to be smaller,
	easier to maintain, and prettier.There is a revamped no results
	page where you can search for the word online or in another
	dictionary with just a click. There is also functionality to
	search for a word in a new tab by right clicking it.

	The command line now show download progress as a dictionary is
	being installe,d, and has recieved some basic maintenace.


May 9, 2010
	Version 1.3.1 and 1.2.3 of gWaei is out! Go get it!

	This fixes corrupt dictionary installs because the whole file
	wasn't being written to disk. If you have gWaei crash right at the
	end of searches, it is most likely this bug. Install the update,
	reinstall the dictionary, and you should be fine. (Alternatively,
	install the dictionary then quit to force the whole file to be
	written. Then searches should be fine.)


May 6, 2010
	Version 1.2.2 of gWaei is out! Go get it!

	But if you have 1.3.0, don't get it! This is a bug fix release
	with minimal changes for distrobutions using ths e 1.2.x
	series. This should remove crashes that appear when using a
	version of gtk+ greater than 2.16.


March 19, 2010
	Version 1.3.0 of gWaei is out! Go get it!

	Now supports tabs. A lot of code rewritten. New ncurses interface
	for the console version. Many bug fixes. Simpler preferences
	dialog.

6 files changed, 34 insertions, 113 deletions

diff --git a/misc/gwaei/Makefile b/misc/gwaei/Makefile
index 1bddf46d7ea..727619c0159 100644
--- a/misc/gwaei/Makefile
+++ b/misc/gwaei/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2011/01/13 13:38:46 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2011/01/25 11:02:34 ryoon Exp $
 #
 
-DISTNAME=	gwaei-1.2.1
-PKGREVISION=	5
+DISTNAME=	gwaei-1.5.2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwaei/}
 
@@ -11,35 +10,29 @@ HOMEPAGE=	http://gwaei.sourceforge.net/
 COMMENT=	Japanese dictionary for GNOME
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	rsync-[0-9]*:../../net/rsync
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake perl pkg-config
 
-#SUBST_CLASSES+=		perl
-#SUBST_STAGE.perl=	pre-configure
-#SUBST_FILES.perl=	src/kpengine/Makefile.in
-#SUBST_SED.perl=		-e "s,/usr/bin/perl,${PERL5},"
-#SUBST_MESSAGE.perl=	Fixing path to perl.
-
-SUBST_CLASSES+=		rsync
-SUBST_STAGE.rsync=	pre-configure
-SUBST_FILES.rsync=	src/io.c
-SUBST_SED.rsync=	-e "s,@RSYNC@,${LOCALBASE}/bin/rsync,"
-SUBST_MESSAGE.rsync=	Fixing path to rsync.
-
 PLIST_SRC=		PLIST
+
 .include "options.mk"
 
+INSTALLATION_DIRS=	share/glib-2.0/schemas
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/src/schemas/*xml \
+	    ${DESTDIR}${PREFIX}/share/glib-2.0/schemas/
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.5
-.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/glib2/schemas.mk"
 BUILDLINK_API_DEPENDS.curl+=	curl>=7.18.0
 .include "../../www/curl/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.14.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gwaei/PLIST b/misc/gwaei/PLIST
index f6feb4148bd..999d954f13e 100644
--- a/misc/gwaei/PLIST
+++ b/misc/gwaei/PLIST
@@ -1,13 +1,23 @@
-@comment $NetBSD: PLIST,v 1.8 2009/12/15 14:46:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/01/25 11:02:35 ryoon Exp $
 bin/gwaei
 bin/waei
 man/man1/waei.1
 share/doc/gwaei/COPYING
 share/doc/gwaei/ChangeLog
 share/doc/gwaei/NEWS
+share/glib-2.0/schemas/org.gnome.gwaei.dictionary.gschema.xml
+share/glib-2.0/schemas/org.gnome.gwaei.fonts.gschema.xml
+share/glib-2.0/schemas/org.gnome.gwaei.gschema.xml
+share/glib-2.0/schemas/org.gnome.gwaei.highlight.gschema.xml
+share/glib-2.0/schemas/org.gnome.gwaei.kanjipad_window.gschema.xml
+share/glib-2.0/schemas/org.gnome.gwaei.main_window.gschema.xml
+share/glib-2.0/schemas/org.gnome.gwaei.radicals_window.gschema.xml
+share/locale/cs/LC_MESSAGES/gwaei.mo
+share/locale/de/LC_MESSAGES/gwaei.mo
 share/locale/en@boldquot/LC_MESSAGES/gwaei.mo
 share/locale/en@quot/LC_MESSAGES/gwaei.mo
 share/locale/es/LC_MESSAGES/gwaei.mo
 share/locale/fr/LC_MESSAGES/gwaei.mo
 share/locale/it/LC_MESSAGES/gwaei.mo
 share/locale/ja/LC_MESSAGES/gwaei.mo
+share/locale/tr/LC_MESSAGES/gwaei.mo
diff --git a/misc/gwaei/PLIST.gnome b/misc/gwaei/PLIST.gnome
index 04f34869941..31fee43e928 100644
--- a/misc/gwaei/PLIST.gnome
+++ b/misc/gwaei/PLIST.gnome
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST.gnome,v 1.2 2009/12/15 14:46:44 wiz Exp $
+@comment $NetBSD: PLIST.gnome,v 1.3 2011/01/25 11:02:35 ryoon Exp $
 lib/gwaei/kpengine
 man/man1/gwaei.1
 share/applications/gwaei.desktop
-share/gconf/schemas/gwaei.schemas
 share/gnome/help/gwaei/C/glossary.xml
 share/gnome/help/gwaei/C/gwaei.xml
-share/gwaei/character.png
-share/gwaei/character2.png
-share/gwaei/character3.png
+share/gwaei/book_green.png
+share/gwaei/goo.png
+share/gwaei/google.png
 share/gwaei/jdata.dat
 share/gwaei/kanjipad.ui
 share/gwaei/logo.png
 share/gwaei/main.ui
 share/gwaei/radicals.ui
 share/gwaei/settings.ui
+share/gwaei/wikipedia.png
 share/icons/hicolor/16x16/actions/non-word-boundary.png
 share/icons/hicolor/16x16/actions/unknown-character.png
 share/icons/hicolor/16x16/actions/word-boundary.png
diff --git a/misc/gwaei/distinfo b/misc/gwaei/distinfo
index 246f222bd6c..7ce0e760859 100644
--- a/misc/gwaei/distinfo
+++ b/misc/gwaei/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2009/12/16 22:52:42 wiz Exp $
+$NetBSD: distinfo,v 1.10 2011/01/25 11:02:35 ryoon Exp $
 
-SHA1 (gwaei-1.2.1.tar.gz) = b22fc28790223d115a121206f4855f3ab421c9eb
-RMD160 (gwaei-1.2.1.tar.gz) = 5d06eecf5efde6aa6fed2d055b5637ca87fbb3a8
-Size (gwaei-1.2.1.tar.gz) = 643964 bytes
-SHA1 (patch-aa) = 2bab4ddca6b4547f9f748dffe2c79fdec8badf38
+SHA1 (gwaei-1.5.2.tar.gz) = c4bfee7487ff3bbcfee38a218d98cc4d2caf3238
+RMD160 (gwaei-1.5.2.tar.gz) = d9317e595cf708f1267856a90174bc274cec38ed
+Size (gwaei-1.5.2.tar.gz) = 709778 bytes
diff --git a/misc/gwaei/options.mk b/misc/gwaei/options.mk
index 1619049dc07..fe026f9bd91 100644
--- a/misc/gwaei/options.mk
+++ b/misc/gwaei/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2009/12/16 22:52:42 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2011/01/25 11:02:35 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gwaei
 PKG_SUPPORTED_OPTIONS=	gnome
@@ -7,15 +7,10 @@ PKG_SUGGESTED_OPTIONS=	gnome
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnome)
-GCONF_SCHEMAS=		gwaei.schemas
 PLIST_SRC+=		PLIST.gnome
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/src/schemas/gwaei.schemas \
-		${DESTDIR}${PREFIX}/share/gconf/schemas/
-
-BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.22.0
-.include "../../devel/GConf/schemas.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.14.0
+.include "../../x11/gtk2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.22.0
 .include "../../devel/libgnome/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libsexy+=		libsexy>=0.1.11
diff --git a/misc/gwaei/patches/patch-aa b/misc/gwaei/patches/patch-aa
deleted file mode 100644
index 5d04ebb70f3..00000000000
--- a/misc/gwaei/patches/patch-aa
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/12/16 22:52:42 wiz Exp $
-
---- configure.orig	2009-11-15 04:57:24.000000000 +0000
-+++ configure
-@@ -2545,10 +2545,12 @@ if test -n "$DEPS_CFLAGS"; then
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0           >= \$GLIB_REQUIRED_VERSION
-+                        gobject-2.0        >= \$GLIB_REQUIRED_VERSION
-                         libcurl            >= \$LIBCURL_REQUIRED_VERSION
-                         gmodule-2.0        >= \$GMODULE_EXPORT_REQUIRED_VERSION
-                         gthread-2.0        >= \$GTHREAD_REQUIRED_VERSION       \"") >&5
-   ($PKG_CONFIG --exists --print-errors "glib-2.0           >= $GLIB_REQUIRED_VERSION
-+                        gobject-2.0        >= $GLIB_REQUIRED_VERSION
-                         libcurl            >= $LIBCURL_REQUIRED_VERSION
-                         gmodule-2.0        >= $GMODULE_EXPORT_REQUIRED_VERSION
-                         gthread-2.0        >= $GTHREAD_REQUIRED_VERSION       ") 2>&5
-@@ -2556,6 +2558,7 @@ if test -n "$DEPS_CFLAGS"; then
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0           >= $GLIB_REQUIRED_VERSION
-+                        gobject-2.0        >= $GLIB_REQUIRED_VERSION
-                         libcurl            >= $LIBCURL_REQUIRED_VERSION
-                         gmodule-2.0        >= $GMODULE_EXPORT_REQUIRED_VERSION
-                         gthread-2.0        >= $GTHREAD_REQUIRED_VERSION       " 2>/dev/null`
-@@ -2570,10 +2573,12 @@ if test -n "$DEPS_LIBS"; then
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0           >= \$GLIB_REQUIRED_VERSION
-+                        gobject-2.0        >= \$GLIB_REQUIRED_VERSION
-                         libcurl            >= \$LIBCURL_REQUIRED_VERSION
-                         gmodule-2.0        >= \$GMODULE_EXPORT_REQUIRED_VERSION
-                         gthread-2.0        >= \$GTHREAD_REQUIRED_VERSION       \"") >&5
-   ($PKG_CONFIG --exists --print-errors "glib-2.0           >= $GLIB_REQUIRED_VERSION
-+                        gobject-2.0        >= $GLIB_REQUIRED_VERSION
-                         libcurl            >= $LIBCURL_REQUIRED_VERSION
-                         gmodule-2.0        >= $GMODULE_EXPORT_REQUIRED_VERSION
-                         gthread-2.0        >= $GTHREAD_REQUIRED_VERSION       ") 2>&5
-@@ -2581,6 +2586,7 @@ if test -n "$DEPS_LIBS"; then
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0           >= $GLIB_REQUIRED_VERSION
-+                        gobject-2.0        >= $GLIB_REQUIRED_VERSION
-                         libcurl            >= $LIBCURL_REQUIRED_VERSION
-                         gmodule-2.0        >= $GMODULE_EXPORT_REQUIRED_VERSION
-                         gthread-2.0        >= $GTHREAD_REQUIRED_VERSION       " 2>/dev/null`
-@@ -2602,11 +2608,13 @@ else
- fi
-         if test $_pkg_short_errors_supported = yes; then
- 	        DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0           >= $GLIB_REQUIRED_VERSION
-+                        gobject-2.0        >= $GLIB_REQUIRED_VERSION
-                         libcurl            >= $LIBCURL_REQUIRED_VERSION
-                         gmodule-2.0        >= $GMODULE_EXPORT_REQUIRED_VERSION
-                         gthread-2.0        >= $GTHREAD_REQUIRED_VERSION       " 2>&1`
-         else
- 	        DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0           >= $GLIB_REQUIRED_VERSION
-+                        gobject-2.0        >= $GLIB_REQUIRED_VERSION
-                         libcurl            >= $LIBCURL_REQUIRED_VERSION
-                         gmodule-2.0        >= $GMODULE_EXPORT_REQUIRED_VERSION
-                         gthread-2.0        >= $GTHREAD_REQUIRED_VERSION       " 2>&1`
-@@ -2615,6 +2623,7 @@ fi
- 	echo "$DEPS_PKG_ERRORS" >&5
- 
- 	{ { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0           >= $GLIB_REQUIRED_VERSION
-+                        gobject-2.0        >= $GLIB_REQUIRED_VERSION
-                         libcurl            >= $LIBCURL_REQUIRED_VERSION
-                         gmodule-2.0        >= $GMODULE_EXPORT_REQUIRED_VERSION
-                         gthread-2.0        >= $GTHREAD_REQUIRED_VERSION       ) were not met:
-@@ -2629,6 +2638,7 @@ and DEPS_LIBS to avoid the need to call 
- See the pkg-config man page for more details.
- " >&5
- $as_echo "$as_me: error: Package requirements (glib-2.0           >= $GLIB_REQUIRED_VERSION
-+                        gobject-2.0        >= $GLIB_REQUIRED_VERSION
-                         libcurl            >= $LIBCURL_REQUIRED_VERSION
-                         gmodule-2.0        >= $GMODULE_EXPORT_REQUIRED_VERSION
-                         gthread-2.0        >= $GTHREAD_REQUIRED_VERSION       ) were not met: