Page MenuHomeFreeBSD
Files F149863819

D13550.diff
No OneTemporary
Actions

D13550.diff
View Options

Index: head/Mk/Uses/gnome.mk
===================================================================
--- head/Mk/Uses/gnome.mk
+++ head/Mk/Uses/gnome.mk
@@ -90,7 +90,7 @@
# GNOME 3 components
_USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
gnomemenus3 gsound gtk30 gtkhtml4 gtksourceview3 libgda5 \
- libgda5-ui libwnck3 metacity nautilus3 py3gobject3 \
+ libgda5-ui libwnck3 metacity nautilus3 \
pygobject3 vte3
# C++ bindings
@@ -116,66 +116,50 @@
--disable-gtk-doc \
--with-gconf-source=${GCONF_CONFIG_SOURCE}
-atkmm_DETECT= ${LOCALBASE}/libdata/pkgconfig/atkmm-1.6.pc
atkmm_LIB_DEPENDS= libatkmm-1.6.so:accessibility/atkmm
atkmm_USE_GNOME_IMPL= glibmm atk
-libxml++26_DETECT= ${LOCALBASE}/libdata/pkgconfig/libxml++-2.6.pc
libxml++26_LIB_DEPENDS= libxml++-2.6.so:textproc/libxml++26
libxml++26_USE_GNOME_IMPL= glibmm libxml2
-cairo_DETECT= ${LOCALBASE}/libdata/pkgconfig/cairo.pc
cairo_LIB_DEPENDS= libcairo.so:graphics/cairo
-cairomm_DETECT= ${LOCALBASE}/libdata/pkgconfig/cairomm-1.0.pc
cairomm_LIB_DEPENDS= libcairomm-1.0.so:graphics/cairomm
cairomm_USE_GNOME_IMPL= cairo libxml++26
-gconfmm26_DETECT= ${LOCALBASE}/libdata/pkgconfig/gconfmm-2.6.pc
gconfmm26_LIB_DEPENDS= libgconfmm-2.6.so:devel/gconfmm26
gconfmm26_USE_GNOME_IMPL= glibmm gconf2
-glibmm_DETECT= ${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc
glibmm_LIB_DEPENDS= libglibmm-2.4.so:devel/glibmm
glibmm_USE_GNOME_IMPL= libsigc++20 glib20
-gsound_DETECT= ${LOCALBASE}/libdata/pkgconfig/gsound.pc
gsound_BUILD_DEPENDS= gsound-play:audio/gsound
gsound_LIB_DEPENDS= libgsound.so:audio/gsound
gsound_RUN_DEPENDS= gsound-play:audio/gsound
gsound_USE_GNOME_IMPL= glib20
-gtkmm20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc
gtkmm20_LIB_DEPENDS= libgtkmm-2.0.so:x11-toolkits/gtkmm20
gtkmm20_USE_GNOME_IMPL= libsigc++12 gtk20
-gtkmm24_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc
gtkmm24_LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24
gtkmm24_USE_GNOME_IMPL= glibmm cairomm atkmm pangomm gtk20
-gtkmm30_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtkmm-3.0.pc
gtkmm30_LIB_DEPENDS= libgtkmm-3.0.so:x11-toolkits/gtkmm30
gtkmm30_USE_GNOME_IMPL= glibmm cairomm atkmm pangomm gtk30
-gtksourceviewmm3_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceviewmm-3.0.pc
gtksourceviewmm3_LIB_DEPENDS= libgtksourceviewmm-3.0.so:x11-toolkits/gtksourceviewmm3
gtksourceviewmm3_USE_GNOME_IMPL= gtkmm30 gtksourceview3
-libgdamm5_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgdamm-5.0.pc
libgdamm5_LIB_DEPENDS= libgdamm-5.0.so:databases/libgdamm5
libgdamm5_USE_GNOME_IMPL= libgda5 glibmm
-libgtksourceviewmm_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceviewmm-2.0.pc
libgtksourceviewmm_LIB_DEPENDS= libgtksourceviewmm-2.0.so:x11-toolkits/libgtksourceviewmm
libgtksourceviewmm_USE_GNOME_IMPL= gtksourceview2 gtkmm24
-libsigc++12_DETECT= ${LOCALBASE}/libdata/pkgconfig/sigc++-1.2.pc
libsigc++12_LIB_DEPENDS= libsigc-1.2.so:devel/libsigc++12
-libsigc++20_DETECT= ${LOCALBASE}/libdata/pkgconfig/sigc++-2.0.pc
libsigc++20_LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20
-pangomm_DETECT= ${LOCALBASE}/libdata/pkgconfig/pangomm-1.4.pc
pangomm_LIB_DEPENDS= libpangomm-1.4.so:x11-toolkits/pangomm
pangomm_USE_GNOME_IMPL= pango glibmm cairomm
@@ -183,101 +167,80 @@
esound_LIB_DEPENDS= libesd.so:audio/esound
esound_CONFIGURE_ENV= ESD_CONFIG="${ESD_CONFIG}"
esound_MAKE_ENV= ESD_CONFIG="${ESD_CONFIG}"
-esound_DETECT= ${ESD_CONFIG}
GLIB_CONFIG?= ${LOCALBASE}/bin/glib-config
glib12_LIB_DEPENDS= libglib.so:devel/glib12
glib12_CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
glib12_MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
-glib12_DETECT= ${GLIB_CONFIG}
GTK_CONFIG?= ${LOCALBASE}/bin/gtk-config
gtk12_LIB_DEPENDS= libgtk.so:x11-toolkits/gtk12
gtk12_CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
gtk12_MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-gtk12_DETECT= ${GTK_CONFIG}
gtk12_USE_GNOME_IMPL= glib12
GDK_PIXBUF_CONFIG?= ${LOCALBASE}/bin/gdk-pixbuf-config
gdkpixbuf_LIB_DEPENDS= libgdk_pixbuf.so:graphics/gdk-pixbuf
gdkpixbuf_CONFIGURE_ENV=GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}"
gdkpixbuf_MAKE_ENV= GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}"
-gdkpixbuf_DETECT= ${GDK_PIXBUF_CONFIG}
gdkpixbuf_USE_GNOME_IMPL=gtk12
-gnomemimedata_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc
-gnomemimedata_BUILD_DEPENDS=${gnomemimedata_DETECT}:misc/gnome-mime-data
-gnomemimedata_RUN_DEPENDS=${gnomemimedata_DETECT}:misc/gnome-mime-data
+gnomemimedata_BUILD_DEPENDS=${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:misc/gnome-mime-data
+gnomemimedata_RUN_DEPENDS=${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:misc/gnome-mime-data
glib20_LIB_DEPENDS= libglib-2.0.so:devel/glib20 \
libintl.so:devel/gettext-runtime
-glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc
atk_LIB_DEPENDS= libatk-1.0.so:accessibility/atk
-atk_DETECT= ${LOCALBASE}/libdata/pkgconfig/atk.pc
atk_USE_GNOME_IMPL= glib20
dconf_BUILD_DEPENDS= dconf:devel/dconf
dconf_LIB_DEPENDS= libdconf.so:devel/dconf
dconf_RUN_DEPENDS= dconf:devel/dconf
-dconf_DETECT= ${LOCALBASE}/libdata/pkgconfig/dconf.pc
dconf_USE_GNOME_IMPL= glib20
pango_LIB_DEPENDS= libpango-1.0.so:x11-toolkits/pango
-pango_DETECT= ${LOCALBASE}/libdata/pkgconfig/pango.pc
pango_USE_GNOME_IMPL= glib20
pangox-compat_LIB_DEPENDS= libpangox-1.0.so:x11-toolkits/pangox-compat
-pangox-compat_DETECT= ${LOCALBASE}/libdata/pkgconfig/pangox.pc
pangox-compat_USE_GNOME_IMPL= glib20 pango
gdkpixbuf2_LIB_DEPENDS= libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
-gdkpixbuf2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gdk-pixbuf-2.0.pc
gdkpixbuf2_USE_GNOME_IMPL=glib20
gtk-update-icon-cache_BUILD_DEPENDS= gtk-update-icon-cache:graphics/gtk-update-icon-cache
gtk-update-icon-cache_RUN_DEPENDS= gtk-update-icon-cache:graphics/gtk-update-icon-cache
-gtk-update-icon-cache_DETECT= ${LOCALBASE}/bin/gtk-update-icon-cache
gtk-update-icon-cache_USE_GNOME_IMPL= atk pango gdkpixbuf2
gtk20_LIB_DEPENDS= libgtk-x11-2.0.so:x11-toolkits/gtk20
-gtk20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk+-x11-2.0.pc
gtk20_USE_GNOME_IMPL= atk pango
GTK2_VERSION= 2.10.0
gtk30_LIB_DEPENDS= libgtk-3.so:x11-toolkits/gtk30
-gtk30_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk+-3.0.pc
gtk30_USE_GNOME_IMPL= atk pango
GTK3_VERSION= 3.0.0
libidl_LIB_DEPENDS= libIDL-2.so:devel/libIDL
-libidl_DETECT= ${LOCALBASE}/libdata/pkgconfig/libIDL-2.0.pc
libidl_USE_GNOME_IMPL= glib20
orbit2_LIB_DEPENDS= libORBit-2.so:devel/ORBit2
-orbit2_DETECT= ${LOCALBASE}/libdata/pkgconfig/ORBit-2.0.pc
orbit2_USE_GNOME_IMPL= libidl
libglade2_LIB_DEPENDS= libglade-2.0.so:devel/libglade2
-libglade2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libglade-2.0.pc
libglade2_USE_GNOME_IMPL=libxml2 gtk20
libxml2_BUILD_DEPENDS= xml2-config:textproc/libxml2
libxml2_LIB_DEPENDS= libxml2.so:textproc/libxml2
libxml2_RUN_DEPENDS= xml2-config:textproc/libxml2
-libxml2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc
libxslt_BUILD_DEPENDS= xsltproc:textproc/libxslt
libxslt_LIB_DEPENDS= libxslt.so:textproc/libxslt
libxslt_RUN_DEPENDS= ${libxslt_BUILD_DEPENDS}
-libxslt_DETECT= ${LOCALBASE}/libdata/pkgconfig/libxslt.pc
libxslt_USE_GNOME_IMPL= libxml2
libbonobo_LIB_DEPENDS= libbonobo-2.so:devel/libbonobo
-libbonobo_DETECT= ${LOCALBASE}/libdata/pkgconfig/libbonobo-2.0.pc
libbonobo_USE_GNOME_IMPL=libxml2 orbit2
-introspection_DETECT= ${LOCALBASE}/libdata/pkgconfig/gobject-introspection-1.0.pc
introspection_BUILD_DEPENDS= g-ir-scanner:devel/gobject-introspection
introspection_LIB_DEPENDS= libgirepository-1.0.so:devel/gobject-introspection
introspection_RUN_DEPENDS= g-ir-scanner:devel/gobject-introspection
@@ -285,132 +248,96 @@
introspection_MAKE_ENV= GI_SCANNER_DISABLE_CACHE=1 XDG_CACHE_HOME=${WRKDIR}
gconf2_LIB_DEPENDS= libgconf-2.so:devel/gconf2
-gconf2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gconf-2.0.pc
gconf2_USE_GNOME_IMPL= orbit2 libxml2 gtk20
gnomevfs2_LIB_DEPENDS= libgnomevfs-2.so:devel/gnome-vfs
-gnomevfs2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-vfs-2.0.pc
gnomevfs2_USE_GNOME_IMPL=gconf2 gnomemimedata
libgnomecanvas_LIB_DEPENDS= libgnomecanvas-2.so:graphics/libgnomecanvas
-libgnomecanvas_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc
libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2
libartlgpl2_LIB_DEPENDS= libart_lgpl_2.so:graphics/libart_lgpl
-libartlgpl2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc
libgnomeprint_LIB_DEPENDS= libgnomeprint-2-2.so:print/libgnomeprint
-libgnomeprint_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomeprint-2.2.pc
libgnomeprint_USE_GNOME_IMPL= libbonobo libartlgpl2 gtk20
libgnomeprintui_LIB_DEPENDS= libgnomeprintui-2-2.so:x11-toolkits/libgnomeprintui
-libgnomeprintui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomeprintui-2.2.pc
libgnomeprintui_USE_GNOME_IMPL= libgnomeprint libgnomecanvas
libgnome_LIB_DEPENDS= libgnome-2.so:x11/libgnome
-libgnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-2.0.pc
libgnome_USE_GNOME_IMPL=gnomevfs2 esound libbonobo
libbonoboui_LIB_DEPENDS= libbonoboui-2.so:x11-toolkits/libbonoboui
-libbonoboui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libbonoboui-2.0.pc
libbonoboui_USE_GNOME_IMPL= libgnomecanvas libgnome
libgnomeui_LIB_DEPENDS= libgnomeui-2.so:x11-toolkits/libgnomeui
-libgnomeui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomeui-2.0.pc
libgnomeui_USE_GNOME_IMPL= libbonoboui
libgtkhtml_LIB_DEPENDS= libgtkhtml-2.so:www/libgtkhtml
-libgtkhtml_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc
libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2
gnomedesktop3_LIB_DEPENDS= libgnome-desktop-3.so:x11/gnome-desktop
-gnomedesktop3_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-3.0.pc
gnomedesktop3_USE_GNOME_IMPL= gtk30
libwnck_LIB_DEPENDS= libwnck-1.so:x11-toolkits/libwnck
-libwnck_DETECT= ${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc
libwnck_USE_GNOME_IMPL= gtk20
libwnck3_LIB_DEPENDS= libwnck-3.so:x11-toolkits/libwnck3
-libwnck3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libwnck-3.0.pc
libwnck3_USE_GNOME_IMPL=gtk30
vte_LIB_DEPENDS= libvte.so:x11-toolkits/vte
-vte_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte.pc
vte_USE_GNOME_IMPL= gtk20
vte3_LIB_DEPENDS= libvte-2.91.so:x11-toolkits/vte3
-vte3_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte-2.91.pc
vte3_USE_GNOME_IMPL= gtk30
librsvg2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
-librsvg2_DETECT= ${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc
librsvg2_USE_GNOME_IMPL=libgsf gdkpixbuf2 pango
nautilus3_LIB_DEPENDS= libnautilus-extension.so:x11-fm/nautilus
-nautilus3_DETECT= ${LOCALBASE}/share/gir-1.0/Nautilus-3.0.gir
nautilus3_USE_GNOME_IMPL=gnomedesktop3 gvfs libxml2
metacity_LIB_DEPENDS= libmetacity-private.so:x11-wm/metacity
-metacity_DETECT= ${LOCALBASE}/libdata/pkgconfig/libmetacity-private.pc
-gnomecontrolcenter3_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc
-gnomecontrolcenter3_BUILD_DEPENDS= ${gnomecontrolcenter3_DETECT}:sysutils/gnome-control-center
-gnomecontrolcenter3_RUN_DEPENDS= ${gnomecontrolcenter3_DETECT}:sysutils/gnome-control-center
+gnomecontrolcenter3_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc:sysutils/gnome-control-center
+gnomecontrolcenter3_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc:sysutils/gnome-control-center
gnomecontrolcenter3_USE_GNOME_IMPL= gnomedesktop3
libgda5_LIB_DEPENDS= libgda-5.0.so:databases/libgda5
-libgda5_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-5.0.pc
libgda5_USE_GNOME_IMPL= glib20 libxslt
libgda5-ui_LIB_DEPENDS= libgda-ui-5.0.so:databases/libgda5-ui
-libgda5-ui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-ui-5.0.pc
libgda5-ui_USE_GNOME_IMPL=glib20 libxslt libgda5
gtksourceview_LIB_DEPENDS= libgtksourceview-1.0.so:x11-toolkits/gtksourceview
-gtksourceview_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceview-1.0.pc
gtksourceview_USE_GNOME_IMPL=libgnome libgnomeprintui
gtksourceview2_LIB_DEPENDS= libgtksourceview-2.0.so:x11-toolkits/gtksourceview2
-gtksourceview2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceview-2.0.pc
gtksourceview2_USE_GNOME_IMPL=gtk20 libxml2
gtksourceview3_LIB_DEPENDS= libgtksourceview-3.0.so:x11-toolkits/gtksourceview3
-gtksourceview3_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksoureview-3.0.pc
gtksourceview3_USE_GNOME_IMPL=gtk30 libxml2
libgsf_LIB_DEPENDS= libgsf-1.so:devel/libgsf
-libgsf_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-1.pc
libgsf_USE_GNOME_IMPL= glib20 libxml2
-pygobject_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc
pygobject_BUILD_DEPENDS= pygobject-codegen-2.0:devel/py-gobject
pygobject_RUN_DEPENDS= pygobject-codegen-2.0:devel/py-gobject
pygobject_USE_GNOME_IMPL= glib20
-# Have to keep two components because the _DETECT file is not the same.
-py3gobject3_DETECT= ${LOCALBASE}/share/py3gobject3/.keep
-py3gobject3_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
-py3gobject3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
-py3gobject3_USE_GNOME_IMPL= glib20
-
-pygobject3_DETECT= ${LOCALBASE}/share/pygobject3/.keep
pygobject3_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
pygobject3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
pygobject3_USE_GNOME_IMPL= glib20
-pygtk2_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc
-pygtk2_BUILD_DEPENDS= ${pygtk2_DETECT}:x11-toolkits/py-gtk2
-pygtk2_RUN_DEPENDS= ${pygtk2_DETECT}:x11-toolkits/py-gtk2
+pygtk2_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2
+pygtk2_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2
pygtk2_USE_GNOME_IMPL= libglade2 pygobject
-pygnome2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-python-2.0.pc
-pygnome2_BUILD_DEPENDS= ${pygnome2_DETECT}:x11-toolkits/py-gnome2
-pygnome2_RUN_DEPENDS= ${pygnome2_DETECT}:x11-toolkits/py-gnome2
+pygnome2_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-python-2.0.pc:x11-toolkits/py-gnome2
+pygnome2_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-python-2.0.pc:x11-toolkits/py-gnome2
pygnome2_USE_GNOME_IMPL=libgnomeui pygtk2
-intltool_DETECT= ${LOCALBASE}/bin/intltool-extract
-intltool_BUILD_DEPENDS= ${intltool_DETECT}:textproc/intltool
+intltool_BUILD_DEPENDS= ${LOCALBASE}/bin/intltool-extract:textproc/intltool
intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} \
's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
@@ -422,52 +349,41 @@
intlhack_USE_GNOME_IMPL=intltool
gtkhtml3_LIB_DEPENDS= libgtkhtml-3.14.so:www/gtkhtml3
-gtkhtml3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.14.pc
gtkhtml3_USE_GNOME_IMPL=libglade2
gtkhtml4_LIB_DEPENDS= libgtkhtml-4.0.so:www/gtkhtml4
-gtkhtml4_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-4.0.pc
gtkhtml4_USE_GNOME_IMPL=gtk30 libxml2
evolutiondataserver3_LIB_DEPENDS= libedataserver-1.2.so:databases/evolution-data-server
-evolutiondataserver3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libedataserverui-3.0.pc
evolutiondataserver3_USE_GNOME_IMPL= libxml2 gtk30
gnomemenus3_BUILD_DEPENDS= gnome-menus>=3.2.0:x11/gnome-menus
gnomemenus3_RUN_DEPENDS= gnome-menus>=3.2.0:x11/gnome-menus
-gnomemenus3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-menu-3.0.pc
gnomemenus3_USE_GNOME_IMPL= glib20
-gnomedocutils_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-doc-utils.pc
-gnomedocutils_BUILD_DEPENDS= ${gnomedocutils_DETECT}:textproc/gnome-doc-utils
-gnomedocutils_RUN_DEPENDS= ${gnomedocutils_DETECT}:textproc/gnome-doc-utils
+gnomedocutils_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-doc-utils.pc:textproc/gnome-doc-utils
+gnomedocutils_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-doc-utils.pc:textproc/gnome-doc-utils
gnomedocutils_USE_GNOME_IMPL= libxslt
-gtksharp10_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc
-gtksharp10_BUILD_DEPENDS= ${gtksharp10_DETECT}:x11-toolkits/gtk-sharp10
-gtksharp10_RUN_DEPENDS= ${gtksharp10_DETECT}:x11-toolkits/gtk-sharp10
+gtksharp10_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc:x11-toolkits/gtk-sharp10
+gtksharp10_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc:x11-toolkits/gtk-sharp10
gtksharp10_USE_GNOME_IMPL= gtk20
-gtksharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp-2.0.pc
-gtksharp20_BUILD_DEPENDS= ${gtksharp20_DETECT}:x11-toolkits/gtk-sharp20
-gtksharp20_RUN_DEPENDS= ${gtksharp20_DETECT}:x11-toolkits/gtk-sharp20
+gtksharp20_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp-2.0.pc:x11-toolkits/gtk-sharp20
+gtksharp20_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp-2.0.pc:x11-toolkits/gtk-sharp20
gtksharp20_USE_GNOME_IMPL= gtk20
-gnomesharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-sharp-2.0.pc
-gnomesharp20_BUILD_DEPENDS= ${gnomesharp20_DETECT}:x11-toolkits/gnome-sharp20
-gnomesharp20_RUN_DEPENDS= ${gnomesharp20_DETECT}:x11-toolkits/gnome-sharp20
+gnomesharp20_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-sharp-2.0.pc:x11-toolkits/gnome-sharp20
+gnomesharp20_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-sharp-2.0.pc:x11-toolkits/gnome-sharp20
gnomesharp20_USE_GNOME_IMPL= gnomevfs2 gtkhtml3 gtksharp20 librsvg2 vte
-libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
libgnomekbd_LIB_DEPENDS= libgnomekbd.so:x11/libgnomekbd
libgnomekbd_USE_GNOME_IMPL= gtk30 libxml2
-pygtksourceview_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc
-pygtksourceview_BUILD_DEPENDS= ${pygtksourceview_DETECT}:x11-toolkits/py-gtksourceview
-pygtksourceview_RUN_DEPENDS= ${pygtksourceview_DETECT}:x11-toolkits/py-gtksourceview
+pygtksourceview_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc:x11-toolkits/py-gtksourceview
+pygtksourceview_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc:x11-toolkits/py-gtksourceview
pygtksourceview_USE_GNOME_IMPL= gtksourceview2 pygtk2
-gvfs_DETECT= ${LOCALBASE}/lib/gvfs/libgvfscommon.so
gvfs_BUILD_DEPENDS= gvfs>=0:devel/gvfs
gvfs_RUN_DEPENDS= gvfs>=0:devel/gvfs
gvfs_USE_GNOME_IMPL= glib20
@@ -524,18 +440,16 @@
PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS}
. endif
-. if defined(${component}_DETECT)
-. if ${USE_GNOME:M${component}\:build}!=""
+. if ${USE_GNOME:M${component}\:build} && defined(${component}_BUILD_DEPENDS)
BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS}
-. elif ${USE_GNOME:M${component}\:run}!=""
+. elif ${USE_GNOME:M${component}\:run} && defined(${component}_RUN_DEPENDS)
RUN_DEPENDS+= ${${component}_RUN_DEPENDS}
-. else
-. if defined(${component}_LIB_DEPENDS)
+. else
+. if defined(${component}_LIB_DEPENDS)
LIB_DEPENDS+= ${${component}_LIB_DEPENDS}
-. else
+. else
BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS}
RUN_DEPENDS+= ${${component}_RUN_DEPENDS}
-. endif
. endif
. endif
Index: head/Mk/bsd.gecko.mk
===================================================================
--- head/Mk/bsd.gecko.mk
+++ head/Mk/bsd.gecko.mk
@@ -344,8 +344,7 @@
.endif
.if ${PORT_OPTIONS:MGCONF}
-BUILD_DEPENDS+= ${gconf2_DETECT}:${gconf2_LIB_DEPENDS:C/.*://}
-USE_GNOME+= gconf2:build
+USE_GNOME+= gconf2
MOZ_OPTIONS+= --enable-gconf
.else
MOZ_OPTIONS+= --disable-gconf
Index: head/accessibility/accerciser/Makefile
===================================================================
--- head/accessibility/accerciser/Makefile
+++ head/accessibility/accerciser/Makefile
@@ -20,7 +20,7 @@
NO_ARCH= yes
USES= gettext gmake pkgconfig python:3.4+ shebangfix tar:xz
-USE_GNOME= gtk30 intlhack py3gobject3
+USE_GNOME= gtk30 intlhack pygobject3
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
Index: head/accessibility/orca/Makefile
===================================================================
--- head/accessibility/orca/Makefile
+++ head/accessibility/orca/Makefile
@@ -28,7 +28,7 @@
NO_ARCH= yes
USES= gettext gmake gnome pathfix pkgconfig python:3.4+ tar:xz
-USE_GNOME= gtk30 py3gobject3 intlhack
+USE_GNOME= gtk30 pygobject3 intlhack
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
Index: head/accessibility/py-atspi/Makefile
===================================================================
--- head/accessibility/py-atspi/Makefile
+++ head/accessibility/py-atspi/Makefile
@@ -21,11 +21,7 @@
USES= gettext gmake gnome localbase pathfix pkgconfig python tar:xz
USE_PYTHON= flavors
-.if ${FLAVOR:Upy27:Mpy2*}
USE_GNOME= intlhack pygobject3
-.else
-USE_GNOME= intlhack py3gobject3
-.endif
py34_PLIST= ${.CURDIR}/pkg-plist-py3
py35_PLIST= ${.CURDIR}/pkg-plist-py3
py36_PLIST= ${.CURDIR}/pkg-plist-py3
Index: head/audio/lollypop/Makefile
===================================================================
--- head/audio/lollypop/Makefile
+++ head/audio/lollypop/Makefile
@@ -22,7 +22,7 @@
USES= shebangfix python:3.4+ pkgconfig gettext gmake sqlite tar:xz
GNU_CONFIGURE= yes
-USE_GNOME= glib20 gtk30 py3gobject3 introspection:build intltool intlhack
+USE_GNOME= glib20 gtk30 pygobject3 introspection:build intltool intlhack
USE_GSTREAMER1= yes mpg123 ogg flac opus libav faad good speex
USE_PYTHON= py3kplist
INSTALLS_ICONS= yes
Index: head/audio/pithos/Makefile
===================================================================
--- head/audio/pithos/Makefile
+++ head/audio/pithos/Makefile
@@ -19,7 +19,7 @@
${PYTHON_PKGNAMEPREFIX}pylast>0:audio/py-pylast@${FLAVOR} \
git:devel/git
-USE_GNOME= gtk30 py3gobject3
+USE_GNOME= gtk30 pygobject3
USES= python:3.4+
USE_PYTHON= distutils autoplist optsuffix
USE_GSTREAMER= core good bad soup
Index: head/audio/rhythmbox/Makefile
===================================================================
--- head/audio/rhythmbox/Makefile
+++ head/audio/rhythmbox/Makefile
@@ -28,7 +28,7 @@
USES= desktop-file-utils gettext gmake gnome libtool localbase \
pathfix pkgconfig tar:xz
USE_GNOME= intlhack gnomeprefix gtk30 introspection:build \
- py3gobject3
+ pygobject3
USE_XORG= ice xproto
GNU_CONFIGURE= yes
USE_GSTREAMER1= flac lame jpeg cdparanoia vorbis
Index: head/devel/gitg/Makefile
===================================================================
--- head/devel/gitg/Makefile
+++ head/devel/gitg/Makefile
@@ -50,6 +50,6 @@
NLS_CONFIGURE_ENABLE= nls
PYTHON_USES= python:3.2+
PYTHON_CONFIGURE_ENABLE= python
-PYTHON_USE= GNOME=py3gobject3
+PYTHON_USE= GNOME=pygobject3
.include <bsd.port.mk>
Index: head/devel/glade/Makefile
===================================================================
--- head/devel/glade/Makefile
+++ head/devel/glade/Makefile
@@ -40,6 +40,6 @@
OPTIONS_DEFAULT=PYTHON
PYTHON_CONFIGURE_ENABLE= python
PYTHON_USES= python:3.4+
-PYTHON_USE= GNOME=py3gobject3
+PYTHON_USE= GNOME=pygobject3
.include <bsd.port.mk>
Index: head/devel/gnome-builder/Makefile
===================================================================
--- head/devel/gnome-builder/Makefile
+++ head/devel/gnome-builder/Makefile
@@ -26,7 +26,7 @@
PORTDOCS= *
USES= cpe gettext gmake libtool pathfix python:3.4+ pkgconfig tar:xz
-USE_GNOME= glib20 gtk30 gtksourceview3 gtk-update-icon-cache py3gobject3
+USE_GNOME= glib20 gtk30 gtksourceview3 gtk-update-icon-cache pygobject3
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--disable-debug \
ac_cv_path_PYTHON3_CONFIG=${PYTHON_CMD}-config
Index: head/devel/libpeas/Makefile
===================================================================
--- head/devel/libpeas/Makefile
+++ head/devel/libpeas/Makefile
@@ -39,13 +39,12 @@
.if ${LIBPEAS_SLAVE} == python
USES+= python
USE_PYTHON= flavors
-.if ${FLAVOR:Upy27:Mpy2*}
USE_GNOME+= pygobject3
+.if ${FLAVOR:Upy27:Mpy2*}
CONFIGURE_ARGS+= --disable-python3
BUILD_WRKSRC= ${WRKSRC}/loaders/python
INSTALL_WRKSRC= ${WRKSRC}/loaders/python
.else
-USE_GNOME+= py3gobject3
CONFIGURE_ARGS+= --disable-python2 \
ac_cv_path_PYTHON3_CONFIG=${LOCALBASE}/bin/python${PYTHON_VER}-config
BUILD_WRKSRC= ${WRKSRC}/loaders/python3
Index: head/editors/gedit/Makefile
===================================================================
--- head/editors/gedit/Makefile
+++ head/editors/gedit/Makefile
@@ -30,7 +30,7 @@
USES= desktop-file-utils gettext gmake gnome libtool localbase \
pathfix pkgconfig python:3.2+ tar:xz
USE_GNOME= cairo gdkpixbuf2 gtksourceview3 intlhack introspection \
- libxml2 py3gobject3
+ libxml2 pygobject3
USE_XORG= sm x11
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-updater \
Index: head/games/gnome-sudoku/Makefile
===================================================================
--- head/games/gnome-sudoku/Makefile
+++ head/games/gnome-sudoku/Makefile
@@ -24,7 +24,7 @@
USES= gettext gmake gnome localbase pathfix \
pkgconfig python:3.3+ shebangfix tar:xz
-USE_GNOME= cairo gtk30 intlhack libxml2:build py3gobject3
+USE_GNOME= cairo gtk30 intlhack libxml2:build pygobject3
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
Index: head/graphics/graphene/Makefile
===================================================================
--- head/graphics/graphene/Makefile
+++ head/graphics/graphene/Makefile
@@ -12,7 +12,7 @@
LICENSE= MIT
USES= gnome meson pkgconfig python:3.4+ shebangfix tar:xz
-USE_GNOME= glib20 py3gobject3
+USE_GNOME= glib20 pygobject3
OPTIONS_SUB= yes
OPTIONS_DEFINE= GTKDOC #INTROSPECTION
Index: head/graphics/variety/Makefile
===================================================================
--- head/graphics/variety/Makefile
+++ head/graphics/variety/Makefile
@@ -22,7 +22,6 @@
${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.5.1:ftp/py-pycurl@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}exiv2>=0.3.2_3:graphics/py-exiv2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gobject3>=3.14.0:devel/py-gobject3@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml@${FLAVOR} \
@@ -39,7 +38,8 @@
SHEBANG_FILES= bin/variety data/scripts/*
-USES= desktop-file-utils gettext python:2 shebangfix
+USES= desktop-file-utils gettext python:2 shebangfix gnome
+USE_GNOME= pygobject3:run
USE_PYTHON= distutils
WRKSRC= ${WRKDIR}/variety
Index: head/multimedia/py-gstreamer1/Makefile
===================================================================
--- head/multimedia/py-gstreamer1/Makefile
+++ head/multimedia/py-gstreamer1/Makefile
@@ -18,11 +18,7 @@
PORTSCOUT= limitw:1,even
USES= gmake libtool localbase pathfix pkgconfig python tar:xz
-.if ${FLAVOR:Upy27:Mpy2*}
USE_GNOME= pygobject3
-.else
-USE_GNOME= py3gobject3
-.endif
py34_PLIST= ${.CURDIR}/pkg-plist-py3
py35_PLIST= ${.CURDIR}/pkg-plist-py3
py36_PLIST= ${.CURDIR}/pkg-plist-py3
Index: head/science/gramps/Makefile
===================================================================
--- head/science/gramps/Makefile
+++ head/science/gramps/Makefile
@@ -23,7 +23,7 @@
NO_ARCH= yes
USES= desktop-file-utils gettext shared-mime-info python:3.2+
-USE_GNOME= cairo gtk30 intltool librsvg2 pango py3gobject3
+USE_GNOME= cairo gtk30 intltool librsvg2 pango pygobject3
USE_PYTHON= autoplist distutils optsuffix
CONFIGURE_ARGS= --disable-mime-install
INSTALLS_OMF= yes
Index: head/sysutils/battray/Makefile
===================================================================
--- head/sysutils/battray/Makefile
+++ head/sysutils/battray/Makefile
@@ -13,7 +13,7 @@
LICENSE= MIT
USES= python:3.3+
-USE_GNOME= py3gobject3
+USE_GNOME= pygobject3
USE_PYTHON= autoplist distutils optsuffix
USE_GITHUB= yes
Index: head/sysutils/catfish/Makefile
===================================================================
--- head/sysutils/catfish/Makefile
+++ head/sysutils/catfish/Makefile
@@ -14,13 +14,12 @@
RUN_DEPENDS= \
${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR} \
gksu:sysutils/gksu
BUILD_DEPENDS= ${RUN_DEPENDS}
USES= python:2.7
USE_PYTHON= distutils
-USE_GNOME= gtk30 intltool
+USE_GNOME= gtk30 intltool pygobject3
.include <bsd.port.pre.mk>
Index: head/sysutils/solaar/Makefile
===================================================================
--- head/sysutils/solaar/Makefile
+++ head/sysutils/solaar/Makefile
@@ -29,7 +29,8 @@
NO_ARCH= yes
OPTIONS_DEFINE= GUI
-GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR}
+GUI_USES= gnome
+GUI_USE= gnome=pygobject3:run
post-patch:
@${CP} ${FILESDIR}/hidapi.py ${WRKSRC}/lib/hidapi/udev.py
Index: head/textproc/ibus-typing-booster/Makefile
===================================================================
--- head/textproc/ibus-typing-booster/Makefile
+++ head/textproc/ibus-typing-booster/Makefile
@@ -12,14 +12,12 @@
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py-xdg@${PY_FLAVOR} \
- ${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py-gobject3@${PY_FLAVOR} \
${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
LIB_DEPENDS= libibus-1.0.so:textproc/ibus \
libm17n.so:devel/m17n-lib
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py-xdg@${PY_FLAVOR} \
${PYTHON_SITELIBDIR}/dbus/bus.py:devel/py-dbus@${PY_FLAVOR} \
${PYTHON_SITELIBDIR}/hunspell.so:textproc/py-hunspell@${PY_FLAVOR} \
- ${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py-gobject3@${PY_FLAVOR} \
${LOCALBASE}/share/unicode/ucd/Index.txt:textproc/UCD \
${LOCALBASE}/share/unicode/cldr/readme.html:textproc/CLDR\
${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
@@ -30,7 +28,8 @@
USE_GITHUB= yes
GH_ACCOUNT= mike-fabian
-USES= autoreconf gettext gmake iconv pathfix pkgconfig python:3.3+
+USES= autoreconf gettext gmake gnome iconv pathfix pkgconfig python:3.3+
+USE_GNOME= pygobject3
GNU_CONFIGURE= yes
NO_ARCH= yes
TEST_TARGET= check

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 28, 4:46 PM (13 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30449990
Default Alt Text
D13550.diff (29 KB)

Event Timeline