Update to 3.0.0

* Switch gtk2 to gtk3.

Changelog:
2010-01-10: gWaei 3.0.0
  New version of gwaei made to compile against gtk+-3.0 and match other Gnome 3
apps.  Most of the code has been rewritten and the advantages won't all appear u
ntil futuer versions of the program.

  -Spellcheck is now don't directly with enchant instead of relying on libsexy
  -The backend is now separated into a libtool library for cleaner code.
  -The dictionary folder is now in ~/.config/gwaei instead of ~/.waei.
  -Manual installation of dictionaries is now easier and more straight forward.
  -Translations are now handled by intltool instead of gettext
  -Much of the code now uses GError for proper error handling and message passin
g
  -The code now uses GRegex instead of the C regex library included with the OS,
 making the program more cross platform friendly

6 files changed, 78 insertions, 32 deletions

diff --git a/misc/gwaei/Makefile b/misc/gwaei/Makefile
index b6e8f630767..77c87ebc3cd 100644
--- a/misc/gwaei/Makefile
+++ b/misc/gwaei/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2011/04/22 13:44:10 obache Exp $
+# $NetBSD: Makefile,v 1.18 2011/07/14 21:11:54 ryoon Exp $
 #
 
-DISTNAME=	gwaei-1.5.2
-PKGREVISION=	1
+DISTNAME=	gwaei-3.0.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwaei/}
 
@@ -15,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake perl pkg-config
+USE_TOOLS+=		perl gmake pkg-config intltool
 
 PLIST_SRC=		PLIST
 
@@ -28,12 +27,12 @@ post-install:
 	    ${DESTDIR}${PREFIX}/share/glib-2.0/schemas/
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.5
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.25.0
 .include "../../devel/glib2/schemas.mk"
-BUILDLINK_API_DEPENDS.curl+=	curl>=7.18.0
+BUILDLINK_API_DEPENDS.curl+=	curl>=7.19.6
 .include "../../www/curl/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.14.0
-.include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.0.0
+.include "../../x11/gtk3/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 999d954f13e..fb540352700 100644
--- a/misc/gwaei/PLIST
+++ b/misc/gwaei/PLIST
@@ -1,21 +1,27 @@
-@comment $NetBSD: PLIST,v 1.9 2011/01/25 11:02:35 ryoon Exp $
-bin/gwaei
+@comment $NetBSD: PLIST,v 1.10 2011/07/14 21:11:54 ryoon Exp $
 bin/waei
+include/libwaei/dictinfo.h
+include/libwaei/dictinfolist.h
+include/libwaei/dictinst.h
+include/libwaei/dictinstlist.h
+include/libwaei/engine.h
+include/libwaei/historylist.h
+include/libwaei/io.h
+include/libwaei/libwaei.h
+include/libwaei/preferences.h
+include/libwaei/queryline.h
+include/libwaei/regex.h
+include/libwaei/resultline.h
+include/libwaei/searchitem.h
+include/libwaei/utilities.h
+lib/libwaei.la
 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
diff --git a/misc/gwaei/PLIST.gnome b/misc/gwaei/PLIST.gnome
index 31fee43e928..9a22966d592 100644
--- a/misc/gwaei/PLIST.gnome
+++ b/misc/gwaei/PLIST.gnome
@@ -1,12 +1,36 @@
-@comment $NetBSD: PLIST.gnome,v 1.3 2011/01/25 11:02:35 ryoon Exp $
+@comment $NetBSD: PLIST.gnome,v 1.4 2011/07/14 21:11:54 ryoon Exp $
+bin/gwaei
+bin/waei
+include/libwaei/dictinfo.h
+include/libwaei/dictinfolist.h
+include/libwaei/dictinst.h
+include/libwaei/dictinstlist.h
+include/libwaei/engine.h
+include/libwaei/historylist.h
+include/libwaei/io.h
+include/libwaei/libwaei.h
+include/libwaei/preferences.h
+include/libwaei/queryline.h
+include/libwaei/regex.h
+include/libwaei/resultline.h
+include/libwaei/searchitem.h
+include/libwaei/utilities.h
 lib/gwaei/kpengine
+lib/libwaei.la
 man/man1/gwaei.1
+man/man1/waei.1
 share/applications/gwaei.desktop
+share/doc/gwaei/COPYING
+share/doc/gwaei/ChangeLog
+share/doc/gwaei/NEWS
+share/glib-2.0/schemas/org.gnome.gwaei.gschema.xml
 share/gnome/help/gwaei/C/glossary.xml
 share/gnome/help/gwaei/C/gwaei.xml
 share/gwaei/book_green.png
+share/gwaei/dictionaryinstall.ui
 share/gwaei/goo.png
 share/gwaei/google.png
+share/gwaei/installprogress.ui
 share/gwaei/jdata.dat
 share/gwaei/kanjipad.ui
 share/gwaei/logo.png
@@ -27,4 +51,12 @@ 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/icons/hicolor/scalable/apps/gwaei.svg
+share/locale/cs/LC_MESSAGES/gwaei.mo
+share/locale/de/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
 share/omf/gwaei/gwaei-C.omf
diff --git a/misc/gwaei/distinfo b/misc/gwaei/distinfo
index 7ce0e760859..2e3049fcf06 100644
--- a/misc/gwaei/distinfo
+++ b/misc/gwaei/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2011/01/25 11:02:35 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2011/07/14 21:11:54 ryoon Exp $
 
-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
+SHA1 (gwaei-3.0.0.tar.gz) = 9200645f1f6b9c65ee378d2102d14260da62594c
+RMD160 (gwaei-3.0.0.tar.gz) = 6e30564c71bc6208a419d4ba0c17d2271c080e45
+Size (gwaei-3.0.0.tar.gz) = 821703 bytes
+SHA1 (patch-configure) = 5d874d13b032340d0fc852906c9f4284bdbdcff6
diff --git a/misc/gwaei/options.mk b/misc/gwaei/options.mk
index fe026f9bd91..4f1cf21b357 100644
--- a/misc/gwaei/options.mk
+++ b/misc/gwaei/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2011/01/25 11:02:35 ryoon Exp $
+# $NetBSD: options.mk,v 1.5 2011/07/14 21:11:54 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gwaei
 PKG_SUPPORTED_OPTIONS=	gnome
@@ -9,15 +9,8 @@ PKG_SUGGESTED_OPTIONS=	gnome
 .if !empty(PKG_OPTIONS:Mgnome)
 PLIST_SRC+=		PLIST.gnome
 
-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
-.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 "../../x11/libunique3/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .else
 CONFIGURE_ARGS+=	--without-gnome
diff --git a/misc/gwaei/patches/patch-configure b/misc/gwaei/patches/patch-configure
new file mode 100644
index 00000000000..3fee6c5b167
--- /dev/null
+++ b/misc/gwaei/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2011/07/14 21:11:54 ryoon Exp $
+
+* Wrong version detection
+
+--- configure.orig	2011-07-14 19:56:43.000000000 +0000
++++ configure
+@@ -13942,7 +13942,7 @@ case "$am__api_version" in
+     ;;
+ esac
+ 
+-if test -n "0.35.0"; then
++if test -ge "0.35.0"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
+ $as_echo_n "checking for intltool >= 0.35.0... " >&6; }
+