Thu Jul 14 21:11:54 2011 UTC ()
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


(ryoon)
diff -r1.17 -r1.18 pkgsrc/misc/gwaei/Makefile
diff -r1.9 -r1.10 pkgsrc/misc/gwaei/PLIST
diff -r1.3 -r1.4 pkgsrc/misc/gwaei/PLIST.gnome
diff -r1.10 -r1.11 pkgsrc/misc/gwaei/distinfo
diff -r1.4 -r1.5 pkgsrc/misc/gwaei/options.mk
diff -r0 -r1.1 pkgsrc/misc/gwaei/patches/patch-configure
cvs diff -r1.17 -r1.18 pkgsrc/misc/gwaei/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/gwaei/Makefile 2011/04/22 13:44:10 1.17
+++ pkgsrc/misc/gwaei/Makefile 2011/07/14 21:11:54 1.18
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1# $NetBSD: Makefile,v 1.17 2011/04/22 13:44:10 obache Exp $ 1# $NetBSD: Makefile,v 1.18 2011/07/14 21:11:54 ryoon Exp $
2# 2#
3 3
4DISTNAME= gwaei-1.5.2 4DISTNAME= gwaei-3.0.0
5PKGREVISION= 1 
6CATEGORIES= misc 5CATEGORIES= misc
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwaei/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwaei/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://gwaei.sourceforge.net/ 9HOMEPAGE= http://gwaei.sourceforge.net/
11COMMENT= Japanese dictionary for GNOME 10COMMENT= Japanese dictionary for GNOME
12LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
18USE_TOOLS+= gmake perl pkg-config 17USE_TOOLS+= perl gmake pkg-config intltool
19 18
20PLIST_SRC= PLIST 19PLIST_SRC= PLIST
21 20
22.include "options.mk" 21.include "options.mk"
23 22
24INSTALLATION_DIRS= share/glib-2.0/schemas 23INSTALLATION_DIRS= share/glib-2.0/schemas
25 24
26post-install: 25post-install:
27 ${INSTALL_DATA} ${WRKSRC}/src/schemas/*xml \ 26 ${INSTALL_DATA} ${WRKSRC}/src/schemas/*xml \
28 ${DESTDIR}${PREFIX}/share/glib-2.0/schemas/ 27 ${DESTDIR}${PREFIX}/share/glib-2.0/schemas/
29 28
30.include "../../devel/gettext-lib/buildlink3.mk" 29.include "../../devel/gettext-lib/buildlink3.mk"
31BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.5 30BUILDLINK_API_DEPENDS.glib2+= glib2>=2.25.0
32.include "../../devel/glib2/schemas.mk" 31.include "../../devel/glib2/schemas.mk"
33BUILDLINK_API_DEPENDS.curl+= curl>=7.18.0 32BUILDLINK_API_DEPENDS.curl+= curl>=7.19.6
34.include "../../www/curl/buildlink3.mk" 33.include "../../www/curl/buildlink3.mk"
35BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.14.0 34BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.0.0
36.include "../../x11/gtk2/buildlink3.mk" 35.include "../../x11/gtk3/buildlink3.mk"
37.include "../../textproc/gnome-doc-utils/buildlink3.mk" 36.include "../../textproc/gnome-doc-utils/buildlink3.mk"
38.include "../../devel/ncursesw/buildlink3.mk" 37.include "../../devel/ncursesw/buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/misc/gwaei/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/gwaei/PLIST 2011/01/25 11:02:35 1.9
+++ pkgsrc/misc/gwaei/PLIST 2011/07/14 21:11:54 1.10
@@ -1,23 +1,29 @@ @@ -1,23 +1,29 @@
1@comment $NetBSD: PLIST,v 1.9 2011/01/25 11:02:35 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.10 2011/07/14 21:11:54 ryoon Exp $
2bin/gwaei 
3bin/waei 2bin/waei
 3include/libwaei/dictinfo.h
 4include/libwaei/dictinfolist.h
 5include/libwaei/dictinst.h
 6include/libwaei/dictinstlist.h
 7include/libwaei/engine.h
 8include/libwaei/historylist.h
 9include/libwaei/io.h
 10include/libwaei/libwaei.h
 11include/libwaei/preferences.h
 12include/libwaei/queryline.h
 13include/libwaei/regex.h
 14include/libwaei/resultline.h
 15include/libwaei/searchitem.h
 16include/libwaei/utilities.h
 17lib/libwaei.la
4man/man1/waei.1 18man/man1/waei.1
5share/doc/gwaei/COPYING 19share/doc/gwaei/COPYING
6share/doc/gwaei/ChangeLog 20share/doc/gwaei/ChangeLog
7share/doc/gwaei/NEWS 21share/doc/gwaei/NEWS
8share/glib-2.0/schemas/org.gnome.gwaei.dictionary.gschema.xml 
9share/glib-2.0/schemas/org.gnome.gwaei.fonts.gschema.xml 
10share/glib-2.0/schemas/org.gnome.gwaei.gschema.xml 22share/glib-2.0/schemas/org.gnome.gwaei.gschema.xml
11share/glib-2.0/schemas/org.gnome.gwaei.highlight.gschema.xml 
12share/glib-2.0/schemas/org.gnome.gwaei.kanjipad_window.gschema.xml 
13share/glib-2.0/schemas/org.gnome.gwaei.main_window.gschema.xml 
14share/glib-2.0/schemas/org.gnome.gwaei.radicals_window.gschema.xml 
15share/locale/cs/LC_MESSAGES/gwaei.mo 23share/locale/cs/LC_MESSAGES/gwaei.mo
16share/locale/de/LC_MESSAGES/gwaei.mo 24share/locale/de/LC_MESSAGES/gwaei.mo
17share/locale/en@boldquot/LC_MESSAGES/gwaei.mo 
18share/locale/en@quot/LC_MESSAGES/gwaei.mo 
19share/locale/es/LC_MESSAGES/gwaei.mo 25share/locale/es/LC_MESSAGES/gwaei.mo
20share/locale/fr/LC_MESSAGES/gwaei.mo 26share/locale/fr/LC_MESSAGES/gwaei.mo
21share/locale/it/LC_MESSAGES/gwaei.mo 27share/locale/it/LC_MESSAGES/gwaei.mo
22share/locale/ja/LC_MESSAGES/gwaei.mo 28share/locale/ja/LC_MESSAGES/gwaei.mo
23share/locale/tr/LC_MESSAGES/gwaei.mo 29share/locale/tr/LC_MESSAGES/gwaei.mo
cvs diff -r1.3 -r1.4 pkgsrc/misc/gwaei/PLIST.gnome (expand / switch to unified diff)

--- pkgsrc/misc/gwaei/PLIST.gnome 2011/01/25 11:02:35 1.3
+++ pkgsrc/misc/gwaei/PLIST.gnome 2011/07/14 21:11:54 1.4
@@ -1,30 +1,62 @@ @@ -1,30 +1,62 @@
1@comment $NetBSD: PLIST.gnome,v 1.3 2011/01/25 11:02:35 ryoon Exp $ 1@comment $NetBSD: PLIST.gnome,v 1.4 2011/07/14 21:11:54 ryoon Exp $
 2bin/gwaei
 3bin/waei
 4include/libwaei/dictinfo.h
 5include/libwaei/dictinfolist.h
 6include/libwaei/dictinst.h
 7include/libwaei/dictinstlist.h
 8include/libwaei/engine.h
 9include/libwaei/historylist.h
 10include/libwaei/io.h
 11include/libwaei/libwaei.h
 12include/libwaei/preferences.h
 13include/libwaei/queryline.h
 14include/libwaei/regex.h
 15include/libwaei/resultline.h
 16include/libwaei/searchitem.h
 17include/libwaei/utilities.h
2lib/gwaei/kpengine 18lib/gwaei/kpengine
 19lib/libwaei.la
3man/man1/gwaei.1 20man/man1/gwaei.1
 21man/man1/waei.1
4share/applications/gwaei.desktop 22share/applications/gwaei.desktop
 23share/doc/gwaei/COPYING
 24share/doc/gwaei/ChangeLog
 25share/doc/gwaei/NEWS
 26share/glib-2.0/schemas/org.gnome.gwaei.gschema.xml
5share/gnome/help/gwaei/C/glossary.xml 27share/gnome/help/gwaei/C/glossary.xml
6share/gnome/help/gwaei/C/gwaei.xml 28share/gnome/help/gwaei/C/gwaei.xml
7share/gwaei/book_green.png 29share/gwaei/book_green.png
 30share/gwaei/dictionaryinstall.ui
8share/gwaei/goo.png 31share/gwaei/goo.png
9share/gwaei/google.png 32share/gwaei/google.png
 33share/gwaei/installprogress.ui
10share/gwaei/jdata.dat 34share/gwaei/jdata.dat
11share/gwaei/kanjipad.ui 35share/gwaei/kanjipad.ui
12share/gwaei/logo.png 36share/gwaei/logo.png
13share/gwaei/main.ui 37share/gwaei/main.ui
14share/gwaei/radicals.ui 38share/gwaei/radicals.ui
15share/gwaei/settings.ui 39share/gwaei/settings.ui
16share/gwaei/wikipedia.png 40share/gwaei/wikipedia.png
17share/icons/hicolor/16x16/actions/non-word-boundary.png 41share/icons/hicolor/16x16/actions/non-word-boundary.png
18share/icons/hicolor/16x16/actions/unknown-character.png 42share/icons/hicolor/16x16/actions/unknown-character.png
19share/icons/hicolor/16x16/actions/word-boundary.png 43share/icons/hicolor/16x16/actions/word-boundary.png
20share/icons/hicolor/16x16/apps/gwaei.png 44share/icons/hicolor/16x16/apps/gwaei.png
21share/icons/hicolor/22x22/actions/non-word-boundary.png 45share/icons/hicolor/22x22/actions/non-word-boundary.png
22share/icons/hicolor/22x22/actions/unknown-character.png 46share/icons/hicolor/22x22/actions/unknown-character.png
23share/icons/hicolor/22x22/actions/word-boundary.png 47share/icons/hicolor/22x22/actions/word-boundary.png
24share/icons/hicolor/24x24/actions/non-word-boundary.png 48share/icons/hicolor/24x24/actions/non-word-boundary.png
25share/icons/hicolor/24x24/actions/unknown-character.png 49share/icons/hicolor/24x24/actions/unknown-character.png
26share/icons/hicolor/24x24/actions/word-boundary.png 50share/icons/hicolor/24x24/actions/word-boundary.png
27share/icons/hicolor/24x24/apps/gwaei.png 51share/icons/hicolor/24x24/apps/gwaei.png
28share/icons/hicolor/32x32/apps/gwaei.png 52share/icons/hicolor/32x32/apps/gwaei.png
29share/icons/hicolor/48x48/apps/gwaei.png 53share/icons/hicolor/48x48/apps/gwaei.png
 54share/icons/hicolor/scalable/apps/gwaei.svg
 55share/locale/cs/LC_MESSAGES/gwaei.mo
 56share/locale/de/LC_MESSAGES/gwaei.mo
 57share/locale/es/LC_MESSAGES/gwaei.mo
 58share/locale/fr/LC_MESSAGES/gwaei.mo
 59share/locale/it/LC_MESSAGES/gwaei.mo
 60share/locale/ja/LC_MESSAGES/gwaei.mo
 61share/locale/tr/LC_MESSAGES/gwaei.mo
30share/omf/gwaei/gwaei-C.omf 62share/omf/gwaei/gwaei-C.omf
cvs diff -r1.10 -r1.11 pkgsrc/misc/gwaei/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/gwaei/distinfo 2011/01/25 11:02:35 1.10
+++ pkgsrc/misc/gwaei/distinfo 2011/07/14 21:11:54 1.11
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.10 2011/01/25 11:02:35 ryoon Exp $ 1$NetBSD: distinfo,v 1.11 2011/07/14 21:11:54 ryoon Exp $
2 2
3SHA1 (gwaei-1.5.2.tar.gz) = c4bfee7487ff3bbcfee38a218d98cc4d2caf3238 3SHA1 (gwaei-3.0.0.tar.gz) = 9200645f1f6b9c65ee378d2102d14260da62594c
4RMD160 (gwaei-1.5.2.tar.gz) = d9317e595cf708f1267856a90174bc274cec38ed 4RMD160 (gwaei-3.0.0.tar.gz) = 6e30564c71bc6208a419d4ba0c17d2271c080e45
5Size (gwaei-1.5.2.tar.gz) = 709778 bytes 5Size (gwaei-3.0.0.tar.gz) = 821703 bytes
 6SHA1 (patch-configure) = 5d874d13b032340d0fc852906c9f4284bdbdcff6
cvs diff -r1.4 -r1.5 pkgsrc/misc/gwaei/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/gwaei/options.mk 2011/01/25 11:02:35 1.4
+++ pkgsrc/misc/gwaei/options.mk 2011/07/14 21:11:54 1.5
@@ -1,24 +1,17 @@ @@ -1,24 +1,17 @@
1# $NetBSD: options.mk,v 1.4 2011/01/25 11:02:35 ryoon Exp $ 1# $NetBSD: options.mk,v 1.5 2011/07/14 21:11:54 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gwaei 3PKG_OPTIONS_VAR= PKG_OPTIONS.gwaei
4PKG_SUPPORTED_OPTIONS= gnome 4PKG_SUPPORTED_OPTIONS= gnome
5PKG_SUGGESTED_OPTIONS= gnome 5PKG_SUGGESTED_OPTIONS= gnome
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mgnome) 9.if !empty(PKG_OPTIONS:Mgnome)
10PLIST_SRC+= PLIST.gnome 10PLIST_SRC+= PLIST.gnome
11 11
12BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.14.0 
13.include "../../x11/gtk2/buildlink3.mk" 
14BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.22.0 
15.include "../../devel/libgnome/buildlink3.mk" 
16BUILDLINK_API_DEPENDS.libsexy+= libsexy>=0.1.11 
17.include "../../devel/libsexy/buildlink3.mk" 
18.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 
19.include "../../sysutils/desktop-file-utils/desktopdb.mk" 12.include "../../sysutils/desktop-file-utils/desktopdb.mk"
20.include "../../x11/libunique/buildlink3.mk" 13.include "../../x11/libunique3/buildlink3.mk"
21.include "../../mk/omf-scrollkeeper.mk" 14.include "../../mk/omf-scrollkeeper.mk"
22.else 15.else
23CONFIGURE_ARGS+= --without-gnome 16CONFIGURE_ARGS+= --without-gnome
24.endif 17.endif
File Added: pkgsrc/misc/gwaei/patches/Attic/patch-configure
$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; }