Re: pkg/44445: Please update misc/gwaei to 1.5.2

[Ryo ONODERA <ryo_on%yk.rim.or.jp@localhost>]

Hi,
Thanks for your review.

From: Thomas Klausner <wiz%NetBSD.org@localhost>, Date: Sun, 23 Jan 2011 
13:45:04 +0000 (UTC)

> The following reply was made to PR pkg/44445; it has been noted by GNATS.
> 
> From: Thomas Klausner <wiz%NetBSD.org@localhost>
> To: NetBSD bugtracking <gnats-bugs%NetBSD.org@localhost>
> Cc: 
> Subject: Re: pkg/44445: Please update misc/gwaei to 1.5.2
> Date: Sun, 23 Jan 2011 14:40:39 +0100
> 
>  On Sun, Jan 23, 2011 at 03:05:01AM +0000, ryo_on%yk.rim.or.jp@localhost 
> wrote:
>  > +.include "../../devel/glib2/schemas.mk"
>  >  .include "../../devel/gettext-lib/buildlink3.mk"
>  >  BUILDLINK_API_DEPENDS.glib2+=     glib2>=2.16.5
>  >  .include "../../devel/glib2/buildlink3.mk"
>  
>  I don't think you need to include both glib2 files, the first one
>  should be sufficient.

Thank you.
I have understood.

>  > --- PLIST  15 Dec 2009 14:46:44 -0000      1.8
>  > +++ PLIST  23 Jan 2011 02:54:12 -0000
>  > @@ -1,13 +1,23 @@
>  > -@comment $NetBSD: PLIST,v 1.8 2009/12/15 14:46:44 wiz Exp $
>  > +@comment $NetBSD$
>  >  bin/gwaei
>  >  bin/waei
>  ...
>  > retrieving revision 1.2
>  > diff -u -r1.2 PLIST.gnome
>  > --- PLIST.gnome    15 Dec 2009 14:46:44 -0000      1.2
>  > +++ PLIST.gnome    23 Jan 2011 02:54:12 -0000
>  > @@ -1,19 +1,20 @@
>  > -@comment $NetBSD: PLIST.gnome,v 1.2 2009/12/15 14:46:44 wiz Exp $
>  > +@comment $NetBSD$
>  > +bin/gwaei
>  
>  Now bin/gwaei is in both PLISTs?

I did cvs update by mistake, and old file is merged.


I have attached modified patches.

--
Ryo ONODERA // ryo_on%yk.rim.or.jp@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3

Common subdirectories: ../gwaei/CVS and ./CVS
diff -u ../gwaei/Makefile ./Makefile
--- ../gwaei/Makefile   2011-01-13 22:38:46.000000000 +0900
+++ ./Makefile  2011-01-24 06:23:01.000000000 +0900
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.15 2011/01/13 13:38:46 wiz 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 @@
 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 -u ../gwaei/PLIST ./PLIST
--- ../gwaei/PLIST      2009-12-15 23:46:44.000000000 +0900
+++ ./PLIST     2011-01-23 03:24:09.000000000 +0900
@@ -1,13 +1,23 @@
-@comment $NetBSD: PLIST,v 1.8 2009/12/15 14:46:44 wiz Exp $
+@comment $NetBSD$
 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 -u ../gwaei/PLIST.gnome ./PLIST.gnome
--- ../gwaei/PLIST.gnome        2009-12-15 23:46:44.000000000 +0900
+++ ./PLIST.gnome       2011-01-24 06:10:34.000000000 +0900
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST.gnome,v 1.2 2009/12/15 14:46:44 wiz Exp $
+@comment $NetBSD$
 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 -u ../gwaei/distinfo ./distinfo
--- ../gwaei/distinfo   2009-12-17 07:52:42.000000000 +0900
+++ ./distinfo  2011-01-23 01:03:07.000000000 +0900
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.9 2009/12/16 22:52:42 wiz 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 -u ../gwaei/options.mk ./options.mk
--- ../gwaei/options.mk 2009-12-17 07:52:42.000000000 +0900
+++ ./options.mk        2011-01-23 03:14:15.000000000 +0900
@@ -7,15 +7,10 @@
 .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
Only in ../gwaei: patches