pkg/45398: update fonts/gucharmap (patches incl.)

[telarson%west.com@localhost]

>Number:         45398
>Category:       pkg
>Synopsis:       update fonts/gucharmap (patches incl.)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Sep 23 20:00:00 +0000 2011
>Originator:     Tim Larson
>Release:        5.1
>Organization:
>Environment:
n/a
>Description:
Update the package from 2.32 to version 3.1.

With these patches the package builds clean, and I am able to run the program.  
More testing always appreciated though.
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/gucharmap/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- Makefile    22 Apr 2011 13:42:05 -0000      1.76
+++ Makefile    23 Sep 2011 19:50:19 -0000
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.76 2011/04/22 13:42:05 obache Exp $
 #

-DISTNAME=      gucharmap-2.32.1
-PKGREVISION=   2
+DISTNAME=      gucharmap-3.1.92
 CATEGORIES=    fonts gnome
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gucharmap/2.32/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gucharmap/3.1/}
 EXTRACT_SUFX=  .tar.bz2

 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -20,11 +19,7 @@ USE_PKGLOCALEDIR=    yes
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes

-PKGCONFIG_OVERRIDE+=   gucharmap-2.pc.in
-
-GTK2_IMMODULES=                yes
-
-GCONF_SCHEMAS+=        gucharmap.schemas
+GTK3_IMMODULES=                yes

 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=          glib2>=2.16.3
@@ -33,7 +28,6 @@ BUILDLINK_API_DEPENDS.glib2+=         glib2>=2.
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-BUILDLINK_API_DEPENDS.gtk2+=           gtk2+>=2.13.6
-.include "../../x11/gtk2/modules.mk"
+.include "../../x11/gtk3/modules.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/gucharmap/PLIST,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST
--- PLIST       29 Nov 2010 18:29:17 -0000      1.23
+++ PLIST       23 Sep 2011 19:50:19 -0000
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.23 2010/11/29 18:29:17 drochner Exp $
+@comment $NetBSD$
 bin/charmap
 bin/gnome-character-map
 bin/gucharmap
-include/gucharmap-2.0/gucharmap/gucharmap-block-chapters-model.h
-include/gucharmap-2.0/gucharmap/gucharmap-block-codepoint-list.h
-include/gucharmap-2.0/gucharmap/gucharmap-chapters-model.h
-include/gucharmap-2.0/gucharmap/gucharmap-chapters-view.h
-include/gucharmap-2.0/gucharmap/gucharmap-charmap.h
-include/gucharmap-2.0/gucharmap/gucharmap-chartable.h
-include/gucharmap-2.0/gucharmap/gucharmap-codepoint-list.h
-include/gucharmap-2.0/gucharmap/gucharmap-script-chapters-model.h
-include/gucharmap-2.0/gucharmap/gucharmap-script-codepoint-list.h
-include/gucharmap-2.0/gucharmap/gucharmap-type-builtins.h
-include/gucharmap-2.0/gucharmap/gucharmap-unicode-info.h
-include/gucharmap-2.0/gucharmap/gucharmap.h
-lib/libgucharmap.la
-lib/pkgconfig/gucharmap-2.pc
+include/gucharmap-2.90/gucharmap/gucharmap-block-chapters-model.h
+include/gucharmap-2.90/gucharmap/gucharmap-block-codepoint-list.h
+include/gucharmap-2.90/gucharmap/gucharmap-chapters-model.h
+include/gucharmap-2.90/gucharmap/gucharmap-chapters-view.h
+include/gucharmap-2.90/gucharmap/gucharmap-charmap.h
+include/gucharmap-2.90/gucharmap/gucharmap-chartable.h
+include/gucharmap-2.90/gucharmap/gucharmap-codepoint-list.h
+include/gucharmap-2.90/gucharmap/gucharmap-script-chapters-model.h
+include/gucharmap-2.90/gucharmap/gucharmap-script-codepoint-list.h
+include/gucharmap-2.90/gucharmap/gucharmap-type-builtins.h
+include/gucharmap-2.90/gucharmap/gucharmap-unicode-info.h
+include/gucharmap-2.90/gucharmap/gucharmap.h
+lib/libgucharmap_2_90.la
+lib/pkgconfig/gucharmap-2.90.pc
 share/applications/gucharmap.desktop
 share/gconf/schemas/gucharmap.schemas
 share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
@@ -49,12 +49,9 @@ share/gnome/help/gucharmap/fi/gucharmap.
 share/gnome/help/gucharmap/fr/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/fr/figures/gucharmap_window.png
 share/gnome/help/gucharmap/fr/gucharmap.xml
