Update to 1.0.1:

Version 1.0.1

Another release. The most important fix in this bugfix release is
where the romanji->hiragana conversion engine would convert "ge"
as "ke". Most othe bug fixes have to do with building the program
on different archintectures. If you have the program and it is
working fine for you, you may want to wait until gWaei 1.1 releases
in a week or so.

June 14, 2009

Version 1.0

Yay! It finally happened. This will be the stable version for a
while. I'm a bit sad that I had to drop support for Debian 5.0
(Lenny) though. Fortunately, it will be compatible with the next
version. The next stable version of gWaei will be 1.1. If you want
to see something fixed for it, please submit a bug report! gWaei
2.0 will have new features, a reworked interface, and hopefully be
all around better and more polished.

May 27, 2009

Version 1.0rc1

There were some small tweaks to the progam's code to get it to
compile under Windows correctly. There was also a small memory leak
when opening the help menu. This will be the last revision before
1.0!

May 16, 2009

Version 1.0b3

Small changes. Radicals have been reordered and some holes filled.
The number separators for the radicals have been made red to make
them more visible. RPM building has been slightly reworked. Libgnome
is no longer a dependancy.

April 25, 2009

Version 1.0b1

Most important thing fixed in this release is a minor buffer overflow
that caused the program to crash on Ubuntu 9. I have made some
headway on MS Windows support, but still am not 100% there yet.
The last important change is that when gnome is turned off in the
configuration for the build, GConf is no longer a forced dependancy.

Onward-ho to 1.0!

March 29, 2009

Version 0.15.4

This release brings some small changes and fixes. I have to thank
all of the contributors who helped. I have never had so many people
helping by submitting bugs, translations, and fixes. Thank you all!

The major notables this time are a reworked Radical Search Tool
window and a fix so that Mac OS X users should be bale to compile
the program.

I want to eventually release a 1.0 version of gWaei so that people
have something stable to use. In order to do this, I want to squash
the last of the large bugs and make the program usable on MS Windows
in the basic sense. If anyone wants to help, email me or contact
me through my blog.

6 files changed, 92 insertions, 53 deletions

diff --git a/misc/gwaei/Makefile b/misc/gwaei/Makefile
index 6afbec26141..75f4cfdf400 100644
--- a/misc/gwaei/Makefile
+++ b/misc/gwaei/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/08/26 19:58:01 sno Exp $
+# $NetBSD: Makefile,v 1.9 2009/10/22 22:27:23 wiz Exp $
 #
 
-DISTNAME=	gwaei-0.15.3
-PKGREVISION=	1
+DISTNAME=	gwaei-1.0.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwaei/}
 
@@ -18,13 +17,11 @@ GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake perl pkg-config
 
-GCONF_SCHEMAS=		gwaei.schemas
-
-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+=		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
@@ -32,22 +29,15 @@ SUBST_FILES.rsync=	src/io.c
 SUBST_SED.rsync=	-e "s,@RSYNC@,${LOCALBASE}/bin/rsync,"
 SUBST_MESSAGE.rsync=	Fixing path to rsync.
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/src/schemas/gwaei.schemas \
-		${DESTDIR}${PREFIX}/share/gconf/schemas/
+PLIST_SRC=		PLIST
+.include "options.mk"
 
-BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.22.0
-.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.22.0
-.include "../../devel/libgnome/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libsexy+=		libsexy>=0.1.11
-.include "../../devel/libsexy/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 BUILDLINK_API_DEPENDS.curl+=	curl>=7.18.0
 .include "../../www/curl/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gwaei/PLIST b/misc/gwaei/PLIST
index 40384f81388..17660f90bd7 100644
--- a/misc/gwaei/PLIST
+++ b/misc/gwaei/PLIST
@@ -1,36 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:07:22 joerg Exp $
-bin/waei
+@comment $NetBSD: PLIST,v 1.7 2009/10/22 22:27:23 wiz Exp $
 bin/gwaei
-share/applications/gwaei.desktop
+bin/waei
 share/doc/${PKGNAME}/COPYING
 share/doc/${PKGNAME}/ChangeLog
 share/doc/${PKGNAME}/NEWS
