diff options
| -rw-r--r-- | devel/glib2/distinfo | 4 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-cd | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 07b2ed5d967..22ffb5f28d5 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.142 2010/11/15 14:36:03 drochner Exp $ +$NetBSD: distinfo,v 1.143 2010/11/17 14:36:45 drochner Exp $ SHA1 (glib-2.26.1.tar.bz2) = 8d35d5cf41d681dd6480a16be39f7d3cffbd29f0 RMD160 (glib-2.26.1.tar.bz2) = e8b00fce55aa539ee00588500c0162a8877dc060 @@ -21,7 +21,7 @@ SHA1 (patch-ao) = 293b462565ef4991af807e79c1200df5458058e7 SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54 -SHA1 (patch-cd) = aaada4d63aaac18f71ac9fdbff15e8ef0579cf39 +SHA1 (patch-cd) = d1c6fa921be58469adb6b860f4e91f0a7eff067e SHA1 (patch-ce) = 7192ae3bbf27ff92287a66ee090baa80a12cdc79 SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44 SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632 diff --git a/devel/glib2/patches/patch-cd b/devel/glib2/patches/patch-cd index d326b611db8..4f237aa4870 100644 --- a/devel/glib2/patches/patch-cd +++ b/devel/glib2/patches/patch-cd @@ -1,10 +1,10 @@ -$NetBSD: patch-cd,v 1.4 2010/05/31 18:30:06 wiz Exp $ +$NetBSD: patch-cd,v 1.5 2010/11/17 14:36:45 drochner Exp $ sysutils/gio-fam builds the gio/fam backend as a separate module. Force it to link against the installed version of glib2, as it is not rebuilt by the package. ---- gio/fam/Makefile.in.orig 2010-05-03 00:59:22.000000000 +0000 +--- gio/fam/Makefile.in.orig 2010-11-14 06:01:55.000000000 +0000 +++ gio/fam/Makefile.in @@ -76,10 +76,7 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(giomoduledir)" @@ -18,7 +18,7 @@ package. am__objects_1 = am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ libgiofam_la-fam-module.lo \ -@@ -370,9 +367,7 @@ libgiofam_la_CFLAGS = \ +@@ -384,9 +381,7 @@ libgiofam_la_CFLAGS = \ libgiofam_la_LDFLAGS = $(module_flags) libgiofam_la_LIBADD = \ @@ -29,12 +29,13 @@ package. $(GLIB_LIBS) \ $(FAM_LIBS) \ $(NULL) -@@ -777,7 +772,7 @@ check-local: test +@@ -817,9 +812,6 @@ lcov-clean: + check-local: test-nonrecursive install-data-hook: - if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ +- if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ - $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ -+ ${LOCALBASE}/bin/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ - fi +- fi uninstall-local: + $(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodules.cache |