Wed Nov 17 14:36:46 2010 UTC ()
don't call gio-querymodules on installation of gio-fam, the framework
will take care of this


(drochner)
diff -r1.142 -r1.143 pkgsrc/devel/glib2/distinfo
diff -r1.4 -r1.5 pkgsrc/devel/glib2/patches/patch-cd
cvs diff -r1.142 -r1.143 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2010/11/15 14:36:03 1.142
+++ pkgsrc/devel/glib2/distinfo 2010/11/17 14:36:45 1.143
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: distinfo,v 1.142 2010/11/15 14:36:03 drochner Exp $ 1$NetBSD: distinfo,v 1.143 2010/11/17 14:36:45 drochner Exp $
2 2
3SHA1 (glib-2.26.1.tar.bz2) = 8d35d5cf41d681dd6480a16be39f7d3cffbd29f0 3SHA1 (glib-2.26.1.tar.bz2) = 8d35d5cf41d681dd6480a16be39f7d3cffbd29f0
4RMD160 (glib-2.26.1.tar.bz2) = e8b00fce55aa539ee00588500c0162a8877dc060 4RMD160 (glib-2.26.1.tar.bz2) = e8b00fce55aa539ee00588500c0162a8877dc060
5Size (glib-2.26.1.tar.bz2) = 6704686 bytes 5Size (glib-2.26.1.tar.bz2) = 6704686 bytes
6SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f 6SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f
7SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762 7SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
9SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 9SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
10SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 10SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
11SHA1 (patch-af) = 4db7dff19ba34d5a204c12c0c410415fcb077f20 11SHA1 (patch-af) = 4db7dff19ba34d5a204c12c0c410415fcb077f20
12SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b 12SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b
13SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e 13SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
14SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f 14SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f
15SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c 15SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
16SHA1 (patch-ak) = 718dad5f27cb8254d84d6f8007a96b33e7c4a435 16SHA1 (patch-ak) = 718dad5f27cb8254d84d6f8007a96b33e7c4a435
17SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e 17SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
18SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772 18SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772
19SHA1 (patch-an) = dd136645f7555f3600562b055cdcb4f60b41ae78 19SHA1 (patch-an) = dd136645f7555f3600562b055cdcb4f60b41ae78
20SHA1 (patch-ao) = 293b462565ef4991af807e79c1200df5458058e7 20SHA1 (patch-ao) = 293b462565ef4991af807e79c1200df5458058e7
21SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95 21SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
22SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff 22SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
23SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54 23SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
24SHA1 (patch-cd) = aaada4d63aaac18f71ac9fdbff15e8ef0579cf39 24SHA1 (patch-cd) = d1c6fa921be58469adb6b860f4e91f0a7eff067e
25SHA1 (patch-ce) = 7192ae3bbf27ff92287a66ee090baa80a12cdc79 25SHA1 (patch-ce) = 7192ae3bbf27ff92287a66ee090baa80a12cdc79
26SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44 26SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44
27SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632 27SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632
28SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0 28SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0
29SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2 29SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2
cvs diff -r1.4 -r1.5 pkgsrc/devel/glib2/patches/Attic/patch-cd (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/Attic/patch-cd 2010/05/31 18:30:06 1.4
+++ pkgsrc/devel/glib2/patches/Attic/patch-cd 2010/11/17 14:36:45 1.5
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1$NetBSD: patch-cd,v 1.4 2010/05/31 18:30:06 wiz Exp $ 1$NetBSD: patch-cd,v 1.5 2010/11/17 14:36:45 drochner Exp $
2 2
3sysutils/gio-fam builds the gio/fam backend as a separate module. Force it 3sysutils/gio-fam builds the gio/fam backend as a separate module. Force it
4to link against the installed version of glib2, as it is not rebuilt by the 4to link against the installed version of glib2, as it is not rebuilt by the
5package. 5package.
6 6
7--- gio/fam/Makefile.in.orig 2010-05-03 00:59:22.000000000 +0000 7--- gio/fam/Makefile.in.orig 2010-11-14 06:01:55.000000000 +0000
8+++ gio/fam/Makefile.in 8+++ gio/fam/Makefile.in
9@@ -76,10 +76,7 @@ am__base_list = \ 9@@ -76,10 +76,7 @@ am__base_list = \
10 am__installdirs = "$(DESTDIR)$(giomoduledir)" 10 am__installdirs = "$(DESTDIR)$(giomoduledir)"
11 LTLIBRARIES = $(giomodule_LTLIBRARIES) 11 LTLIBRARIES = $(giomodule_LTLIBRARIES)
12 am__DEPENDENCIES_1 = 12 am__DEPENDENCIES_1 =
13-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \ 13-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
14- $(top_builddir)/gobject/libgobject-2.0.la \ 14- $(top_builddir)/gobject/libgobject-2.0.la \
15- $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \ 15- $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
16- $(am__DEPENDENCIES_1) 16- $(am__DEPENDENCIES_1)
17+libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1) 17+libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
18 am__objects_1 = 18 am__objects_1 =
19 am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ 19 am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
20 libgiofam_la-fam-module.lo \ 20 libgiofam_la-fam-module.lo \
21@@ -370,9 +367,7 @@ libgiofam_la_CFLAGS = \ 21@@ -384,9 +381,7 @@ libgiofam_la_CFLAGS = \
22  22
23 libgiofam_la_LDFLAGS = $(module_flags) 23 libgiofam_la_LDFLAGS = $(module_flags)
24 libgiofam_la_LIBADD = \ 24 libgiofam_la_LIBADD = \
25- $(top_builddir)/gio/libgio-2.0.la \ 25- $(top_builddir)/gio/libgio-2.0.la \
26- $(top_builddir)/gobject/libgobject-2.0.la \ 26- $(top_builddir)/gobject/libgobject-2.0.la \
27- $(top_builddir)/glib/libglib-2.0.la \ 27- $(top_builddir)/glib/libglib-2.0.la \
28+ $$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0) \ 28+ $$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0) \
29 $(GLIB_LIBS) \ 29 $(GLIB_LIBS) \
30 $(FAM_LIBS) \ 30 $(FAM_LIBS) \
31 $(NULL) 31 $(NULL)
32@@ -777,7 +772,7 @@ check-local: test 32@@ -817,9 +812,6 @@ lcov-clean:
 33 check-local: test-nonrecursive
33  34
34 install-data-hook: 35 install-data-hook:
35 if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ 36- if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \
36- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ 37- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \
37+ ${LOCALBASE}/bin/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ 38- fi
38 fi 
39  39
40 uninstall-local: 40 uninstall-local:
 41 $(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodules.cache