From afc530071b2f4a865ce6959d05b6628c5fb34301 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Mon, 16 Feb 2004 00:04:08 +0000
Subject: Use gtk2's modules.mk file to handle the immodules database, as this
 package installs an immodule.  Bump PKGREVISION.  Found by wiz@.

---
 fonts/gucharmap/Makefile         |  7 +++++--
 fonts/gucharmap/distinfo         |  3 ++-
 fonts/gucharmap/patches/patch-aa | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 fonts/gucharmap/patches/patch-aa

(limited to 'fonts')

diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 9c32e1969d8..b9ba71f1d1c 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/02/15 23:47:51 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/16 00:04:08 jmmv Exp $
 #
 
 DISTNAME=	gucharmap-1.2.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	fonts
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gucharmap/1.2/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,8 +23,11 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=    gucharmap.pc.in
 
+GTK2_IMMODULES=		yes
+
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/gtk2/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/gucharmap/distinfo b/fonts/gucharmap/distinfo
index b98534c4c7e..99626635d0e 100644
--- a/fonts/gucharmap/distinfo
+++ b/fonts/gucharmap/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/14 01:23:13 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/02/16 00:04:08 jmmv Exp $
 
 SHA1 (gucharmap-1.2.0.tar.bz2) = 6807bbc0c917f6863fae55aba1196f89aa672aa8
 Size (gucharmap-1.2.0.tar.bz2) = 1176137 bytes
+SHA1 (patch-aa) = 9273f3a0b7746a01d28d88b4cfe2744eec7cd90d
diff --git a/fonts/gucharmap/patches/patch-aa b/fonts/gucharmap/patches/patch-aa
new file mode 100644
index 00000000000..a52c8385a4c
--- /dev/null
+++ b/fonts/gucharmap/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2004/02/16 00:04:08 jmmv Exp $
+
+Don't try to rebuild gtk2's immodules database from here; modules.mk will
+do it for us.
+
+--- gucharmap/Makefile.in.orig	2003-11-20 23:01:33.000000000 +0100
++++ gucharmap/Makefile.in
+@@ -814,10 +814,8 @@ gucharmap_marshal.c: gucharmap_marshal.h
+ @BUILD_GTK_IMMODULES_TRUE@all-local: gtk.immodules
+ 
+ @BUILD_GTK_IMMODULES_TRUE@gtk.immodules: $(module_LTLIBRARIES)
+-@BUILD_GTK_IMMODULES_TRUE@	$(GTK_QUERY_IMMODULES) $(module_LTLIBRARIES) > gtk.immodules ;
+ 
+-@BUILD_GTK_IMMODULES_TRUE@install-data-hook: im-module-file
+-@BUILD_GTK_IMMODULES_TRUE@	LD_LIBRARY_PATH=$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH GTK_PATH=$$GTK_PATH:$(DESTDIR)$(libdir)/gtk-2.0 $(GTK_QUERY_IMMODULES) > `./im-module-file` ;
++@BUILD_GTK_IMMODULES_TRUE@install-data-hook:
+ 
+ @BUILD_GTK_IMMODULES_FALSE@install-data-hook: 
+ 
-- 
cgit v1.2.3