Index: Mk/bsd.gnome.mk =================================================================== --- Mk/bsd.gnome.mk (revision 323706) +++ Mk/bsd.gnome.mk (working copy) @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.574 2012/12/18 12:15:14 kwm Exp $ +# $MCom: ports/trunk/Mk/bsd.gnome.mk 17271 2013-04-01 15:16:27Z kwm $ # # Please view me with 4 column tabs! @@ -68,9 +68,9 @@ # # non-version specific components -_USE_GNOME_ALL= esound intlhack intltool ltasneededhack lthack ltverhack \ - gnomehack referencehack gnomehier gnomemimedata gnomeprefix \ - pkgconfig +_USE_GNOME_ALL= esound intlhack intltool introspection ltasneededhack lthack \ + ltverhack gnomehack referencehack gnomehier gnomemimedata \ + gnomeprefix pkgconfig # GNOME 1 components _USE_GNOME_ALL+= bonobo gconf gdkpixbuf glib12 \ @@ -79,7 +79,7 @@ # GNOME 2 components _USE_GNOME_ALL+= atk atspi cairo desktopfileutils eel2 evolutiondataserver gal2 \ - gdkpixbuf2 gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop \ + gdkpixbuf2 gconf2 glib20 gnomecontrolcenter2 gnomedesktop \ gnomedesktopsharp20 gnomedocutils gnomemenus gnomepanel gnomesharp20 \ gnomespeech gnomevfs2 gtk-update-icon-cache gtk20 gtkhtml3 gtksharp10 \ gtksharp20 gtksourceview gtksourceview2 gvfs libartlgpl2 libbonobo \ @@ -87,7 +87,7 @@ libgnomecanvas libgnomedb libgnomekbd libgnomeprint libgnomeprintui \ libgnomeui libgsf libgtkhtml libidl librsvg2 libwnck \ libxml2 libxslt libzvt linc metacity nautilus2 nautiluscdburner \ - orbit2 pango pygnome2 pygnomedesktop pygnomeextras pygobject pygtk2 \ + orbit2 pango pangox-compat pygnome2 pygnomedesktop pygnomeextras pygobject pygtk2 \ pygtksourceview vte # GNOME 3 components @@ -95,7 +95,7 @@ # C++ bindings _USE_GNOME_ALL+=atkmm cairomm gconfmm gconfmm26 glibmm gtkmm20 gtkmm24 \ - gtkmm30 gtksourcviewmm3 libgdamm \ + gtkmm30 gtksourceviewmm3 libgdamm \ libgtksourceviewmm libxml++ libxml++26 libsigc++12 libsigc++20 \ pangomm @@ -272,7 +272,7 @@ gnomemimedata_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc gnomemimedata_BUILD_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data gnomemimedata_RUN_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data -gnomemimedata_USE_GNOME_IMPL=gnomehier pkgconfig +gnomemimedata_USE_GNOME_IMPL=gnomehier GCONF_CONFIG?= ${LOCALBASE}/bin/gconf-config gconf_LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf @@ -310,27 +310,27 @@ libglade_DETECT= ${LIBGLADE_CONFIG} libglade_USE_GNOME_IMPL=gnomedb -_glib20_LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 \ +glib20_LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 \ pcre:${PORTSDIR}/devel/pcre -_glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc +glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc -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_LIB_DEPENDS= atk-1.0:${PORTSDIR}/accessibility/atk atk_DETECT= ${LOCALBASE}/libdata/pkgconfig/atk.pc atk_USE_GNOME_IMPL= glib20 -dconf_LIB_DEPENDS= dconf.0:${PORTSDIR}/devel/dconf +dconf_LIB_DEPENDS= dconf:${PORTSDIR}/devel/dconf dconf_DETECT= ${LOCALBASE}/libdata/pkgconfig/dconf.pc dconf_USE_GNOME_IMPL= glib20 -pango_LIB_DEPENDS= pango-1.0.0:${PORTSDIR}/x11-toolkits/pango +pango_LIB_DEPENDS= pango-1.0:${PORTSDIR}/x11-toolkits/pango pango_DETECT= ${LOCALBASE}/libdata/pkgconfig/pango.pc pango_USE_GNOME_IMPL= glib20 -gdkpixbuf2_LIB_DEPENDS= gdk_pixbuf-2.0.0:${PORTSDIR}/graphics/gdk-pixbuf2 +pangox-compat_LIB_DEPENDS= pangox-1.0:${PORTSDIR}/x11-toolkits/pangox-compat +pangox-compat_DETECT= ${LOCALBASE}/libdata/pkgconfig/pangox.pc +pangox-compat_USE_GNOME_IMPL= glib20 pango + +gdkpixbuf2_LIB_DEPENDS= gdk_pixbuf-2.0:${PORTSDIR}/graphics/gdk-pixbuf2 gdkpixbuf2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gdk-pixbuf-2.0.pc gdkpixbuf2_USE_GNOME_IMPL=glib20 @@ -380,6 +380,12 @@ libbonobo_DETECT= ${LOCALBASE}/libdata/pkgconfig/libbonobo-2.0.pc libbonobo_USE_GNOME_IMPL=libxml2 orbit2 +introspection_BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +introspection_RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +introspection_DETECT= ${LOCALBASE}/libdata/pkgconfig/gobject-introspection-1.0.pc +introspection_USE_GNOME_IMPL= glib20 +introspection_MAKE_ENV= GI_SCANNER_DISABLE_CACHE=1 + gconf2_LIB_DEPENDS= gconf-2.4:${PORTSDIR}/devel/gconf2 gconf2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gconf-2.0.pc gconf2_USE_GNOME_IMPL= orbit2 libxml2 gtk20 Index: accessibility/at-spi2-atk/Makefile =================================================================== --- accessibility/at-spi2-atk/Makefile (revision 323706) +++ accessibility/at-spi2-atk/Makefile (working copy) @@ -1,9 +1,9 @@ # Created by: Maxim Sobolev # $FreeBSD$ -# $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.38 2012/12/16 22:36:25 kwm Exp $ +# $MCom: ports/trunk/accessibility/at-spi2-atk/Makefile 18634 2013-07-26 10:42:35Z kwm $ PORTNAME= at-spi2-atk -PORTVERSION= 2.6.2 +PORTVERSION= 2.8.0 CATEGORIES= accessibility x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -13,15 +13,14 @@ LICENSE= LGPL21 -BUILD_DEPENDS= at-spi2-core>=2.1.4:${PORTSDIR}/accessibility/at-spi2-core +BUILD_DEPENDS= at-spi2-core>=2.8.0:${PORTSDIR}/accessibility/at-spi2-core LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus -RUN_DEPENDS= at-spi2-core>=2.1.4:${PORTSDIR}/accessibility/at-spi2-core +RUN_DEPENDS= at-spi2-core>=2.8.0:${PORTSDIR}/accessibility/at-spi2-core PORTSCOUT= limitw:1,even -USES= pkgconfig pathfix USE_XZ= yes -USE_GMAKE= yes +USES= gmake pathfix pkgconfig USE_GNOME= gnomehier intlhack glib20 atk GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -28,6 +27,5 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-p2p -GLIB_SCHEMAS= org.a11y.atspi.gschema.xml .include Index: accessibility/at-spi2-atk/distinfo =================================================================== --- accessibility/at-spi2-atk/distinfo (revision 323706) +++ accessibility/at-spi2-atk/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome3/at-spi2-atk-2.6.2.tar.xz) = 496c8432e8ab82735145f9af5d45209e9b708bf3c94e527ee091d08641a9bcfa -SIZE (gnome3/at-spi2-atk-2.6.2.tar.xz) = 274748 +SHA256 (gnome3/at-spi2-atk-2.8.0.tar.xz) = 4688acbc1474cda0aa49341f109ad0726603ce3e872cc6521c74931338c7ba20 +SIZE (gnome3/at-spi2-atk-2.8.0.tar.xz) = 267368 Index: accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c =================================================================== --- accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c (revision 323706) +++ accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c (working copy) @@ -1,11 +0,0 @@ ---- atk-adaptor/accessible-cache.c.orig 2012-11-21 23:46:32.000000000 +0000 -+++ atk-adaptor/accessible-cache.c 2012-11-21 23:47:06.000000000 +0000 -@@ -362,7 +362,7 @@ - if (!child) - { - g_static_rec_mutex_unlock (&cache_mutex); -- return; -+ return FALSE; - } - - g_object_ref (child); Index: accessibility/at-spi2-core/Makefile =================================================================== --- accessibility/at-spi2-core/Makefile (revision 323706) +++ accessibility/at-spi2-core/Makefile (working copy) @@ -1,9 +1,9 @@ # Created by: Maxim Sobolev # $FreeBSD$ -# $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.41 2012/12/16 22:36:25 kwm Exp $ +# $MCom: ports/trunk/accessibility/at-spi2-core/Makefile 18634 2013-07-26 10:42:35Z kwm $ PORTNAME= at-spi2-core -PORTVERSION= 2.6.3 +PORTVERSION= 2.8.0 CATEGORIES= accessibility x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -13,15 +13,13 @@ LICENSE= LGPL21 -BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus PORTSCOUT= limitw:1,even -USES= pathfix pkgconfig gettext +USES= gettext gmake pathfix pkgconfig USE_XZ= yes -USE_GMAKE= yes -USE_GNOME= gnomehier glib20 intlhack +USE_GNOME= gnomehier glib20 intlhack introspection:build USE_XORG= x11 xi xtst xext USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: accessibility/at-spi2-core/distinfo =================================================================== --- accessibility/at-spi2-core/distinfo (revision 323706) +++ accessibility/at-spi2-core/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome3/at-spi2-core-2.6.3.tar.xz) = fc4487ae46e847cfd057b329b852cf99923772ecd2ddc29f29670c9f2b15d0ea -SIZE (gnome3/at-spi2-core-2.6.3.tar.xz) = 445084 +SHA256 (gnome3/at-spi2-core-2.8.0.tar.xz) = 1861a30fc7f583d5a567a0ba547db67ce9bd294f0d1c9f7403c96a10a481c458 +SIZE (gnome3/at-spi2-core-2.8.0.tar.xz) = 436836 Index: accessibility/at-spi2-core/files/patch-atspi_Makefile.in =================================================================== --- accessibility/at-spi2-core/files/patch-atspi_Makefile.in (revision 323706) +++ accessibility/at-spi2-core/files/patch-atspi_Makefile.in (working copy) @@ -1,10 +0,0 @@ ---- atspi/Makefile.in.orig 2011-01-24 00:11:24.000000000 +0000 -+++ atspi/Makefile.in 2011-01-24 00:13:25.000000000 +0000 -@@ -897,6 +897,7 @@ - @HAVE_INTROSPECTION_TRUE@ --nsversion=2.0 \ - @HAVE_INTROSPECTION_TRUE@ -I$(top_builddir) \ - @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) \ -+@HAVE_INTROSPECTION_TRUE@ $(CPPFLAGS) \ - @HAVE_INTROSPECTION_TRUE@ --include=GLib-2.0 \ - @HAVE_INTROSPECTION_TRUE@ --include=GObject-2.0 \ - @HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \ Index: accessibility/at-spi2-core/pkg-plist =================================================================== --- accessibility/at-spi2-core/pkg-plist (revision 323706) +++ accessibility/at-spi2-core/pkg-plist (working copy) @@ -133,6 +133,7 @@ share/locale/sv/LC_MESSAGES/at-spi2-core.mo share/locale/ta/LC_MESSAGES/at-spi2-core.mo share/locale/te/LC_MESSAGES/at-spi2-core.mo +share/locale/tg/LC_MESSAGES/at-spi2-core.mo share/locale/tr/LC_MESSAGES/at-spi2-core.mo share/locale/ug/LC_MESSAGES/at-spi2-core.mo share/locale/uk/LC_MESSAGES/at-spi2-core.mo Index: accessibility/atk/Makefile =================================================================== --- accessibility/atk/Makefile (revision 323706) +++ accessibility/atk/Makefile (working copy) @@ -1,9 +1,9 @@ # Created by: Maxim Sobolev # $FreeBSD$ -# $MCom: ports/accessibility/atk/Makefile,v 1.123 2012/10/07 09:00:37 kwm Exp $ +# $MCom: ports/trunk/accessibility/atk/Makefile 18634 2013-07-26 10:42:35Z kwm $ PORTNAME= atk -PORTVERSION= 2.6.0 +PORTVERSION= 2.8.0 PORTREVISION?= 0 CATEGORIES= accessibility devel MASTER_SITES= GNOME @@ -16,15 +16,11 @@ .if !defined(REFERENCE_PORT) -BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection - -USES= pathfix pkgconfig gettext -USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehier glib20 ltverhack referencehack -CONFIGURE_ARGS= --enable-static \ - --with-html-dir=${PREFIX}/share/doc +USES= gettext gmake pathfix pkgconfig +USE_GNOME= gnomehier glib20 ltverhack referencehack introspection:build +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= AUTOCONF=${TRUE} AUTOMAKE=${TRUE} Index: accessibility/atk/distinfo =================================================================== --- accessibility/atk/distinfo (revision 323706) +++ accessibility/atk/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome2/atk-2.6.0.tar.xz) = eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f -SIZE (gnome2/atk-2.6.0.tar.xz) = 609136 +SHA256 (gnome2/atk-2.8.0.tar.xz) = b22519176226f3e07cf6d932b77852e6b6be4780977770704b32d0f4e0686df4 +SIZE (gnome2/atk-2.8.0.tar.xz) = 634052 Index: accessibility/atk/pkg-plist =================================================================== --- accessibility/atk/pkg-plist (revision 323706) +++ accessibility/atk/pkg-plist (working copy) @@ -28,6 +28,7 @@ include/atk-1.0/atk/atktext.h include/atk-1.0/atk/atkutil.h include/atk-1.0/atk/atkvalue.h +include/atk-1.0/atk/atkversion.h include/atk-1.0/atk/atkwindow.h lib/girepository-1.0/Atk-1.0.typelib lib/libatk-1.0.a @@ -117,6 +118,7 @@ share/locale/sv/LC_MESSAGES/atk10.mo share/locale/ta/LC_MESSAGES/atk10.mo share/locale/te/LC_MESSAGES/atk10.mo +share/locale/tg/LC_MESSAGES/atk10.mo share/locale/th/LC_MESSAGES/atk10.mo share/locale/tk/LC_MESSAGES/atk10.mo share/locale/tr/LC_MESSAGES/atk10.mo Index: accessibility/py-atspi/Makefile =================================================================== --- accessibility/py-atspi/Makefile (revision 323706) +++ accessibility/py-atspi/Makefile (working copy) @@ -1,31 +1,26 @@ -# New ports collection makefile for: at-spi -# Date Created: 12 April 2002 -# Whom: Maxim Sobolev -# +# Created by: Maxim Sobolev # $FreeBSD$ -# $MCom: ports/accessibility/py-atspi/Makefile,v 1.13 2010/11/16 11:55:55 kwm Exp $ -# +# $MCom: ports/trunk/accessibility/py-atspi/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= atspi -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 2.8.0 CATEGORIES= accessibility x11-toolkits python MASTER_SITES= GNOME -MASTER_SITE_SUBDIR= sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITE_SUBDIR= sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pyatspi-${PORTVERSION} -DIST_SUBDIR= gnome2 +DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Python API for the D-BUS based SPI framework -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core -USE_BZIP2= yes -USES= gettext -USE_GMAKE= yes -USE_GNOME= gnomehack gnomehier intlhack gtk20 libxml2 +CONFLICTS= at-spi-1.[0-9]* + +USE_XZ= yes +USES= gettext gmake pathfix pkgconfig +USE_GNOME= gnomehier intlhack pygobject3 GNU_CONFIGURE= yes USE_PYTHON= yes CPPFLAGS+= -I${LOCALBASE}/include Index: accessibility/py-atspi/distinfo =================================================================== --- accessibility/py-atspi/distinfo (revision 323706) +++ accessibility/py-atspi/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome2/pyatspi-0.4.1.tar.bz2) = 2d9672e0ca6277c491a0b35421691d96618d9c02e687851ce418811379aa4a2e -SIZE (gnome2/pyatspi-0.4.1.tar.bz2) = 311019 +SHA256 (gnome3/pyatspi-2.8.0.tar.xz) = f1695670f13c804898f959e3e7fc517db1c7f1079c051d10e22a35889524fd17 +SIZE (gnome3/pyatspi-2.8.0.tar.xz) = 287352 Index: accessibility/py-atspi/pkg-plist =================================================================== --- accessibility/py-atspi/pkg-plist (revision 323706) +++ accessibility/py-atspi/pkg-plist (working copy) @@ -1,98 +1,70 @@ -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.pyo -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.py -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.pyc -%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.pyo -@dirrm %%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils -@dirrm %%PYTHON_SITELIBDIR%%/pyatspi_dbus +%%PYTHON_SITELIBDIR%%/pyatspi/Accessibility.py +%%PYTHON_SITELIBDIR%%/pyatspi/Accessibility.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/Accessibility.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/__init__.py +%%PYTHON_SITELIBDIR%%/pyatspi/__init__.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__init__.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/action.py +%%PYTHON_SITELIBDIR%%/pyatspi/action.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/action.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/appevent.py +%%PYTHON_SITELIBDIR%%/pyatspi/appevent.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/appevent.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/application.py +%%PYTHON_SITELIBDIR%%/pyatspi/application.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/application.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/collection.py +%%PYTHON_SITELIBDIR%%/pyatspi/collection.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/collection.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/component.py +%%PYTHON_SITELIBDIR%%/pyatspi/component.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/component.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/constants.py +%%PYTHON_SITELIBDIR%%/pyatspi/constants.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/constants.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/deviceevent.py +%%PYTHON_SITELIBDIR%%/pyatspi/deviceevent.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/deviceevent.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/document.py +%%PYTHON_SITELIBDIR%%/pyatspi/document.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/document.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/editabletext.py +%%PYTHON_SITELIBDIR%%/pyatspi/editabletext.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/editabletext.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/enum.py +%%PYTHON_SITELIBDIR%%/pyatspi/enum.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/enum.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/hypertext.py +%%PYTHON_SITELIBDIR%%/pyatspi/hypertext.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/hypertext.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/image.py +%%PYTHON_SITELIBDIR%%/pyatspi/image.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/image.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/interface.py +%%PYTHON_SITELIBDIR%%/pyatspi/interface.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/interface.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/registry.py +%%PYTHON_SITELIBDIR%%/pyatspi/registry.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/registry.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/role.py +%%PYTHON_SITELIBDIR%%/pyatspi/role.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/role.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/selection.py +%%PYTHON_SITELIBDIR%%/pyatspi/selection.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/selection.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/state.py +%%PYTHON_SITELIBDIR%%/pyatspi/state.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/state.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/table.py +%%PYTHON_SITELIBDIR%%/pyatspi/table.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/table.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/text.py +%%PYTHON_SITELIBDIR%%/pyatspi/text.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/text.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/utils.py +%%PYTHON_SITELIBDIR%%/pyatspi/utils.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/utils.pyo +%%PYTHON_SITELIBDIR%%/pyatspi/value.py +%%PYTHON_SITELIBDIR%%/pyatspi/value.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/value.pyo +@dirrm %%PYTHON_SITELIBDIR%%/pyatspi Index: devel/Makefile =================================================================== --- devel/Makefile (revision 323706) +++ devel/Makefile (working copy) @@ -549,7 +549,6 @@ SUBDIR += gflags SUBDIR += giggle SUBDIR += gindent - SUBDIR += gio-fam-backend SUBDIR += gio-sharp SUBDIR += git SUBDIR += git-merge-changelog Index: devel/dconf/Makefile =================================================================== --- devel/dconf/Makefile (revision 323706) +++ devel/dconf/Makefile (working copy) @@ -1,10 +1,10 @@ # Created by: Koop Mast # $FreeBSD$ -# $MCom: ports/devel/dconf/Makefile,v 1.30 2012/10/03 17:57:17 kwm Exp $ +# $MCom: ports/trunk/devel/dconf/Makefile 18634 2013-07-26 10:42:35Z kwm $ PORTNAME?= dconf -PORTVERSION= 0.12.1 -PORTREVISION= 1 +PORTVERSION= 0.14.1 +PORTREVISION= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME DISTNAME= dconf-${PORTVERSION} @@ -13,12 +13,14 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A configuration database system for GNOME -BUILD_DEPENDS= vala>=0.15.1:${PORTSDIR}/lang/vala +BUILD_DEPENDS= vala>=0.18.1:${PORTSDIR}/lang/vala \ + docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl + LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus USE_XZ= yes -USE_GMAKE= yes -USE_GNOME= gnomehack glib20 gnomehier +USES= gettext gmake pathfix pkgconfig +USE_GNOME= glib20 gnomehier intltool USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes @@ -36,6 +38,11 @@ CONFIGURE_ARGS+=--disable-editor .endif +.if ${DCONF_SLAVE} == "no" +MAN1= dconf-editor.1 dconf-service.1 dconf.1 +MAN7= dconf.7 +.endif + post-patch: @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ ${WRKSRC}/engine/dconf-engine.c \ Index: devel/dconf/distinfo =================================================================== --- devel/dconf/distinfo (revision 323706) +++ devel/dconf/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome3/dconf-0.12.1.tar.xz) = 3cd32b78d88ed7be90dace5d45e2cf8a6abdb253d43dbfa5ef52103b329dc214 -SIZE (gnome3/dconf-0.12.1.tar.xz) = 202112 +SHA256 (gnome3/dconf-0.14.1.tar.xz) = 59c58c5eafa0ebd616287d078f4441d5342870a44634445d324e88fc0287f0b8 +SIZE (gnome3/dconf-0.14.1.tar.xz) = 291300 Index: devel/dconf/files/patch-client_Makefile.in =================================================================== --- devel/dconf/files/patch-client_Makefile.in (revision 323706) +++ devel/dconf/files/patch-client_Makefile.in (working copy) @@ -1,37 +1,40 @@ ---- client/Makefile.in.orig 2012-05-28 13:27:17.000000000 +0200 -+++ client/Makefile.in 2012-05-28 13:31:25.000000000 +0200 -@@ -34,7 +34,7 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --shlib_PROGRAMS = libdconf.so.0.0.0$(EXEEXT) -+shlib_PROGRAMS = libdconf.so.0$(EXEEXT) +--- client/Makefile.orig.in 2013-03-26 19:40:26.085263743 +0000 ++++ client/Makefile.in 2013-03-26 19:40:33.384265230 +0000 +@@ -55,7 +55,7 @@ + DIST_COMMON = $(dconfclientinclude_HEADERS) $(dconfinclude_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/dconf.pc.in $(top_srcdir)/Makefile.gtester +-shlib_PROGRAMS = libdconf.so.1.0.0$(EXEEXT) ++shlib_PROGRAMS = libdconf.so.1$(EXEEXT) subdir = client - DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/dconf.pc.in dconf-client.c \ -@@ -332,9 +332,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -416,12 +416,12 @@ clean-shlibPROGRAMS: -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS) --libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) -+libdconf.so.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) - @rm -f libdconf.so.0.0.0$(EXEEXT) - $(AM_V_CCLD)$(libdconf_so_0_0_0_LINK) $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_LDADD) $(LIBS) -+ $(AM_V_GEN) ln -fs libdconf.so.0 libdconf.so +-libdconf.so.1.0.0$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES) ++libdconf.so.1$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES) + @rm -f libdconf.so.1.0.0$(EXEEXT) + $(AM_V_CCLD)$(libdconf_so_1_0_0_LINK) $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_LDADD) $(LIBS) ++ $(AM_V_GEN) ln -fs libdconf.so.1 libdconf.so mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -695,12 +696,8 @@ - uninstall-vapiDATA +- -rm -f *.$(OBJEXT) + distclean-compile: + -rm -f *.tab.c +@@ -838,12 +838,8 @@ + # run tests in cwd as part of make check + check-local: test-nonrecursive --libdconf.so.0 libdconf.so: libdconf.so.0.0.0 -- $(AM_V_GEN) ln -fs libdconf.so.0.0.0 $@ +-libdconf.so.1 libdconf.so: libdconf.so.1.0.0 +- $(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@ - install-data-hook: -- ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.0 -- ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so -+ ln -fs libdconf.so.0 $(DESTDIR)$(shlibdir)/libdconf.so +- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1 +- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so ++ ln -fs libdconf.so.1 $(DESTDIR)$(shlibdir)/libdconf.so uninstall-hook: - rm -f $(DESTDIR)$(shlibdir)/libdconf.so.0 + rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1 Index: devel/dconf/files/patch-dbus-1_Makefile.in =================================================================== --- devel/dconf/files/patch-dbus-1_Makefile.in (revision 323706) +++ devel/dconf/files/patch-dbus-1_Makefile.in (working copy) @@ -1,27 +1,28 @@ ---- dbus-1/Makefile.in.orig 2012-05-28 13:31:56.000000000 +0200 -+++ dbus-1/Makefile.in 2012-05-28 13:35:25.000000000 +0200 -@@ -34,7 +34,7 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : +--- dbus-1/Makefile.orig.in 2013-03-26 19:18:48.870352031 +0000 ++++ dbus-1/Makefile.in 2013-03-26 19:18:57.583352154 +0000 +@@ -55,7 +55,7 @@ + DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in \ + $(top_srcdir)/Makefile.gtester -shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0$(EXEEXT) +shlib_PROGRAMS = libdconf-dbus-1.so.0$(EXEEXT) subdir = dbus-1 - DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in -@@ -246,7 +246,7 @@ - ../gvdb/gvdb-reader.c \ - dconf-dbus-1.c + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -341,7 +341,7 @@ --noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0 -+noinst_DATA = libdconf-dbus-1.so.0 + libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0 + libdconf_dbus_1_so_0_0_0_SOURCES = dconf-dbus-1.c +-nodist_noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0 ++nodist_noinst_DATA = libdconf-dbus-1.so.0 CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so all: all-am -@@ -321,9 +321,10 @@ +@@ -430,13 +430,12 @@ + cd "$(DESTDIR)$(shlibdir)" && rm -f $$files clean-shlibPROGRAMS: - -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS) +- -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS) -libdconf-dbus-1.so.0.0.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES) - @rm -f libdconf-dbus-1.so.0.0.0$(EXEEXT) +libdconf-dbus-1.so.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES) @@ -30,10 +31,13 @@ + $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0 libdconf-dbus-1.so mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -640,12 +641,8 @@ - uninstall-hook uninstall-pkgconfigDATA uninstall-shlibPROGRAMS +- -rm -f *.$(OBJEXT) + distclean-compile: + -rm -f *.tab.c +@@ -821,12 +820,8 @@ + # run tests in cwd as part of make check + check-local: test-nonrecursive -libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0 - $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@ Index: devel/dconf/files/patch-editor_Makefile.in =================================================================== --- devel/dconf/files/patch-editor_Makefile.in (revision 323706) +++ devel/dconf/files/patch-editor_Makefile.in (working copy) @@ -1,20 +1,20 @@ ---- editor/Makefile.in.orig 2012-10-03 17:32:51.000000000 +0000 -+++ editor/Makefile.in 2012-10-03 17:35:54.000000000 +0000 -@@ -55,7 +55,7 @@ - dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT) +--- editor/Makefile.orig.in 2013-03-26 19:20:12.623348896 +0000 ++++ editor/Makefile.in 2013-03-26 19:21:40.077341977 +0000 +@@ -72,7 +72,7 @@ + dconf_editor-dconf-view.$(OBJEXT) dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) am__DEPENDENCIES_1 = --dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \ +-dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \ +dconf_editor_DEPENDENCIES = -ldconf \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -@@ -232,7 +232,7 @@ - top_srcdir = @top_srcdir@ - AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\" - AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf --dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS) -+dconf_editor_LDADD = -ldconf $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS) - dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala - desktopdir = $(datadir)/applications - desktop_in_files = dconf-editor.desktop.in.in + dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \ +@@ -297,7 +297,7 @@ + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client + dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf + dconf_editor_LDADD = \ +- ../client/libdconf.so.1 \ ++ -ldconf \ + $(gtk_LIBS) \ + $(gee_LIBS) \ + $(gmodule_LIBS) \ Index: devel/dconf/files/patch-editor_dconf-editor.vala =================================================================== --- devel/dconf/files/patch-editor_dconf-editor.vala (revision 0) +++ devel/dconf/files/patch-editor_dconf-editor.vala (working copy) @@ -0,0 +1,157 @@ +--- editor/dconf-editor.vala.orig 2013-05-01 21:48:10.000000000 +0000 ++++ editor/dconf-editor.vala 2013-05-01 21:50:26.000000000 +0000 +@@ -5,6 +5,10 @@ + private Settings settings; + private Gtk.Builder ui; + private Gtk.ApplicationWindow window; ++ private int window_width = 0; ++ private int window_height = 0; ++ private bool window_is_maximized = false; ++ private bool window_is_fullscreen = false; + private Gtk.TreeView dir_tree_view; + private Gtk.TreeView key_tree_view; + private Gtk.Grid key_info_grid; +@@ -72,8 +76,10 @@ + } + set_app_menu((MenuModel)menu_ui.get_object("menu")); + +- window.set_default_size (settings.get_int ("width"), settings.get_int ("height")); +- if (settings.get_boolean ("maximized")) ++ window.set_default_size (settings.get_int ("window-width"), settings.get_int ("window-height")); ++ if (settings.get_boolean ("window-is-fullscreen")) ++ window.fullscreen (); ++ else if (settings.get_boolean ("window-is-maximized")) + window.maximize (); + + dir_tree_view = new DConfDirView(); +@@ -124,6 +130,15 @@ + window.present(); + } + ++ protected override void shutdown () ++ { ++ base.shutdown(); ++ settings.set_int ("window-width", window_width); ++ settings.set_int ("window-height", window_height); ++ settings.set_boolean ("window-is-maximized", window_is_maximized); ++ settings.set_boolean ("window-is-fullscreen", window_is_fullscreen); ++ } ++ + private void dir_selected_cb() + { + KeyModel? key_model = null; +@@ -201,11 +216,16 @@ + { + if (selected_key.schema != null) + { ++ var gettext_domain = selected_key.schema.gettext_domain; + schema_name = selected_key.schema.schema.id; + if (selected_key.schema.summary != null) + summary = selected_key.schema.summary; ++ if (gettext_domain != null && summary != "") ++ summary = dgettext(gettext_domain, summary); + if (selected_key.schema.description != null) + description = selected_key.schema.description; ++ if (gettext_domain != null && description != "") ++ description = dgettext(gettext_domain, description); + type = key_to_description(selected_key); + default_value = selected_key.schema.default_value.print(false); + } +@@ -236,10 +256,10 @@ + + private bool main_window_configure_event_cb (Gtk.Widget widget, Gdk.EventConfigure event) + { +- if (!settings.get_boolean ("maximized")) ++ if (!window_is_maximized && !window_is_fullscreen) + { +- settings.set_int ("width", event.width); +- settings.set_int ("height", event.height); ++ window_width = event.width; ++ window_height = event.height; + } + + return false; +@@ -248,10 +268,9 @@ + private bool main_window_window_state_event_cb (Gtk.Widget widget, Gdk.EventWindowState event) + { + if ((event.changed_mask & Gdk.WindowState.MAXIMIZED) != 0) +- { +- var is_maximized = (event.new_window_state & Gdk.WindowState.MAXIMIZED) != 0; +- settings.set_boolean ("maximized", is_maximized); +- } ++ window_is_maximized = (event.new_window_state & Gdk.WindowState.MAXIMIZED) != 0; ++ if ((event.changed_mask & Gdk.WindowState.FULLSCREEN) != 0) ++ window_is_fullscreen = (event.new_window_state & Gdk.WindowState.FULLSCREEN) != 0; + + return false; + } +@@ -266,6 +285,7 @@ + { + search_label.set_text(""); + ++ /* Get the current position in the tree */ + Gtk.TreeIter iter; + var key_iter = Gtk.TreeIter(); + var have_key_iter = false; +@@ -283,17 +303,31 @@ + else if (!model.get_iter_first(out iter)) + return; + ++ var on_first_directory = true; + do + { ++ /* Select next directory that matches */ + var dir = model.get_directory(iter); + if (!have_key_iter) ++ { + have_key_iter = dir.key_model.get_iter_first(out key_iter); ++ if (!on_first_directory && dir.name.index_of(search_entry.text) >= 0) ++ { ++ dir_tree_view.expand_to_path(model.get_path(iter)); ++ dir_tree_view.get_selection().select_iter(iter); ++ dir_tree_view.scroll_to_cell(model.get_path(iter), null, false, 0, 0); ++ return; ++ } ++ } ++ on_first_directory = false; ++ ++ /* Select next key that matches */ + if (have_key_iter) + { + do + { + var key = dir.key_model.get_key(key_iter); +- if (key.name.index_of (search_entry.text) >= 0) ++ if (key_matches(key, search_entry.text)) + { + dir_tree_view.expand_to_path(model.get_path(iter)); + dir_tree_view.get_selection().select_iter(iter); +@@ -310,6 +344,28 @@ + search_label.set_text(_("Not found")); + } + ++ private bool key_matches (Key key, string text) ++ { ++ /* Check key name */ ++ if (key.name.index_of(text) >= 0) ++ return true; ++ ++ /* Check key schema (description) */ ++ if (key.schema != null) ++ { ++ if (key.schema.summary != null && key.schema.summary.index_of(text) >= 0) ++ return true; ++ if (key.schema.description != null && key.schema.description.index_of(text) >= 0) ++ return true; ++ } ++ ++ /* Check key value */ ++ if (key.value.is_of_type(VariantType.STRING) && key.value.get_string().index_of(text) >= 0) ++ return true; ++ ++ return false; ++ } ++ + private bool get_next_iter(ref Gtk.TreeIter iter) + { + /* Search children next */ Index: devel/dconf/files/patch-editor_dconf-model.vala =================================================================== --- devel/dconf/files/patch-editor_dconf-model.vala (revision 0) +++ devel/dconf/files/patch-editor_dconf-model.vala (working copy) @@ -0,0 +1,212 @@ +--- editor/dconf-model.vala.orig 2013-05-01 21:47:59.000000000 +0000 ++++ editor/dconf-model.vala 2013-05-01 21:50:26.000000000 +0000 +@@ -254,7 +254,7 @@ + string[] tokens = path.split("/", 2); + string name = tokens[0]; + +- Directory directory = get_child(name); ++ var directory = get_child(name); + directory.load_schema(schema, tokens[1]); + } + } +@@ -341,8 +341,10 @@ + return (Key)iter.user_data; + } + +- public bool get_iter(ref Gtk.TreeIter iter, Gtk.TreePath path) ++ public bool get_iter(out Gtk.TreeIter iter, Gtk.TreePath path) + { ++ iter = Gtk.TreeIter(); ++ + if (path.get_depth() != 1) + return false; + +@@ -391,11 +393,14 @@ + return true; + } + +- public bool iter_children(ref Gtk.TreeIter iter, Gtk.TreeIter? parent) ++ public bool iter_children(out Gtk.TreeIter iter, Gtk.TreeIter? parent) + { ++ iter = Gtk.TreeIter(); ++ + if (parent != null || directory.keys.length() == 0) + return false; + set_iter(ref iter, directory.keys.nth_data(0)); ++ + return true; + } + +@@ -412,8 +417,10 @@ + return 0; + } + +- public bool iter_nth_child(ref Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) ++ public bool iter_nth_child(out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) + { ++ iter = Gtk.TreeIter(); ++ + if (parent != null) + return false; + +@@ -423,8 +430,9 @@ + return true; + } + +- public bool iter_parent(ref Gtk.TreeIter iter, Gtk.TreeIter child) ++ public bool iter_parent(out Gtk.TreeIter iter, Gtk.TreeIter child) + { ++ iter = Gtk.TreeIter(); + return false; + } + +@@ -479,8 +487,10 @@ + return (SchemaValue)iter.user_data; + } + +- public bool get_iter(ref Gtk.TreeIter iter, Gtk.TreePath path) ++ public bool get_iter(out Gtk.TreeIter iter, Gtk.TreePath path) + { ++ iter = Gtk.TreeIter(); ++ + if (path.get_depth() != 1) + return false; + +@@ -513,11 +523,15 @@ + return true; + } + +- public bool iter_children(ref Gtk.TreeIter iter, Gtk.TreeIter? parent) ++ public bool iter_children(out Gtk.TreeIter iter, Gtk.TreeIter? parent) + { ++ iter = Gtk.TreeIter(); ++ + if (parent != null || schema_enum.values.length() == 0) + return false; ++ + set_iter(ref iter, schema_enum.values.nth_data(0)); ++ + return true; + } + +@@ -534,8 +548,10 @@ + return 0; + } + +- public bool iter_nth_child(ref Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) ++ public bool iter_nth_child(out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) + { ++ iter = Gtk.TreeIter(); ++ + if (parent != null) + return false; + +@@ -545,8 +561,9 @@ + return true; + } + +- public bool iter_parent(ref Gtk.TreeIter iter, Gtk.TreeIter child) ++ public bool iter_parent(out Gtk.TreeIter iter, Gtk.TreeIter child) + { ++ iter = Gtk.TreeIter(); + return false; + } + +@@ -586,9 +603,14 @@ + schemas = new SchemaList(); + try + { +- foreach (var dir in GLib.Environment.get_system_data_dirs()) ++ var dirs = GLib.Environment.get_system_data_dirs(); ++ ++ /* Walk directories in reverse so the schemas in the ++ * directory which appears first in the XDG_DATA_DIRS are ++ * not overridden. */ ++ for (int i = dirs.length - 1; i >= 0; i--) + { +- var path = Path.build_filename (dir, "glib-2.0", "schemas", null); ++ var path = Path.build_filename (dirs[i], "glib-2.0", "schemas"); + if (File.new_for_path (path).query_exists ()) + schemas.load_directory (path); + } +@@ -601,7 +623,7 @@ + } + + /* Add keys for the values in the schemas */ +- foreach (var schema in schemas.schemas) ++ foreach (var schema in schemas.schemas.get_values()) + root.load_schema(schema, schema.path[1:schema.path.length]); + } + +@@ -639,8 +661,10 @@ + return (Directory)iter.user_data; + } + +- public bool get_iter(ref Gtk.TreeIter iter, Gtk.TreePath path) ++ public bool get_iter(out Gtk.TreeIter iter, Gtk.TreePath path) + { ++ iter = Gtk.TreeIter(); ++ + if (!iter_nth_child(out iter, null, path.get_indices()[0])) + return false; + +@@ -672,19 +696,23 @@ + + public bool iter_next(ref Gtk.TreeIter iter) + { +- Directory directory = get_directory(iter); ++ var directory = get_directory(iter); + if (directory.index >= directory.parent.children.length() - 1) + return false; + set_iter(ref iter, directory.parent.children.nth_data(directory.index+1)); ++ + return true; + } + +- public bool iter_children(ref Gtk.TreeIter iter, Gtk.TreeIter? parent) ++ public bool iter_children(out Gtk.TreeIter iter, Gtk.TreeIter? parent) + { +- Directory directory = get_directory(parent); ++ iter = Gtk.TreeIter(); ++ ++ var directory = get_directory(parent); + if (directory.children.length() == 0) + return false; + set_iter(ref iter, directory.children.nth_data(0)); ++ + return true; + } + +@@ -698,21 +726,28 @@ + return (int) get_directory(iter).children.length(); + } + +- public bool iter_nth_child(ref Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) ++ public bool iter_nth_child(out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) + { +- Directory directory = get_directory(parent); ++ iter = Gtk.TreeIter(); ++ ++ var directory = get_directory(parent); + if (n >= directory.children.length()) + return false; + set_iter(ref iter, directory.children.nth_data(n)); ++ + return true; + } + +- public bool iter_parent(ref Gtk.TreeIter iter, Gtk.TreeIter child) ++ public bool iter_parent(out Gtk.TreeIter iter, Gtk.TreeIter child) + { +- Directory directory = get_directory(child); ++ iter = Gtk.TreeIter(); ++ ++ var directory = get_directory(child); + if (directory.parent == root) + return false; ++ + set_iter(ref iter, directory.parent); ++ + return true; + } + Index: devel/dconf/files/patch-editor_dconf-schema.vala =================================================================== --- devel/dconf/files/patch-editor_dconf-schema.vala (revision 0) +++ devel/dconf/files/patch-editor_dconf-schema.vala (working copy) @@ -0,0 +1,129 @@ +--- editor/dconf-schema.vala.orig 2013-05-01 21:48:04.000000000 +0000 ++++ editor/dconf-schema.vala 2013-05-01 21:50:26.000000000 +0000 +@@ -44,7 +44,7 @@ + { + try + { +- default_value = Variant.parse(new VariantType(type), child->children->content); ++ default_value = Variant.parse(new VariantType(type), child->get_content()); + } + catch (VariantParseError e) + { +@@ -52,9 +52,9 @@ + } + } + else if (child->name == "summary") +- summary = child->children == null ? "" : child->children->content; ++ summary = child->get_content(); + else if (child->name == "description") +- description = child->children == null ? "" : child->children->content; ++ description = child->get_content(); + else if (child->name == "range") + range = new SchemaValueRange.from_xml(type, child); + else if (child->name == "choices") +@@ -345,7 +345,7 @@ + + public class SchemaList + { +- public GLib.List schemas = new GLib.List(); ++ public GLib.HashTable schemas = new GLib.HashTable(str_hash, str_equal); + public GLib.HashTable keys = new GLib.HashTable(str_hash, str_equal); + public GLib.HashTable enums = new GLib.HashTable(str_hash, str_equal); + public GLib.HashTable flags = new GLib.HashTable(str_hash, str_equal); +@@ -385,7 +385,7 @@ + string full_name = schema.path + key.name; + keys.insert(full_name, key); + } +- schemas.append(schema); ++ schemas.insert(schema.id, schema); + } + else if (node->name == "enum") + { +@@ -407,19 +407,79 @@ + delete doc; + } + ++ public void parse_override(string path) ++ { ++ var keyfile = new KeyFile(); ++ try ++ { ++ keyfile.load_from_file(path, KeyFileFlags.NONE); ++ } ++ catch (Error e) ++ { ++ warning("Failed to load override file %s: %s", path, e.message); ++ return; ++ } ++ ++ foreach (var group in keyfile.get_groups()) ++ { ++ var schema = schemas.lookup(group); ++ if (schema == null) ++ continue; ++ ++ string[] keys; ++ try { keys = keyfile.get_keys(group); } catch (Error e) { continue; } ++ ++ foreach (var key_name in keys) ++ { ++ string value; ++ try { value = keyfile.get_value(group, key_name); } catch (Error e) { continue; } ++ ++ var key = schema.keys.lookup (key_name); ++ if (key == null) ++ continue; ++ ++ Variant default_value; ++ try ++ { ++ default_value = Variant.parse(new VariantType(key.type), value); ++ } ++ catch (VariantParseError e) ++ { ++ // ... ++ continue; ++ } ++ ++ key.default_value = default_value; ++ } ++ } ++ } ++ + public void load_directory(string dir) throws Error + { +- File directory = File.new_for_path(dir); ++ var directory = File.new_for_path(dir); ++ + var i = directory.enumerate_children (FileAttribute.STANDARD_NAME, 0, null); +- FileInfo info; +- while ((info = i.next_file (null)) != null) { +- string name = info.get_name(); ++ while (true) ++ { ++ var info = i.next_file (null); ++ if (info == null) ++ break; ++ var name = info.get_name(); + +- if (!name.has_suffix(".gschema.xml") && !name.has_suffix(".enums.xml")) +- continue; ++ if (name.has_suffix(".gschema.xml") || name.has_suffix(".enums.xml")) ++ parse_file(Path.build_filename(dir, name, null)); ++ } ++ ++ i = directory.enumerate_children (FileAttribute.STANDARD_NAME, 0, null); ++ while (true) ++ { ++ var info = i.next_file (null); ++ if (info == null) ++ break; ++ var name = info.get_name(); + +- string path = Path.build_filename(dir, name, null); +- parse_file(path); ++ if (name.has_suffix(".override")) ++ parse_override(Path.build_filename(dir, name, null)); + } + } + } Index: devel/dconf/files/patch-editors_dconf-view.vala =================================================================== --- devel/dconf/files/patch-editors_dconf-view.vala (revision 0) +++ devel/dconf/files/patch-editors_dconf-view.vala (working copy) @@ -0,0 +1,11 @@ +--- editor/dconf-view.vala.orig 2013-05-01 21:48:19.000000000 +0000 ++++ editor/dconf-view.vala 2013-05-01 21:50:26.000000000 +0000 +@@ -270,7 +270,7 @@ + + private void spin_edited_cb(Gtk.CellRendererText renderer, string path, string text) + { +- Key key = get_key_from_path(path); ++ var key = get_key_from_path(path); + switch (key.type_string) + { + case "y": Index: devel/dconf/files/patch-test_Makefile.am =================================================================== --- devel/dconf/files/patch-test_Makefile.am (revision 0) +++ devel/dconf/files/patch-test_Makefile.am (working copy) @@ -0,0 +1,21 @@ +--- tests/Makefile.orig.am 2013-03-26 21:34:03.467621533 +0100 ++++ tests/Makefile.am 2013-03-26 21:34:43.396618710 +0100 +@@ -28,8 +28,7 @@ + shm_CFLAGS = $(glib_CFLAGS) + shm_LDADD = \ + ../shm/libdconf-shm.a \ +- $(glib_LIBS) \ +- -ldl ++ $(glib_LIBS) + shm_SOURCES = \ + shm.c \ + tmpdir.h \ +@@ -79,7 +78,7 @@ + ../common/libdconf-common.a \ + libdconf-mock.a \ + $(glib_LIBS) \ +- -ldl -lm ++ -lm + engine_SOURCES = engine.c + EXTRA_DIST += \ + profile/broken-profile \ Index: devel/dconf/files/patch-test_Makefile.in =================================================================== --- devel/dconf/files/patch-test_Makefile.in (revision 0) +++ devel/dconf/files/patch-test_Makefile.in (working copy) @@ -0,0 +1,21 @@ +--- tests/Makefile.orig.in 2013-03-26 21:34:10.705623412 +0100 ++++ tests/Makefile.in 2013-03-26 21:34:54.686617478 +0100 +@@ -349,8 +349,7 @@ + shm_CFLAGS = $(glib_CFLAGS) + shm_LDADD = \ + ../shm/libdconf-shm.a \ +- $(glib_LIBS) \ +- -ldl ++ $(glib_LIBS) + + shm_SOURCES = \ + shm.c \ +@@ -395,7 +394,7 @@ + ../common/libdconf-common.a \ + libdconf-mock.a \ + $(glib_LIBS) \ +- -ldl -lm ++ -lm + + engine_SOURCES = engine.c + client_CFLAGS = $(gio_CFLAGS) -DSRCDIR=\"$(abs_srcdir)\" Index: devel/dconf/pkg-plist =================================================================== --- devel/dconf/pkg-plist (revision 323706) +++ devel/dconf/pkg-plist (working copy) @@ -1,19 +1,26 @@ bin/dconf -etc/bash_completion.d/dconf-bash-completion.sh -include/dconf/dconf-client.h +include/dconf/client/dconf-client.h +include/dconf/common/dconf-changeset.h include/dconf-dbus-1/dconf-dbus-1.h -include/dconf/dconf-engine.h -include/dconf/dconf-paths.h +include/dconf/common/dconf-paths.h include/dconf/dconf.h lib/gio/modules/libdconfsettings.so +lib/gio/modules/giomodule.cache lib/libdconf.so -lib/libdconf.so.0 +lib/libdconf.so.1 lib/libdconf-dbus-1.so lib/libdconf-dbus-1.so.0 libdata/pkgconfig/dconf.pc libdata/pkgconfig/dconf-dbus-1.pc libexec/dconf-service +share/bash-completion/completions/dconf share/dbus-1/services/ca.desrt.dconf.service +share/gtk-doc/html/dconf/dconf-DConfChangeset.html +share/gtk-doc/html/dconf/dconf-editor.html +share/gtk-doc/html/dconf/dconf-overview.html +share/gtk-doc/html/dconf/dconf-service.html +share/gtk-doc/html/dconf/dconf-tool.html +share/gtk-doc/html/dconf/programs.html share/gtk-doc/html/dconf/DConfClient.html share/gtk-doc/html/dconf/dconf-DConf-Paths.html share/gtk-doc/html/dconf/annotation-glossary.html @@ -28,6 +35,55 @@ share/gtk-doc/html/dconf/right.png share/gtk-doc/html/dconf/style.css share/gtk-doc/html/dconf/up.png +share/locale/ar/LC_MESSAGES/dconf.mo +share/locale/as/LC_MESSAGES/dconf.mo +share/locale/be/LC_MESSAGES/dconf.mo +share/locale/bg/LC_MESSAGES/dconf.mo +share/locale/bn_IN/LC_MESSAGES/dconf.mo +share/locale/ca/LC_MESSAGES/dconf.mo +share/locale/ca@valencia/LC_MESSAGES/dconf.mo +share/locale/cs/LC_MESSAGES/dconf.mo +share/locale/da/LC_MESSAGES/dconf.mo +share/locale/de/LC_MESSAGES/dconf.mo +share/locale/el/LC_MESSAGES/dconf.mo +share/locale/en_GB/LC_MESSAGES/dconf.mo +share/locale/eo/LC_MESSAGES/dconf.mo +share/locale/es/LC_MESSAGES/dconf.mo +share/locale/et/LC_MESSAGES/dconf.mo +share/locale/fa/LC_MESSAGES/dconf.mo +share/locale/fi/LC_MESSAGES/dconf.mo +share/locale/fr/LC_MESSAGES/dconf.mo +share/locale/gl/LC_MESSAGES/dconf.mo +share/locale/he/LC_MESSAGES/dconf.mo +share/locale/hi/LC_MESSAGES/dconf.mo +share/locale/hu/LC_MESSAGES/dconf.mo +share/locale/id/LC_MESSAGES/dconf.mo +share/locale/it/LC_MESSAGES/dconf.mo +share/locale/ja/LC_MESSAGES/dconf.mo +share/locale/ko/LC_MESSAGES/dconf.mo +share/locale/lt/LC_MESSAGES/dconf.mo +share/locale/lv/LC_MESSAGES/dconf.mo +share/locale/ml/LC_MESSAGES/dconf.mo +share/locale/mr/LC_MESSAGES/dconf.mo +share/locale/nb/LC_MESSAGES/dconf.mo +share/locale/pa/LC_MESSAGES/dconf.mo +share/locale/pl/LC_MESSAGES/dconf.mo +share/locale/pt/LC_MESSAGES/dconf.mo +share/locale/pt_BR/LC_MESSAGES/dconf.mo +share/locale/ru/LC_MESSAGES/dconf.mo +share/locale/sk/LC_MESSAGES/dconf.mo +share/locale/sl/LC_MESSAGES/dconf.mo +share/locale/sr/LC_MESSAGES/dconf.mo +share/locale/sr@latin/LC_MESSAGES/dconf.mo +share/locale/sv/LC_MESSAGES/dconf.mo +share/locale/ta/LC_MESSAGES/dconf.mo +share/locale/te/LC_MESSAGES/dconf.mo +share/locale/th/LC_MESSAGES/dconf.mo +share/locale/uk/LC_MESSAGES/dconf.mo +share/locale/vi/LC_MESSAGES/dconf.mo +share/locale/zh_CN/LC_MESSAGES/dconf.mo +share/locale/zh_HK/LC_MESSAGES/dconf.mo +share/locale/zh_TW/LC_MESSAGES/dconf.mo share/vala/vapi/dconf.deps share/vala/vapi/dconf.vapi @dirrm share/gtk-doc/html/dconf @@ -34,7 +90,8 @@ @dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc @dirrm include/dconf-dbus-1 +@dirrm include/dconf/common +@dirrm include/dconf/client @dirrm include/dconf @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true @unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true -@dirrmtry etc/bash_completion.d Index: devel/dconf-editor/Makefile =================================================================== --- devel/dconf-editor/Makefile (revision 323706) +++ devel/dconf-editor/Makefile (working copy) @@ -1,8 +1,9 @@ # Created by: Koop Mast # $FreeBSD$ -# $MCom: ports/devel/dconf-editor/Makefile,v 1.2 2012/12/16 22:43:23 kwm Exp $ +# $MCom: ports/trunk/devel/dconf-editor/Makefile 18422 2013-05-06 11:04:38Z kwm $ PORTNAME= dconf +PORTREVISION= 0 PKGNAMESUFFIX= -editor COMMENT= configuration editor for dconf Index: devel/gamin/Makefile =================================================================== --- devel/gamin/Makefile (revision 323706) +++ devel/gamin/Makefile (working copy) @@ -1,10 +1,10 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/devel/gamin/Makefile,v 1.11 2012/08/04 16:55:24 kwm Exp $ +# $MCom: ports/trunk/devel/gamin/Makefile 18634 2013-07-26 10:42:35Z kwm $ PORTNAME= gamin PORTVERSION= 0.1.10 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES?= devel MASTER_SITES= http://people.gnome.org/~veillard/gamin/sources/ @@ -11,10 +11,9 @@ MAINTAINER?= gnome@FreeBSD.org COMMENT?= A file and directory monitoring system -USES= pkgconfig gettext +USES= gettext gmake pathfix pkgconfig USE_AUTOTOOLS= libtool -USE_GMAKE= yes -USE_GNOME?= gnomehack _glib20 +USE_GNOME?= glib20 USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --without-python Index: devel/gio-fam-backend/Makefile =================================================================== --- devel/gio-fam-backend/Makefile (revision 323706) +++ devel/gio-fam-backend/Makefile (working copy) @@ -1,35 +0,0 @@ -# Created by: Joe Marcus Clarke -# $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.96 2012/12/09 20:42:55 kwm Exp $ - -PORTNAME= gio-fam-backend -PORTVERSION= 2.34.3 -PORTREVISION= 0 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ - ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ - ftp://ftp.gimp.org/pub/%SUBDIR%/ \ - ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ - http://www.ameth.org/gimp/%SUBDIR%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DISTNAME= glib-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= FAM backend for GLib\'s GIO library - -USE_XZ= yes -BUILD_WRKSRC= ${WRKSRC}/gio/fam -INSTALL_WRKSRC= ${BUILD_WRKSRC} -GNU_CONFIGURE= yes -USES= pkgconfig -USE_GNOME= gnomehack _glib20 -USE_FAM= yes -USE_GMAKE= yes -MAKE_JOBS_SAFE= yes -CONFIGURE_ARGS= --enable-static --with-libiconv=gnu -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lintl - -.include Index: devel/gio-fam-backend/distinfo =================================================================== --- devel/gio-fam-backend/distinfo (revision 323706) +++ devel/gio-fam-backend/distinfo (working copy) @@ -1,2 +0,0 @@ -SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 -SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872 Index: devel/gio-fam-backend/files/patch-ae =================================================================== --- devel/gio-fam-backend/files/patch-ae (revision 323706) +++ devel/gio-fam-backend/files/patch-ae (working copy) @@ -1,43 +0,0 @@ ---- configure.orig 2013-02-14 19:12:15.000000000 +0000 -+++ configure 2013-02-14 19:13:51.000000000 +0000 -@@ -603,6 +603,9 @@ - #ifdef HAVE_SYS_TYPES_H - # include - #endif -+#ifdef HAVE_SYS_PARAM_H -+# include -+#endif - #ifdef HAVE_SYS_STAT_H - # include - #endif -@@ -5602,7 +5605,7 @@ - fi - - GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" --ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`" -+ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`" - - - if test "x$with_runtime_libdir" != "x"; then -@@ -23647,7 +23650,7 @@ - fi - done - --for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid -+for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -@@ -27108,10 +27111,10 @@ - # b) FreeBSD doesn't do this either. - # - case $host in -- *-*-freebsd*|*-*-linux*) -+ *-*-linux*) - G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`" - ;; -- *-*-openbsd*) -+ *-*-freebsd*|*-*-openbsd*) - LDFLAGS="$LDFLAGS -pthread" - ;; - *) Index: devel/gio-fam-backend/files/patch-gio_fam_Makefile.in =================================================================== --- devel/gio-fam-backend/files/patch-gio_fam_Makefile.in (revision 323706) +++ devel/gio-fam-backend/files/patch-gio_fam_Makefile.in (working copy) @@ -1,36 +0,0 @@ ---- gio/fam/Makefile.in.orig 2010-01-28 10:40:29.000000000 -0500 -+++ gio/fam/Makefile.in 2010-01-28 10:43:26.000000000 -0500 -@@ -76,9 +76,8 @@ am__base_list = \ - am__installdirs = "$(DESTDIR)$(giomoduledir)" - LTLIBRARIES = $(giomodule_LTLIBRARIES) - am__DEPENDENCIES_1 = --libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \ -- $(top_builddir)/gobject/libgobject-2.0.la \ -- $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \ -+libgiofam_la_DEPENDENCIES = \ -+ $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) - am__objects_1 = - am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ -@@ -369,9 +368,9 @@ libgiofam_la_CFLAGS = \ - - libgiofam_la_LDFLAGS = $(module_flags) - libgiofam_la_LIBADD = \ -- $(top_builddir)/gio/libgio-2.0.la \ -- $(top_builddir)/gobject/libgobject-2.0.la \ -- $(top_builddir)/glib/libglib-2.0.la \ -+ -lgio-2.0 \ -+ -lgobject-2.0 \ -+ -lglib-2.0 \ - $(GLIB_LIBS) \ - $(FAM_LIBS) \ - $(NULL) -@@ -776,7 +775,7 @@ check-local: test - - install-data-hook: - if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ -- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ -+ gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ - fi - - uninstall-local: Index: devel/gio-fam-backend/pkg-descr =================================================================== --- devel/gio-fam-backend/pkg-descr (revision 323706) +++ devel/gio-fam-backend/pkg-descr (working copy) @@ -1,2 +0,0 @@ -gio-fam-backend provides a file Alteration Monitor (FAM) backend module for -GLib's GIO subsystem. Index: devel/gio-fam-backend/pkg-plist =================================================================== --- devel/gio-fam-backend/pkg-plist (revision 323706) +++ devel/gio-fam-backend/pkg-plist (working copy) @@ -1,5 +0,0 @@ -lib/gio/modules/libgiofam.a -lib/gio/modules/libgiofam.la -lib/gio/modules/libgiofam.so -@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true -@unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true Index: devel/glib20/Makefile =================================================================== --- devel/glib20/Makefile (revision 323706) +++ devel/glib20/Makefile (working copy) @@ -1,11 +1,10 @@ # Created by: Vanilla I. Shu # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.229 2012/12/09 20:42:55 kwm Exp $ -# !! DON'T FORGET ABOUT devel/gio-fam-backend !! +# $MCom: ports/trunk/devel/glib20/Makefile 18634 2013-07-26 10:42:35Z kwm $ PORTNAME= glib -PORTVERSION= 2.34.3 -PORTREVISION?= 0 +PORTVERSION= 2.36.3 +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -26,10 +25,8 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USES= pkgconfig gettext iconv -USE_GNOME= gnomehack ltverhack -USE_GMAKE= yes -MAKE_JOBS_SAFE= yes +USES= gettext gmake iconv pathfix pkgconfig shebangfix +USE_GNOME= ltverhack USE_PYTHON= 2.5+ USE_PERL5= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ @@ -37,9 +34,12 @@ --disable-man --without-xml-catalog \ --with-pcre=system \ --disable-fam +CONFIGURE_ENV= ac_cv_header_sys_inotify_h= CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lintl +LDFLAGS+= -L${LOCALBASE}/lib +SHEBANG_FILES= */*.pl glib/gen-iswide-table.py + OPTIONS_DEFINE= COLLATION_FIX DEBUG COLLATION_FIX_DESC= fix string collation @@ -73,6 +73,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ ${FILESDIR}/extra-patch-glib_gunicollate.c # Disable it until someone can figure why it causes net-im/pidgin crashed. +# http://www.freebsd.org/cgi/query-pr.cgi?pr=175930 see comment by ed@ #CONFIGURE_ENV+= CFLAGS="-D__STDC_ISO_10646__" .endif @@ -91,6 +92,7 @@ ${WRKSRC}/gio/gdbusaddress.c ${WRKSRC}/gio/gdbusprivate.c \ ${WRKSRC}/po/*.po @${REINPLACE_CMD} -e 's|inotify_support=yes|inotify_support=no| ; \ + s|-Werror|| ; \ s|#define HAVE_SYS_INOTIFY_H 1||' ${WRKSRC}/configure post-install: Index: devel/glib20/distinfo =================================================================== --- devel/glib20/distinfo (revision 323706) +++ devel/glib20/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 -SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872 +SHA256 (gnome2/glib-2.36.3.tar.xz) = 5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e +SIZE (gnome2/glib-2.36.3.tar.xz) = 6626972 Index: devel/glib20/files/patch-ae =================================================================== --- devel/glib20/files/patch-ae (revision 323706) +++ devel/glib20/files/patch-ae (working copy) @@ -1,5 +1,5 @@ ---- configure.orig 2013-02-14 19:12:15.000000000 +0000 -+++ configure 2013-02-14 19:13:51.000000000 +0000 +--- configure.orig 2013-03-28 02:59:16.000000000 +0000 ++++ configure 2013-03-28 03:00:20.000000000 +0000 @@ -603,6 +603,9 @@ #ifdef HAVE_SYS_TYPES_H # include @@ -10,7 +10,7 @@ #ifdef HAVE_SYS_STAT_H # include #endif -@@ -5602,7 +5605,7 @@ +@@ -5699,7 +5702,7 @@ fi GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" @@ -19,7 +19,7 @@ if test "x$with_runtime_libdir" != "x"; then -@@ -23647,7 +23650,7 @@ +@@ -23089,7 +23092,7 @@ fi done @@ -28,16 +28,16 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -@@ -27108,10 +27111,10 @@ +@@ -26629,10 +26632,10 @@ # b) FreeBSD doesn't do this either. # case $host in - *-*-freebsd*|*-*-linux*) + *-*-linux*) - G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`" + G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`" ;; - *-*-openbsd*) -+ *-*-freebsd*|*-*-openbsd*) ++ *-*-openbsd*|*-*-freebsd*) LDFLAGS="$LDFLAGS -pthread" ;; *) Index: devel/glib20/files/patch-glib::libcharset::Makefile.in =================================================================== --- devel/glib20/files/patch-glib::libcharset::Makefile.in (revision 323706) +++ devel/glib20/files/patch-glib::libcharset::Makefile.in (working copy) @@ -1,25 +1,5 @@ --- glib/libcharset/Makefile.in.orig 2010-08-08 12:46:01.000000000 +0200 +++ glib/libcharset/Makefile.in 2010-08-08 12:46:01.000000000 +0200 -@@ -328,7 +328,7 @@ EXTRA_DIST = README config.charset ref-a - codeset.m4 update.sh make-patch.sh libcharset-glib.patch - TEST_PROGS = - INCLUDES = \ -- -DLIBDIR=\"$(libdir)\" $(config_h_INCLUDES) -+ -DLIBDIR=\"$(prefix)/libdata\" $(config_h_INCLUDES) - - noinst_LTLIBRARIES = libcharset.la - libcharset_la_SOURCES = \ -@@ -336,8 +336,8 @@ libcharset_la_SOURCES = \ - localcharset.h \ - localcharset.c - --charset_alias = $(DESTDIR)$(libdir)/charset.alias --charset_tmp = $(DESTDIR)$(libdir)/charset.tmp -+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias -+charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp - SUFFIXES = .sed .sin - CLEANFILES = charset.alias ref-add.sed ref-del.sed - all: all-am @@ -566,7 +566,7 @@ install-dvi: install-dvi-am install-dvi-am: Index: devel/glib20/files/patch-glib_tests_gdatetime.c =================================================================== --- devel/glib20/files/patch-glib_tests_gdatetime.c (revision 323706) +++ devel/glib20/files/patch-glib_tests_gdatetime.c (working copy) @@ -1,20 +1,20 @@ ---- glib/tests/gdatetime.c.orig 2012-08-17 00:06:25.000000000 +0000 -+++ glib/tests/gdatetime.c 2012-10-23 12:38:55.000000000 +0000 -@@ -1230,7 +1230,7 @@ - gint64 u; +--- glib/tests/gdatetime.c.orig 2013-03-13 13:39:09.000000000 +0000 ++++ glib/tests/gdatetime.c 2013-03-28 10:15:49.000000000 +0000 +@@ -1276,7 +1276,7 @@ gint i1, i2; + #ifdef G_OS_UNIX - tz = g_time_zone_new ("Canada/Eastern"); + tz = g_time_zone_new ("America/Montreal"); - dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0); - u = g_date_time_to_unix (dt); - -@@ -1259,7 +1259,7 @@ - gint64 u, u2; + #elif defined G_OS_WIN32 + tz = g_time_zone_new ("Eastern Standard Time"); + #endif +@@ -1309,7 +1309,7 @@ gint i1, i2; + #ifdef G_OS_UNIX - tz = g_time_zone_new ("Canada/Eastern"); + tz = g_time_zone_new ("America/Montreal"); - dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0); - u = g_date_time_to_unix (dt); - u2 = u; + #elif defined G_OS_WIN32 + tz = g_time_zone_new ("Eastern Standard Time"); + #endif Index: devel/glib20/pkg-plist =================================================================== --- devel/glib20/pkg-plist (revision 323706) +++ devel/glib20/pkg-plist (working copy) @@ -105,6 +105,7 @@ include/glib-2.0/gio/gmountoperation.h include/glib-2.0/gio/gnativevolumemonitor.h include/glib-2.0/gio/gnetworkaddress.h +include/glib-2.0/gio/gnetworking.h include/glib-2.0/gio/gnetworkmonitor.h include/glib-2.0/gio/gnetworkservice.h include/glib-2.0/gio/goutputstream.h @@ -125,6 +126,7 @@ include/glib-2.0/gio/gsettingsschema.h include/glib-2.0/gio/gsimpleaction.h include/glib-2.0/gio/gsimpleactiongroup.h +include/glib-2.0/gio/gsimpleproxyresolver.h include/glib-2.0/gio/gsimpleasyncresult.h include/glib-2.0/gio/gsimplepermission.h include/glib-2.0/gio/gsocket.h @@ -137,6 +139,7 @@ include/glib-2.0/gio/gsocketlistener.h include/glib-2.0/gio/gsocketservice.h include/glib-2.0/gio/gsrvtarget.h +include/glib-2.0/gio/gtask.h include/glib-2.0/gio/gtcpconnection.h include/glib-2.0/gio/gtcpwrapperconnection.h include/glib-2.0/gio/gtestdbus.h @@ -258,30 +261,6 @@ include/glib-2.0/gobject/gvaluearray.h include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h -lib/gdbus-2.0/codegen/__init__.py -lib/gdbus-2.0/codegen/__init__.pyc -lib/gdbus-2.0/codegen/__init__.pyo -lib/gdbus-2.0/codegen/codegen.py -lib/gdbus-2.0/codegen/codegen.pyc -lib/gdbus-2.0/codegen/codegen.pyo -lib/gdbus-2.0/codegen/codegen_docbook.py -lib/gdbus-2.0/codegen/codegen_docbook.pyc -lib/gdbus-2.0/codegen/codegen_docbook.pyo -lib/gdbus-2.0/codegen/codegen_main.py -lib/gdbus-2.0/codegen/codegen_main.pyc -lib/gdbus-2.0/codegen/codegen_main.pyo -lib/gdbus-2.0/codegen/config.py -lib/gdbus-2.0/codegen/config.pyc -lib/gdbus-2.0/codegen/config.pyo -lib/gdbus-2.0/codegen/dbustypes.py -lib/gdbus-2.0/codegen/dbustypes.pyc -lib/gdbus-2.0/codegen/dbustypes.pyo -lib/gdbus-2.0/codegen/parser.py -lib/gdbus-2.0/codegen/parser.pyc -lib/gdbus-2.0/codegen/parser.pyo -lib/gdbus-2.0/codegen/utils.py -lib/gdbus-2.0/codegen/utils.pyc -lib/gdbus-2.0/codegen/utils.pyo lib/libgio-2.0.a lib/libgio-2.0.la lib/libgio-2.0.so @@ -313,7 +292,30 @@ share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 share/aclocal/gsettings.m4 -share/glib-2.0/gettext/mkinstalldirs +share/glib-2.0/codegen/__init__.py +share/glib-2.0/codegen/__init__.pyc +share/glib-2.0/codegen/__init__.pyo +share/glib-2.0/codegen/codegen.py +share/glib-2.0/codegen/codegen.pyc +share/glib-2.0/codegen/codegen.pyo +share/glib-2.0/codegen/codegen_docbook.py +share/glib-2.0/codegen/codegen_docbook.pyc +share/glib-2.0/codegen/codegen_docbook.pyo +share/glib-2.0/codegen/codegen_main.py +share/glib-2.0/codegen/codegen_main.pyc +share/glib-2.0/codegen/codegen_main.pyo +share/glib-2.0/codegen/config.py +share/glib-2.0/codegen/config.pyc +share/glib-2.0/codegen/config.pyo +share/glib-2.0/codegen/dbustypes.py +share/glib-2.0/codegen/dbustypes.pyc +share/glib-2.0/codegen/dbustypes.pyo +share/glib-2.0/codegen/parser.py +share/glib-2.0/codegen/parser.pyc +share/glib-2.0/codegen/parser.pyo +share/glib-2.0/codegen/utils.py +share/glib-2.0/codegen/utils.pyc +share/glib-2.0/codegen/utils.pyo share/glib-2.0/gettext/po/Makefile.in.in share/glib-2.0/schemas/gschema.dtd share/locale/af/LC_MESSAGES/glib20.mo @@ -397,6 +399,7 @@ share/locale/sv/LC_MESSAGES/glib20.mo share/locale/ta/LC_MESSAGES/glib20.mo share/locale/te/LC_MESSAGES/glib20.mo +share/locale/tg/LC_MESSAGES/glib20.mo share/locale/th/LC_MESSAGES/glib20.mo share/locale/tl/LC_MESSAGES/glib20.mo share/locale/tr/LC_MESSAGES/glib20.mo @@ -469,6 +472,7 @@ @dirrm share/glib-2.0/schemas @dirrm share/glib-2.0/gettext/po @dirrm share/glib-2.0/gettext +@dirrm share/glib-2.0/codegen @dirrm share/glib-2.0 @dirrmtry share/bash-completion/completions @dirrmtry share/bash-completion @@ -479,8 +483,6 @@ @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true @dirrmtry lib/gio/modules @dirrmtry lib/gio -@dirrm lib/gdbus-2.0/codegen -@dirrm lib/gdbus-2.0 @dirrm include/glib-2.0/gobject @dirrm include/glib-2.0/glib/deprecated @dirrm include/glib-2.0/glib Index: devel/glibmm/Makefile =================================================================== --- devel/glibmm/Makefile (revision 323706) +++ devel/glibmm/Makefile (working copy) @@ -1,9 +1,9 @@ # Created by: Adam Weinberger # $FreeBSD$ -# $MCom: ports/devel/glibmm/Makefile,v 1.121 2012/12/09 21:00:20 kwm Exp $ +# $MCom: ports/trunk/devel/glibmm/Makefile 18634 2013-07-26 10:42:35Z kwm $ PORTNAME= glibmm -PORTVERSION= 2.34.1 +PORTVERSION= 2.36.2 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= devel @@ -21,9 +21,8 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_GMAKE= yes -USE_GNOME= gnomehack glib20 ltverhack libsigc++20 -USES= pkgconfig gettext +USES= gettext gmake pathfix pkgconfig +USE_GNOME= glib20 ltverhack libsigc++20 USE_PERL5= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes Index: devel/glibmm/distinfo =================================================================== --- devel/glibmm/distinfo (revision 323706) +++ devel/glibmm/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome2/glibmm-2.34.1.tar.xz) = b425a52c7e178aeaaaffd02c5497bfd68d0cb8be56cef3620558a80dd5d692c4 -SIZE (gnome2/glibmm-2.34.1.tar.xz) = 5670736 +SHA256 (gnome2/glibmm-2.36.2.tar.xz) = f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf +SIZE (gnome2/glibmm-2.36.2.tar.xz) = 2309976 Index: devel/glibmm/pkg-plist =================================================================== --- devel/glibmm/pkg-plist (revision 323706) +++ devel/glibmm/pkg-plist (working copy) @@ -229,6 +229,7 @@ include/glibmm-%%API_VERSION%%/glibmm.h include/glibmm-%%API_VERSION%%/glibmm/arrayhandle.h include/glibmm-%%API_VERSION%%/glibmm/balancedtree.h +include/glibmm-%%API_VERSION%%/glibmm/bytearray.h include/glibmm-%%API_VERSION%%/glibmm/bytes.h include/glibmm-%%API_VERSION%%/glibmm/checksum.h include/glibmm-%%API_VERSION%%/glibmm/class.h @@ -264,6 +265,7 @@ include/glibmm-%%API_VERSION%%/glibmm/pattern.h include/glibmm-%%API_VERSION%%/glibmm/priorities.h include/glibmm-%%API_VERSION%%/glibmm/private/balancedtree_p.h +include/glibmm-%%API_VERSION%%/glibmm/private/bytearray_p.h include/glibmm-%%API_VERSION%%/glibmm/private/bytes_p.h include/glibmm-%%API_VERSION%%/glibmm/private/checksum_p.h include/glibmm-%%API_VERSION%%/glibmm/private/convert_p.h Index: devel/gobject-introspection/Makefile =================================================================== --- devel/gobject-introspection/Makefile (revision 323706) +++ devel/gobject-introspection/Makefile (working copy) @@ -1,9 +1,10 @@ # Created by: Alexander Logvinov # $FreeBSD$ -# $MCom: ports/devel/gobject-introspection/Makefile,v 1.51 2013/02/18 22:07:40 kwm Exp $ +# $MCom: ports/trunk/devel/gobject-introspection/Makefile 18634 2013-07-26 10:42:35Z kwm $ PORTNAME= gobject-introspection -PORTVERSION= 1.34.2 +PORTVERSION= 1.36.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -13,12 +14,11 @@ # we need cairo otherwise the generated Cairo gir is broken BUILD_DEPENDS= cairo-trace:${PORTSDIR}/graphics/cairo -LIB_DEPENDS= ffi.6:${PORTSDIR}/devel/libffi +LIB_DEPENDS= ffi:${PORTSDIR}/devel/libffi -USES= bison pathfix pkgconfig gettext +USES= bison gettext gmake pathfix pkgconfig USE_XZ= yes GNU_CONFIGURE= yes -USE_GMAKE= yes USE_GNOME= gnomehier glib20 ltverhack USE_PYTHON= -2.7 USE_AUTOTOOLS= libtool @@ -26,7 +26,6 @@ MAKE_JOBS_UNSAFE=yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --disable-tests # Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260 MAKE_ENV= HOME=${WRKDIR} @@ -33,4 +32,8 @@ MAN1= g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1 +post-patch: + @${REINPLACE_CMD} -e 's|'gcc'|'cc'|g' \ + ${WRKSRC}/giscanner/dumper.py + .include Index: devel/gobject-introspection/distinfo =================================================================== --- devel/gobject-introspection/distinfo (revision 323706) +++ devel/gobject-introspection/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome3/gobject-introspection-1.34.2.tar.xz) = bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429 -SIZE (gnome3/gobject-introspection-1.34.2.tar.xz) = 1088768 +SHA256 (gnome3/gobject-introspection-1.36.0.tar.xz) = e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383 +SIZE (gnome3/gobject-introspection-1.36.0.tar.xz) = 1201108 Index: devel/gobject-introspection/files/patch-configure =================================================================== --- devel/gobject-introspection/files/patch-configure (revision 323706) +++ devel/gobject-introspection/files/patch-configure (working copy) @@ -1,29 +1,11 @@ ---- configure.orig 2011-09-23 11:49:54.000000000 +0200 -+++ configure 2011-09-23 11:50:31.000000000 +0200 -@@ -14400,10 +14400,10 @@ - $as_echo_n "checking for headers required to compile python extensions... " >&6; } - py_prefix=`$PYTHON -c "import sys; print sys.prefix"` - py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` --if test "x$PYTHON_INCLUDES" == x; then -- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -+if test "x$PYTHON_INCLUDES" = x; then -+ PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags` - if test "$py_prefix" != "$py_exec_prefix"; then -- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -+ PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags` - fi - fi +--- configure.orig 2013-03-29 22:15:44.000000000 +0000 ++++ configure 2013-03-29 22:18:30.000000000 +0000 +@@ -14623,7 +14623,7 @@ -@@ -14429,10 +14429,10 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to link against libpython" >&5 $as_echo_n "checking for libraries required to link against libpython... " >&6; } -if test "x$PYTHON_LIBS" == x; then +if test "x$PYTHON_LIBS" = x; then - PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" + PYTHON_LIBS=`$PYTHON-config --ldflags --libs` fi --if test "x$PYTHON_LIB_LOC" == x; then -+if test "x$PYTHON_LIB_LOC" = x; then - PYTHON_LIB_LOC="${py_prefix}/lib" - fi Index: devel/gobject-introspection/files/patch-giscanner_dumper.py =================================================================== --- devel/gobject-introspection/files/patch-giscanner_dumper.py (revision 0) +++ devel/gobject-introspection/files/patch-giscanner_dumper.py (working copy) @@ -0,0 +1,14 @@ +--- giscanner/dumper.py.orig 2013-02-23 11:40:08.000000000 +0100 ++++ giscanner/dumper.py 2013-06-28 21:51:35.000000000 +0200 +@@ -89,8 +89,9 @@ + # Enable the --msvc-syntax pkg-config flag when + # the Microsoft compiler is used + # (This is the other way to check whether Visual C++ is used subsequently) +- if 'cl' in self._compiler_cmd: +- self._pkgconfig_msvc_flags = '--msvc-syntax' ++ if 'clang' not in self._compiler_cmd: ++ if 'cl' in self._compiler_cmd: ++ self._pkgconfig_msvc_flags = '--msvc-syntax' + self._uninst_srcdir = os.environ.get( + 'UNINSTALLED_INTROSPECTION_SRCDIR') + self._packages = ['gio-2.0 gmodule-2.0'] Index: devel/gobject-introspection/files/patch-giscanner_sourcescanner.py =================================================================== --- devel/gobject-introspection/files/patch-giscanner_sourcescanner.py (revision 0) +++ devel/gobject-introspection/files/patch-giscanner_sourcescanner.py (working copy) @@ -0,0 +1,16 @@ +--- giscanner/sourcescanner.py.orig 2013-03-06 23:53:19.000000000 +0100 ++++ giscanner/sourcescanner.py 2013-06-28 22:01:04.000000000 +0200 +@@ -281,8 +281,11 @@ + # some help from gcc from MinGW/Cygwin or so. + # Note that the generated dumper program is + # still built and linked by Visual C++. +- if 'cl' in cpp_exec: +- cpp_args = 'gcc'.split() ++ if 'clang' not in cpp_exec: ++ if 'cl' in cpp_exec: ++ cpp_args = 'gcc'.split() ++ else: ++ cpp_args = cpp_exec + else: + cpp_args = cpp_exec + cpp_args += ['-E', '-C', '-I.', '-'] Index: devel/gobject-introspection/pkg-plist =================================================================== --- devel/gobject-introspection/pkg-plist (revision 323706) +++ devel/gobject-introspection/pkg-plist (working copy) @@ -50,9 +50,6 @@ lib/gobject-introspection/giscanner/annotationparser.py lib/gobject-introspection/giscanner/annotationparser.pyc lib/gobject-introspection/giscanner/annotationparser.pyo -lib/gobject-introspection/giscanner/annotationpatterns.py -lib/gobject-introspection/giscanner/annotationpatterns.pyc -lib/gobject-introspection/giscanner/annotationpatterns.pyo lib/gobject-introspection/giscanner/ast.py lib/gobject-introspection/giscanner/ast.pyc lib/gobject-introspection/giscanner/ast.pyo @@ -65,6 +62,45 @@ lib/gobject-introspection/giscanner/docmain.py lib/gobject-introspection/giscanner/docmain.pyc lib/gobject-introspection/giscanner/docmain.pyo +lib/gobject-introspection/giscanner/doctemplates/C/class.tmpl +lib/gobject-introspection/giscanner/doctemplates/C/constructor.tmpl +lib/gobject-introspection/giscanner/doctemplates/C/default.tmpl +lib/gobject-introspection/giscanner/doctemplates/C/enum.tmpl +lib/gobject-introspection/giscanner/doctemplates/C/function.tmpl +lib/gobject-introspection/giscanner/doctemplates/C/method.tmpl +lib/gobject-introspection/giscanner/doctemplates/C/namespace.tmpl +lib/gobject-introspection/giscanner/doctemplates/C/property.tmpl +lib/gobject-introspection/giscanner/doctemplates/C/record.tmpl +lib/gobject-introspection/giscanner/doctemplates/C/signal.tmpl +lib/gobject-introspection/giscanner/doctemplates/C/vfunc.tmpl +lib/gobject-introspection/giscanner/doctemplates/Gjs/class.tmpl +lib/gobject-introspection/giscanner/doctemplates/Gjs/constructor.tmpl +lib/gobject-introspection/giscanner/doctemplates/Gjs/default.tmpl +lib/gobject-introspection/giscanner/doctemplates/Gjs/enum.tmpl +lib/gobject-introspection/giscanner/doctemplates/Gjs/function.tmpl +lib/gobject-introspection/giscanner/doctemplates/Gjs/method.tmpl +lib/gobject-introspection/giscanner/doctemplates/Gjs/namespace.tmpl +lib/gobject-introspection/giscanner/doctemplates/Gjs/property.tmpl +lib/gobject-introspection/giscanner/doctemplates/Gjs/record.tmpl +lib/gobject-introspection/giscanner/doctemplates/Gjs/signal.tmpl +lib/gobject-introspection/giscanner/doctemplates/Gjs/vfunc.tmpl +lib/gobject-introspection/giscanner/doctemplates/Python/class.tmpl +lib/gobject-introspection/giscanner/doctemplates/Python/constructor.tmpl +lib/gobject-introspection/giscanner/doctemplates/Python/default.tmpl +lib/gobject-introspection/giscanner/doctemplates/Python/enum.tmpl +lib/gobject-introspection/giscanner/doctemplates/Python/function.tmpl +lib/gobject-introspection/giscanner/doctemplates/Python/method.tmpl +lib/gobject-introspection/giscanner/doctemplates/Python/namespace.tmpl +lib/gobject-introspection/giscanner/doctemplates/Python/property.tmpl +lib/gobject-introspection/giscanner/doctemplates/Python/record.tmpl +lib/gobject-introspection/giscanner/doctemplates/Python/signal.tmpl +lib/gobject-introspection/giscanner/doctemplates/Python/vfunc.tmpl +lib/gobject-introspection/giscanner/doctemplates/base.tmpl +lib/gobject-introspection/giscanner/doctemplates/class.tmpl +lib/gobject-introspection/giscanner/doctemplates/namespace.tmpl +lib/gobject-introspection/giscanner/docwriter.py +lib/gobject-introspection/giscanner/docwriter.pyc +lib/gobject-introspection/giscanner/docwriter.pyo lib/gobject-introspection/giscanner/dumper.py lib/gobject-introspection/giscanner/dumper.pyc lib/gobject-introspection/giscanner/dumper.pyo @@ -86,27 +122,6 @@ lib/gobject-introspection/giscanner/maintransformer.py lib/gobject-introspection/giscanner/maintransformer.pyc lib/gobject-introspection/giscanner/maintransformer.pyo -lib/gobject-introspection/giscanner/mallard-C-class.tmpl -lib/gobject-introspection/giscanner/mallard-C-default.tmpl -lib/gobject-introspection/giscanner/mallard-C-enum.tmpl -lib/gobject-introspection/giscanner/mallard-C-function.tmpl -lib/gobject-introspection/giscanner/mallard-C-namespace.tmpl -lib/gobject-introspection/giscanner/mallard-C-property.tmpl -lib/gobject-introspection/giscanner/mallard-C-record.tmpl -lib/gobject-introspection/giscanner/mallard-C-signal.tmpl -lib/gobject-introspection/giscanner/mallard-C-vfunc.tmpl -lib/gobject-introspection/giscanner/mallard-Python-class.tmpl -lib/gobject-introspection/giscanner/mallard-Python-default.tmpl -lib/gobject-introspection/giscanner/mallard-Python-enum.tmpl -lib/gobject-introspection/giscanner/mallard-Python-function.tmpl -lib/gobject-introspection/giscanner/mallard-Python-namespace.tmpl -lib/gobject-introspection/giscanner/mallard-Python-property.tmpl -lib/gobject-introspection/giscanner/mallard-Python-record.tmpl -lib/gobject-introspection/giscanner/mallard-Python-signal.tmpl -lib/gobject-introspection/giscanner/mallard-Python-vfunc.tmpl -lib/gobject-introspection/giscanner/mallardwriter.py -lib/gobject-introspection/giscanner/mallardwriter.pyc -lib/gobject-introspection/giscanner/mallardwriter.pyo lib/gobject-introspection/giscanner/message.py lib/gobject-introspection/giscanner/message.pyc lib/gobject-introspection/giscanner/message.pyo @@ -116,6 +131,9 @@ lib/gobject-introspection/giscanner/scannermain.py lib/gobject-introspection/giscanner/scannermain.pyc lib/gobject-introspection/giscanner/scannermain.pyo +lib/gobject-introspection/giscanner/sectionparser.py +lib/gobject-introspection/giscanner/sectionparser.pyc +lib/gobject-introspection/giscanner/sectionparser.pyo lib/gobject-introspection/giscanner/shlibs.py lib/gobject-introspection/giscanner/shlibs.pyc lib/gobject-introspection/giscanner/shlibs.pyo @@ -159,57 +177,28 @@ share/gir-1.0/xrandr-1.3.gir share/gobject-introspection-1.0/Makefile.introspection share/gobject-introspection-1.0/gdump.c +share/gobject-introspection-1.0/tests/annotation.c +share/gobject-introspection-1.0/tests/annotation.h +share/gobject-introspection-1.0/tests/drawable.c +share/gobject-introspection-1.0/tests/drawable.h share/gobject-introspection-1.0/tests/everything.c share/gobject-introspection-1.0/tests/everything.h +share/gobject-introspection-1.0/tests/foo.c +share/gobject-introspection-1.0/tests/foo.h share/gobject-introspection-1.0/tests/gimarshallingtests.c share/gobject-introspection-1.0/tests/gimarshallingtests.h share/gobject-introspection-1.0/tests/regress.c share/gobject-introspection-1.0/tests/regress.h -share/gtk-doc/html/gi/annotation-glossary.html -share/gtk-doc/html/gi/gi-GIArgInfo.html -share/gtk-doc/html/gi/gi-GIBaseInfo.html -share/gtk-doc/html/gi/gi-GICallableInfo.html -share/gtk-doc/html/gi/gi-GIConstantInfo.html -share/gtk-doc/html/gi/gi-GIEnumInfo.html -share/gtk-doc/html/gi/gi-GIFieldInfo.html -share/gtk-doc/html/gi/gi-GIFunctionInfo.html -share/gtk-doc/html/gi/gi-GIInterfaceInfo.html -share/gtk-doc/html/gi/gi-GIObjectInfo.html -share/gtk-doc/html/gi/gi-GIPropertyInfo.html -share/gtk-doc/html/gi/gi-GIRegisteredTypeInfo.html -share/gtk-doc/html/gi/gi-GISignalInfo.html -share/gtk-doc/html/gi/gi-GIStructInfo.html -share/gtk-doc/html/gi/gi-GITypeInfo.html -share/gtk-doc/html/gi/gi-GIUnionInfo.html -share/gtk-doc/html/gi/gi-GIVFuncInfo.html -share/gtk-doc/html/gi/gi-ffi.html -share/gtk-doc/html/gi/gi-gierrordomaininfo.html -share/gtk-doc/html/gi/gi-gir-reference.html -share/gtk-doc/html/gi/gi-gir.html -share/gtk-doc/html/gi/gi-girepository.html -share/gtk-doc/html/gi/gi-girffi.html -share/gtk-doc/html/gi/gi-gtypelib.html -share/gtk-doc/html/gi/gi-libgirepository.html -share/gtk-doc/html/gi/gi-overview.html -share/gtk-doc/html/gi/gi-repository-structs.html -share/gtk-doc/html/gi/gi-struct-hierarchy.html -share/gtk-doc/html/gi/gi-typelib.html -share/gtk-doc/html/gi/gi.devhelp2 -share/gtk-doc/html/gi/girepository.html -share/gtk-doc/html/gi/glib.html -share/gtk-doc/html/gi/home.png -share/gtk-doc/html/gi/index.html -share/gtk-doc/html/gi/index.sgml -share/gtk-doc/html/gi/left.png -share/gtk-doc/html/gi/overview.png -share/gtk-doc/html/gi/right.png -share/gtk-doc/html/gi/style.css -share/gtk-doc/html/gi/up.png -@dirrm share/gtk-doc/html/gi -@dirrmtry share/gtk-doc/html -@dirrmtry share/gtk-doc +share/gobject-introspection-1.0/tests/utility.c +share/gobject-introspection-1.0/tests/utility.h +share/gobject-introspection-1.0/tests/warnlib.c +share/gobject-introspection-1.0/tests/warnlib.h @dirrm share/gobject-introspection-1.0/tests @dirrm share/gobject-introspection-1.0 +@dirrm lib/gobject-introspection/giscanner/doctemplates/Python +@dirrm lib/gobject-introspection/giscanner/doctemplates/Gjs +@dirrm lib/gobject-introspection/giscanner/doctemplates/C +@dirrm lib/gobject-introspection/giscanner/doctemplates @dirrm lib/gobject-introspection/giscanner @dirrm lib/gobject-introspection @dirrm include/gobject-introspection-1.0 Index: devel/gsettings-desktop-schemas/Makefile =================================================================== --- devel/gsettings-desktop-schemas/Makefile (revision 323706) +++ devel/gsettings-desktop-schemas/Makefile (working copy) @@ -1,9 +1,9 @@ # Created by: Koop Mast # $FreeBSD$ -# $MCom: ports/devel/gsettings-desktop-schemas/Makefile,v 1.13 2011/04/27 21:18:30 kwm Exp $ +# $MCom: ports/trunk/devel/gsettings-desktop-schemas/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= gsettings-desktop-schemas -PORTVERSION= 3.0.1 +PORTVERSION= 3.6.1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -11,15 +11,14 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Collection of globally shared GSetting schemas +LICENSE= LGPL21 + RUN_DEPENDS= ${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11-fonts/cantarell-fonts -LICENSE= LGPL21 - -USES= pkgconfig gettext -USE_BZIP2= yes -USE_GMAKE= yes +USE_XZ= yes +USES= gettext gmake pathfix pkgconfig USE_PERL5_BUILD= yes -USE_GNOME= gnomehack intltool glib20 +USE_GNOME= intltool glib20 introspection:build GNU_CONFIGURE= yes GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \ @@ -29,6 +28,7 @@ org.gnome.desktop.background.gschema.xml \ org.gnome.desktop.default-applications.gschema.xml \ org.gnome.desktop.enums.xml \ + org.gnome.desktop.input-sources.gschema.xml \ org.gnome.desktop.interface.gschema.xml \ org.gnome.desktop.lockdown.gschema.xml \ org.gnome.desktop.media-handling.gschema.xml \ @@ -37,6 +37,9 @@ org.gnome.desktop.sound.gschema.xml \ org.gnome.desktop.thumbnailers.gschema.xml \ org.gnome.desktop.thumbnail-cache.gschema.xml \ + org.gnome.desktop.wm.keybindings.gschema.xml \ + org.gnome.desktop.wm.preferences.gschema.xml \ + org.gnome.system.locale.gschema.xml \ org.gnome.system.proxy.gschema.xml .include Index: devel/gsettings-desktop-schemas/distinfo =================================================================== --- devel/gsettings-desktop-schemas/distinfo (revision 323706) +++ devel/gsettings-desktop-schemas/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome3/gsettings-desktop-schemas-3.0.1.tar.bz2) = 6e72158a0e70ae50b8bb992e1486dd2fda43207f4ec4eb03a0d769f210363fd9 -SIZE (gnome3/gsettings-desktop-schemas-3.0.1.tar.bz2) = 136439 +SHA256 (gnome3/gsettings-desktop-schemas-3.6.1.tar.xz) = d9a877d209e668845d6cafcd62663b0f6e6154df5a96f581ff36f999050e67e6 +SIZE (gnome3/gsettings-desktop-schemas-3.6.1.tar.xz) = 384248 Index: devel/gsettings-desktop-schemas/pkg-plist =================================================================== --- devel/gsettings-desktop-schemas/pkg-plist (revision 323706) +++ devel/gsettings-desktop-schemas/pkg-plist (working copy) @@ -1,10 +1,55 @@ include/gsettings-desktop-schemas/gdesktop-enums.h +lib/girepository-1.0/GDesktopEnums-3.0.typelib libdata/pkgconfig/gsettings-desktop-schemas.pc share/GConf/gsettings/gsettings-desktop-schemas.convert +share/GConf/gsettings/wm-schemas.convert +share/gir-1.0/GDesktopEnums-3.0.gir +share/locale/as/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/ca/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/ca@valencia/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/cs/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/da/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/de/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/el/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/en_GB/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/eo/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/es/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/fi/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/fr/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/gl/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/gu/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/hi/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/hu/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/id/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/it/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/ja/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/lt/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/lv/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/nb/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/or/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/pa/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/pl/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/pt/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/pt_BR/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/ru/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/sl/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/sr/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/sr@latin/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/sv/LC_MESSAGES/gsettings-desktop-schemas.mo -@dirrm include/gsettings-desktop-schemas +share/locale/ug/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/uk/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/vi/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/zh_CN/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/zh_HK/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/zh_TW/LC_MESSAGES/gsettings-desktop-schemas.mo +@dirrmtry include/gsettings-desktop-schemas +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as Index: devel/libnotify/Makefile =================================================================== --- devel/libnotify/Makefile (revision 323706) +++ devel/libnotify/Makefile (working copy) @@ -1,14 +1,9 @@ -# New ports collection makefile for: libnotify -# Date created: 2005-08-06 -# Whom: Andreas Kohn -# +# Created by: Andreas Kohn # $FreeBSD$ -# $MCom: ports/devel/libnotify/Makefile,v 1.21 2011/06/11 19:51:15 mezz Exp $ -# +# $MCom: ports/trunk/devel/libnotify/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= libnotify -PORTVERSION= 0.7.3 -PORTREVISION= 2 +PORTVERSION= 0.7.5 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -15,15 +10,12 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A library for desktop notifications -BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection - LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -USE_BZIP2= yes -USE_GNOME= gnomehack intlhack glib20 gtk20 ltverhack -USES= gettext -USE_GMAKE= yes + +USE_XZ= yes +USE_GNOME= intlhack glib20 gdkpixbuf2 ltverhack introspection:build +USES= gettext gmake pathfix pkgconfig USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include Index: devel/libnotify/distinfo =================================================================== --- devel/libnotify/distinfo (revision 323706) +++ devel/libnotify/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (libnotify-0.7.3.tar.bz2) = 322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88 -SIZE (libnotify-0.7.3.tar.bz2) = 305203 +SHA256 (libnotify-0.7.5.tar.xz) = 4378cb47874ba4d5f759b7890d8d28d086e81d3f0bd4f6e84e5ab66d82ffb652 +SIZE (libnotify-0.7.5.tar.xz) = 275804 Index: devel/libnotify/files/patch-configure =================================================================== --- devel/libnotify/files/patch-configure (revision 323706) +++ devel/libnotify/files/patch-configure (working copy) @@ -1,6 +1,6 @@ ---- configure.orig 2011-06-07 22:08:06.000000000 +0200 -+++ configure 2011-06-07 22:08:10.000000000 +0200 -@@ -646,8 +646,6 @@ +--- configure.orig 2011-08-30 23:03:20.000000000 +0200 ++++ configure 2011-08-30 23:03:01.000000000 +0200 +@@ -648,8 +648,6 @@ INTROSPECTION_COMPILER INTROSPECTION_SCANNER GLIB_GENMARSHAL @@ -9,16 +9,16 @@ PACKAGE_LIBS PACKAGE_CFLAGS PKG_CONFIG_LIBDIR -@@ -804,8 +802,6 @@ +@@ -806,8 +804,6 @@ PKG_CONFIG_LIBDIR PACKAGE_CFLAGS PACKAGE_LIBS -TESTS_CFLAGS -TESTS_LIBS + GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS XMLTO - XMLTO_FLAGS' - -@@ -1473,9 +1469,6 @@ +@@ -1477,9 +1473,6 @@ C compiler flags for PACKAGE, overriding pkg-config PACKAGE_LIBS linker flags for PACKAGE, overriding pkg-config @@ -25,11 +25,11 @@ - TESTS_CFLAGS - C compiler flags for TESTS, overriding pkg-config - TESTS_LIBS linker flags for TESTS, overriding pkg-config - XMLTO Define/override the `xmlto' location. - XMLTO_FLAGS Define/override `xmlto' options, like `--skip-validation'. + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS +@@ -11664,98 +11657,6 @@ -@@ -11656,99 +11643,6 @@ - fi -tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION" @@ -124,7 +124,6 @@ -$as_echo "yes" >&6; } - -fi -- + GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` - Index: devel/libnotify/pkg-plist =================================================================== --- devel/libnotify/pkg-plist (revision 323706) +++ devel/libnotify/pkg-plist (working copy) @@ -11,6 +11,9 @@ libdata/pkgconfig/libnotify.pc share/gir-1.0/Notify-0.7.gir share/gtk-doc/html/libnotify/NotifyNotification.html +share/gtk-doc/html/libnotify/annotation-glossary.html +share/gtk-doc/html/libnotify/api-index-deprecated.html +share/gtk-doc/html/libnotify/api-index-full.html share/gtk-doc/html/libnotify/ch01.html share/gtk-doc/html/libnotify/home.png share/gtk-doc/html/libnotify/index.html @@ -17,7 +20,6 @@ share/gtk-doc/html/libnotify/index.sgml share/gtk-doc/html/libnotify/left.png share/gtk-doc/html/libnotify/libnotify-notify.html -share/gtk-doc/html/libnotify/libnotify.devhelp share/gtk-doc/html/libnotify/libnotify.devhelp2 share/gtk-doc/html/libnotify/right.png share/gtk-doc/html/libnotify/style.css Index: devel/libsigc++20/Makefile =================================================================== --- devel/libsigc++20/Makefile (revision 323706) +++ devel/libsigc++20/Makefile (working copy) @@ -1,9 +1,9 @@ # Created by: Alexander Nedotsukov # $FreeBSD$ -# $MCom: ports/devel/libsigc++20/Makefile,v 1.17 2011/07/25 09:19:14 kwm Exp $ +# $MCom: ports/trunk/devel/libsigc++20/Makefile 18634 2013-07-26 10:42:35Z kwm $ PORTNAME= libsigc++ -PORTVERSION= 2.2.10 +PORTVERSION= 2.3.1 CATEGORIES= devel MASTER_SITES= GNOME @@ -14,16 +14,17 @@ USE_AUTOTOOLS= libtool USE_XZ= yes -USE_GMAKE= yes USE_PERL5_BUILD=yes LATEST_LINK= libsigc++20 USE_LDCONFIG= yes -USES= pathfix +USES= gmake pathfix GNU_CONFIGURE= yes PLIST_SUB= VERSION="2.0" API_VERSION="2.0" -.if defined(NOPORTDOCS) +.include + +.if ! ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+=--enable-documentation=no .endif Index: devel/libsigc++20/distinfo =================================================================== --- devel/libsigc++20/distinfo (revision 323706) +++ devel/libsigc++20/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (libsigc++-2.2.10.tar.xz) = 8ceb6f2732f5399ef50d5b70f433d49945a12e0900b8f9f43c135866a2e5bf47 -SIZE (libsigc++-2.2.10.tar.xz) = 2911656 +SHA256 (libsigc++-2.3.1.tar.xz) = 67d05852b31fdb267c9fdcecd40b046a11aa54d884435e99e3c60dd20cd60393 +SIZE (libsigc++-2.3.1.tar.xz) = 3458088 Index: devel/libsigc++20/pkg-plist =================================================================== --- devel/libsigc++20/pkg-plist (revision 323706) +++ devel/libsigc++20/pkg-plist (working copy) @@ -51,6 +51,7 @@ %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/index.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/annotated.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/bc_s.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/bdwn.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classes.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument.html @@ -351,8 +352,28 @@ %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/closed.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/dir_0bd3c8d814eb03171de012519d7a2ccd.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/dir_5c02128c554eaa40138b2e605fc08970.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/dir_5fbc72877197f8c6013d0f619df5433c.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/dir_ea4abdd77c05d5873cecf571a6d96de7.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/doxygen.css %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/doxygen.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2blank.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2cl.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2doc.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2folderclosed.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2folderopen.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2lastnode.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2link.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2mlastnode.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2mnode.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2mo.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2node.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2ns.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2plastnode.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2pnode.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2splitbar.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/ftv2vertline.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/functions.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/functions_0x62.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/functions_0x63.html @@ -430,8 +451,31 @@ %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_3.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_30.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_31.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_32.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_33.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_34.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_35.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_36.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_37.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_38.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_39.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_4.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_40.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_41.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_42.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_43.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_44.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_45.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_46.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_47.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_48.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_49.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_5.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_50.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_51.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_52.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_53.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_54.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_6.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_7.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_8.png @@ -438,8 +482,6 @@ %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit_graph_9.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherits.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/modules.html -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/nav_f.png -%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/nav_h.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespacemembers.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespacemembers_0x63.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespacemembers_0x68.html @@ -458,7 +500,16 @@ %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespacemembers_func_0x76.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespaces.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespacesigc.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/nav_f.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/nav_g.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/nav_h.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/open.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/pages.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/since_2_2_11.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/since_2_4.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structbind__functor.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structhide__functor.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structlambda__core.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__base.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__base__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor-members.html @@ -486,6 +537,8 @@ %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1dereference__trait.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1functor__base.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1functor__base__inherit__graph.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1functor__trait.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1functor__trait-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3-1_00_01T__functor_01_4-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3-1_00_01T__functor_01_4.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3-1_00_01T__functor_01_4__inherit__graph.png @@ -541,6 +594,8 @@ %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1trackable__inherit__graph.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1unwrap__lambda__type-members.html %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1unwrap__lambda__type.html +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/sync_off.png +%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/sync_on.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/tab_a.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/tab_b.png %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/tab_h.png Index: devel/qt4-corelib/Makefile =================================================================== --- devel/qt4-corelib/Makefile (revision 323706) +++ devel/qt4-corelib/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -13,7 +13,7 @@ LIB_DEPENDS= icui18n:${PORTSDIR}/devel/icu USES= pkgconfig -USE_GNOME= _glib20 +USE_GNOME= glib20 USE_QT4= qmake_build moc_build QT_NONSTANDARD= yes QT_DIST= yes Index: graphics/gdk-pixbuf2/Makefile =================================================================== --- graphics/gdk-pixbuf2/Makefile (revision 323706) +++ graphics/gdk-pixbuf2/Makefile (working copy) @@ -1,10 +1,9 @@ # Created by: Ade Lovett # $FreeBSD$ -# $MCom: ports/graphics/gdk-pixbuf2/Makefile,v 1.28 2012/12/10 12:09:15 kwm Exp $ +# $MCom: ports/trunk/graphics/gdk-pixbuf2/Makefile 18634 2013-07-26 10:42:35Z kwm $ PORTNAME= gdk-pixbuf -PORTVERSION= 2.26.5 -PORTREVISION= 3 +PORTVERSION= 2.28.2 CATEGORIES= graphics MASTER_SITES= GNOME PKGNAMESUFFIX= 2 @@ -13,20 +12,17 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Graphic library for GTK+ -BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection - LATEST_LINK= gdk-pixbuf2 USE_XZ= yes -USE_GMAKE= yes USE_XORG= xt xi x11 USE_AUTOTOOLS= libtool -USE_GNOME+= gnomehack gnomehier glib20 ltverhack +USES= gmake pathfix pkgconfig +USE_GNOME+= gnomehier glib20 ltverhack introspection:build USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-introspection=yes --with-x11 -MAKE_ENV+= GI_SCANNER_DISABLE_CACHE=yes MAN1= gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 Index: graphics/gdk-pixbuf2/distinfo =================================================================== --- graphics/gdk-pixbuf2/distinfo (revision 323706) +++ graphics/gdk-pixbuf2/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome2/gdk-pixbuf-2.26.5.tar.xz) = 77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84 -SIZE (gnome2/gdk-pixbuf-2.26.5.tar.xz) = 1181336 +SHA256 (gnome2/gdk-pixbuf-2.28.2.tar.xz) = 183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617 +SIZE (gnome2/gdk-pixbuf-2.28.2.tar.xz) = 1192936 Index: graphics/gdk-pixbuf2/pkg-plist =================================================================== --- graphics/gdk-pixbuf2/pkg-plist (revision 323706) +++ graphics/gdk-pixbuf2/pkg-plist (working copy) @@ -165,6 +165,7 @@ %%NLS%%share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/te/LC_MESSAGES/gdk-pixbuf.mo +%%NLS%%share/locale/tg/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/th/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo Index: graphics/liblqr-1/Makefile =================================================================== --- graphics/liblqr-1/Makefile (revision 323706) +++ graphics/liblqr-1/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= liblqr-1 DISTVERSION= 0.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://liblqr.wdfiles.com/local--files/en:download-page/ \ http://mirror.amdmi3.ru/distfiles/ @@ -14,8 +14,8 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= _glib20 -USES= gettext pkgconfig +USE_GNOME= glib20 pkgconfig +USES= gettext MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes Index: multimedia/ffmpegthumbnailer/Makefile =================================================================== --- multimedia/ffmpegthumbnailer/Makefile (revision 323706) +++ multimedia/ffmpegthumbnailer/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= ffmpegthumbnailer PORTVERSION= 2.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia graphics MASTER_SITES= GOOGLE_CODE @@ -19,8 +19,8 @@ CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig --enable-gio GNU_CONFIGURE= yes -USES= pkgconfig -USE_GNOME= gnomehack _glib20 +USES= pathfix pkgconfig +USE_GNOME= glib20 USE_LDCONFIG= yes OPTIONS_DEFINE= GNOME Index: net/mtr/Makefile =================================================================== --- net/mtr/Makefile (revision 323706) +++ net/mtr/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= mtr PORTVERSION= 0.85 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \ LOCAL/sunpoet @@ -27,7 +28,7 @@ .if ${PORT_OPTIONS:MGLIB} CONFIGURE_ARGS+=--with-glib -USE_GNOME= _glib20 +USE_GNOME= glib20 .else CONFIGURE_ARGS+=--without-glib .endif Index: www/multiwatch/Makefile =================================================================== --- www/multiwatch/Makefile (revision 323706) +++ www/multiwatch/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= multiwatch PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.lighttpd.net/multiwatch/releases-1.x/ @@ -15,7 +16,7 @@ MAN1= multiwatch.1 USES= pkgconfig USE_BZIP2= yes -USE_GNOME= _glib20 +USE_GNOME= glib20 # Help configure find libev. CFLAGS+= -I${LOCALBASE}/include Index: x11-toolkits/Makefile =================================================================== --- x11-toolkits/Makefile (revision 323706) +++ x11-toolkits/Makefile (working copy) @@ -182,6 +182,7 @@ SUBDIR += pango SUBDIR += pango-reference SUBDIR += pangomm + SUBDIR += pangox-compat SUBDIR += pangoxsl SUBDIR += paragui-devel SUBDIR += phat Index: x11-toolkits/gtk30/Makefile =================================================================== --- x11-toolkits/gtk30/Makefile (revision 323706) +++ x11-toolkits/gtk30/Makefile (working copy) @@ -1,9 +1,9 @@ # Created by: Vanilla I. Shu # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.53 2013/01/07 13:35:02 kwm Exp $ +# $MCom: ports/trunk/x11-toolkits/gtk30/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= gtk -PORTVERSION= 3.6.4 +PORTVERSION= 3.8.2 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME @@ -21,26 +21,24 @@ .if !defined(REFERENCE_PORT) -BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk +BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ ${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk -RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ - ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ - ${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk -USE_GMAKE= yes USE_PERL5_BUILD=yes MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache -USES= gettext +USE_GNOME= atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache +# introspection:build +USES= gettext gmake pathfix pkgconfig USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite -CONFIGURE_ARGS= --enable-static -CONFIGURE_ARGS+=--enable-gtk2-dependency --disable-packagekit +CONFIGURE_ARGS= --enable-gtk2-dependency --disable-packagekit CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0` ac_cv_path_SED="${SED}" +CONFIGURE_ENV= INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0` GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ org.gtk.Settings.ColorChooser.gschema.xml \ Index: x11-toolkits/gtk30/distinfo =================================================================== --- x11-toolkits/gtk30/distinfo (revision 323706) +++ x11-toolkits/gtk30/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome3/gtk+-3.6.4.tar.xz) = dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1 -SIZE (gnome3/gtk+-3.6.4.tar.xz) = 13275488 +SHA256 (gnome3/gtk+-3.8.2.tar.xz) = 1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297 +SIZE (gnome3/gtk+-3.8.2.tar.xz) = 13701516 Index: x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in =================================================================== --- x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in (revision 323706) +++ x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in (working copy) @@ -1,10 +1,10 @@ ---- docs/reference/gtk/Makefile.in.orig 2012-09-25 07:07:36.000000000 +0000 -+++ docs/reference/gtk/Makefile.in 2012-09-25 07:08:14.000000000 +0000 -@@ -822,7 +822,6 @@ +--- docs/reference/gtk/Makefile.in.orig 2013-03-28 10:39:58.000000000 +0000 ++++ docs/reference/gtk/Makefile.in 2013-03-28 10:43:09.000000000 +0000 +@@ -852,7 +852,6 @@ ######################################################################## man_MANS = \ gtk-query-immodules-3.0.1 \ - gtk-update-icon-cache.1 \ - gtk-launch.1 + gtk-launch.1 \ + broadwayd.1 - @ENABLE_MAN_TRUE@XSLTPROC_FLAGS = \ Index: x11-toolkits/gtk30/pkg-plist =================================================================== --- x11-toolkits/gtk30/pkg-plist (revision 323706) +++ x11-toolkits/gtk30/pkg-plist (working copy) @@ -20,6 +20,8 @@ include/gtk-3.0/gdk/gdkdnd.h include/gtk-3.0/gdk/gdkenumtypes.h include/gtk-3.0/gdk/gdkevents.h +include/gtk-3.0/gdk/gdkframeclock.h +include/gtk-3.0/gdk/gdkframetimings.h include/gtk-3.0/gdk/gdkkeys.h include/gtk-3.0/gdk/gdkkeysyms-compat.h include/gtk-3.0/gdk/gdkkeysyms.h @@ -57,9 +59,54 @@ include/gtk-3.0/gdk/x11/gdkx11utils.h include/gtk-3.0/gdk/x11/gdkx11visual.h include/gtk-3.0/gdk/x11/gdkx11window.h +include/gtk-3.0/gtk/a11y/gtkarrowaccessible.h +include/gtk-3.0/gtk/a11y/gtkbooleancellaccessible.h +include/gtk-3.0/gtk/a11y/gtkbuttonaccessible.h +include/gtk-3.0/gtk/a11y/gtkcellaccessible.h +include/gtk-3.0/gtk/a11y/gtkcellaccessibleparent.h +include/gtk-3.0/gtk/a11y/gtkcheckmenuitemaccessible.h +include/gtk-3.0/gtk/a11y/gtkcomboboxaccessible.h +include/gtk-3.0/gtk/a11y/gtkcontaineraccessible.h +include/gtk-3.0/gtk/a11y/gtkcontainercellaccessible.h +include/gtk-3.0/gtk/a11y/gtkentryaccessible.h +include/gtk-3.0/gtk/a11y/gtkexpanderaccessible.h +include/gtk-3.0/gtk/a11y/gtkframeaccessible.h +include/gtk-3.0/gtk/a11y/gtkiconviewaccessible.h +include/gtk-3.0/gtk/a11y/gtkimageaccessible.h +include/gtk-3.0/gtk/a11y/gtkimagecellaccessible.h +include/gtk-3.0/gtk/a11y/gtklabelaccessible.h +include/gtk-3.0/gtk/a11y/gtklevelbaraccessible.h +include/gtk-3.0/gtk/a11y/gtklinkbuttonaccessible.h +include/gtk-3.0/gtk/a11y/gtklockbuttonaccessible.h +include/gtk-3.0/gtk/a11y/gtkmenuaccessible.h +include/gtk-3.0/gtk/a11y/gtkmenuitemaccessible.h +include/gtk-3.0/gtk/a11y/gtkmenushellaccessible.h +include/gtk-3.0/gtk/a11y/gtknotebookaccessible.h +include/gtk-3.0/gtk/a11y/gtknotebookpageaccessible.h +include/gtk-3.0/gtk/a11y/gtkpanedaccessible.h +include/gtk-3.0/gtk/a11y/gtkprogressbaraccessible.h +include/gtk-3.0/gtk/a11y/gtkradiobuttonaccessible.h +include/gtk-3.0/gtk/a11y/gtkradiomenuitemaccessible.h +include/gtk-3.0/gtk/a11y/gtkrangeaccessible.h +include/gtk-3.0/gtk/a11y/gtkrenderercellaccessible.h +include/gtk-3.0/gtk/a11y/gtkscaleaccessible.h +include/gtk-3.0/gtk/a11y/gtkscalebuttonaccessible.h +include/gtk-3.0/gtk/a11y/gtkscrolledwindowaccessible.h +include/gtk-3.0/gtk/a11y/gtkspinbuttonaccessible.h +include/gtk-3.0/gtk/a11y/gtkspinneraccessible.h +include/gtk-3.0/gtk/a11y/gtkstatusbaraccessible.h +include/gtk-3.0/gtk/a11y/gtkswitchaccessible.h +include/gtk-3.0/gtk/a11y/gtktextcellaccessible.h +include/gtk-3.0/gtk/a11y/gtktextviewaccessible.h +include/gtk-3.0/gtk/a11y/gtktogglebuttonaccessible.h +include/gtk-3.0/gtk/a11y/gtktoplevelaccessible.h +include/gtk-3.0/gtk/a11y/gtktreeviewaccessible.h +include/gtk-3.0/gtk/a11y/gtkwidgetaccessible.h +include/gtk-3.0/gtk/a11y/gtkwindowaccessible.h include/gtk-3.0/gtk/deprecated/gtkcolorsel.h include/gtk-3.0/gtk/deprecated/gtkcolorseldialog.h include/gtk-3.0/gtk/deprecated/gtkfontsel.h +include/gtk-3.0/gtk/deprecated/gtkgradient.h include/gtk-3.0/gtk/deprecated/gtkhandlebox.h include/gtk-3.0/gtk/deprecated/gtkhbbox.h include/gtk-3.0/gtk/deprecated/gtkhbox.h @@ -70,6 +117,7 @@ include/gtk-3.0/gtk/deprecated/gtkhsv.h include/gtk-3.0/gtk/deprecated/gtkrc.h include/gtk-3.0/gtk/deprecated/gtkstyle.h +include/gtk-3.0/gtk/deprecated/gtksymboliccolor.h include/gtk-3.0/gtk/deprecated/gtktable.h include/gtk-3.0/gtk/deprecated/gtktearoffmenuitem.h include/gtk-3.0/gtk/deprecated/gtkvbbox.h @@ -78,6 +126,7 @@ include/gtk-3.0/gtk/deprecated/gtkvscale.h include/gtk-3.0/gtk/deprecated/gtkvscrollbar.h include/gtk-3.0/gtk/deprecated/gtkvseparator.h +include/gtk-3.0/gtk/gtk-a11y.h include/gtk-3.0/gtk/gtk.h include/gtk-3.0/gtk/gtkaboutdialog.h include/gtk-3.0/gtk/gtkaccelgroup.h @@ -158,7 +207,6 @@ include/gtk-3.0/gtk/gtkfontchooserdialog.h include/gtk-3.0/gtk/gtkfontchooserwidget.h include/gtk-3.0/gtk/gtkframe.h -include/gtk-3.0/gtk/gtkgradient.h include/gtk-3.0/gtk/gtkgrid.h include/gtk-3.0/gtk/gtkiconfactory.h include/gtk-3.0/gtk/gtkicontheme.h @@ -239,7 +287,6 @@ include/gtk-3.0/gtk/gtkstyleproperties.h include/gtk-3.0/gtk/gtkstyleprovider.h include/gtk-3.0/gtk/gtkswitch.h -include/gtk-3.0/gtk/gtksymboliccolor.h include/gtk-3.0/gtk/gtktestutils.h include/gtk-3.0/gtk/gtktextattributes.h include/gtk-3.0/gtk/gtktextbuffer.h @@ -355,87 +402,13 @@ share/gir-1.0/Gdk-3.0.gir share/gir-1.0/GdkX11-3.0.gir share/gir-1.0/Gtk-3.0.gir -share/gtk-3.0/demo/alphatest.png -share/gtk-3.0/demo/apple-red.png -share/gtk-3.0/demo/application.c -share/gtk-3.0/demo/application.ui -share/gtk-3.0/demo/appwindow.c -share/gtk-3.0/demo/assistant.c -share/gtk-3.0/demo/background.jpg -share/gtk-3.0/demo/builder.c -share/gtk-3.0/demo/button_box.c -share/gtk-3.0/demo/changedisplay.c -share/gtk-3.0/demo/clipboard.c -share/gtk-3.0/demo/colorsel.c -share/gtk-3.0/demo/combobox.c -share/gtk-3.0/demo/css_accordion.c -share/gtk-3.0/demo/css_accordion.css -share/gtk-3.0/demo/css_basics.c -share/gtk-3.0/demo/css_basics.css -share/gtk-3.0/demo/css_multiplebgs.c -share/gtk-3.0/demo/css_multiplebgs.css -share/gtk-3.0/demo/css_pixbufs.c -share/gtk-3.0/demo/css_pixbufs.css -share/gtk-3.0/demo/css_shadows.c -share/gtk-3.0/demo/css_shadows.css -share/gtk-3.0/demo/cssview.css -share/gtk-3.0/demo/demo.ui -share/gtk-3.0/demo/dialog.c -share/gtk-3.0/demo/drawingarea.c -share/gtk-3.0/demo/editable_cells.c -share/gtk-3.0/demo/entry_buffer.c -share/gtk-3.0/demo/entry_completion.c -share/gtk-3.0/demo/expander.c -share/gtk-3.0/demo/fancy.css -share/gtk-3.0/demo/floppybuddy.gif -share/gtk-3.0/demo/gnome-applets.png -share/gtk-3.0/demo/gnome-calendar.png -share/gtk-3.0/demo/gnome-foot.png -share/gtk-3.0/demo/gnome-fs-directory.png -share/gtk-3.0/demo/gnome-fs-regular.png -share/gtk-3.0/demo/gnome-gimp.png -share/gtk-3.0/demo/gnome-gmush.png -share/gtk-3.0/demo/gnome-gsame.png -share/gtk-3.0/demo/gnu-keys.png -share/gtk-3.0/demo/gtk-logo-24.png -share/gtk-3.0/demo/gtk-logo-48.png -share/gtk-3.0/demo/gtk-logo-rgb.gif -share/gtk-3.0/demo/hypertext.c -share/gtk-3.0/demo/iconview.c -share/gtk-3.0/demo/iconview_edit.c -share/gtk-3.0/demo/images.c -share/gtk-3.0/demo/infobar.c -share/gtk-3.0/demo/links.c -share/gtk-3.0/demo/list_store.c -share/gtk-3.0/demo/menus.c -share/gtk-3.0/demo/menus.ui -share/gtk-3.0/demo/offscreen_window.c -share/gtk-3.0/demo/offscreen_window2.c -share/gtk-3.0/demo/overlay.c -share/gtk-3.0/demo/panes.c -share/gtk-3.0/demo/pickers.c -share/gtk-3.0/demo/pixbufs.c -share/gtk-3.0/demo/printing.c -share/gtk-3.0/demo/reset.css -share/gtk-3.0/demo/rotated_text.c -share/gtk-3.0/demo/search_entry.c -share/gtk-3.0/demo/sizegroup.c -share/gtk-3.0/demo/spinner.c -share/gtk-3.0/demo/stock_browser.c -share/gtk-3.0/demo/textscroll.c -share/gtk-3.0/demo/textview.c -share/gtk-3.0/demo/theming_custom_css.c -share/gtk-3.0/demo/theming_style_classes.c -share/gtk-3.0/demo/theming.ui -share/gtk-3.0/demo/toolpalette.c -share/gtk-3.0/demo/transparent.c -share/gtk-3.0/demo/tree_store.c -share/gtk-3.0/demo/ui_manager.c share/gtk-3.0/gtkbuilder.rng share/locale/af/LC_MESSAGES/gtk30-properties.mo share/locale/af/LC_MESSAGES/gtk30.mo share/locale/am/LC_MESSAGES/gtk30-properties.mo share/locale/am/LC_MESSAGES/gtk30.mo +share/locale/an/LC_MESSAGES/gtk30-properties.mo +share/locale/an/LC_MESSAGES/gtk30.mo share/locale/ang/LC_MESSAGES/gtk30-properties.mo share/locale/ang/LC_MESSAGES/gtk30.mo share/locale/ar/LC_MESSAGES/gtk30-properties.mo @@ -741,8 +714,8 @@ @dirrmtry share/locale/as @dirrmtry share/locale/ang/LC_MESSAGES @dirrmtry share/locale/ang -@dirrm share/gtk-3.0/demo -@dirrm share/gtk-3.0 +@dirrmtry share/locale/an/LC_MESSAGES +@dirrmtry share/locale/an @exec /bin/mkdir -p %D/lib/gtk-3.0/modules @exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/engines @exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/loaders @@ -757,6 +730,7 @@ @dirrm include/gtk-3.0/unix-print/gtk @dirrm include/gtk-3.0/unix-print @dirrm include/gtk-3.0/gtk/deprecated +@dirrm include/gtk-3.0/gtk/a11y @dirrm include/gtk-3.0/gtk @dirrm include/gtk-3.0/gdk/x11 @dirrm include/gtk-3.0/gdk Index: x11-toolkits/pango/Makefile =================================================================== --- x11-toolkits/pango/Makefile (revision 323706) +++ x11-toolkits/pango/Makefile (working copy) @@ -1,9 +1,9 @@ # Created by: Maxim Sobolev # $FreeBSD$ -# $MCom: ports/x11-toolkits/pango/Makefile,v 1.167 2012/06/06 21:18:48 kwm Exp $ +# $MCom: ports/trunk/x11-toolkits/pango/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= pango -PORTVERSION= 1.30.1 +PORTVERSION= 1.34.1 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME @@ -16,23 +16,22 @@ .if !defined(REFERENCE_PORT) -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2 \ - g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo +BUILD_DEPENDS= fontconfig>=2.10.91:${PORTSDIR}/x11-fonts/fontconfig +LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ + freetype:${PORTSDIR}/print/freetype2 \ + harfbuzz:${PORTSDIR}/print/harfbuzz \ + fontconfig:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \ - ${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings \ - ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection + ${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings -USE_GMAKE= yes -MAKE_JOBS_SAFE= yes +USES= gettext gmake pathfix pkgconfig USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack glib20 ltverhack referencehack -USES= pkgconfig gettext +USE_GNOME= glib20 ltverhack referencehack introspection:build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -PLIST_SUB= VERSION="1.6.0" +PLIST_SUB= VERSION="1.8.0" FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir @@ -45,11 +44,12 @@ .include .if ${PORT_OPTIONS:MX11} -USE_XORG+= xft xrender -PLIST_SUB+= X11="" +USE_XORG+= xft xrender +#CONFIGURE_ARGS=--with-xft +PLIST_SUB+= X11="" .else -CONFIGURE_ARGS+= --with-x=no -PLIST_SUB+= X11="@comment " +CONFIGURE_ARGS+=--without-xft +PLIST_SUB+= X11="@comment " .endif pre-configure: Index: x11-toolkits/pango/distinfo =================================================================== --- x11-toolkits/pango/distinfo (revision 323706) +++ x11-toolkits/pango/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome2/pango-1.30.1.tar.xz) = 3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe -SIZE (gnome2/pango-1.30.1.tar.xz) = 1162828 +SHA256 (gnome2/pango-1.34.1.tar.xz) = 1aea30df34a8ae4fcce71afd22aa5b57224b52916d46e3ea81ff9f1eb130e64c +SIZE (gnome2/pango-1.34.1.tar.xz) = 1015112 Index: x11-toolkits/pango/pkg-plist =================================================================== --- x11-toolkits/pango/pkg-plist (revision 323706) +++ x11-toolkits/pango/pkg-plist (working copy) @@ -1,7 +1,6 @@ bin/pango-querymodules bin/pango-view etc/pango/pango.modules -%%X11%%etc/pango/pangox.aliases include/pango-1.0/pango/pango-attributes.h include/pango-1.0/pango/pango-bidi-type.h include/pango-1.0/pango/pango-break.h @@ -33,7 +32,6 @@ include/pango-1.0/pango/pangofc-font.h include/pango-1.0/pango/pangofc-fontmap.h include/pango-1.0/pango/pangoft2.h -%%X11%%include/pango-1.0/pango/pangox.h %%X11%%include/pango-1.0/pango/pangoxft-render.h %%X11%%include/pango-1.0/pango/pangoxft.h lib/girepository-1.0/Pango-1.0.typelib @@ -52,17 +50,10 @@ lib/libpangoft2-1.0.la lib/libpangoft2-1.0.so lib/libpangoft2-1.0.so.0 -%%X11%%lib/libpangox-1.0.a -%%X11%%lib/libpangox-1.0.la -%%X11%%lib/libpangox-1.0.so -%%X11%%lib/libpangox-1.0.so.0 %%X11%%lib/libpangoxft-1.0.a %%X11%%lib/libpangoxft-1.0.la %%X11%%lib/libpangoxft-1.0.so %%X11%%lib/libpangoxft-1.0.so.0 -lib/pango/%%VERSION%%/modules/pango-arabic-fc.a -lib/pango/%%VERSION%%/modules/pango-arabic-fc.la -lib/pango/%%VERSION%%/modules/pango-arabic-fc.so lib/pango/%%VERSION%%/modules/pango-arabic-lang.a lib/pango/%%VERSION%%/modules/pango-arabic-lang.la lib/pango/%%VERSION%%/modules/pango-arabic-lang.so @@ -69,37 +60,12 @@ lib/pango/%%VERSION%%/modules/pango-basic-fc.a lib/pango/%%VERSION%%/modules/pango-basic-fc.la lib/pango/%%VERSION%%/modules/pango-basic-fc.so -%%X11%%lib/pango/%%VERSION%%/modules/pango-basic-x.a -%%X11%%lib/pango/%%VERSION%%/modules/pango-basic-x.la -%%X11%%lib/pango/%%VERSION%%/modules/pango-basic-x.so -lib/pango/%%VERSION%%/modules/pango-hangul-fc.a -lib/pango/%%VERSION%%/modules/pango-hangul-fc.la -lib/pango/%%VERSION%%/modules/pango-hangul-fc.so -lib/pango/%%VERSION%%/modules/pango-hebrew-fc.a -lib/pango/%%VERSION%%/modules/pango-hebrew-fc.la -lib/pango/%%VERSION%%/modules/pango-hebrew-fc.so -lib/pango/%%VERSION%%/modules/pango-indic-fc.a -lib/pango/%%VERSION%%/modules/pango-indic-fc.la -lib/pango/%%VERSION%%/modules/pango-indic-fc.so lib/pango/%%VERSION%%/modules/pango-indic-lang.a lib/pango/%%VERSION%%/modules/pango-indic-lang.la lib/pango/%%VERSION%%/modules/pango-indic-lang.so -lib/pango/%%VERSION%%/modules/pango-khmer-fc.a -lib/pango/%%VERSION%%/modules/pango-khmer-fc.la -lib/pango/%%VERSION%%/modules/pango-khmer-fc.so -lib/pango/%%VERSION%%/modules/pango-syriac-fc.a -lib/pango/%%VERSION%%/modules/pango-syriac-fc.la -lib/pango/%%VERSION%%/modules/pango-syriac-fc.so -lib/pango/%%VERSION%%/modules/pango-thai-fc.a -lib/pango/%%VERSION%%/modules/pango-thai-fc.la -lib/pango/%%VERSION%%/modules/pango-thai-fc.so -lib/pango/%%VERSION%%/modules/pango-tibetan-fc.a -lib/pango/%%VERSION%%/modules/pango-tibetan-fc.la -lib/pango/%%VERSION%%/modules/pango-tibetan-fc.so libdata/pkgconfig/pango.pc libdata/pkgconfig/pangocairo.pc libdata/pkgconfig/pangoft2.pc -%%X11%%libdata/pkgconfig/pangox.pc %%X11%%libdata/pkgconfig/pangoxft.pc share/gir-1.0/Pango-1.0.gir share/gir-1.0/PangoCairo-1.0.gir @@ -124,6 +90,7 @@ share/gtk-doc/html/pango/api-index-1-26.html share/gtk-doc/html/pango/api-index-1-28.html share/gtk-doc/html/pango/api-index-1-30.html +share/gtk-doc/html/pango/api-index-1-32.html share/gtk-doc/html/pango/api-index-1-4.html share/gtk-doc/html/pango/api-index-1-6.html share/gtk-doc/html/pango/api-index-1-8.html @@ -135,7 +102,6 @@ share/gtk-doc/html/pango/layout.gif share/gtk-doc/html/pango/left.png share/gtk-doc/html/pango/lowlevel.html -share/gtk-doc/html/pango/pango-ATSUI-Fonts.html share/gtk-doc/html/pango/pango-Bidirectional-Text.html share/gtk-doc/html/pango/pango-Cairo-Rendering.html share/gtk-doc/html/pango/pango-CoreText-Fonts.html @@ -155,7 +121,6 @@ share/gtk-doc/html/pango/pango-Version-Checking.html share/gtk-doc/html/pango/pango-Vertical-Text.html share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html -share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html share/gtk-doc/html/pango/pango-hierarchy.html share/gtk-doc/html/pango/pango-pango-renderer.html Index: x11-toolkits/pangox-compat/Makefile =================================================================== --- x11-toolkits/pangox-compat/Makefile (revision 0) +++ x11-toolkits/pangox-compat/Makefile (working copy) @@ -0,0 +1,25 @@ +# Created by: Maxim Sobolev +# $FreeBSD$ +# $MCom: ports/trunk/x11-toolkits/pangox-compat/Makefile 18610 2013-06-30 16:33:05Z marcus $ + +PORTNAME= pangox-compat +PORTVERSION= 0.0.2 +CATEGORIES= x11-toolkits +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Depricated pangoX support. + +BUILD_DEPENDS= pango>=1.34.0:${PORTSDIR}/x11-toolkits/pango + +USE_XZ= yes +USE_XORG= x11 ice +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +USES= gmake pathfix pkgconfig +USE_GNOME= glib20 pango +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +.include Index: x11-toolkits/pangox-compat/distinfo =================================================================== --- x11-toolkits/pangox-compat/distinfo (revision 0) +++ x11-toolkits/pangox-compat/distinfo (working copy) @@ -0,0 +1,2 @@ +SHA256 (gnome2/pangox-compat-0.0.2.tar.xz) = 552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046 +SIZE (gnome2/pangox-compat-0.0.2.tar.xz) = 267396 Index: x11-toolkits/pangox-compat/pkg-descr =================================================================== --- x11-toolkits/pangox-compat/pkg-descr (revision 0) +++ x11-toolkits/pangox-compat/pkg-descr (working copy) @@ -0,0 +1,9 @@ +Pango provides a framework to render and control the layout of +internationalized text, and is the backend for right-to-left text. +Pango is an integral part of the GTK+ and GNOME projects, but its +code is platform- and toolkit-independent. + +This port supplies the deprecated pangox interface which was removed from +the pango port. + +WWW: http://www.pango.org/ Index: x11-toolkits/pangox-compat/pkg-plist =================================================================== --- x11-toolkits/pangox-compat/pkg-plist (revision 0) +++ x11-toolkits/pangox-compat/pkg-plist (working copy) @@ -0,0 +1,8 @@ +etc/pango/pangox.aliases +include/pango-1.0/pango/pangox.h +lib/libpangox-1.0.a +lib/libpangox-1.0.la +lib/libpangox-1.0.so +lib/libpangox-1.0.so.0 +libdata/pkgconfig/pangox.pc +@dirrm etc/pango Index: x11-toolkits/wxgtk26/Makefile =================================================================== --- x11-toolkits/wxgtk26/Makefile (revision 323706) +++ x11-toolkits/wxgtk26/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= wx PORTVERSION= 2.6.4 -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION} PKGNAMESUFFIX= ${WXGTK_FLAVOR} @@ -24,7 +24,7 @@ USE_GL= glu USE_GMAKE= yes MAKE_JOBS_SAFE= yes -USE_GNOME= gtk20 +USE_GNOME= gtk20 pangox-compat GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libpng=sys\ --with-libjpeg=sys\ Index: x11-toolkits/wxgtk28/Makefile =================================================================== --- x11-toolkits/wxgtk28/Makefile (revision 323706) +++ x11-toolkits/wxgtk28/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= wx PORTVERSION= 2.8.12 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/${PORTVERSION} PKGNAMESUFFIX= ${WXGTK_FLAVOR} @@ -23,7 +23,7 @@ USE_GL= glu USE_GMAKE= yes MAKE_JOBS_SAFE= yes -USE_GNOME= gtk20 +USE_GNOME= gtk20 pangox-compat GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libpng=sys\ --with-libjpeg=sys\