Add support for running gio-querymodules.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13524 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 23 insertions, 14 deletions

diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 751c8ebae..20f5355c1 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.44 2009/12/21 16:26:58 kwm Exp $
+#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.45 2010/01/26 04:15:48 avl Exp $
 #
 
 PORTNAME=	gio-fam-backend
 PORTVERSION=	2.23.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
diff --git a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
index 2d770297a..44250d545 100644
--- a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
+++ b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
@@ -1,7 +1,7 @@
---- gio/fam/Makefile.in.orig	2008-01-07 19:40:38.000000000 -0500
-+++ gio/fam/Makefile.in	2008-01-07 19:41:53.000000000 -0500
-@@ -59,9 +59,8 @@ am__installdirs = "$(DESTDIR)$(giomodule
- giomoduleLTLIBRARIES_INSTALL = $(INSTALL)
+--- gio/fam/Makefile.in.orig	2010-01-28 10:40:29.000000000 -0500
++++ gio/fam/Makefile.in	2010-01-28 10:43:26.000000000 -0500
+@@ -76,9 +76,8 @@ am__base_list = \
+ am__installdirs = "$(DESTDIR)$(giomoduledir)"
  LTLIBRARIES = $(giomodule_LTLIBRARIES)
  am__DEPENDENCIES_1 =
 -libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
@@ -12,7 +12,7 @@
  	$(am__DEPENDENCIES_1)
  am__objects_1 =
  am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
-@@ -321,9 +320,9 @@ libgiofam_la_CFLAGS = \
+@@ -369,9 +368,9 @@ libgiofam_la_CFLAGS = \
  
  libgiofam_la_LDFLAGS = $(module_flags)
  libgiofam_la_LIBADD = \
@@ -25,11 +25,12 @@
  		$(GLIB_LIBS) \
  		$(FAM_LIBS) \
  		$(NULL)
-@@ -659,7 +658,6 @@ info-am:
+@@ -776,7 +775,7 @@ check-local: test
  
- install-data-am: install-giomoduleLTLIBRARIES
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-dvi: install-dvi-am
+ install-data-hook:
+ 	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
+-		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
++		gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
+ 	fi
  
- install-dvi-am:
+ uninstall-local:
diff --git a/devel/gio-fam-backend/pkg-plist b/devel/gio-fam-backend/pkg-plist
index 7e06d5a98..f3ca7da86 100644
--- a/devel/gio-fam-backend/pkg-plist
+++ b/devel/gio-fam-backend/pkg-plist
@@ -1,3 +1,5 @@
 lib/gio/modules/libgiofam.a
 lib/gio/modules/libgiofam.la
 lib/gio/modules/libgiofam.so
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index e46e14532..9f5402e98 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,13 +3,13 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.158 2009/12/21 16:26:58 kwm Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.159 2010/01/26 04:04:19 avl Exp $
 #
 # !! DON'T FORGET ABOUT devel/gio-fam-backend !!
 
 PORTNAME=	glib
 PORTVERSION=	2.23.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
@@ -73,6 +73,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/glib/gutils.c
 
+post-install:
+	-${PREFIX}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
+
 .include <bsd.port.post.mk>
 
 .endif
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 0b0828df8..017b4d3a2 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -294,6 +294,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrm share/glib-2.0/gettext
 @dirrm share/glib-2.0
 @exec mkdir -p %D/lib/gio/modules
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@unexec /bin/rm -f %D/lib/gio/modules/giomodule.cache
 @dirrmtry lib/gio/modules
 @dirrmtry lib/gio
 @dirrm include/glib-2.0/gobject