diff options
Diffstat (limited to 'devel/glib2/patches/patch-cd')
| -rw-r--r-- | devel/glib2/patches/patch-cd | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/devel/glib2/patches/patch-cd b/devel/glib2/patches/patch-cd index dd5860bbdc5..bd719bc8520 100644 --- a/devel/glib2/patches/patch-cd +++ b/devel/glib2/patches/patch-cd @@ -1,10 +1,6 @@ -$NetBSD: patch-cd,v 1.2 2010/04/20 22:39:55 wiz Exp $ +$NetBSD: patch-cd,v 1.3 2010/05/31 17:30:36 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-03-16 02:52:15.000000000 +0000 +--- gio/fam/Makefile.in.orig 2010-05-03 00:59:22.000000000 +0000 +++ gio/fam/Makefile.in @@ -76,10 +76,7 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(giomoduledir)" @@ -18,16 +14,7 @@ package. am__objects_1 = am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ libgiofam_la-fam-module.lo \ -@@ -311,7 +308,7 @@ infodir = @infodir@ - install_sh = @install_sh@ - libdir = @libdir@ - libexecdir = @libexecdir@ --localedir = @localedir@ -+localedir = /usr/pkg/share/locale - localstatedir = @localstatedir@ - lt_ECHO = @lt_ECHO@ - mandir = @mandir@ -@@ -369,9 +366,7 @@ libgiofam_la_CFLAGS = \ +@@ -370,9 +367,7 @@ libgiofam_la_CFLAGS = \ libgiofam_la_LDFLAGS = $(module_flags) libgiofam_la_LIBADD = \ @@ -38,3 +25,12 @@ package. $(GLIB_LIBS) \ $(FAM_LIBS) \ $(NULL) +@@ -777,7 +772,7 @@ check-local: test + + install-data-hook: + 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 + + uninstall-local: |