diff options
| author | tnn <tnn@pkgsrc.org> | 2008-04-13 05:31:16 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2008-04-13 05:31:16 +0000 |
| commit | e9f4a419aad6d4d33e84ad21cbb64c4cfd865f87 (patch) | |
| tree | 033175bfb011af73bafd3e65b3caf007fb73b991 /devel/glib2 | |
| parent | f6c235754f95340909f65966c43fc70b36498a6e (diff) | |
| download | pkgsrc-e9f4a419aad6d4d33e84ad21cbb64c4cfd865f87.tar.gz | |
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 (limited to 'devel/glib2')
| -rw-r--r-- | devel/glib2/Makefile | 12 | ||||
| -rw-r--r-- | devel/glib2/PLIST | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 75776f66252..d565a7ed4e2 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -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 @@ CONFIGURE_ARGS+= --disable-threads .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 --git a/devel/glib2/PLIST b/devel/glib2/PLIST index 79d76f31dc6..f8e6be54a94 100644 --- a/devel/glib2/PLIST +++ b/devel/glib2/PLIST @@ -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/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 -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 |