diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-01-10 03:55:24 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-01-10 03:55:24 +0800 |
| commit | 1f54644c601db9102def6d2a04c4af7db9714511 (patch) | |
| tree | 7f88663aed80c12d3d352c2c12c2a2b012e07f3d /Mk | |
| parent | 868ea39205fb83309080af61df139d23278b8dff (diff) | |
| download | marcuscom-ports-1f54644c601db9102def6d2a04c4af7db9714511.tar.gz marcuscom-ports-1f54644c601db9102def6d2a04c4af7db9714511.tar.zst marcuscom-ports-1f54644c601db9102def6d2a04c4af7db9714511.zip | |
Update glib20 to 2.15.1, and break out the GIO FAM backend into a separate
port (gio-fam-backend).
This requires a bit of trickery in bsd.gnome.mk to
avoid a dependency loop, so a new _glib20 component was added that should
only be required by FAM providers. To that end, add gamin, and make gamin
depend on _glib20.
Update gvfs to 0.1.1, and add a new gvfs component to bsd.gnome.mk.
gio-standalone is no longer needed as this code is now part of glib.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10030 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 4d51444ef..57cb0e2ca 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.429 2007/08/04 22:09:00 marcus Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.430 2007/10/29 11:44:38 ahze Exp $ # # Please view me with 4 column tabs! @@ -57,9 +57,9 @@ _USE_GNOME_ALL+= bonobo gal gconf gdkpixbuf glib12 glibwww \ # GNOME 2 components _USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gail \ - gal2 gconf2 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \ + gal2 gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \ gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \ - gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 \ + gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 gvfs \ libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 \ libglade2 libgnome libgnomecanvas libgnomedb libgnomekbd libgnomeprint \ libgnomeprintui libgnomeui libgsf libgsf_gnome libgtkhtml libidl \ @@ -250,9 +250,13 @@ pygnome_BUILD_DEPENDS= ${pygnome_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome pygnome_RUN_DEPENDS= ${pygnome_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome pygnome_USE_GNOME_IMPL= gtkhtml pygtk -glib20_LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 -glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc -glib20_USE_GNOME_IMPL=gnometarget pkgconfig +_glib20_LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +_glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc +_glib20_USE_GNOME_IMPL= gnometarget pkgconfig + +glib20_RUN_DEPENDS= ${LOCALBASE}/lib/gio/modules/libgiofam.so:${PORTSDIR}/devel/gio-fam-backend +glib20_DETECT= ${LOCALBASE}/lib/gio/modules/libgiofam.so +glib20_USE_GNOME_IMPL= _glib20 atk_LIB_DEPENDS= atk-1.0.0:${PORTSDIR}/accessibility/atk atk_DETECT= ${LOCALBASE}/libdata/pkgconfig/atk.pc @@ -510,6 +514,10 @@ pygtksourceview_BUILD_DEPENDS= ${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkit pygtksourceview_RUN_DEPENDS= ${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview pygtksourceview_USE_GNOME_IMPL= gtksourceview2 pygtk2 +gvfs_DETECT= ${LOCALBASE}/lib/libgvfscommon.so +gvfs_LIB_DEPENDS= gvfscommon.0:${PORTSDIR}/devel/gvfs +gvfs_USE_GNOME_IMPL= glib20 + ######## #### NOTE: DO NOT COMMIT THIS NEXT PART TO THE MAIN FREEBSD REPO ######## |