Drop fam support from devel/glib2; I'll readd this as sysutils/gio-fam.

This functionality can easily be built as a loadable module, so it should
not be conditional on a build-time option.

Split the Makefile into two parts so that the sysutils/gio-fam package can
reuse most of it.

Bump PKGREVISION to 1.

6 files changed, 131 insertions, 108 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index c6679c3ef1b..abc00619502 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,27 +1,13 @@
-# $NetBSD: Makefile,v 1.172 2010/03/16 13:41:15 wiz Exp $
+# $NetBSD: Makefile,v 1.173 2010/04/20 17:43:50 jmmv Exp $
 
-# When updating glib2, please apply patch-ak to configure.in
-# Then run a matching version of autoconf to regen patch-aa.
-DISTNAME=		glib-2.22.5
-PKGNAME=		${DISTNAME:S/glib/glib2/}
+.include "Makefile.common"
+
+PKGREVISION=		1
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.22/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.22/}
-EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://developer.gnome.org/doc/API/2.0/glib/glib.html
 COMMENT=		Some useful routines for C programming (glib2)
-LICENSE=		gnu-lgpl-v2
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake msgfmt perl:run pkg-config
-USE_LANGUAGES=		c c++ c99
-USE_LIBTOOL=		yes
-TEST_TARGET=		check
+USE_TOOLS+=		msgfmt perl:run
 
 PKGCONFIG_OVERRIDE=	glib-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	glib-2.0.pc.in
@@ -37,64 +23,10 @@ PKGCONFIG_OVERRIDE+=	gthread-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gio-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gio-unix-2.0.pc.in
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
-CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
-CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu
-CONFIGURE_ARGS+=	--with-pcre=system
-
-CONFIGURE_ENV+=		PERL_PATH=${PERL5:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-# configure detects wrongly
-CONFIGURE_ENV+=		ac_cv_func_statfs=no
-.endif
-
-CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
-CPPFLAGS+=		-DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
-CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-
-.if ${OPSYS} == "FreeBSD"
-SUBST_CLASSES+=		thr
-SUBST_STAGE.thr=	post-patch
-SUBST_FILES.thr=	gthread/Makefile.in
-.  if ${OS_VERSION:R} >= 5
-SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
-.  else
-SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
-.  endif
-SUBST_MESSAGE.thr=	Fixing libgthread.
-
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*)
-CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
-.endif
-
-.if ${OPSYS} == "HPUX"
-CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
-.endif
-
-PLIST_VARS+=		fam
-
-.if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1"
-.include "options.mk"
-.endif
+# need pcre utf8 + unicode-properties
+BUILDLINK_API_DEPENDS.pcre+=	pcre>=7.4nb1
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-
-.if !empty(MACHINE_PLATFORM:MIRIX-5*)
-CONFIGURE_ARGS+=	--disable-threads
-.else
-.include "../../mk/pthread.buildlink3.mk"
-.endif
-# need pcre utf8 + unicode-properties
-BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
 .include "../../devel/pcre/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
new file mode 100644
index 00000000000..79d23c085be
--- /dev/null
+++ b/devel/glib2/Makefile.common
@@ -0,0 +1,81 @@
+# $NetBSD: Makefile.common,v 1.1 2010/04/20 17:43:50 jmmv Exp $
+#
+# used by devel/glib2/Makefile
+# used by sysutils/gio-fam/Makefile
+
+# When updating this package, please apply patch-ak to configure.in and
+# then run a matching version of autoconf to regen patch-aa.
+DISTNAME=		glib-2.22.5
+PKGNAME=		${DISTNAME:S/glib/glib2/}
+CATEGORIES=		# empty; redefined in Makefile
+MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.22/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.22/}
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://developer.gnome.org/doc/API/2.0/glib/glib.html
+COMMENT=		# empty; redefined in Makefile
+LICENSE=		gnu-lgpl-v2
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		gmake pkg-config
+USE_LANGUAGES=		c c++ c99
+USE_LIBTOOL=		yes
+TEST_TARGET=		check
+
+DISTINFO_FILE=		${.CURDIR}/../../devel/glib2/distinfo
+PATCHDIR=		${.CURDIR}/../../devel/glib2/patches
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+CONFIGURE_ARGS+=	--disable-fam	# See sysutils/gio-fam.
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
+CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
+CONFIGURE_ARGS+=	--with-pcre=system
+
+CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu
+
+CONFIGURE_ENV+=		PERL_PATH=${PERL5:Q}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# configure detects wrongly
+CONFIGURE_ENV+=		ac_cv_func_statfs=no
+.endif
+
+CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
+CPPFLAGS+=		-DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
+CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
+
+.if ${OPSYS} == "FreeBSD"
+SUBST_CLASSES+=		thr
+SUBST_STAGE.thr=	post-patch
+SUBST_FILES.thr=	gthread/Makefile.in
+.  if ${OS_VERSION:R} >= 5
+SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
+.  else
+SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
+.  endif
+SUBST_MESSAGE.thr=	Fixing libgthread.
+
+.endif
+
+.if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*)
+CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
+.endif
+
+.if ${OPSYS} == "HPUX"
+CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
+.endif
+
+.include "../../mk/dlopen.buildlink3.mk"
+
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
+CONFIGURE_ARGS+=	--disable-threads
+.else
+.include "../../mk/pthread.buildlink3.mk"
+.endif
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 63b72f03dba..16db274d908 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.51 2010/03/16 13:41:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.52 2010/04/20 17:43:50 jmmv Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -158,7 +158,6 @@ include/glib/glib-2.0/gobject/gvalue.h
 include/glib/glib-2.0/gobject/gvaluearray.h
 include/glib/glib-2.0/gobject/gvaluecollector.h
 include/glib/glib-2.0/gobject/gvaluetypes.h