-share/gconf/schemas/gwaei.schemas
-share/gnome/help/gwaei/C/glossary.xml
-share/gnome/help/gwaei/C/index.xml
-share/gwaei/character.png
-share/gwaei/character2.png
-share/gwaei/character3.png
-share/gwaei/jdata.dat
-share/gwaei/kanjipad.xml
-share/gwaei/kpengine
-share/gwaei/logo.png
-share/gwaei/main.xml
-share/gwaei/radicals.xml
-share/gwaei/settings.xml
-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
-share/icons/hicolor/16x16/apps/gwaei.png
-share/icons/hicolor/22x22/actions/non-word-boundary.png
-share/icons/hicolor/22x22/actions/unknown-character.png
-share/icons/hicolor/22x22/actions/word-boundary.png
-share/icons/hicolor/24x24/actions/non-word-boundary.png
-share/icons/hicolor/24x24/actions/unknown-character.png
-share/icons/hicolor/24x24/actions/word-boundary.png
-share/icons/hicolor/24x24/apps/gwaei.png
-share/icons/hicolor/32x32/apps/gwaei.png
-share/icons/hicolor/48x48/apps/gwaei.png
 share/locale/en@boldquot/LC_MESSAGES/gwaei.mo
 share/locale/en@quot/LC_MESSAGES/gwaei.mo
 share/locale/es/LC_MESSAGES/gwaei.mo
diff --git a/misc/gwaei/PLIST.gnome b/misc/gwaei/PLIST.gnome
new file mode 100644
index 00000000000..ebe122f34bf
--- /dev/null
+++ b/misc/gwaei/PLIST.gnome
@@ -0,0 +1,30 @@
+@comment $NetBSD: PLIST.gnome,v 1.1 2009/10/22 22:27:23 wiz Exp $
+bin/gwaei
+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/jdata.dat
+share/gwaei/kanjipad.xml
+share/gwaei/kpengine
+share/gwaei/logo.png
+share/gwaei/main.xml
+share/gwaei/radicals.xml
+share/gwaei/settings.xml
+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
+share/icons/hicolor/16x16/apps/gwaei.png
+share/icons/hicolor/22x22/actions/non-word-boundary.png
+share/icons/hicolor/22x22/actions/unknown-character.png
+share/icons/hicolor/22x22/actions/word-boundary.png
+share/icons/hicolor/24x24/actions/non-word-boundary.png
+share/icons/hicolor/24x24/actions/unknown-character.png
+share/icons/hicolor/24x24/actions/word-boundary.png
+share/icons/hicolor/24x24/apps/gwaei.png
+share/icons/hicolor/32x32/apps/gwaei.png
+share/icons/hicolor/48x48/apps/gwaei.png
+share/omf/gwaei/gwaei-C.omf
diff --git a/misc/gwaei/distinfo b/misc/gwaei/distinfo
index fc1ae92797c..26cdf83bf3f 100644
--- a/misc/gwaei/distinfo
+++ b/misc/gwaei/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2009/03/22 17:37:39 wiz Exp $
+$NetBSD: distinfo,v 1.7 2009/10/22 22:27:23 wiz Exp $
 
-SHA1 (gwaei-0.15.3.tar.gz) = d92c269c6b049774c6b6e51058d78c12ee6c2d6a
-RMD160 (gwaei-0.15.3.tar.gz) = 87df84e149c6a6a0dec62641937fe104648476aa
-Size (gwaei-0.15.3.tar.gz) = 536092 bytes
+SHA1 (gwaei-1.0.1.tar.gz) = 8638b7365e8a06c6bc0565fb5fac497081b81ee1
+RMD160 (gwaei-1.0.1.tar.gz) = 2456cfd89767d61e408d1c94019a479b90eda4ee
+Size (gwaei-1.0.1.tar.gz) = 551430 bytes
+SHA1 (patch-aa) = a9f5f6dda8efe6140bce1b9d9132ffd2f302e15a
diff --git a/misc/gwaei/options.mk b/misc/gwaei/options.mk
new file mode 100644
index 00000000000..bfbf7d5f874
--- /dev/null
+++ b/misc/gwaei/options.mk
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2009/10/22 22:27:23 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gwaei
+PKG_SUPPORTED_OPTIONS=	gnome
+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.libgnome+=	libgnome>=2.22.0
+.include "../../devel/libgnome/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libsexy+=		libsexy>=0.1.11
+.include "../../devel/libsexy/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/omf-scrollkeeper.mk"
+.else
+CONFIGURE_ARGS+=	--without-gnome
+.endif
diff --git a/misc/gwaei/patches/patch-aa b/misc/gwaei/patches/patch-aa
new file mode 100644
index 00000000000..dc1f49d258c
--- /dev/null
+++ b/misc/gwaei/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2009/10/22 22:27:23 wiz Exp $
+
+From upstream, will be in next release.
+
+--- src/preferences-gconf.c.orig	2009-05-25 03:57:50.000000000 +0200
++++ src/preferences-gconf.c	2009-10-23 00:17:03.000000000 +0200
+@@ -170,6 +168,10 @@
+       return_value = NULL;
+       strncpy(output, backup, n);
+     }
++    else if (return_value == NULL || strlen(return_value) == 0)
++    {
++      strncpy(output, backup, n);
++    }
+     else
+     {
+       strncpy(output, return_value, n);