From 0b743289fc32232ef4026a42f720186d8ae7c899 Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Sat, 30 Jul 2011 09:20:22 +0000 Subject: Update the glib and gtk stack to the lastest stable releases. Add new ports for the new stable releases of gtk+-3.0. Update vala to the newest stable release 0.12.1. Thanks to pav@ for doing multiple exp-runs, and marcus@ for repo-copies. Full contributors acknowledgment will be given in the GNOME 3 import. --- Mk/bsd.gnome.mk | 67 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 26 deletions(-) (limited to 'Mk/bsd.gnome.mk') diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 9ad2cb93eb15..1301e1eaa3f6 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.512 2010/10/26 09:02:45 kwm Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.549 2011/06/10 22:16:59 mezz Exp $ # # Please view me with 4 column tabs! @@ -41,7 +41,7 @@ Gnome_Pre_Include= bsd.gnome.mk # and MAKE_ENV defined. # # -# GCONF_SCHEMAS - Set the following to list of all the gconf schema files +# GCONF_SCHEMAS - Set the following to list of all the gconf schema files # that your port installs. These schema files and # %gconf.xml files will be automatically added to # the ${PLIST}. For example, if your port has @@ -50,10 +50,10 @@ Gnome_Pre_Include= bsd.gnome.mk # "GCONF_SCHEMAS=foo.schemas bar.schemas". # # GLIB_SCHEMAS - Set the following to list of all gsettings schema files -# (*.gschema.xml) that your ports installs. The -# schema files will be automatically added to -# the ${PLIST}. For example, if your port has -# "share/glib-2.0/schemas/(foo.gschema.xml and bar.gschema.xml)", +# (*.gschema.xml) that your ports installs. The +# schema files will be automatically added to +# the ${PLIST}. For example, if your port has +# "share/glib-2.0/schemas/(foo.gschema.xml and bar.gschema.xml)", # add the following to your Makefile: # "GLIB_SCHEMAS=foo.gschema.xml bar.gschema.xml". # @@ -78,19 +78,20 @@ _USE_GNOME_ALL+= bonobo gal gconf gdkpixbuf glib12 \ libgda libghttp libglade libxml imlib oaf orbit pygtk # GNOME 2 components -_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 gdkpixbuf2 \ - gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedesktopsharp20 \ - gnomedocutils gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \ - gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 gvfs \ - libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 libgda4 \ - libglade2 libgnome libgnomecanvas libgnomedb libgnomekbd libgnomeprint \ - libgnomeprintui libgnomeui libgsf libgsf_gnome libgtkhtml libidl \ - librsvg2 libwnck libxml2 libxslt libzvt linc metacity nautilus2 \ - nautiluscdburner orbit2 pango pygnome2 pygnomedesktop pygnomeextras \ - pygobject pygtk2 pygtksourceview vte +_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 \ + gdkpixbuf2 gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop \ + gnomedesktopsharp20 gnomedocutils gnomemenus gnomepanel gnomesharp20 \ + gnomespeech gnomevfs2 gtk-update-icon-cache gtk20 gtkhtml3 gtksharp10 \ + gtksharp20 gtksourceview gtksourceview2 gvfs libartlgpl2 libbonobo \ + libbonoboui libgailgnome libgda2 libgda3 libgda4 libglade2 libgnome \ + libgnomecanvas libgnomedb libgnomekbd libgnomeprint libgnomeprintui \ + libgnomeui libgsf libgsf_gnome libgtkhtml libidl librsvg2 libwnck \ + libxml2 libxslt libzvt linc metacity nautilus2 nautiluscdburner \ + orbit2 pango pygnome2 pygnomedesktop pygnomeextras pygobject pygtk2 \ + pygtksourceview vte # GNOME 3 components -_USE_GNOME_ALL+= dconf +_USE_GNOME_ALL+= dconf gtk30 GNOME_MAKEFILEIN?= Makefile.in SCROLLKEEPER_DIR= /var/db/rarian @@ -278,11 +279,21 @@ gdkpixbuf2_LIB_DEPENDS= gdk_pixbuf-2.0.0:${PORTSDIR}/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:${PORTSDIR}/graphics/gtk-update-icon-cache +gtk-update-icon-cache_RUN_DEPENDS= gtk-update-icon-cache:${PORTSDIR}/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= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 gtk20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk+-x11-2.0.pc gtk20_USE_GNOME_IMPL= intltool atk pango GTK2_VERSION= 2.10.0 +gtk30_LIB_DEPENDS= gtk-3.0:${PORTSDIR}/x11-toolkits/gtk30 +gtk30_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk+-3.0.pc +gtk30_USE_GNOME_IMPL= intltool atk pango +GTK3_VERSION= 3.0.0 + linc_LIB_DEPENDS= linc.1:${PORTSDIR}/net/linc linc_DETECT= ${LOCALBASE}/libdata/pkgconfig/linc.pc linc_USE_GNOME_IMPL= glib20 @@ -455,7 +466,7 @@ pygobject_USE_GNOME_IMPL= glib20 pygtk2_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc pygtk2_BUILD_DEPENDS= ${pygtk2_DETECT}:${PORTSDIR}/x11-toolkits/py-gtk2 pygtk2_RUN_DEPENDS= ${pygtk2_DETECT}:${PORTSDIR}/x11-toolkits/py-gtk2 -pygtk2_USE_GNOME_IMPL= libglade2 +pygtk2_USE_GNOME_IMPL= libglade2 pygobject pygnome2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-python-2.0.pc pygnome2_BUILD_DEPENDS= ${pygnome2_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome2 @@ -546,6 +557,10 @@ gvfs_USE_GNOME_IMPL= glib20 gconf2 . endif .endif +.if defined(INSTALLS_ICONS) +USE_GNOME+= gtk-update-icon-cache +.endif + # End component definition section # This section defines tests for optional software. These work off four @@ -586,10 +601,10 @@ gvfs_USE_GNOME_IMPL= glib20 gconf2 # If the user has not defined GNOME_DESKTOP_VERSION, let's try to prevent # users from shooting themselves in the foot. We will try to make an # intelligent choice on the user's behalf. -.if exists(${gnomepanel_DETECT}) +.if exists(${gnomepanel3_DETECT}) +GNOME_DESKTOP_VERSION?= 3 +.elif exists(${gnomepanel_DETECT}) GNOME_DESKTOP_VERSION?= 2 -#.elif exists(${libpanel_DETECT}) -#GNOME_DESKTOP_VERSION?= 1 .endif # We also check each component to see if it has a desktop requirement. If @@ -822,16 +837,16 @@ gnome-post-install: done . endif -# we put the @unexec behind the plist schema entry, because it compiles files +# we put the @unexec behind the plist schema entry, because it compiles files # in the directory. So we should remove the port file first before recompiling. . if defined(GLIB_SCHEMAS) @for i in ${GLIB_SCHEMAS}; do \ ${ECHO_CMD} "share/glib-2.0/schemas/$${i}" >> ${TMPPLIST}; \ - ${ECHO_CMD} "@exec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \ - >> ${TMPPLIST}; \ - ${ECHO_CMD} "@unexec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \ - >> ${TMPPLIST}; \ done + @${ECHO_CMD} "@exec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \ + >> ${TMPPLIST}; \ + ${ECHO_CMD} "@unexec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \ + >> ${TMPPLIST}; .endif . if defined(INSTALLS_OMF) -- cgit v1.2.3