-share/gnome/help/gucharmap/it/figures/gucharmap_window.png
-share/gnome/help/gucharmap/it/gucharmap.xml
-share/gnome/help/gucharmap/it/legal.xml
-share/gnome/help/gucharmap/ja/figures/gucharmap_window.png
-share/gnome/help/gucharmap/ja/gucharmap.xml
-share/gnome/help/gucharmap/ja/legal.xml
+share/gnome/help/gucharmap/gl/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/gl/figures/gucharmap_window.png
+share/gnome/help/gucharmap/gl/gucharmap.xml
 share/gnome/help/gucharmap/ko/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/ko/figures/gucharmap_window.png
 share/gnome/help/gucharmap/ko/gucharmap.xml
@@ -67,6 +64,9 @@ share/gnome/help/gucharmap/pt_BR/gucharm
 share/gnome/help/gucharmap/ru/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/ru/figures/gucharmap_window.png
 share/gnome/help/gucharmap/ru/gucharmap.xml
+share/gnome/help/gucharmap/sl/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/sl/figures/gucharmap_window.png
+share/gnome/help/gucharmap/sl/gucharmap.xml
 share/gnome/help/gucharmap/sv/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/sv/figures/gucharmap_window.png
 share/gnome/help/gucharmap/sv/gucharmap.xml
@@ -76,12 +76,6 @@ share/gnome/help/gucharmap/vi/gucharmap.
 share/gnome/help/gucharmap/zh_CN/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/zh_CN/figures/gucharmap_window.png
 share/gnome/help/gucharmap/zh_CN/gucharmap.xml
-share/gnome/help/gucharmap/zh_HK/figures/gucharmap_window.png
-share/gnome/help/gucharmap/zh_HK/gucharmap.xml
-share/gnome/help/gucharmap/zh_HK/legal.xml
-share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png
-share/gnome/help/gucharmap/zh_TW/gucharmap.xml
-share/gnome/help/gucharmap/zh_TW/legal.xml
 share/locale/af/LC_MESSAGES/gucharmap.mo
 share/locale/am/LC_MESSAGES/gucharmap.mo
 share/locale/ar/LC_MESSAGES/gucharmap.mo
@@ -160,6 +154,7 @@ share/locale/ta/LC_MESSAGES/gucharmap.mo
 share/locale/te/LC_MESSAGES/gucharmap.mo
 share/locale/th/LC_MESSAGES/gucharmap.mo
 share/locale/tr/LC_MESSAGES/gucharmap.mo
+share/locale/ug/LC_MESSAGES/gucharmap.mo
 share/locale/uk/LC_MESSAGES/gucharmap.mo
 share/locale/vi/LC_MESSAGES/gucharmap.mo
 share/locale/wa/LC_MESSAGES/gucharmap.mo
@@ -177,14 +172,12 @@ share/omf/gucharmap/gucharmap-en_GB.omf
 share/omf/gucharmap/gucharmap-es.omf
 share/omf/gucharmap/gucharmap-fi.omf
 share/omf/gucharmap/gucharmap-fr.omf
-share/omf/gucharmap/gucharmap-it.omf
-share/omf/gucharmap/gucharmap-ja.omf
+share/omf/gucharmap/gucharmap-gl.omf
 share/omf/gucharmap/gucharmap-ko.omf
 share/omf/gucharmap/gucharmap-oc.omf
 share/omf/gucharmap/gucharmap-pt_BR.omf
 share/omf/gucharmap/gucharmap-ru.omf
+share/omf/gucharmap/gucharmap-sl.omf
 share/omf/gucharmap/gucharmap-sv.omf
 share/omf/gucharmap/gucharmap-vi.omf
 share/omf/gucharmap/gucharmap-zh_CN.omf
-share/omf/gucharmap/gucharmap-zh_HK.omf
-share/omf/gucharmap/gucharmap-zh_TW.omf
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/gucharmap/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo    29 Nov 2010 18:29:17 -0000      1.30
+++ distinfo    23 Sep 2011 19:50:19 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.30 2010/11/29 18:29:17 drochner Exp $

-SHA1 (gucharmap-2.32.1.tar.bz2) = 4cb86f114e4ed2921fb4ffa58caa0370e4f82f0c
-RMD160 (gucharmap-2.32.1.tar.bz2) = 10faecd24f2e7b3a150b0e7edba2a2dd419336c8
-Size (gucharmap-2.32.1.tar.bz2) = 3242939 bytes
+SHA1 (gucharmap-3.1.92.tar.bz2) = 67584e6f99bb83a898f4d7463c220a6eff3348d0
+RMD160 (gucharmap-3.1.92.tar.bz2) = f70701356ca6e9ef805eeb738785736ecb691c15
+Size (gucharmap-3.1.92.tar.bz2) = 3292126 bytes