-${PLIST.fam}lib/gio/modules/libgiofam.la
 lib/glib-2.0/include/glibconfig.h
 lib/libgio-2.0.la
 lib/libglib-2.0.la
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 1a57f7df26b..7c75ceb9042 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.131 2010/03/16 13:41:15 wiz Exp $
+$NetBSD: distinfo,v 1.132 2010/04/20 17:43:51 jmmv Exp $
 
 SHA1 (glib-2.22.5.tar.bz2) = a35acb06c3155937651aaffc1f1895c6e19a91a4
 RMD160 (glib-2.22.5.tar.bz2) = 2e2f06f956f63a75121b335e4150edc44f5e04f2
@@ -19,3 +19,4 @@ SHA1 (patch-an) = e4a4b88a029c534f5be552eb301607ac57961915
 SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
 SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
+SHA1 (patch-cd) = 1548985fcaca76fc42bed651eda2ea658eb84fd7
diff --git a/devel/glib2/options.mk b/devel/glib2/options.mk
deleted file mode 100644
index 523bf26c8ae..00000000000
--- a/devel/glib2/options.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2009/06/13 06:46:42 rillig Exp $
-#
-# This file is *not* included for HPUX and OSF1, as they don't have
-# a working FAM implementation.
-
-PKG_OPTIONS_VAR =	PKG_OPTIONS.glib2
-PKG_SUPPORTED_OPTIONS=	fam
-PKG_SUGGESTED_OPTIONS=	fam
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mfam)
-PLIST.fam=		yes
-FAM_ACCEPTED=		fam gamin
-FAM_SERVER=		no
-.  include "../../mk/fam.buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-fam
-
-.  if ${OPSYS} == "IRIX"
-SUBST_CLASSES+=			fam-linkage
-SUBST_STAGE.fam-linkage=	pre-configure
-SUBST_MESSAGE.fam-linkage=	Fixing fam linkage
-SUBST_FILES.fam-linkage=	gio/fam/Makefile.in
-SUBST_SED.fam-linkage=		-e 's,^FAM_LIBS =.*$$,FAM_LIBS = -lfam -lC,g'
-
-BUILDLINK_TRANSFORM+=		l:fam:fam:C
-.  endif
-.else
-CONFIGURE_ARGS+=	--disable-fam
-.endif
diff --git a/devel/glib2/patches/patch-cd b/devel/glib2/patches/patch-cd
new file mode 100644
index 00000000000..ac5c9be3199
--- /dev/null
+++ b/devel/glib2/patches/patch-cd
@@ -0,0 +1,40 @@
+$NetBSD: patch-cd,v 1.1 2010/04/20 17:43:51 jmmv Exp $
+
+sysutils/glib2-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
+@@ -76,10 +76,7 @@ am__base_list = \
+ am__installdirs = "$(DESTDIR)$(giomoduledir)"
+ LTLIBRARIES = $(giomodule_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
+-	$(top_builddir)/gobject/libgobject-2.0.la \
+-	$(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
++libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ 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 = \
+ 
+ libgiofam_la_LDFLAGS = $(module_flags)
+ libgiofam_la_LIBADD = \
+-		$(top_builddir)/gio/libgio-2.0.la \
+-		$(top_builddir)/gobject/libgobject-2.0.la \
+-		$(top_builddir)/glib/libglib-2.0.la \
++		$$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0) \
+ 		$(GLIB_LIBS) \
+ 		$(FAM_LIBS) \
+ 		$(NULL)