6 files changed, 25 insertions, 38 deletions
diff --git a/misc/gwaei/Makefile b/misc/gwaei/Makefile
index 75f4cfdf400..f438caae692 100644
--- a/misc/gwaei/Makefile
+++ b/misc/gwaei/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2009/10/22 22:27:23 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2009/12/15 14:46:44 wiz Exp $
 #
 
-DISTNAME=	gwaei-1.0.1
+DISTNAME=	gwaei-1.2.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwaei/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gwaei.sourceforge.net/
 COMMENT=	Japanese dictionary for GNOME
+LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	rsync-[0-9]*:../../net/rsync
 
@@ -33,11 +34,11 @@ PLIST_SRC=		PLIST
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.5
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.curl+=	curl>=7.18.0
 .include "../../www/curl/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.14.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 17660f90bd7..f6feb4148bd 100644
--- a/misc/gwaei/PLIST
+++ b/misc/gwaei/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 2009/10/22 22:27:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/12/15 14:46:44 wiz Exp $
 bin/gwaei
 bin/waei
-share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/ChangeLog
-share/doc/${PKGNAME}/NEWS
+man/man1/waei.1
+share/doc/gwaei/COPYING
+share/doc/gwaei/ChangeLog
+share/doc/gwaei/NEWS
 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
diff --git a/misc/gwaei/PLIST.gnome b/misc/gwaei/PLIST.gnome
index ebe122f34bf..04f34869941 100644
--- a/misc/gwaei/PLIST.gnome
+++ b/misc/gwaei/PLIST.gnome
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST.gnome,v 1.1 2009/10/22 22:27:23 wiz Exp $
-bin/gwaei
+@comment $NetBSD: PLIST.gnome,v 1.2 2009/12/15 14:46:44 wiz Exp $
+lib/gwaei/kpengine
+man/man1/gwaei.1
 share/applications/gwaei.desktop
 share/gconf/schemas/gwaei.schemas
 share/gnome/help/gwaei/C/glossary.xml
@@ -8,12 +9,11 @@ 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/kanjipad.ui
 share/gwaei/logo.png
-share/gwaei/main.xml
-share/gwaei/radicals.xml
-share/gwaei/settings.xml
+share/gwaei/main.ui
+share/gwaei/radicals.ui
+share/gwaei/settings.ui
 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 26cdf83bf3f..b93aa76ccb9 100644
--- a/misc/gwaei/distinfo
+++ b/misc/gwaei/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2009/10/22 22:27:23 wiz Exp $
+$NetBSD: distinfo,v 1.8 2009/12/15 14:46:44 wiz Exp $
 
-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
+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
diff --git a/misc/gwaei/options.mk b/misc/gwaei/options.mk
index bfbf7d5f874..593eeb12489 100644
--- a/misc/gwaei/options.mk
+++ b/misc/gwaei/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2009/10/22 22:27:23 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2009/12/15 14:46:44 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gwaei
 PKG_SUPPORTED_OPTIONS=	gnome
+# XXX: needed in 1.2.1, link failure if disabled
 PKG_SUGGESTED_OPTIONS=	gnome
 
 .include "../../mk/bsd.options.mk"
@@ -22,6 +23,7 @@ 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 "../../x11/libunique/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .else
 CONFIGURE_ARGS+=	--without-gnome
diff --git a/misc/gwaei/patches/patch-aa b/misc/gwaei/patches/patch-aa
deleted file mode 100644
index dc1f49d258c..00000000000
--- a/misc/gwaei/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$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);