[pkgsrc/trunk]: pkgsrc/devel/glib2 Don't accept sysutils/gamin as a "fam" imp...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fed97220d715
branches:  trunk
changeset: 540985:fed97220d715
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Apr 13 05:31:16 2008 +0000

description:
Don't accept sysutils/gamin as a "fam" implementation, because gamin
in turn depends on glib2!
Additionally, disable fam support entirely on HP-UX, because it uses
gamin as the default fam type and sysutils/fam lacks platform support.

diffstat:

 devel/glib2/Makefile |  12 ++++++++++--
 devel/glib2/PLIST    |   4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r ee53601a305f -r fed97220d715 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Sun Apr 13 05:25:25 2008 +0000
+++ b/devel/glib2/Makefile      Sun Apr 13 05:31:16 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2008/04/10 12:13:49 drochner Exp $
+# $NetBSD: Makefile,v 1.133 2008/04/13 05:31:16 tnn Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
@@ -98,6 +98,14 @@
 .include "../../mk/pthread.buildlink3.mk"
 .endif
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../mk/fam.buildlink3.mk"
+
+.if ${OPSYS} == "HPUX"
+PLIST_SUBST+=          FAM="@comment "
+CONFIGURE_ARGS+=       --disable-fam
+.else
+PLIST_SUBST+=          FAM=""
+FAM_ACCEPTED=          fam
+. include "../../mk/fam.buildlink3.mk"
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r ee53601a305f -r fed97220d715 devel/glib2/PLIST
--- a/devel/glib2/PLIST Sun Apr 13 05:25:25 2008 +0000
+++ b/devel/glib2/PLIST Sun Apr 13 05:31:16 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2008/04/10 12:13:49 drochner Exp $
+@comment $NetBSD: PLIST,v 1.40 2008/04/13 05:31:16 tnn Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -128,7 +128,7 @@
 include/glib/glib-2.0/gobject/gvaluearray.h
 include/glib/glib-2.0/gobject/gvaluecollector.h
 include/glib/glib-2.0/gobject/gvaluetypes.h
-lib/gio/modules/libgiofam.la
+${FAM}lib/gio/modules/libgiofam.la
 lib/glib-2.0/include/glibconfig.h
 lib/libgio-2.0.la
 lib/libglib-2.0.la