diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2013-07-31 11:57:45 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2013-07-31 11:57:45 +0000 |
| commit | a5f590e51d3b147b9b5085ac6a2920189b42967a (patch) | |
| tree | cee27e48f57eafc0ae5948472d8e095072bb5222 | |
| parent | a74217e6d9281b3d195ab0ad6e6b9434f63b6d27 (diff) | |
| download | ports-a5f590e51d3b147b9b5085ac6a2920189b42967a.tar.gz ports-a5f590e51d3b147b9b5085ac6a2920189b42967a.zip | |
The FreeBSD GNOME team presents a Glib and Gtk+ 3 update.
This update updates Glib20 to 2.36 and Gtk+ 3.8
* The gio-fam-backend port that used gamin for the GFileMonitor API is gone.
It is replaced by a GIO kqueue implementation developed as part of a NetBSD
GSoC 2011 project by Dimitry Matveev.
* Fix a bug in the glib20 Makefile so it includes -lintl in the glib-2.0
pkgconfig file [1]. This broke static linking and newer binutils.
* Add introspection USE_GNOME component which sets GI_SCANNER_DISABLE_CACHE to
prevent creation of / root/.cache dir. Defaults to build & run depend,
but :build and :run switches available.
* New x11-toolkits/pangox-compat port and companion USE_GNOME component for
pangox support which was removed from the pango port. Add it to ports still
using pangox API.
Exp-run by: bapt@
PR: ports/178958 [1]
Submitted by: emaste@ [1]
Notes
Notes:
svn path=/head/; revision=324037
152 files changed, 1750 insertions, 1628 deletions
@@ -4831,3 +4831,4 @@ audio/artswrapper||2013-07-27|Depend on the expired audio/arts net/ns2|net/ns|2013-07-29|Duplicate ports merged x11-toolkits/libbonobouimm||2013-07-31|Not supported upstream anymore devel/libbonobomm||2013-07-31|Not supported upstream anymore +devel/gio-fam-backend|devel/glib20|2013-07-31|Obsoleted by new functionality in glib20 diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 26eadea6fbd7..fff44785009d 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.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 @@ Gnome_Pre_Include= bsd.gnome.mk # # 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 @@ _USE_GNOME_ALL+= bonobo gconf gdkpixbuf glib12 \ # 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 @@ _USE_GNOME_ALL+= atk atspi cairo desktopfileutils eel2 evolutiondataserver gal2 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 @@ _USE_GNOME_ALL+= dconf gtk30 gtksourceview3 pygobject3 # 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 @@ oaf_USE_GNOME_IMPL= glib12 orbit libxml 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_MAKE_ENV= LIBGLADE_CONFIG="${LIBGLADE_CONFIG}" 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_LIB_DEPENDS= bonobo-2.0:${PORTSDIR}/devel/libbonobo 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 @@ -5,6 +5,32 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20130731: + AFFECTS: users of glib20 + AUTHOR: kwm@FreeBSD.org + + The devel/gio-fam-backend port was removed in the glib 2.36 update. + Since the gio-fam-backend port was used in USE_GNOME=glib20, all + dependencies need to rebuilt. The removal of gio-fam-backend isn't critical, + glib20 using programs should work just fine if the port is still installed. + It is not clear however, if glib20 will use the new kqueue backend or the old + fam backend. + + Note that users of pkg packages can just run the pkg delete command after + there next update. + + # portmaster -f gio-fam-backend + or + # portupgrade -rf gio-fam-backend + + # pkg delete gio-fam-backend + or + # pkg_delete gio-fam-backend + + # portmaster -a + or + # portupgrade -a + 20130726: AFFECTS: users of Qt 3 and KDE 3 AUTHOR: rene@FreeBSD.org diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile index ca984131a732..24775d4bdb54 100644 --- a/accessibility/at-spi2-atk/Makefile +++ b/accessibility/at-spi2-atk/Makefile @@ -1,9 +1,9 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $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,21 +13,19 @@ COMMENT= Assisted Technology Provider module for GTK+ 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 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-p2p -GLIB_SCHEMAS= org.a11y.atspi.gschema.xml .include <bsd.port.mk> diff --git a/accessibility/at-spi2-atk/distinfo b/accessibility/at-spi2-atk/distinfo index e325fa4f0063..00525571fa4d 100644 --- a/accessibility/at-spi2-atk/distinfo +++ b/accessibility/at-spi2-atk/distinfo @@ -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 diff --git a/accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c b/accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c deleted file mode 100644 index 2ccb400fb7b9..000000000000 --- a/accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c +++ /dev/null @@ -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); diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile index 51f6f357e72a..9da652c5ef17 100644 --- a/accessibility/at-spi2-core/Makefile +++ b/accessibility/at-spi2-core/Makefile @@ -1,9 +1,9 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $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 @@ COMMENT= Assistive Technology Service Provider Interface 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 diff --git a/accessibility/at-spi2-core/distinfo b/accessibility/at-spi2-core/distinfo index 6304e38a067c..a454b1ca16cd 100644 --- a/accessibility/at-spi2-core/distinfo +++ b/accessibility/at-spi2-core/distinfo @@ -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 diff --git a/accessibility/at-spi2-core/files/patch-atspi_Makefile.in b/accessibility/at-spi2-core/files/patch-atspi_Makefile.in deleted file mode 100644 index e6d6cbeb0b18..000000000000 --- a/accessibility/at-spi2-core/files/patch-atspi_Makefile.in +++ /dev/null @@ -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" \ diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist index 09efc89e6cae..19ad675f8d65 100644 --- a/accessibility/at-spi2-core/pkg-plist +++ b/accessibility/at-spi2-core/pkg-plist @@ -133,6 +133,7 @@ share/locale/sr@latin/LC_MESSAGES/at-spi2-core.mo 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 diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index 1a2944ff6446..2d69d20fe9b5 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -1,9 +1,9 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $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 @@ USE_XZ= yes .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} diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo index b987ddc3379e..f35d01073826 100644 --- a/accessibility/atk/distinfo +++ b/accessibility/atk/distinfo @@ -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 diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist index 5b6cf77cd359..c084aa251fac 100644 --- a/accessibility/atk/pkg-plist +++ b/accessibility/atk/pkg-plist @@ -28,6 +28,7 @@ include/atk-1.0/atk/atktable.h 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/sr@latin/LC_MESSAGES/atk10.mo 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 diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile index b8daae1eaa4d..bef29481e713 100644 --- a/accessibility/py-atspi/Makefile +++ b/accessibility/py-atspi/Makefile @@ -1,31 +1,26 @@ -# New ports collection makefile for: at-spi -# Date Created: 12 April 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $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 diff --git a/accessibility/py-atspi/distinfo b/accessibility/py-atspi/distinfo index dd82dbd20708..11ce72cb8fdc 100644 --- a/accessibility/py-atspi/distinfo +++ b/accessibility/py-atspi/distinfo @@ -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 diff --git a/accessibility/py-atspi/pkg-plist b/accessibility/py-atspi/pkg-plist index d2c66630deb8..07ef9c42e630 100644 --- a/accessibility/py-atspi/pkg-plist +++ b/accessibility/py-atspi/pkg-plist @@ -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 diff --git a/audio/openal/Makefile b/audio/openal/Makefile index b7659cebff70..a4ee0f63f5a4 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -16,6 +16,7 @@ CONFLICTS= openal-soft-[0-9]* USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -Wno-return-type LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-capture \ --disable-arts diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index 6e98433f8fba..648bcab57035 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -4,7 +4,7 @@ PORTNAME= fcitx PORTVERSION= 4.2.6.1 CATEGORIES= chinese x11 -PORTREVISION= 1 +PORTREVISION= 2 MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ pinyin.tar.gz table.tar.gz en_dict-${_DICT_VER}.tar.gz @@ -30,10 +30,10 @@ SUB_LIST+= PORTSDIR=${PORTSDIR} CONFLICTS= zh-scim-fcitx-3.* USE_XZ= yes -USE_GNOME= pango intltool libxml2 gnomehack +USE_GNOME= pango intltool libxml2 introspection USE_XORG= x11 xext xkbfile USE_LDCONFIG= yes -USES= cmake gettext +USES= cmake gettext pathfix INSTALLS_ICONS= yes OPTIONS_DEFINE= GTK2 GTK3 QT4 OPENCC TPUNC diff --git a/devel/Makefile b/devel/Makefile index b287eaca370c..6577caa119a8 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -548,7 +548,6 @@ SUBDIR += gflags SUBDIR += giggle SUBDIR += gindent - SUBDIR += gio-fam-backend SUBDIR += gio-sharp SUBDIR += git SUBDIR += git-merge-changelog diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile index 57e6d47e38ef..faab04ffc9fc 100644 --- a/devel/dconf-editor/Makefile +++ b/devel/dconf-editor/Makefile @@ -1,8 +1,9 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $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 diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index a97df3d4aa59..fa96e4d9c962 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -1,10 +1,10 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $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 @@ DIST_SUBDIR= gnome3 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 @@ LIB_DEPENDS+= dconf:${PORTSDIR}/devel/dconf 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 \ diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo index eccaa2835e51..e1afb761d267 100644 --- a/devel/dconf/distinfo +++ b/devel/dconf/distinfo @@ -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 diff --git a/devel/dconf/files/patch-client_Makefile.in b/devel/dconf/files/patch-client_Makefile.in index d97d83186173..c53b723b7edb 100644 --- a/devel/dconf/files/patch-client_Makefile.in +++ b/devel/dconf/files/patch-client_Makefile.in @@ -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 diff --git a/devel/dconf/files/patch-dbus-1_Makefile.in b/devel/dconf/files/patch-dbus-1_Makefile.in index 907188b52967..2cabd14fb157 100644 --- a/devel/dconf/files/patch-dbus-1_Makefile.in +++ b/devel/dconf/files/patch-dbus-1_Makefile.in @@ -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 $@ diff --git a/devel/dconf/files/patch-editor_Makefile.in b/devel/dconf/files/patch-editor_Makefile.in index 8f158fced556..f9935dd33e93 100644 --- a/devel/dconf/files/patch-editor_Makefile.in +++ b/devel/dconf/files/patch-editor_Makefile.in @@ -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) \ diff --git a/devel/dconf/files/patch-editor_dconf-editor.vala b/devel/dconf/files/patch-editor_dconf-editor.vala new file mode 100644 index 000000000000..3c03fa220d56 --- /dev/null +++ b/devel/dconf/files/patch-editor_dconf-editor.vala @@ -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 */ diff --git a/devel/dconf/files/patch-editor_dconf-model.vala b/devel/dconf/files/patch-editor_dconf-model.vala new file mode 100644 index 000000000000..58077d674334 --- /dev/null +++ b/devel/dconf/files/patch-editor_dconf-model.vala @@ -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; + } + diff --git a/devel/dconf/files/patch-editor_dconf-schema.vala b/devel/dconf/files/patch-editor_dconf-schema.vala new file mode 100644 index 000000000000..2c624560cda4 --- /dev/null +++ b/devel/dconf/files/patch-editor_dconf-schema.vala @@ -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<Schema> schemas = new GLib.List<Schema>(); ++ public GLib.HashTable<string, Schema> schemas = new GLib.HashTable<string, Schema>(str_hash, str_equal); + public GLib.HashTable<string, SchemaKey> keys = new GLib.HashTable<string, SchemaKey>(str_hash, str_equal); + public GLib.HashTable<string, SchemaEnum> enums = new GLib.HashTable<string, SchemaEnum>(str_hash, str_equal); + public GLib.HashTable<string, SchemaFlags> flags = new GLib.HashTable<string, SchemaFlags>(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)); + } + } + } diff --git a/devel/dconf/files/patch-editors_dconf-view.vala b/devel/dconf/files/patch-editors_dconf-view.vala new file mode 100644 index 000000000000..70998f181065 --- /dev/null +++ b/devel/dconf/files/patch-editors_dconf-view.vala @@ -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": diff --git a/devel/dconf/files/patch-test_Makefile.am b/devel/dconf/files/patch-test_Makefile.am new file mode 100644 index 000000000000..a3288f9e607a --- /dev/null +++ b/devel/dconf/files/patch-test_Makefile.am @@ -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 \ diff --git a/devel/dconf/files/patch-test_Makefile.in b/devel/dconf/files/patch-test_Makefile.in new file mode 100644 index 000000000000..cdd5f47a0f48 --- /dev/null +++ b/devel/dconf/files/patch-test_Makefile.in @@ -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)\" diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist index 167169ca8e7c..cf67219371da 100644 --- a/devel/dconf/pkg-plist +++ b/devel/dconf/pkg-plist @@ -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,13 +35,63 @@ share/gtk-doc/html/dconf/object-tree.html 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 @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 diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index 22ceb78d29e5..e9687badf60e 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -1,20 +1,19 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $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/ 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 diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile deleted file mode 100644 index cc6846d7aa99..000000000000 --- a/devel/gio-fam-backend/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> -# $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 <bsd.port.mk> diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo deleted file mode 100644 index 57207bc60785..000000000000 --- a/devel/gio-fam-backend/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 -SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872 diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/gio-fam-backend/files/patch-ae deleted file mode 100644 index 9c9caf0ab20c..000000000000 --- a/devel/gio-fam-backend/files/patch-ae +++ /dev/null @@ -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 <sys/types.h> - #endif -+#ifdef HAVE_SYS_PARAM_H -+# include <sys/param.h> -+#endif - #ifdef HAVE_SYS_STAT_H - # include <sys/stat.h> - #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" - ;; - *) diff --git a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in deleted file mode 100644 index 44250d545fcb..000000000000 --- a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in +++ /dev/null @@ -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: diff --git a/devel/gio-fam-backend/pkg-descr b/devel/gio-fam-backend/pkg-descr deleted file mode 100644 index b44b5d5576ec..000000000000 --- a/devel/gio-fam-backend/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -gio-fam-backend provides a file Alteration Monitor (FAM) backend module for -GLib's GIO subsystem. diff --git a/devel/gio-fam-backend/pkg-plist b/devel/gio-fam-backend/pkg-plist deleted file mode 100644 index f3ca7da86f63..000000000000 --- a/devel/gio-fam-backend/pkg-plist +++ /dev/null @@ -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 diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index e350b14c0ed6..50598fcb78bc 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,11 +1,10 @@ # Created by: Vanilla I. Shu <vanilla@FreeBSD.org> # $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 @@ LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \ 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,8 +34,11 @@ CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ --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 @@ LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu 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 @@ post-patch: ${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: diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 57207bc60785..f464fe5b679e 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -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 diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 9c9caf0ab20c..e62156bf5c34 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -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 <sys/types.h> @@ -10,7 +10,7 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #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" ;; *) diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in index 7175b8581c93..b3589ad592c5 100644 --- a/devel/glib20/files/patch-glib::libcharset::Makefile.in +++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in @@ -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: diff --git a/devel/glib20/files/patch-glib_tests_gdatetime.c b/devel/glib20/files/patch-glib_tests_gdatetime.c index 8a8774254f95..e86fb7ffde09 100644 --- a/devel/glib20/files/patch-glib_tests_gdatetime.c +++ b/devel/glib20/files/patch-glib_tests_gdatetime.c @@ -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 diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index fe7f895a6c81..4ffc74514a22 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -105,6 +105,7 @@ include/glib-2.0/gio/gmount.h 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/gsettingsbackend.h 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/gsocketcontrolmessage.h 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/gvalue.h 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 @@ libdata/pkgconfig/gthread-2.0.pc 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/sr@latin/LC_MESSAGES/glib20.mo 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 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @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 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @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 diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index 4b9c5a058e3e..6af23116a286 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -1,9 +1,9 @@ # Created by: Adam Weinberger <adamw@FreeBSD.org> # $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 @@ PLIST_SUB= VERSION="2.4" API_VERSION="2.4" 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 diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index 99984514c4ba..39bdd604bc53 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -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 diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist index ecfb362d7e39..70c513c6c1ea 100644 --- a/devel/glibmm/pkg-plist +++ b/devel/glibmm/pkg-plist @@ -229,6 +229,7 @@ include/giomm-%%API_VERSION%%/giomm/zlibdecompressor.h 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/optiongroup.h 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 diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile index eff47fd92141..104e529afce5 100644 --- a/devel/gnome-common/Makefile +++ b/devel/gnome-common/Makefile @@ -13,7 +13,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Common automake macros for GNOME 2 and GNOME 3 USE_XZ= yes -USE_GMAKE= yes +USES= gmake pkgconfig GNU_CONFIGURE= yes .include <bsd.port.mk> diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 7afebc768dbd..dbb26fab1638 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -1,9 +1,10 @@ # Created by: Alexander Logvinov <avl@FreeBSD.org> # $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 @@ COMMENT= Generate interface introspection data for GObject libraries # 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,11 +26,14 @@ USE_LDCONFIG= yes 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} 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 <bsd.port.mk> diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index c8a30b46dd2f..a72b0f501568 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -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 diff --git a/devel/gobject-introspection/files/patch-configure b/devel/gobject-introspection/files/patch-configure index d2838d890f5e..693f3a8534f3 100644 --- a/devel/gobject-introspection/files/patch-configure +++ b/devel/gobject-introspection/files/patch-configure @@ -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 - -@@ -14429,10 +14429,10 @@ +--- configure.orig 2013-03-29 22:15:44.000000000 +0000 ++++ configure 2013-03-29 22:18:30.000000000 +0000 +@@ -14623,7 +14623,7 @@ { $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}" - fi --if test "x$PYTHON_LIB_LOC" == x; then -+if test "x$PYTHON_LIB_LOC" = x; then - PYTHON_LIB_LOC="${py_prefix}/lib" + PYTHON_LIBS=`$PYTHON-config --ldflags --libs` fi diff --git a/devel/gobject-introspection/files/patch-giscanner_dumper.py b/devel/gobject-introspection/files/patch-giscanner_dumper.py new file mode 100644 index 000000000000..7307c617e314 --- /dev/null +++ b/devel/gobject-introspection/files/patch-giscanner_dumper.py @@ -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'] diff --git a/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py b/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py new file mode 100644 index 000000000000..999fc742b2ff --- /dev/null +++ b/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py @@ -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.', '-'] diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist index 2d400ec2ebe0..6493d359072e 100644 --- a/devel/gobject-introspection/pkg-plist +++ b/devel/gobject-introspection/pkg-plist @@ -50,9 +50,6 @@ lib/gobject-introspection/giscanner/annotationmain.pyo 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/codegen.pyo 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/libtoolimporter.pyo 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/odict.pyo 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/xlib-2.0.gir 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 diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile index e284960c2c0f..18d11614b864 100644 --- a/devel/gsettings-desktop-schemas/Makefile +++ b/devel/gsettings-desktop-schemas/Makefile @@ -1,9 +1,9 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $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 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Collection of globally shared GSetting schemas -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 +RUN_DEPENDS= ${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11-fonts/cantarell-fonts + +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 @@ GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \ 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 @@ GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \ 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 <bsd.port.mk> diff --git a/devel/gsettings-desktop-schemas/distinfo b/devel/gsettings-desktop-schemas/distinfo index 0e1eed0bcdc2..9d35450ce75c 100644 --- a/devel/gsettings-desktop-schemas/distinfo +++ b/devel/gsettings-desktop-schemas/distinfo @@ -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 diff --git a/devel/gsettings-desktop-schemas/pkg-plist b/devel/gsettings-desktop-schemas/pkg-plist index a52c53e3c4a0..47b500335f37 100644 --- a/devel/gsettings-desktop-schemas/pkg-plist +++ b/devel/gsettings-desktop-schemas/pkg-plist @@ -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 diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 965e59201811..a713115027e0 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,14 +1,9 @@ -# New ports collection makefile for: libgtop2 -# Date Created: 29 April 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/libgtop/Makefile,v 1.56 2010/05/02 00:04:47 marcus Exp $ -# +# $MCom: ports/trunk/devel/libgtop/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= libgtop -PORTVERSION= 2.28.3 -PORTREVISION= 2 +PORTVERSION= 2.28.4 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,32 +11,21 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 top library -BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection - -USE_BZIP2= yes +USE_XZ= yes USE_PERL5_BUILD=yes USE_XORG= xau -USES= gettext pkgconfig -USE_GMAKE= yes -USE_GNOME= gnomehack glib20 ltverhack intlhack +USES= gettext gmake pathfix pkgconfig +USE_GNOME= gnomeprefix glib20 ltverhack intlhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ARGS= --disable-gtk-doc \ - --with-html-dir=${PREFIX}/share/doc CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS= --disable-introspection INFO= libgtop2 PKGMESSAGE= ${FILESDIR}/pkg-message -.include <bsd.port.pre.mk> - -.if ( ${OSVERSION} >= 800000 && ${OSVERSION} < 800019 ) || \ - ${OSVERSION} < 700104 -RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof -.endif - post-configure: @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f @@ -50,4 +34,4 @@ post-install: @${CHMOD} 2555 ${PREFIX}/bin/libgtop_server2 @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index 4b597b32645c..96dc6955eeb1 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/libgtop-2.28.3.tar.bz2) = 2c866bd14b3cd78f78504cfb65baa105d62b8085c90e433ab9db97e050efea42 -SIZE (gnome2/libgtop-2.28.3.tar.bz2) = 793252 +SHA256 (gnome2/libgtop-2.28.4.tar.xz) = b6619cfd1540267ee81d456d1a26c72c793261586f1b00a7b9a7a229d0abe1d8 +SIZE (gnome2/libgtop-2.28.4.tar.xz) = 653940 diff --git a/devel/libgtop/files/patch-configure b/devel/libgtop/files/patch-configure index ecacbd4ade00..5c7cb8a2a8a6 100644 --- a/devel/libgtop/files/patch-configure +++ b/devel/libgtop/files/patch-configure @@ -1,17 +1,5 @@ --- configure.orig 2011-03-30 10:06:27.000000000 +0200 +++ configure 2011-03-30 10:07:52.000000000 +0200 -@@ -3231,9 +3231,9 @@ - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} -+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} -+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "e|${libdir}|\\\$(libdir)|g"` - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection @@ -13230,6 +13230,78 @@ if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat" diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am deleted file mode 100644 index 25ec1f7d7949..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ ---- sysdeps/freebsd/Makefile.am.orig 2008-09-29 17:21:56.000000000 -0400 -+++ sysdeps/freebsd/Makefile.am 2008-09-29 17:22:07.000000000 -0400 -@@ -7,12 +7,12 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid. - cpu.c msg_limits.c sem_limits.c loadavg.c \ - uptime.c netlist.c fsusage.c mem.c \ - mountlist.c procopenfiles.c procwd.c \ -- procaffinity.c glibtop_private.c -+ procaffinity.c glibtop_private.c open.c - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - - libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS) --libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \ -+libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \ - proclist.c procstate.c procuid.c \ - proctime.c procmem.c procsignal.c \ - prockernel.c procsegment.c procargs.c \ diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in deleted file mode 100644 index d60fe782e018..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in +++ /dev/null @@ -1,43 +0,0 @@ ---- sysdeps/freebsd/Makefile.in.orig 2009-01-13 01:49:02.172092000 -0500 -+++ sysdeps/freebsd/Makefile.in 2009-01-13 01:53:30.000000000 -0500 -@@ -50,7 +50,8 @@ libgtop_sysdeps_2_0_la_LIBADD = - am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo \ - shm_limits.lo cpu.lo msg_limits.lo sem_limits.lo loadavg.lo \ - uptime.lo netlist.lo fsusage.lo mem.lo mountlist.lo \ -- procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo -+ procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo \ -+ open.lo - libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS) - libgtop_sysdeps_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -58,7 +59,7 @@ libgtop_sysdeps_2_0_la_LINK = $(LIBTOOL) - am__DEPENDENCIES_1 = - libgtop_sysdeps_suid_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo swap.lo \ -+am_libgtop_sysdeps_suid_2_0_la_OBJECTS = suid_open.lo close.lo swap.lo \ - proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \ - procsignal.lo prockernel.lo procsegment.lo procargs.lo \ - procmap.lo netload.lo ppp.lo -@@ -296,11 +297,11 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid. - cpu.c msg_limits.c sem_limits.c loadavg.c \ - uptime.c netlist.c fsusage.c mem.c \ - mountlist.c procopenfiles.c procwd.c \ -- procaffinity.c glibtop_private.c -+ procaffinity.c glibtop_private.c open.c - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS) --libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \ -+libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \ - proclist.c procstate.c procuid.c \ - proctime.c procmem.c procsignal.c \ - prockernel.c procsegment.c procargs.c \ -@@ -375,6 +376,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suid_open.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procaffinity.Plo@am__quote@ diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_cpu.c b/devel/libgtop/files/patch-sysdeps_freebsd_cpu.c deleted file mode 100644 index 99a3e8ef8346..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_cpu.c +++ /dev/null @@ -1,66 +0,0 @@ ---- sysdeps/freebsd/cpu.c.orig 2009-04-12 01:45:28.000000000 -0400 -+++ sysdeps/freebsd/cpu.c 2009-04-12 01:45:29.000000000 -0400 -@@ -54,6 +54,7 @@ void - glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf) - { - long cpts [CPUSTATES]; -+ long *cp_times = NULL; - struct clockinfo ci; - size_t length; - int ncpu, i; -@@ -75,6 +76,16 @@ glibtop_get_cpu_s (glibtop *server, glib - return; - } - -+ length = 0; -+ if (sysctlbyname ("kern.cp_times", NULL, &length, NULL, 0) == 0) { -+ cp_times = g_malloc (length); -+ length = sizeof(long) * CPUSTATES * (length / (sizeof(long) * CPUSTATES)); -+ if (sysctlbyname ("kern.cp_times", cp_times, &length, NULL, 0)) { -+ g_free (cp_times); -+ cp_times = NULL; -+ } -+ } -+ - /* set user time */ - buf->user = cpts [CP_USER]; - /* set nice time */ -@@ -89,22 +100,32 @@ glibtop_get_cpu_s (glibtop *server, glib - /* set frequency */ - buf->frequency = (ci.stathz ? ci.stathz : ci.hz); - /* set total */ -- buf->total = cpts [CP_USER] + cpts [CP_NICE] -+ buf->total = cpts [CP_USER] + cpts [CP_NICE] \ - + cpts [CP_SYS] + cpts [CP_IDLE] + cpts [CP_INTR]; - - ncpu = server->ncpu + 1; - - for (i = 0; i < ncpu; i++) { -- buf->xcpu_user[i] = cpts [CP_USER] / ncpu; -- buf->xcpu_nice[i] = cpts [CP_NICE] / ncpu; -- buf->xcpu_sys[i] = cpts [CP_SYS] / ncpu; -- buf->xcpu_idle[i] = cpts [CP_IDLE] / ncpu; -- buf->xcpu_irq[i] = cpts [CP_INTR] / ncpu; -+ if (cp_times) { -+ buf->xcpu_user[i] = cp_times[i * CPUSTATES + CP_USER]; -+ buf->xcpu_nice[i] = cp_times[i * CPUSTATES + CP_NICE]; -+ buf->xcpu_sys[i] = cp_times[i * CPUSTATES + CP_SYS]; -+ buf->xcpu_idle[i] = cp_times[i * CPUSTATES + CP_IDLE]; -+ buf->xcpu_irq[i] = cp_times[i * CPUSTATES + CP_INTR]; -+ } else { -+ buf->xcpu_user[i] = cpts [CP_USER] / ncpu; -+ buf->xcpu_nice[i] = cpts [CP_NICE] / ncpu; -+ buf->xcpu_sys[i] = cpts [CP_SYS] / ncpu; -+ buf->xcpu_idle[i] = cpts [CP_IDLE] / ncpu; -+ buf->xcpu_irq[i] = cpts [CP_INTR] / ncpu; -+ } - buf->xcpu_total[i] = buf->xcpu_user[i] + buf->xcpu_nice[i] \ - + buf->xcpu_sys[i] + buf->xcpu_idle[i] \ - + buf->xcpu_irq[i]; - } - -+ g_free (cp_times); -+ - /* Set the flags last. */ - buf->flags = _glibtop_sysdeps_cpu; - diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_machine.h b/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_machine.h deleted file mode 100644 index e3b899af1d49..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_glibtop_machine.h +++ /dev/null @@ -1,10 +0,0 @@ ---- sysdeps/freebsd/glibtop_machine.h.orig 2009-12-13 18:34:21.000000000 -0500 -+++ sysdeps/freebsd/glibtop_machine.h 2009-12-13 18:34:32.000000000 -0500 -@@ -24,6 +24,7 @@ - - #include <sys/param.h> - #include <nlist.h> -+#include <limits.h> - #include <kvm.h> - #include <sys/dkstat.h> - #include <time.h> diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c b/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c deleted file mode 100644 index acb327f98162..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c +++ /dev/null @@ -1,19 +0,0 @@ ---- sysdeps/freebsd/nosuid.c.orig 2008-09-29 17:28:31.000000000 -0400 -+++ sysdeps/freebsd/nosuid.c 2008-09-29 17:28:39.000000000 -0400 -@@ -21,16 +21,8 @@ - - #include <config.h> - #include <glibtop.h> --#include <glibtop/open.h> - #include <glibtop/close.h> - - void --glibtop_open_s (glibtop *server, -- const char *program_name, -- const unsigned long features, -- const unsigned flags) --{ } -- --void - glibtop_close_s (glibtop *server) - { } diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_open.c index 213d49a23559..985caa1f4a2b 100644 --- a/devel/libgtop/files/patch-sysdeps_freebsd_open.c +++ b/devel/libgtop/files/patch-sysdeps_freebsd_open.c @@ -1,91 +1,14 @@ ---- sysdeps/freebsd/open.c.orig 2011-12-25 11:29:32.897248000 +0000 -+++ sysdeps/freebsd/open.c 2011-12-25 11:38:05.000000000 +0000 -@@ -20,76 +20,27 @@ - */ - - #include <config.h> -+#include <sys/types.h> -+#include <sys/sysctl.h> - #include <glibtop.h> --#include <glibtop/error.h> - #include <glibtop/open.h> --#include <glibtop/init_hooks.h> +--- sysdeps/freebsd/open.c.orig 2011-07-24 15:13:56.000000000 -0400 ++++ sysdeps/freebsd/open.c 2011-12-28 16:26:48.000000000 -0500 +@@ -42,11 +42,5 @@ glibtop_open_s (glibtop *server, const c + sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); + server->real_ncpu = ncpus - 1; + server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu); - --/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */ -- --void --glibtop_init_p (glibtop *server, const unsigned long features, -- const unsigned flags) --{ -- const _glibtop_init_func_t *init_fkt; -- -- if (server == NULL) -- glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); -- -- /* Do the initialization, but only if not already initialized. */ -+#include <glibtop/cpu.h> -+#include <glibtop/error.h> - -- if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) { -- glibtop_open_p (server, "glibtop", features, flags); -+#include <glibtop_private.h> - -- for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++) -- (*init_fkt) (server); -- -- server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS; -- } --} - - void --glibtop_open_p (glibtop *server, const char *program_name, -+glibtop_open_s (glibtop *server, const char *program_name, - const unsigned long features, - const unsigned flags) - { --#ifdef DEBUG -- fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ()); --#endif -- -- /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */ -+ int ncpus; -+ size_t len; - -- server->machine.uid = getuid (); -- server->machine.euid = geteuid (); -- server->machine.gid = getgid (); -- server->machine.egid = getegid (); -#if defined(__FreeBSD_kernel__) - server->os_version_code = __FreeBSD_kernel_version; -#else -+ len = sizeof (ncpus); -+ sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); -+ server->real_ncpu = ncpus - 1; -+ server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu); server->os_version_code = __FreeBSD_version; -#endif -- /* Setup machine-specific data */ -- server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open"); -- -- if (server->machine.kd == NULL) -- glibtop_error_io_r (server, "kvm_open"); -- -- /* Drop priviledges. */ -- -- if (setreuid (server->machine.euid, server->machine.uid)) -- _exit (1); -- -- if (setregid (server->machine.egid, server->machine.gid)) -- _exit (1); -- -- /* !!! END OF SUID ROOT PART !!! */ -- -- /* Our effective uid is now those of the user invoking the server, -- * so we do no longer have any priviledges. */ - -- /* NOTE: On FreeBSD, we do not need to be suid root, we just need to -- * be sgid kmem. -- * -- * The server will only use setegid() to get back it's priviledges, -- * so it will fail if it is suid root and not sgid kmem. */ } diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c deleted file mode 100644 index 3a5a93bfc028..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c +++ /dev/null @@ -1,35 +0,0 @@ ---- sysdeps/freebsd/procmap.c.orig 2009-12-13 18:53:02.827740000 -0500 -+++ sysdeps/freebsd/procmap.c 2009-12-13 19:00:04.000000000 -0500 -@@ -85,7 +85,9 @@ _glibtop_sysdeps_freebsd_dev_inode (glib - char tagstr[12]; - struct inode inode; - struct cdev_priv priv; -+#if __FreeBSD_version < 800039 - struct cdev si; -+#endif - - *inum = 0; - *dev = 0; -@@ -111,18 +113,18 @@ _glibtop_sysdeps_freebsd_dev_inode (glib - return; - } - -- if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si, -- sizeof (si)) != sizeof (si) || - #if __FreeBSD_version >= 800039 -- kvm_read (server->machine.kd, (gulong) cdev2priv(&si), (char *) &priv, -+ if (kvm_read (server->machine.kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv, - sizeof (priv)) - #else -+ if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si, -+ sizeof (si)) != sizeof (si) || - kvm_read (server->machine.kd, (gulong) si.si_priv, (char *) &priv, - sizeof (priv)) - #endif - != sizeof (priv)) - { -- glibtop_warn_io_r (server, "kvm_read (si)"); -+ glibtop_warn_io_r (server, "kvm_read (priv)"); - return; - } - diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c deleted file mode 100644 index 0efedfc616d6..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c +++ /dev/null @@ -1,61 +0,0 @@ ---- sysdeps/freebsd/procopenfiles.c.orig 2009-12-13 18:53:02.827740000 -0500 -+++ sysdeps/freebsd/procopenfiles.c 2009-12-13 18:54:55.000000000 -0500 -@@ -35,6 +35,9 @@ - #include <sys/user.h> - #include <netinet/in.h> - #include <arpa/inet.h> -+#ifdef HAVE_KINFO_GETFILE -+#include <libutil.h> -+#endif - #include <string.h> - #include <stdlib.h> - -@@ -263,9 +266,13 @@ glibtop_get_proc_open_files_s (glibtop * - { - #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) - struct kinfo_file *freep, *kif; -+#ifndef HAVE_KINFO_GETFILE - int name[4]; - size_t len; -- size_t i; -+#else -+ int cnt; -+#endif -+ ssize_t i; - #else - char *output; - #endif -@@ -274,6 +281,7 @@ glibtop_get_proc_open_files_s (glibtop * - memset(buf, 0, sizeof (glibtop_proc_open_files)); - - #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) -+#ifndef HAVE_KINFO_GETFILE - name[0] = CTL_KERN; - name[1] = KERN_PROC; - name[2] = KERN_PROC_FILEDESC; -@@ -287,12 +295,25 @@ glibtop_get_proc_open_files_s (glibtop * - g_free(freep); - return NULL; - } -+#else -+ freep = kinfo_getfile(pid, &cnt); -+#endif - - entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry)); - -+#ifndef HAVE_KINFO_GETFILE - for (i = 0; i < len / sizeof(*kif); i++, kif++) { - glibtop_open_files_entry entry = {0}; - -+ if (kif->kf_structsize != sizeof(*kif)) -+ continue; -+#else -+ for (i = 0; i < cnt; i++) { -+ glibtop_open_files_entry entry = {0}; -+ -+ kif = &freep[i]; -+#endif -+ - if (kif->kf_fd < 0) - continue; - diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c deleted file mode 100644 index f29ef64d7c64..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c +++ /dev/null @@ -1,89 +0,0 @@ ---- sysdeps/freebsd/procwd.c.orig 2009-04-19 19:51:00.000000000 +0200 -+++ sysdeps/freebsd/procwd.c 2010-05-07 13:17:54.000000000 +0200 -@@ -27,6 +27,9 @@ - #include <sys/sysctl.h> - #include <sys/param.h> - #include <sys/user.h> -+#ifdef HAVE_KINFO_GETFILE -+#include <libutil.h> -+#endif - #include <string.h> - - static const unsigned long _glibtop_sysdeps_proc_wd = -@@ -40,7 +43,7 @@ _glibtop_init_proc_wd_s(glibtop *server) - server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd; - } - --#if (__FreeBSD_version >= 800000 && __FreeBSD_version < 800019) || _FreeBSD_version < 700104 -+#if (__FreeBSD_version >= 800000 && __FreeBSD_version < 800019) || __FreeBSD_version < 700104 - static GPtrArray * - parse_output(const char *output, glibtop_proc_wd *buf) - { -@@ -97,24 +100,39 @@ parse_output(const char *output, glibtop - char** - glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid) - { -- char path[MAXPATHLEN]; -+ int exe_mib[4]; -+ size_t len; - #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) - struct kinfo_file *freep, *kif; - GPtrArray *dirs; -- size_t len; -- int i; -+#ifndef HAVE_KINFO_GETFILE - int name[4]; - #else -+ int cnt; -+#endif -+ int i; -+#else - char *output; - #endif - - memset (buf, 0, sizeof (glibtop_proc_wd)); -+ len = 0; - -- g_snprintf(path, sizeof(path), "/proc/%u/file", pid); -- if (safe_readlink(path, buf->exe, sizeof(buf->exe))) -- buf->flags |= (1 << GLIBTOP_PROC_WD_EXE); -+ exe_mib[0] = CTL_KERN; -+ exe_mib[1] = KERN_PROC; -+ exe_mib[2] = KERN_PROC_PATHNAME; -+ exe_mib[3] = pid; -+ -+ if (sysctl(exe_mib, 4, NULL, &len, NULL, 0) == 0) { -+ if (len > sizeof(buf->exe)) -+ len = sizeof(buf->exe); -+ if (sysctl(exe_mib, 4, buf->exe, &len, NULL, 0) == 0) -+ buf->flags |= (1 << GLIBTOP_PROC_WD_EXE); -+ } - - #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) -+#ifndef HAVE_KINFO_GETFILE -+ len = 0; - name[0] = CTL_KERN; - name[1] = KERN_PROC; - name[2] = KERN_PROC_FILEDESC; -@@ -127,10 +145,21 @@ glibtop_get_proc_wd_s(glibtop *server, g - g_free(freep); - return NULL; - } -+#else -+ freep = kinfo_getfile(pid, &cnt); -+#endif - - dirs = g_ptr_array_sized_new(1); - -+#ifndef HAVE_KINFO_GETFILE - for (i = 0; i < len / sizeof(*kif); i++, kif++) { -+ if (kif->kf_structsize != sizeof(*kif)) -+ continue; -+#else -+ for (i = 0; i < cnt; i++) { -+ kif = &freep[i]; -+#endif -+ - switch (kif->kf_fd) { - case KF_FD_TYPE_ROOT: - g_strlcpy(buf->root, kif->kf_path, diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c deleted file mode 100644 index dec0ffb49b4c..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c +++ /dev/null @@ -1,95 +0,0 @@ ---- sysdeps/freebsd/suid_open.c.orig 2009-12-13 13:47:12.739004000 -0500 -+++ sysdeps/freebsd/suid_open.c 2009-12-13 18:37:51.000000000 -0500 -@@ -0,0 +1,92 @@ -+/* Copyright (C) 1998 Joshua Sled -+ This file is part of LibGTop 1.0. -+ -+ Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998. -+ -+ LibGTop is free software; you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, -+ or (at your option) any later version. -+ -+ LibGTop is distributed in the hope that it will be useful, but WITHOUT -+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with LibGTop; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#include <config.h> -+#include <glibtop.h> -+#include <glibtop/error.h> -+#include <glibtop/cpu.h> -+#include <glibtop/open.h> -+#include <glibtop/init_hooks.h> -+ -+ -+/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */ -+ -+void -+glibtop_init_p (glibtop *server, const unsigned long features, -+ const unsigned flags) -+{ -+ const _glibtop_init_func_t *init_fkt; -+ -+ if (server == NULL) -+ glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); -+ -+ /* Do the initialization, but only if not already initialized. */ -+ -+ if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) { -+ glibtop_open_p (server, "glibtop", features, flags); -+ -+ for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++) -+ (*init_fkt) (server); -+ -+ server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS; -+ } -+} -+ -+void -+glibtop_open_p (glibtop *server, const char *program_name, -+ const unsigned long features, -+ const unsigned flags) -+{ -+ char errbuf[_POSIX2_LINE_MAX]; -+#ifdef DEBUG -+ fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ()); -+#endif -+ -+ /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */ -+ server->machine.uid = getuid (); -+ server->machine.euid = geteuid (); -+ server->machine.gid = getgid (); -+ server->machine.egid = getegid (); -+ /* Setup machine-specific data */ -+ server->machine.kd = kvm_openfiles (NULL, NULL, NULL, O_RDONLY, errbuf); -+ -+ if (server->machine.kd == NULL) -+ glibtop_error_io_r (server, "kvm_open"); -+ -+ /* Drop priviledges. */ -+ -+ if (setreuid (server->machine.euid, server->machine.uid)) -+ _exit (1); -+ -+ if (setregid (server->machine.egid, server->machine.gid)) -+ _exit (1); -+ -+ /* !!! END OF SUID ROOT PART !!! */ -+ -+ /* Our effective uid is now those of the user invoking the server, -+ * so we do no longer have any priviledges. */ -+ -+ /* NOTE: On FreeBSD, we do not need to be suid root, we just need to -+ * be sgid kmem. -+ * -+ * The server will only use setegid() to get back it's priviledges, -+ * so it will fail if it is suid root and not sgid kmem. */ -+} diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c b/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c deleted file mode 100644 index ab5fdd66d5ee..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c +++ /dev/null @@ -1,13 +0,0 @@ ---- sysdeps/freebsd/sysinfo.c.orig 2008-05-23 18:13:23.000000000 -0400 -+++ sysdeps/freebsd/sysinfo.c 2008-09-29 14:35:25.000000000 -0400 -@@ -45,8 +45,8 @@ init_sysinfo (glibtop *server) - - glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0); - -- len = sizeof (ncpus); -- sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); -+ ncpus = server->ncpu + 1; -+ - len = 0; - sysctlbyname ("hw.model", NULL, &len, NULL, 0); - model = g_malloc (len); diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist index 2b9a0fb28bf5..7f31d0731f45 100644 --- a/devel/libgtop/pkg-plist +++ b/devel/libgtop/pkg-plist @@ -43,7 +43,6 @@ include/libgtop-2.0/glibtop_private.h include/libgtop-2.0/glibtop_server.h include/libgtop-2.0/glibtop_suid.h include/libgtop-2.0/libgtopconfig.h -lib/girepository-1.0/GTop-2.0.typelib lib/libgtop-2.0.a lib/libgtop-2.0.la lib/libgtop-2.0.so @@ -91,12 +90,10 @@ libdata/pkgconfig/libgtop-2.0.pc %%DOCSDIR%%/libgtop-version.html %%DOCSDIR%%/libgtop-white-paper-overview.html %%DOCSDIR%%/libgtop-white-paper.html -%%DOCSDIR%%/libgtop.devhelp %%DOCSDIR%%/libgtop.devhelp2 %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png -share/gir-1.0/GTop-2.0.gir share/locale/am/LC_MESSAGES/libgtop-2.0.mo share/locale/ar/LC_MESSAGES/libgtop-2.0.mo share/locale/as/LC_MESSAGES/libgtop-2.0.mo @@ -224,5 +221,3 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry share/gir-1.0 -@dirrmtry lib/girepository-1.0 diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile index 5591b1968926..1a45ca22ba2f 100644 --- a/devel/libnotify/Makefile +++ b/devel/libnotify/Makefile @@ -1,29 +1,21 @@ -# New ports collection makefile for: libnotify -# Date created: 2005-08-06 -# Whom: Andreas Kohn <andreas@syndrom23.de> -# +# Created by: Andreas Kohn <andreas@syndrom23.de> # $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 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 diff --git a/devel/libnotify/distinfo b/devel/libnotify/distinfo index cdc49f2c6748..048dd5e9163f 100644 --- a/devel/libnotify/distinfo +++ b/devel/libnotify/distinfo @@ -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 diff --git a/devel/libnotify/files/patch-configure b/devel/libnotify/files/patch-configure index 6aca4e53d57f..fa512f8de042 100644 --- a/devel/libnotify/files/patch-configure +++ b/devel/libnotify/files/patch-configure @@ -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,26 +9,26 @@ 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 - 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'. - -@@ -11656,99 +11643,6 @@ + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS +@@ -11664,98 +11657,6 @@ fi @@ -124,7 +124,6 @@ -$as_echo "yes" >&6; } - -fi -- - GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` + GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` diff --git a/devel/libnotify/pkg-plist b/devel/libnotify/pkg-plist index 2a6d2352ab67..1be0df3cc4ee 100644 --- a/devel/libnotify/pkg-plist +++ b/devel/libnotify/pkg-plist @@ -11,13 +11,15 @@ lib/libnotify.so.4 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 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 diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile index 05b62947e02b..fc012dbdca5b 100644 --- a/devel/libsigc++20/Makefile +++ b/devel/libsigc++20/Makefile @@ -1,9 +1,9 @@ # Created by: Alexander Nedotsukov <bland@FreeBSD.org> # $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 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 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 <bsd.port.options.mk> + +.if ! ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+=--enable-documentation=no .endif diff --git a/devel/libsigc++20/distinfo b/devel/libsigc++20/distinfo index 1109df8bf4d5..b6832e320c58 100644 --- a/devel/libsigc++20/distinfo +++ b/devel/libsigc++20/distinfo @@ -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 diff --git a/devel/libsigc++20/pkg-plist b/devel/libsigc++20/pkg-plist index f8e7e37efcf5..7fd5d9c23843 100644 --- a/devel/libsigc++20/pkg-plist +++ b/devel/libsigc++20/pkg-plist @@ -51,6 +51,7 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%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 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%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,16 +451,37 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%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 %%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 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%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 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%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 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%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 diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index ff3637219380..2b652993605b 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -13,7 +13,7 @@ COMMENT= Qt core library 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 diff --git a/graphics/Makefile b/graphics/Makefile index 86138978b877..270c2e0f1feb 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -92,6 +92,7 @@ SUBDIR += clutter-box2d SUBDIR += clutter-gtk SUBDIR += colord + SUBDIR += colord-gtk SUBDIR += comical SUBDIR += comix SUBDIR += commons-utilities diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index 8803a43c1892..1049c13cb825 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -37,5 +37,7 @@ post-patch: ${WRKSRC}/clutter/x11/*.h \ ${WRKSRC}/clutter/cogl/cogl/*.h \ ${WRKSRC}/clutter/json/*.c + @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \ + ${WRKSRC}/clutter/Makefile.in .include <bsd.port.mk> diff --git a/graphics/colord-gtk/Makefile b/graphics/colord-gtk/Makefile new file mode 100644 index 000000000000..8610bf949e6e --- /dev/null +++ b/graphics/colord-gtk/Makefile @@ -0,0 +1,37 @@ +# Created by: Koop Mast <kwm@FreeBSD.org> +# $FreeBSD$ +# $MCom: ports/trunk/graphics/colord-gtk/Makefile 18610 2013-06-30 16:33:05Z marcus $ + +PORTNAME= colord-gtk +PORTVERSION= 0.1.25 +CATEGORIES= graphics +MASTER_SITES= http://www.freedesktop.org/software/colord/releases/ + +MAINTAINER= kwm@FreeBSD.org +COMMENT= Manage color profiles to accurately color input/output devices + +BUILD_DEPENDS= colord>=0.1.20:${PORTSDIR}/graphics/colord +LIB_DEPENDS= colord:${PORTSDIR}/graphics/colord \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ + dbus-1:${PORTSDIR}/devel/dbus \ + lcms2:${PORTSDIR}/graphics/lcms2 + +USE_XZ= yes +USE_GNOME= gnomehier gtk30 intlhack introspection:build +USES= gettext gmake pathfix pkgconfig +USE_SQLITE= 3 +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +CONFIGURE_ARGS= --enable-gtk-doc-html=no +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +post-patch: + @${REINPLACE_CMD} -e 's|-Wclobbered||g' \ + -e 's|-Wempty-body||g' \ + -e 's|-Wignored-qualifiers||g' \ + -e 's|-Wtype-limits||g' \ + -e 's|-Wmissing-parameter-type||g' \ + ${WRKSRC}/configure + +.include <bsd.port.mk> diff --git a/graphics/colord-gtk/distinfo b/graphics/colord-gtk/distinfo new file mode 100644 index 000000000000..2b99ce36069e --- /dev/null +++ b/graphics/colord-gtk/distinfo @@ -0,0 +1,2 @@ +SHA256 (colord-gtk-0.1.25.tar.xz) = bd0f91c4348acba41018222915cd62917882dd35883bcc81848d089e13a70b0a +SIZE (colord-gtk-0.1.25.tar.xz) = 271192 diff --git a/graphics/colord-gtk/pkg-descr b/graphics/colord-gtk/pkg-descr new file mode 100644 index 000000000000..b92a9b339ac9 --- /dev/null +++ b/graphics/colord-gtk/pkg-descr @@ -0,0 +1,3 @@ +Gtk3 widget for the colord system service. + +WWW: http://www.freedesktop.org/software/colord diff --git a/graphics/colord-gtk/pkg-plist b/graphics/colord-gtk/pkg-plist new file mode 100644 index 000000000000..5e857889adea --- /dev/null +++ b/graphics/colord-gtk/pkg-plist @@ -0,0 +1,15 @@ +include/colord-1/colord-gtk.h +include/colord-1/colord-gtk/cd-sample-widget.h +include/colord-1/colord-gtk/cd-sample-window.h +include/colord-1/colord-gtk/cd-version.h +include/colord-1/colord-gtk/cd-window-sync.h +include/colord-1/colord-gtk/cd-window.h +lib/girepository-1.0/ColordGtk-1.0.typelib +lib/libcolord-gtk.a +lib/libcolord-gtk.la +lib/libcolord-gtk.so +lib/libcolord-gtk.so.1 +libdata/pkgconfig/colord-gtk.pc +share/gir-1.0/ColordGtk-1.0.gir +share/locale/en_GB/LC_MESSAGES/colord-gtk.mo +@dirrmtry include/colord-1/colord-gtk diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile index b4661f2fc968..1789595b9f34 100644 --- a/graphics/colord/Makefile +++ b/graphics/colord/Makefile @@ -1,47 +1,48 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/graphics/colord/Makefile,v 1.10 2012/12/17 23:50:40 kwm Exp $ +# $MCom: ports/trunk/graphics/colord/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= colord -PORTVERSION= 0.1.20 -PORTREVISION= 2 +PORTVERSION= 1.0.1 CATEGORIES= graphics MASTER_SITES= http://www.freedesktop.org/software/colord/releases/ MAINTAINER= kwm@FreeBSD.org COMMENT= Manage color profiles to accurately color input/output devices -BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ - vala-vapigen>=0.13.0:${PORTSDIR}/lang/vala-vapigen LIB_DEPENDS= polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ dbus-1:${PORTSDIR}/devel/dbus \ lcms2:${PORTSDIR}/graphics/lcms2 +USERS= colord +GROUPS= colord + USE_XZ= yes -USE_GNOME= gnomehier glib20 intlhack -USES= pathfix gettext -USE_GMAKE= yes -USE_SQLITE= yes +USE_GNOME= gnomehier glib20 intlhack introspection:build +USES= gettext gmake pathfix pkgconfig +USE_SQLITE= 3 GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes -CONFIGURE_ARGS= --disable-gudev --enable-gtk-doc-html=no --disable-gtk +CONFIGURE_ARGS= --disable-gudev \ + --enable-gtk-doc-html=no \ + --disable-bash-completion \ + --disable-gusb \ + --disable-sane \ + --with-daemon-user=colord \ + --disable-systemd-login +# takes ages we don't want to wait. +CONFIGURE_ARGS+=--disable-print-profiles CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= USB_CFLAGS="-I/usr/include" \ USB_LIBS="-L/usr/lib -lusb" -MAKE_ENV+= GI_SCANNER_DISABLE_CACHE=yes -OPTIONS_DEFINE= SANE MANPAGES +GLIB_SCHEMAS= org.freedesktop.ColorHelper.gschema.xml -.include <bsd.port.options.mk> +OPTIONS_DEFINE= MANPAGES -.if ${PORT_OPTIONS:MSANE} -CONFGIURE_ARGS+=--enable-sane=yes -LIB_DEPENDS+= sane:${PORTSDIR}/graphics/sane-backends -.else -CONFIGURE_ARGS+=--disable-sane -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMANPAGES} BUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \ @@ -57,9 +58,17 @@ post-patch: -e 's|-Wmissing-parameter-type||g' \ -e 's|LIBS="-lusb-1.0|LIBS="-lusb|g' \ ${WRKSRC}/configure -.if !${PORT_OPTIONS:MMANPAGES} + @${REINPLACE_CMD} -e 's|lib/color|db/color|g' \ + -e 's|/usr/share/color|${PREFIX}/share/color|g' \ + ${WRKSRC}/src/cd-main.c \ + ${WRKSRC}/src/cd-profile-store.c \ + ${WRKSRC}/src/cd-profile.c +.if ! ${PORT_OPTIONS:MMANPAGES} @${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \ s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure .endif +post-install: + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + .include <bsd.port.mk> diff --git a/graphics/colord/distinfo b/graphics/colord/distinfo index 2db4de59d601..0df0e3bd034c 100644 --- a/graphics/colord/distinfo +++ b/graphics/colord/distinfo @@ -1,2 +1,2 @@ -SHA256 (colord-0.1.20.tar.xz) = 45d6e7e73c9eab9f3f3c0eec8d008fd96c147333aeb4a77a2c2695657e48ae58 -SIZE (colord-0.1.20.tar.xz) = 551408 +SHA256 (colord-1.0.1.tar.xz) = 053f028aba6071068064ca7fe949bb3f74fb5ad16af2d7ec5bba10dea00cb785 +SIZE (colord-1.0.1.tar.xz) = 1074508 diff --git a/graphics/colord/files/patch-Makefile.in b/graphics/colord/files/patch-Makefile.in index 8adde68742b5..262c61c66e78 100644 --- a/graphics/colord/files/patch-Makefile.in +++ b/graphics/colord/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2012-05-15 23:46:55.000000000 +0200 -+++ Makefile.in 2012-05-15 23:47:27.000000000 +0200 -@@ -329,7 +329,7 @@ - # this needs libcolord and libcolord-gtk - +--- Makefile.in.orig 2013-03-29 15:05:15.000000000 +0000 ++++ Makefile.in 2013-03-29 15:06:06.000000000 +0000 +@@ -387,7 +387,7 @@ # this needs client/cd-create-profile --SUBDIRS = etc policy man libcolord rules po $(am__append_1) client \ -+SUBDIRS = etc policy man libcolord po $(am__append_1) client \ - contrib doc examples src data + + # this needs data/profiles/*.icc +-SUBDIRS = etc policy man lib rules po client contrib doc examples data \ ++SUBDIRS = etc policy man lib po client contrib doc examples data \ + src DISTCHECK_CONFIGURE_FLAGS = \ --enable-introspection \ diff --git a/graphics/colord/files/patch-client_Makefile.in b/graphics/colord/files/patch-client_Makefile.in deleted file mode 100644 index 4c832e9f1f11..000000000000 --- a/graphics/colord/files/patch-client_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- client/Makefile.in.orig 2012-05-16 20:35:37.000000000 +0200 -+++ client/Makefile.in 2012-05-16 20:35:57.000000000 +0200 -@@ -36,8 +36,8 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --bin_PROGRAMS = colormgr$(EXEEXT) cd-create-profile$(EXEEXT) \ -- cd-fix-profile$(EXEEXT) -+@HAVE_GTK_TRUE@bin_PROGRAMS = colormgr$(EXEEXT) cd-create-profile$(EXEEXT) \ -+@HAVE_GTK_TRUE@ cd-fix-profile$(EXEEXT) - @HAVE_GTK_TRUE@noinst_PROGRAMS = colord-convert$(EXEEXT) - subdir = client - DIST_COMMON = $(dist_bashcompletion_DATA) $(srcdir)/Makefile.am \ diff --git a/graphics/colord/files/patch-configure b/graphics/colord/files/patch-configure new file mode 100644 index 000000000000..bd3d39baefdf --- /dev/null +++ b/graphics/colord/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2013-04-11 10:05:05.000000000 +0000 ++++ configure 2013-04-11 10:06:38.000000000 +0000 +@@ -17763,7 +17763,7 @@ + fi + + # per-machine directory +-CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/lib/colord/icc" ++CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/db/colord/icc" + + + ac_config_files="$ac_config_files Makefile etc/Makefile contrib/Makefile contrib/session-helper/Makefile contrib/colord-sane/Makefile examples/Makefile man/Makefile doc/Makefile doc/api/Makefile doc/api/dbus/Makefile doc/api/version.xml data/Makefile data/figures/Makefile data/profiles/Makefile data/ti1/Makefile data/org.freedesktop.ColorManager.conf data/tests/Makefile policy/Makefile rules/Makefile rules/69-cd-sensors.rules po/Makefile.in src/Makefile src/plugins/Makefile src/sensors/Makefile client/Makefile lib/Makefile lib/colord/cd-version.h lib/colord/colord.pc lib/colord/Makefile lib/colorhug/Makefile lib/colorhug/colorhug.pc lib/colorhug/ch-version.h lib/dtp94/Makefile lib/huey/Makefile lib/munki/Makefile" diff --git a/graphics/colord/files/patch-src_Makefile_in b/graphics/colord/files/patch-src_Makefile_in new file mode 100644 index 000000000000..15edb6bfb971 --- /dev/null +++ b/graphics/colord/files/patch-src_Makefile_in @@ -0,0 +1,15 @@ +$OpenBSD: patch-src_Makefile_in,v 1.6 2013/03/31 19:41:23 ajacoutot Exp $ +--- src/Makefile.in.orig Thu Mar 28 11:16:10 2013 ++++ src/Makefile.in Sat Mar 30 16:25:48 2013 +@@ -1774,11 +1774,6 @@ cd-resources.h: colord.gresource.xml + $(srcdir)/colord.gresource.xml + + install-data-hook: +- if test -w $(DESTDIR)$(prefix)/; then \ +- mkdir -p $(DESTDIR)$(CD_SYSTEM_PROFILES_DIR); \ +- chown $(daemon_user) $(DESTDIR)$(localstatedir)/lib/colord; \ +- chmod 0755 $(DESTDIR)$(localstatedir)/lib/colord; \ +- fi + + -include $(top_srcdir)/git.mk + diff --git a/graphics/colord/pkg-install b/graphics/colord/pkg-install new file mode 100644 index 000000000000..30e77997e670 --- /dev/null +++ b/graphics/colord/pkg-install @@ -0,0 +1,11 @@ +#!/bin/sh + +case $2 in +POST-INSTALL) + /bin/mkdir -p /var/db/colord/icc + /bin/chmod 0755 /var/db/colord + /usr/sbin/chown colord:colord /var/db/colord + /usr/sbin/chown colord:colord /var/db/colord/icc + exit 0 + ;; +esac diff --git a/graphics/colord/pkg-plist b/graphics/colord/pkg-plist index eba0ba0519fc..bb35fb489274 100644 --- a/graphics/colord/pkg-plist +++ b/graphics/colord/pkg-plist @@ -1,23 +1,38 @@ -etc/bash_completion.d/colormgr-completion.bash +bin/cd-create-profile +bin/cd-fix-profile +bin/cd-iccdump +bin/colormgr etc/colord.conf etc/dbus-1/system.d/org.freedesktop.ColorManager.conf -etc/dbus-1/system.d/org.freedesktop.colord-sane.conf -include/colord-1/colord.h include/colord-1/colord-private.h +include/colord-1/colord-session/cd-session.h +include/colord-1/colord.h +include/colord-1/colord/cd-buffer.h include/colord-1/colord/cd-client-sync.h include/colord-1/colord/cd-client.h include/colord-1/colord/cd-color.h +include/colord-1/colord/cd-deprecated.h include/colord-1/colord/cd-device-sync.h include/colord-1/colord/cd-device.h +include/colord-1/colord/cd-dom.h include/colord-1/colord/cd-enum.h -include/colord-1/colord/cd-it8.h +include/colord-1/colord/cd-icc.h +include/colord-1/colord/cd-interp-akima.h +include/colord-1/colord/cd-interp-linear.h +include/colord-1/colord/cd-interp.h include/colord-1/colord/cd-it8-utils.h +include/colord-1/colord/cd-it8.h include/colord-1/colord/cd-math.h include/colord-1/colord/cd-profile-sync.h include/colord-1/colord/cd-profile.h +include/colord-1/colord/cd-quirk.h include/colord-1/colord/cd-sensor-sync.h include/colord-1/colord/cd-sensor.h +include/colord-1/colord/cd-transform.h include/colord-1/colord/cd-version.h +lib/colord-sensors/libcolord_sensor_argyll.a +lib/colord-sensors/libcolord_sensor_argyll.la +lib/colord-sensors/libcolord_sensor_argyll.so lib/colord-sensors/libcolord_sensor_dummy.a lib/colord-sensors/libcolord_sensor_dummy.la lib/colord-sensors/libcolord_sensor_dummy.so @@ -26,17 +41,66 @@ lib/libcolord.a lib/libcolord.la lib/libcolord.so lib/libcolord.so.1 +lib/libcolordprivate.a +lib/libcolordprivate.la +lib/libcolordprivate.so +lib/libcolordprivate.so.1 libdata/pkgconfig/colord.pc libexec/colord -share/color/icc/colord/crayons.icc +libexec/colord-session +share/color/icc/colord/AdobeRGB1998.icc +share/color/icc/colord/AppleRGB.icc +share/color/icc/colord/BestRGB.icc +share/color/icc/colord/BetaRGB.icc +share/color/icc/colord/Bluish.icc +share/color/icc/colord/BruceRGB.icc +share/color/icc/colord/CIE-RGB.icc +share/color/icc/colord/ColorMatchRGB.icc +share/color/icc/colord/Crayons.icc +share/color/icc/colord/DonRGB4.icc +share/color/icc/colord/ECI-RGBv1.icc +share/color/icc/colord/ECI-RGBv2.icc +share/color/icc/colord/EktaSpacePS5.icc +share/color/icc/colord/Gamma5000K.icc +share/color/icc/colord/Gamma5500K.icc +share/color/icc/colord/Gamma6500K.icc +share/color/icc/colord/NTSC-RGB.icc +share/color/icc/colord/PAL-RGB.icc +share/color/icc/colord/ProPhotoRGB.icc +share/color/icc/colord/SMPTE-C-RGB.icc +share/color/icc/colord/SwappedRedAndGreen.icc +share/color/icc/colord/WideGamutRGB.icc +share/color/icc/colord/sRGB.icc share/color/icc/colord/x11-colors.icc +share/colord/icons/color-munki-photo-ambient.svg +share/colord/icons/color-munki-photo-attach.svg +share/colord/icons/color-munki-photo-calibrate.svg +share/colord/icons/color-munki-photo-projector.svg +share/colord/icons/color-munki-photo-screen.svg +share/colord/icons/color-munki-smile-attach.svg +share/colord/icons/colorhug-attach.svg +share/colord/icons/dtp94-attach.svg +share/colord/icons/hcfr-attach.svg +share/colord/icons/huey-attach.svg +share/colord/icons/i1-display3-attach.svg +share/colord/icons/i1-monitor-attach.svg +share/colord/icons/i1-pro-attach.svg +share/colord/icons/spyder2-attach.svg +share/colord/icons/spyder3-attach.svg +share/colord/icons/spyder4-attach.svg +share/colord/ti1/display-long.ti1 +share/colord/ti1/display-normal.ti1 +share/colord/ti1/display-short.ti1 +share/colord/ti1/printer-long.ti1 +share/colord/ti1/printer-normal.ti1 +share/colord/ti1/printer-short.ti1 +share/dbus-1/interfaces/org.freedesktop.ColorHelper.xml share/dbus-1/interfaces/org.freedesktop.ColorManager.Device.xml share/dbus-1/interfaces/org.freedesktop.ColorManager.Profile.xml share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml share/dbus-1/interfaces/org.freedesktop.ColorManager.xml -share/dbus-1/interfaces/org.freedesktop.colord.sane.xml +share/dbus-1/services/org.freedesktop.ColorHelper.service share/dbus-1/system-services/org.freedesktop.ColorManager.service -share/dbus-1/system-services/org.freedesktop.colord-sane.service share/gir-1.0/Colord-1.0.gir share/locale/as/LC_MESSAGES/colord.mo share/locale/bg/LC_MESSAGES/colord.mo @@ -51,6 +115,7 @@ share/locale/en_GB/LC_MESSAGES/colord.mo share/locale/eo/LC_MESSAGES/colord.mo share/locale/es/LC_MESSAGES/colord.mo share/locale/eu/LC_MESSAGES/colord.mo +share/locale/fa/LC_MESSAGES/colord.mo share/locale/fi/LC_MESSAGES/colord.mo share/locale/fr/LC_MESSAGES/colord.mo share/locale/ga/LC_MESSAGES/colord.mo @@ -58,11 +123,14 @@ share/locale/gl/LC_MESSAGES/colord.mo share/locale/gu/LC_MESSAGES/colord.mo share/locale/he/LC_MESSAGES/colord.mo share/locale/hi/LC_MESSAGES/colord.mo +share/locale/hr/LC_MESSAGES/colord.mo share/locale/hu/LC_MESSAGES/colord.mo +share/locale/ia/LC_MESSAGES/colord.mo share/locale/id/LC_MESSAGES/colord.mo share/locale/it/LC_MESSAGES/colord.mo share/locale/it_IT/LC_MESSAGES/colord.mo share/locale/ja/LC_MESSAGES/colord.mo +share/locale/ka/LC_MESSAGES/colord.mo share/locale/kk/LC_MESSAGES/colord.mo share/locale/kn/LC_MESSAGES/colord.mo share/locale/ko/LC_MESSAGES/colord.mo @@ -82,6 +150,7 @@ share/locale/ro/LC_MESSAGES/colord.mo share/locale/ru/LC_MESSAGES/colord.mo share/locale/sk/LC_MESSAGES/colord.mo share/locale/sl/LC_MESSAGES/colord.mo +share/locale/sq/LC_MESSAGES/colord.mo share/locale/sr/LC_MESSAGES/colord.mo share/locale/sr@latin/LC_MESSAGES/colord.mo share/locale/sv/LC_MESSAGES/colord.mo @@ -91,14 +160,11 @@ share/locale/th/LC_MESSAGES/colord.mo share/locale/tr/LC_MESSAGES/colord.mo share/locale/uk/LC_MESSAGES/colord.mo share/locale/zh_CN/LC_MESSAGES/colord.mo +share/locale/zh_HK/LC_MESSAGES/colord.mo share/locale/zh_TW/LC_MESSAGES/colord.mo share/polkit-1/actions/org.freedesktop.color.policy -share/vala/vapi/colord.vapi -@exec mkdir -p %D/var/lib/colord/icc -@dirrmtry var/lib/colord/icc -@dirrmtry var/lib/colord -@dirrmtry var/lib -@dirrmtry var +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -109,16 +175,25 @@ share/vala/vapi/colord.vapi @dirrmtry share/locale/kk @dirrmtry share/locale/it_IT/LC_MESSAGES @dirrmtry share/locale/it_IT +@dirrmtry share/locale/ia/LC_MESSAGES +@dirrmtry share/locale/ia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/bg_BG/LC_MESSAGES @dirrmtry share/locale/bg_BG @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrm share/colord/ti1 +@dirrm share/colord/icons +@dirrm share/colord @dirrm share/color/icc/colord @dirrm share/color/icc @dirrm share/color @dirrm lib/colord-sensors +@dirrm include/colord-1/colord-session @dirrm include/colord-1/colord @dirrm include/colord-1 -@dirrmtry etc/bash_completion.d +@cwd / +@dirrmtry var/db/colord/icc +@dirrmtry var/db/colord +@cwd diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 54ef516378e9..99ea21f16197 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -1,10 +1,9 @@ # Created by: Ade Lovett <ade@lovett.com> # $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 @@ DIST_SUBDIR= gnome2 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 diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo index b694e8216b8e..f773527303e0 100644 --- a/graphics/gdk-pixbuf2/distinfo +++ b/graphics/gdk-pixbuf2/distinfo @@ -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 diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist index 700b06a52ddc..a9eec0e893dc 100644 --- a/graphics/gdk-pixbuf2/pkg-plist +++ b/graphics/gdk-pixbuf2/pkg-plist @@ -165,6 +165,7 @@ share/gir-1.0/GdkPixbuf-2.0.gir %%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 diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile index 55ca726929f2..95269785357c 100644 --- a/graphics/liblqr-1/Makefile +++ b/graphics/liblqr-1/Makefile @@ -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 @@ COMMENT= An easy to use C/C++ seam carving library 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 diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 107cad9293ba..71907d910a3f 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -1,6 +1,6 @@ # Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/graphics/librsvg2/Makefile,v 1.147 2012/10/16 08:58:47 kwm Exp $ +# $MCom: ports/trunk/graphics/librsvg2/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= librsvg PORTVERSION= 2.36.4 @@ -12,26 +12,23 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Library for parsing and rendering SVG vector-graphic files -BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ - croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco + croco-0.6:${PORTSDIR}/textproc/libcroco RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2 USE_XZ= yes -USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehier gnomeprefix libgsf ltverhack gtk20 -USES= pathfix gettext +USE_GNOME= gnomehier gnomeprefix libgsf ltverhack gtk20 \ + introspection:build +USES= gettext gmake pathfix pkgconfig CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-svgz \ --with-croco \ --disable-Bsymbolic \ --enable-gtk-theme -CROCO_VERSION= 0.6 MAN1= rsvg-convert.1 -MAKE_ENV+= GI_SCANNER_DISABLE_CACHE=yes post-patch: @${REINPLACE_CMD} -e 's|GTK3_REQUIRED=3.0.0|GTK3_REQUIRED=9.90.0|g' \ diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index 666747c100a9..ab4d0c9e4823 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -1,10 +1,9 @@ # Created by: Pawel Worach <pawel.worach@gmail.com> # $FreeBSD$ -# $MCom: ports/lang/gjs/Makefile,v 1.28 2012/10/18 08:57:51 kwm Exp $ +# $MCom: ports/trunk/lang/gjs/Makefile 18581 2013-06-23 10:50:00Z kwm $ PORTNAME= gjs -PORTVERSION= 1.32.0 -PORTREVISION= 1 +PORTVERSION= 1.34.0 CATEGORIES= lang gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -12,24 +11,21 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME Javascript binding -BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ - spidermonkey185>=1.8.5:${PORTSDIR}/lang/spidermonkey185 LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - cairo:${PORTSDIR}/graphics/cairo \ mozjs185:${PORTSDIR}/lang/spidermonkey185 +CONFLICTS_BUILD=spidermonkey17-1.7.* + USE_XZ= yes -USE_GMAKE= yes +USES= gettext gmake pathfix pkgconfig shebangfix USE_PYTHON_BUILD=yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack -USES= pkgconfig gettext +USE_GNOME= cairo glib20 gnomeprefix introspection:build \ + intlhack ltverhack USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -post-patch: - ${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \ - ${WRKSRC}/scripts/make-tests +SHEBANG_FILES= scripts/make-tests .include <bsd.port.mk> diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo index a392b1e47c27..25d125ca9618 100644 --- a/lang/gjs/distinfo +++ b/lang/gjs/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gjs-1.32.0.tar.xz) = b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0 -SIZE (gnome3/gjs-1.32.0.tar.xz) = 464372 +SHA256 (gnome3/gjs-1.34.0.tar.xz) = 3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb +SIZE (gnome3/gjs-1.34.0.tar.xz) = 474004 diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist index 45599cf6975c..1a5a0558e8ba 100644 --- a/lang/gjs/pkg-plist +++ b/lang/gjs/pkg-plist @@ -6,6 +6,7 @@ include/gjs-1.0/gi/closure.h include/gjs-1.0/gi/enumeration.h include/gjs-1.0/gi/foreign.h include/gjs-1.0/gi/function.h +include/gjs-1.0/gi/gerror.h include/gjs-1.0/gi/gtype.h include/gjs-1.0/gi/interface.h include/gjs-1.0/gi/keep-alive.h @@ -26,7 +27,7 @@ include/gjs-1.0/gjs/importer.h include/gjs-1.0/gjs/jsapi-util.h include/gjs-1.0/gjs/mem.h include/gjs-1.0/gjs/native.h -lib/girepository-1.0/GjsDBus-1.0.typelib +include/gjs-1.0/gjs/type-module.h lib/gjs-1.0/cairoNative.a lib/gjs-1.0/cairoNative.la lib/gjs-1.0/cairoNative.so @@ -39,6 +40,9 @@ lib/gjs-1.0/dbusNative.so lib/gjs-1.0/debugger.a lib/gjs-1.0/debugger.la lib/gjs-1.0/debugger.so +lib/gjs-1.0/formatNative.a +lib/gjs-1.0/formatNative.la +lib/gjs-1.0/formatNative.so lib/gjs-1.0/gettextNative.a lib/gjs-1.0/gettextNative.la lib/gjs-1.0/gettextNative.so @@ -51,14 +55,11 @@ lib/gjs-1.0/mainloop.so lib/gjs-1.0/system.a lib/gjs-1.0/system.la lib/gjs-1.0/system.so +lib/gjs/girepository-1.0/GjsPrivate-1.0.typelib lib/libgjs-dbus.a lib/libgjs-dbus.la lib/libgjs-dbus.so lib/libgjs-dbus.so.0 -lib/libgjs-gdbus.a -lib/libgjs-gdbus.la -lib/libgjs-gdbus.so -lib/libgjs-gdbus.so.0 lib/libgjs.a lib/libgjs.la lib/libgjs.so @@ -66,10 +67,10 @@ lib/libgjs.so.0 libdata/pkgconfig/gjs-1.0.pc libdata/pkgconfig/gjs-dbus-1.0.pc libdata/pkgconfig/gjs-internals-1.0.pc -share/gir-1.0/GjsDBus-1.0.gir share/gjs-1.0/cairo.js share/gjs-1.0/dbus.js share/gjs-1.0/gettext.js +share/gjs-1.0/format.js share/gjs-1.0/jsUnit.js share/gjs-1.0/lang.js share/gjs-1.0/overrides/GLib.js @@ -83,7 +84,9 @@ share/gjs-1.0/tweener/tweener.js @dirrm share/gjs-1.0/tweener @dirrm share/gjs-1.0/overrides @dirrm share/gjs-1.0 +@dirrm lib/gjs/girepository-1.0 @dirrm lib/gjs-1.0 +@dirrm lib/gjs @dirrm include/gjs-1.0/gjs @dirrm include/gjs-1.0/gjs-dbus @dirrm include/gjs-1.0/gi diff --git a/lang/vala-vapigen/Makefile b/lang/vala-vapigen/Makefile index 4ad37acfb044..98681f75dde6 100644 --- a/lang/vala-vapigen/Makefile +++ b/lang/vala-vapigen/Makefile @@ -1,6 +1,6 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/lang/vala-vapigen/Makefile,v 1.7 2012/12/17 19:46:24 kwm Exp $ +# $MCom: ports/trunk/lang/vala-vapigen/Makefile 18374 2013-04-15 09:25:19Z kwm $ PORTREVISION= 0 CATEGORIES= devel gnome diff --git a/lang/vala/Makefile b/lang/vala/Makefile index b899fdd9e7f4..deff7eb0d509 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -1,9 +1,9 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/lang/vala/Makefile,v 1.65 2012/12/17 19:46:24 kwm Exp $ +# $MCom: ports/trunk/lang/vala/Makefile 18634 2013-07-26 10:42:35Z kwm $ PORTNAME= vala -PORTVERSION= 0.18.1 +PORTVERSION= 0.20.1 CATEGORIES= lang gnome MASTER_SITES= GNOME @@ -12,17 +12,16 @@ COMMENT= Programming language and compiler that converts Vala code into C code LICENSE= LGPL21 -USES= bison pathfix pkgconfig gettext +USES= bison gettext gmake pathfix pkgconfig USE_XZ= yes USE_GNOME= glib20 gnomeprefix libxslt -USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes MAN1?= valac.1 valac-${VALA_VER}.1 -VALA_VER= 0.18 +VALA_VER= ${PORTVERSION:R} PLIST_SUB= VERSION=${VALA_VER} diff --git a/lang/vala/distinfo b/lang/vala/distinfo index a1be5a85260e..b2acf129e50d 100644 --- a/lang/vala/distinfo +++ b/lang/vala/distinfo @@ -1,2 +1,2 @@ -SHA256 (vala-0.18.1.tar.xz) = 7f5e2e8ca03f9fa2cf13acaf93bfdc3a7ad0a10b000a337ba9c6bdc021bdca32 -SIZE (vala-0.18.1.tar.xz) = 2584924 +SHA256 (vala-0.20.1.tar.xz) = 9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481 +SIZE (vala-0.20.1.tar.xz) = 2627808 diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist index 3aa18a907102..241299a6cf44 100644 --- a/lang/vala/pkg-plist +++ b/lang/vala/pkg-plist @@ -31,6 +31,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/alsa.deps %%DATADIR%%-%%VERSION%%/vapi/alsa.vapi %%DATADIR%%-%%VERSION%%/vapi/atk.vapi +%%DATADIR%%-%%VERSION%%/vapi/atspi-2.deps +%%DATADIR%%-%%VERSION%%/vapi/atspi-2.vapi %%DATADIR%%-%%VERSION%%/vapi/avahi-client.vapi %%DATADIR%%-%%VERSION%%/vapi/avahi-gobject.deps %%DATADIR%%-%%VERSION%%/vapi/avahi-gobject.vapi @@ -150,6 +152,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtsp-0.10.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtsp-1.0.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtsp-1.0.vapi +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtsp-server-1.0.deps +%%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtsp-server-1.0.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-sdp-0.10.deps %%DATADIR%%-%%VERSION%%/vapi/gstreamer-sdp-0.10.vapi %%DATADIR%%-%%VERSION%%/vapi/gstreamer-sdp-1.0.deps diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile index 89a477570bde..a62ffc0acc54 100644 --- a/mail/gmime2/Makefile +++ b/mail/gmime2/Makefile @@ -36,6 +36,8 @@ PORTDOCS= * post-patch: @${REINPLACE_CMD} -e "s|stdint.h|inttypes.h|" ${WRKSRC}/zentimer.h + @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \ + ${WRKSRC}/gmime/Makefile.in post-install: .if !defined(NOPORTDOCS) diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index c37532a33590..2df70c003ecc 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -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 @@ LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib 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 diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile index 436527408e2a..0d8b87999cc4 100644 --- a/net-im/telepathy-glib/Makefile +++ b/net-im/telepathy-glib/Makefile @@ -1,32 +1,27 @@ # $FreeBSD$ -# $MCom: ports/net-im/telepathy-glib/Makefile,v 1.38 2012/08/07 20:30:33 kwm Exp $ +# $MCom: ports/trunk/net-im/telepathy-glib/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= telepathy-glib -PORTVERSION= 0.18.2 +PORTVERSION= 0.20.2 CATEGORIES= net-im -MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ \ - http://miwibox.org/distfiles/ +MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= GLib utility library for the Telepathy framework -BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ - vala-vapigen>=0.14.0:${PORTSDIR}/lang/vala-vapigen \ - g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +BUILD_DEPENDS= vala-vapigen>=0.20.0:${PORTSDIR}/lang/vala-vapigen LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen +PORTSCOUT= limitw:1,even + USE_AUTOTOOLS= libtool -USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack glib20 ltverhack gnomehier +USES= gmake pathfix pkgconfig +USE_GNOME= glib20 gnomehier introspection:build libxslt:build ltverhack USE_PYTHON_BUILD= yes MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-vala-bindings -post-patch: - @${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \ - ${WRKSRC}/telepathy-glib/Makefile.in - .include <bsd.port.mk> diff --git a/net-im/telepathy-glib/distinfo b/net-im/telepathy-glib/distinfo index 83cbaecd20bb..df425cbb5895 100644 --- a/net-im/telepathy-glib/distinfo +++ b/net-im/telepathy-glib/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-glib-0.18.2.tar.gz) = 372375578be8053398f9fb1e12188a8b472d6d897e0ac73b230d31e112c68b3f -SIZE (telepathy-glib-0.18.2.tar.gz) = 3539165 +SHA256 (telepathy-glib-0.20.2.tar.gz) = 43c7d576576d9c5856bc56a45a86f42d770b427371e10698c9ed3f9ced65c7ed +SIZE (telepathy-glib-0.20.2.tar.gz) = 3776255 diff --git a/net-im/telepathy-glib/pkg-plist b/net-im/telepathy-glib/pkg-plist index afaaa0ac1b4a..49bcde053010 100644 --- a/net-im/telepathy-glib/pkg-plist +++ b/net-im/telepathy-glib/pkg-plist @@ -16,11 +16,13 @@ include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-client.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-connection-manager.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-connection.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-debug.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-dbus-daemon.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-generic.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-media-session-handler.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-media-stream-handler.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-protocol.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-tls-cert.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account-manager.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-content-media-description.h @@ -42,6 +44,7 @@ include/telepathy-1.0/telepathy-glib/_gen/tp-svc-protocol.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-tls-cert.h include/telepathy-1.0/telepathy-glib/account-channel-request.h include/telepathy-1.0/telepathy-glib/account-manager.h +include/telepathy-1.0/telepathy-glib/account-request.h include/telepathy-1.0/telepathy-glib/account.h include/telepathy-1.0/telepathy-glib/add-dispatch-operation-context.h include/telepathy-1.0/telepathy-glib/automatic-client-factory.h @@ -92,6 +95,8 @@ include/telepathy-1.0/telepathy-glib/dbus-properties-mixin.h include/telepathy-1.0/telepathy-glib/dbus-tube-channel.h include/telepathy-1.0/telepathy-glib/dbus.h include/telepathy-1.0/telepathy-glib/debug-ansi.h +include/telepathy-1.0/telepathy-glib/debug-client.h +include/telepathy-1.0/telepathy-glib/debug-message.h include/telepathy-1.0/telepathy-glib/debug-sender.h include/telepathy-1.0/telepathy-glib/debug.h include/telepathy-1.0/telepathy-glib/defs.h @@ -145,11 +150,18 @@ include/telepathy-1.0/telepathy-glib/svc-media-interfaces.h include/telepathy-1.0/telepathy-glib/svc-properties-interface.h include/telepathy-1.0/telepathy-glib/svc-protocol.h include/telepathy-1.0/telepathy-glib/svc-tls.h +include/telepathy-1.0/telepathy-glib/room-info.h +include/telepathy-1.0/telepathy-glib/room-list.h +include/telepathy-1.0/telepathy-glib/telepathy-glib-dbus.h include/telepathy-1.0/telepathy-glib/telepathy-glib.h include/telepathy-1.0/telepathy-glib/text-channel.h include/telepathy-1.0/telepathy-glib/text-mixin.h +include/telepathy-1.0/telepathy-glib/tls-certificate-rejection.h +include/telepathy-1.0/telepathy-glib/tls-certificate.h include/telepathy-1.0/telepathy-glib/util.h +include/telepathy-1.0/telepathy-glib/variant-util.h include/telepathy-1.0/telepathy-glib/verify.h +include/telepathy-1.0/telepathy-glib/version.h lib/girepository-1.0/TelepathyGLib-0.12.typelib lib/libtelepathy-glib.a lib/libtelepathy-glib.la @@ -174,12 +186,16 @@ share/gtk-doc/html/telepathy-glib/TpChannelFactoryIface.html share/gtk-doc/html/telepathy-glib/TpChannelIface.html share/gtk-doc/html/telepathy-glib/TpChannelManager.html share/gtk-doc/html/telepathy-glib/TpClientMessage.html +share/gtk-doc/html/telepathy-glib/TpDebugClient.html +share/gtk-doc/html/telepathy-glib/TpDebugMessage.html share/gtk-doc/html/telepathy-glib/TpDynamicHandleRepo.html share/gtk-doc/html/telepathy-glib/TpExportableChannel.html share/gtk-doc/html/telepathy-glib/TpIntset.html share/gtk-doc/html/telepathy-glib/TpMessage.html share/gtk-doc/html/telepathy-glib/TpSignalledMessage.html share/gtk-doc/html/telepathy-glib/TpStaticHandleRepo.html +share/gtk-doc/html/telepathy-glib/TpTLSCertificate.html +share/gtk-doc/html/telepathy-glib/TpTLSCertificateRejection.html share/gtk-doc/html/telepathy-glib/annotation-glossary.html share/gtk-doc/html/telepathy-glib/ch-client.html share/gtk-doc/html/telepathy-glib/ch-dbus.html @@ -204,6 +220,7 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPropertiesMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpTextMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-account-channel-request.html share/gtk-doc/html/telepathy-glib/telepathy-glib-account-manager.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-account-request.html share/gtk-doc/html/telepathy-glib/telepathy-glib-account.html share/gtk-doc/html/telepathy-glib/telepathy-glib-add-dispatch-operation-context.html share/gtk-doc/html/telepathy-glib/telepathy-glib-asv.html @@ -325,8 +342,13 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-protocol.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-service-point.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-tls.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-room-info.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-room-list.html share/gtk-doc/html/telepathy-glib/telepathy-glib-text-channel.html share/gtk-doc/html/telepathy-glib/telepathy-glib-util.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-vardict.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-variant-util.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-version.html share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp2 share/gtk-doc/html/telepathy-glib/up.png share/vala/vapi/telepathy-glib.deps diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile index 233d17e9d334..6b0a5cef401d 100644 --- a/net/glib-networking/Makefile +++ b/net/glib-networking/Makefile @@ -1,10 +1,9 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net/glib-networking/Makefile,v 1.20 2012/12/10 11:17:13 kwm Exp $ +# $MCom: ports/trunk/net/glib-networking/Makefile 18537 2013-06-16 20:08:30Z kwm $ PORTNAME= glib-networking -PORTVERSION= 2.34.2 -PORTREVISION= 1 +PORTVERSION= 2.36.2 CATEGORIES= net MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -24,9 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro USE_XZ= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack glib20 intltool -USES= gettext -USE_GMAKE= yes -MAKE_JOBS_SAFE= yes +USES= gettext gmake CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo index c1f8b8ccd4e6..3e11d608183e 100644 --- a/net/glib-networking/distinfo +++ b/net/glib-networking/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/glib-networking-2.34.2.tar.xz) = 00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde -SIZE (gnome2/glib-networking-2.34.2.tar.xz) = 346828 +SHA256 (gnome2/glib-networking-2.36.2.tar.xz) = 2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9 +SIZE (gnome2/glib-networking-2.36.2.tar.xz) = 352284 diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist index 37fc07295423..ee319a7ba6f9 100644 --- a/net/glib-networking/pkg-plist +++ b/net/glib-networking/pkg-plist @@ -9,6 +9,7 @@ lib/gio/modules/libgiolibproxy.la lib/gio/modules/libgiolibproxy.so libexec/glib-pacrunner share/dbus-1/services/org.gtk.GLib.PACRunner.service +share/locale/an/LC_MESSAGES/glib-networking.mo share/locale/ar/LC_MESSAGES/glib-networking.mo share/locale/as/LC_MESSAGES/glib-networking.mo share/locale/be/LC_MESSAGES/glib-networking.mo @@ -29,6 +30,7 @@ share/locale/eu/LC_MESSAGES/glib-networking.mo share/locale/fa/LC_MESSAGES/glib-networking.mo share/locale/fi/LC_MESSAGES/glib-networking.mo share/locale/fr/LC_MESSAGES/glib-networking.mo +share/locale/fur/LC_MESSAGES/glib-networking.mo share/locale/gl/LC_MESSAGES/glib-networking.mo share/locale/gu/LC_MESSAGES/glib-networking.mo share/locale/he/LC_MESSAGES/glib-networking.mo @@ -60,6 +62,7 @@ share/locale/sr@latin/LC_MESSAGES/glib-networking.mo share/locale/sv/LC_MESSAGES/glib-networking.mo share/locale/ta/LC_MESSAGES/glib-networking.mo share/locale/te/LC_MESSAGES/glib-networking.mo +share/locale/tg/LC_MESSAGES/glib-networking.mo share/locale/th/LC_MESSAGES/glib-networking.mo share/locale/tr/LC_MESSAGES/glib-networking.mo share/locale/ug/LC_MESSAGES/glib-networking.mo @@ -80,11 +83,15 @@ share/locale/zh_TW/LC_MESSAGES/glib-networking.mo @dirrmtry share/locale/mr @dirrmtry share/locale/km/LC_MESSAGES @dirrmtry share/locale/km +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrmtry share/locale/an/LC_MESSAGES +@dirrmtry share/locale/an @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 diff --git a/net/mtr/Makefile b/net/mtr/Makefile index f67af5599627..9b4cc567ed75 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -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 @@ PLIST_FILES= sbin/mtr .if ${PORT_OPTIONS:MGLIB} CONFIGURE_ARGS+=--with-glib -USE_GNOME= _glib20 +USE_GNOME= glib20 .else CONFIGURE_ARGS+=--without-glib .endif diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile index c72515d17b5d..8cf0094f1163 100644 --- a/ports-mgmt/packagekit/Makefile +++ b/ports-mgmt/packagekit/Makefile @@ -21,8 +21,7 @@ RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info -USE_GMAKE= yes -USES= gettext iconv +USES= gettext gmake iconv USE_GNOME= glib20 intltool gnomehier USE_SQLITE= 3 USE_LDCONFIG= yes @@ -85,6 +84,7 @@ USE_QT4+= dbus gui xml sql moc_build post-patch: @${REINPLACE_CMD} -E -e 's/.*WARNINGFLAGS_CPP.*-Werror/#$$&/' \ + -e 's|-DG_DISABLE_DEPRECATED||g' \ -e 's|-Wmissing-include-dirs||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/pk-lsof.c diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index 52d006bff392..4e2984f4a6a9 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: gnome-doc-utils -# Date created: 11 November 2004 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.84 2010/09/29 15:20:02 kwm Exp $ -# +# $MCom: ports/trunk/textproc/gnome-doc-utils/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= gnome-doc-utils -PORTVERSION= 0.20.3 +PORTVERSION= 0.20.10 CATEGORIES= textproc gnome MASTER_SITES= GNOME @@ -22,11 +18,10 @@ RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \ ${LOCALBASE}/share/xml/docbook/4.3/catalog.xml:${PORTSDIR}/textproc/docbook-xml-430 \ ${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:${PORTSDIR}/textproc/docbook-xml-440 -USE_BZIP2= yes -USE_GMAKE= yes +USE_XZ= yes MAKE_JOBS_UNSAFE=yes -USES= gettext -USE_GNOME= gnomehier gnomehack libxslt intlhack +USES= gettext gmake pathfix pkgconfig +USE_GNOME= gnomehier libxslt intlhack USE_PYTHON= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo index 4fdb9e279b2d..c8e02ae7b975 100644 --- a/textproc/gnome-doc-utils/distinfo +++ b/textproc/gnome-doc-utils/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome-doc-utils-0.20.3.tar.bz2) = 1a1812ebf216a868af7478c55d3d4778ef50ebe41bfc5d42342a547b796829b3 -SIZE (gnome-doc-utils-0.20.3.tar.bz2) = 706057 +SHA256 (gnome-doc-utils-0.20.10.tar.xz) = cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6 +SIZE (gnome-doc-utils-0.20.10.tar.xz) = 526700 diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist index dc9481d9c71d..e760e82d2f6f 100644 --- a/textproc/gnome-doc-utils/pkg-plist +++ b/textproc/gnome-doc-utils/pkg-plist @@ -137,6 +137,7 @@ share/gnome/help/gnome-doc-xslt/de/utils.xml share/locale/ar/LC_MESSAGES/gnome-doc-utils.mo share/locale/as/LC_MESSAGES/gnome-doc-utils.mo share/locale/ast/LC_MESSAGES/gnome-doc-utils.mo +share/locale/be/LC_MESSAGES/gnome-doc-utils.mo share/locale/be@latin/LC_MESSAGES/gnome-doc-utils.mo share/locale/bg/LC_MESSAGES/gnome-doc-utils.mo share/locale/bn/LC_MESSAGES/gnome-doc-utils.mo @@ -152,6 +153,7 @@ share/locale/el/LC_MESSAGES/gnome-doc-utils.mo share/locale/en_CA/LC_MESSAGES/gnome-doc-utils.mo share/locale/en_GB/LC_MESSAGES/gnome-doc-utils.mo share/locale/en@shaw/LC_MESSAGES/gnome-doc-utils.mo +share/locale/eo/LC_MESSAGES/gnome-doc-utils.mo share/locale/es/LC_MESSAGES/gnome-doc-utils.mo share/locale/et/LC_MESSAGES/gnome-doc-utils.mo share/locale/eu/LC_MESSAGES/gnome-doc-utils.mo @@ -168,6 +170,7 @@ share/locale/id/LC_MESSAGES/gnome-doc-utils.mo share/locale/it/LC_MESSAGES/gnome-doc-utils.mo share/locale/ja/LC_MESSAGES/gnome-doc-utils.mo share/locale/ka/LC_MESSAGES/gnome-doc-utils.mo +share/locale/km/LC_MESSAGES/gnome-doc-utils.mo share/locale/kn/LC_MESSAGES/gnome-doc-utils.mo share/locale/ko/LC_MESSAGES/gnome-doc-utils.mo share/locale/lt/LC_MESSAGES/gnome-doc-utils.mo @@ -202,16 +205,14 @@ share/locale/te/LC_MESSAGES/gnome-doc-utils.mo share/locale/th/LC_MESSAGES/gnome-doc-utils.mo share/locale/tr/LC_MESSAGES/gnome-doc-utils.mo share/locale/ug/LC_MESSAGES/gnome-doc-utils.mo +share/locale/uz/LC_MESSAGES/gnome-doc-utils.mo +share/locale/uz@cyrillic/LC_MESSAGES/gnome-doc-utils.mo share/locale/uk/LC_MESSAGES/gnome-doc-utils.mo share/locale/vi/LC_MESSAGES/gnome-doc-utils.mo share/locale/wa/LC_MESSAGES/gnome-doc-utils.mo share/locale/zh_CN/LC_MESSAGES/gnome-doc-utils.mo share/locale/zh_HK/LC_MESSAGES/gnome-doc-utils.mo share/locale/zh_TW/LC_MESSAGES/gnome-doc-utils.mo -share/omf/gnome-doc-make/gnome-doc-make-C.omf -share/omf/gnome-doc-make/gnome-doc-make-de.omf -share/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf -share/omf/gnome-doc-xslt/gnome-doc-xslt-de.omf share/xml/gnome/xslt/common/utils.xsl share/xml/gnome/xslt/common/theme.xsl share/xml/gnome/xslt/docbook/common/db-chunk.xsl @@ -282,8 +283,6 @@ share/xml/mallard/1.0/mallard.rng @dirrm share/xml/gnome/xslt/common @dirrm share/xml/gnome/xslt @dirrm share/xml/gnome -@dirrm share/omf/gnome-doc-xslt -@dirrm share/omf/gnome-doc-make @dirrm share/gnome/help/gnome-doc-xslt/de @dirrm share/gnome/help/gnome-doc-xslt/C @dirrm share/gnome/help/gnome-doc-xslt @@ -303,6 +302,8 @@ share/xml/mallard/1.0/mallard.rng @dirrm %%PYTHON_SITELIBDIR%%/xml2po @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES +@dirrmtry share/locale/uz@cyrillic @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @@ -319,6 +320,8 @@ share/xml/mallard/1.0/mallard.rng @dirrmtry share/locale/mg @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km @dirrmtry share/locale/en@shaw/LC_MESSAGES @dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index 6a8371c810c7..41a381d64af0 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -1,9 +1,9 @@ # Created by: fenner # $FreeBSD$ -# $MCom: ports-stable/textproc/gtk-doc/Makefile,v 1.1 2010/06/24 09:20:01 kwm Exp $ +# $MCom: ports/trunk/textproc/gtk-doc/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= gtk-doc -PORTVERSION= 1.15 +PORTVERSION= 1.18 CATEGORIES= textproc MASTER_SITES= GNOME @@ -25,15 +25,13 @@ CATALOG_DIR= ${PREFIX}/share/sgml/${PORTNAME} XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -USE_BZIP2= yes +USE_XZ= yes USE_PERL5= yes -USE_GMAKE= yes GNU_CONFIGURE= yes -USES= pathfix shebangfix -USE_GNOME= gnomehack gnomeprefix libxslt gnomedocutils +USES= gmake pathfix pkgconfig shebangfix +USE_GNOME= gnomeprefix libxslt gnomedocutils INSTALLS_OMF= yes CONFIGURE_ARGS= --with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports - SHEBANG_FILES= tools/docpercentages.pl PLIST_SUB= XMLCATMGR=${XMLCATMGR} \ @@ -42,10 +40,7 @@ PLIST_SUB= XMLCATMGR=${XMLCATMGR} \ post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \ - -e 's|#!/bin/bash|#!/bin/sh|g' \ - ${WRKSRC}/tests/tools.sh.in \ - ${WRKSRC}/tests/fail.sh \ - ${WRKSRC}/tests/sanity.sh + ${WRKSRC}/tests/tools.sh post-install: -@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${CATALOG_DIR}/gtk-doc.cat diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo index dfb982f109f0..e5a1075cef7e 100644 --- a/textproc/gtk-doc/distinfo +++ b/textproc/gtk-doc/distinfo @@ -1,2 +1,2 @@ -SHA256 (gtk-doc-1.15.tar.bz2) = 59cc73babf0db3a89d1a71f7ef5394a42ec1d3447d3a0a1539057a7b0ce44831 -SIZE (gtk-doc-1.15.tar.bz2) = 787687 +SHA256 (gtk-doc-1.18.tar.xz) = 785b591c561be1c8206f0d2575dc63558ea6199c3afe49cbc4efde94a6629a20 +SIZE (gtk-doc-1.18.tar.xz) = 637936 diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist index 51f4fe9c5396..905715452a74 100644 --- a/textproc/gtk-doc/pkg-plist +++ b/textproc/gtk-doc/pkg-plist @@ -22,14 +22,16 @@ share/gnome/help/gtk-doc-manual/en_GB/gtk-doc-manual.xml share/gnome/help/gtk-doc-manual/es/gtk-doc-manual.xml share/gnome/help/gtk-doc-manual/fr/gtk-doc-manual.xml share/gnome/help/gtk-doc-manual/gu/gtk-doc-manual.xml +share/gnome/help/gtk-doc-manual/sl/gtk-doc-manual.xml share/gnome/help/gtk-doc-manual/sv/gtk-doc-manual.xml share/gnome/help/gtk-doc-manual/ta/gtk-doc-manual.xml share/gnome/help/gtk-doc-manual/te/gtk-doc-manual.xml -%%DATADIR%%/data/devhelp.xsl %%DATADIR%%/data/devhelp2.xsl %%DATADIR%%/data/gtk-doc.dcl %%DATADIR%%/data/gtk-doc.dsl +%%DATADIR%%/data/gtk-doc.flat.make %%DATADIR%%/data/gtk-doc.make +%%DATADIR%%/data/gtk-doc.notmpl-flat.make %%DATADIR%%/data/gtk-doc.notmpl.make %%DATADIR%%/data/gtk-doc.xsl %%DATADIR%%/data/gtkdoc-common.pl @@ -47,6 +49,7 @@ share/omf/gtk-doc-manual/gtk-doc-manual-en_GB.omf share/omf/gtk-doc-manual/gtk-doc-manual-es.omf share/omf/gtk-doc-manual/gtk-doc-manual-fr.omf share/omf/gtk-doc-manual/gtk-doc-manual-gu.omf +share/omf/gtk-doc-manual/gtk-doc-manual-sl.omf share/omf/gtk-doc-manual/gtk-doc-manual-sv.omf share/omf/gtk-doc-manual/gtk-doc-manual-ta.omf share/omf/gtk-doc-manual/gtk-doc-manual-te.omf @@ -57,15 +60,16 @@ share/sgml/gtk-doc/gtk-doc.cat @dirrm share/omf/gtk-doc-manual @dirrm %%DATADIR%%/data @dirrm %%DATADIR%% -@dirrm share/gnome/help/gtk-doc-manual/bn_IN -@dirrm share/gnome/help/gtk-doc-manual/de -@dirrm share/gnome/help/gtk-doc-manual/el -@dirrm share/gnome/help/gtk-doc-manual/en_GB -@dirrm share/gnome/help/gtk-doc-manual/es -@dirrm share/gnome/help/gtk-doc-manual/fr -@dirrm share/gnome/help/gtk-doc-manual/gu -@dirrm share/gnome/help/gtk-doc-manual/sv -@dirrm share/gnome/help/gtk-doc-manual/ta @dirrm share/gnome/help/gtk-doc-manual/te +@dirrm share/gnome/help/gtk-doc-manual/ta +@dirrm share/gnome/help/gtk-doc-manual/sv +@dirrm share/gnome/help/gtk-doc-manual/sl +@dirrm share/gnome/help/gtk-doc-manual/gu +@dirrm share/gnome/help/gtk-doc-manual/fr +@dirrm share/gnome/help/gtk-doc-manual/es +@dirrm share/gnome/help/gtk-doc-manual/en_GB +@dirrm share/gnome/help/gtk-doc-manual/el +@dirrm share/gnome/help/gtk-doc-manual/de +@dirrm share/gnome/help/gtk-doc-manual/bn_IN @dirrm share/gnome/help/gtk-doc-manual/C @dirrm share/gnome/help/gtk-doc-manual diff --git a/www/multiwatch/Makefile b/www/multiwatch/Makefile index 434e9ff92a56..195de837da09 100644 --- a/www/multiwatch/Makefile +++ b/www/multiwatch/Makefile @@ -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 @@ GNU_CONFIGURE= yes MAN1= multiwatch.1 USES= pkgconfig USE_BZIP2= yes -USE_GNOME= _glib20 +USE_GNOME= glib20 # Help configure find libev. CFLAGS+= -I${LOCALBASE}/include diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 1efe9d05b038..a1d6867edd0e 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -1,9 +1,9 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.29 2011/04/30 20:43:31 mezz Exp $ +# $MCom: ports/trunk/x11-fonts/fontconfig/Makefile 18637 2013-07-27 09:15:21Z kwm $ PORTNAME= fontconfig -PORTVERSION= 2.9.0 +PORTVERSION= 2.10.93 PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= x11-fonts @@ -12,34 +12,38 @@ MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/ MAINTAINER= gnome@FreeBSD.org COMMENT= An XML-based font configuration API for X Windows +USE_BZIP2= yes + .if !defined(REFERENCE_PORT) LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 -USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack ltverhack -CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \ +USES= gmake pathfix pkgconfig +USE_GNOME= ltverhack +CONFIGURE_ARGS= --with-configdir=${PREFIX}/etc/fonts/conf.d \ + --with-templatedir=${PREFIX}/etc/fonts/conf.avail \ + --with-xmldir=${PREFIX}/etc/fonts \ --with-expat-includes=${LOCALBASE}/include \ --with-expat-lib=${LOCALBASE}/lib \ --with-default-fonts=${PREFIX}/share/fonts \ --with-add-fonts=${LOCALBASE}/lib/X11/fonts \ --with-cache-dir=/var/db/fontconfig \ + --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --disable-docs MAKE_ENV= LC_ALL=C -MAKE_JOBS_SAFE= yes PKGINSTALL= ${WRKDIR}/pkg-install MAN1= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1 MAN5= fonts-conf.5 PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR} .endif @@ -61,6 +65,6 @@ post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo index 18f7db090d38..fd942cc89131 100644 --- a/x11-fonts/fontconfig/distinfo +++ b/x11-fonts/fontconfig/distinfo @@ -1,2 +1,2 @@ -SHA256 (fontconfig-2.9.0.tar.gz) = ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a -SIZE (fontconfig-2.9.0.tar.gz) = 1682774 +SHA256 (fontconfig-2.10.93.tar.bz2) = ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c +SIZE (fontconfig-2.10.93.tar.bz2) = 1526089 diff --git a/x11-fonts/fontconfig/files/fc-query.1 b/x11-fonts/fontconfig/files/fc-query.1 index 38dbaa43bef8..e36622a5b496 100644 --- a/x11-fonts/fontconfig/files/fc-query.1 +++ b/x11-fonts/fontconfig/files/fc-query.1 @@ -1,4 +1,4 @@ -.\\" auto-generated by docbook2man-spec $Revision: 1.1 $ +.\\" auto-generated by docbook2man-spec $Revision: 1.5 $ .TH "FC-QUERY" "1" "Aug 13, 2008" "" "" .SH NAME fc-query \- query font files @@ -39,7 +39,7 @@ Query \fIfont-file\fR for font faces. .SH "RETURN CODES" .PP \fBfc-query\fR returns error code 0 for successful parsing, -or 1 if any errors occurred or if at least one font face could not be opened. +or 1 if any errors occured or if at least one font face could not be opened. .SH "SEE ALSO" .PP \fBfc-scan\fR(1) diff --git a/x11-fonts/fontconfig/files/fc-scan.1 b/x11-fonts/fontconfig/files/fc-scan.1 index 77748d18f5c4..c2bd1ed54301 100644 --- a/x11-fonts/fontconfig/files/fc-scan.1 +++ b/x11-fonts/fontconfig/files/fc-scan.1 @@ -1,4 +1,4 @@ -.\\" auto-generated by docbook2man-spec $Revision: 1.1 $ +.\\" auto-generated by docbook2man-spec $Revision: 1.5 $ .TH "FC-SCAN" "1" "Jan 15, 2009" "" "" .SH NAME fc-scan \- scan font files or directories diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in index 545b0ddb667d..8c8b6784ea31 100644 --- a/x11-fonts/fontconfig/files/patch-Makefile.in +++ b/x11-fonts/fontconfig/files/patch-Makefile.in @@ -1,20 +1,20 @@ ---- Makefile.in.orig 2012-05-20 12:18:32.000000000 -0500 -+++ Makefile.in 2012-05-20 12:19:20.000000000 -0500 -@@ -900,28 +900,28 @@ +--- Makefile.in.orig 2012-11-01 10:55:40.000000000 +0000 ++++ Makefile.in 2012-11-01 10:56:37.000000000 +0000 +@@ -932,28 +932,6 @@ mv $@.tmp $@ install-data-local: fonts.conf -- $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) -- if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \ -- echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \ -- mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \ +- $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir) +- if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \ +- echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \ +- mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \ - fi - if [ -f $(srcdir)/fonts.conf ]; then \ -- echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \ -- $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \ +- echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \ +- $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \ - else if [ -f fonts.conf ]; then \ -- echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \ -- $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \ +- echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \ +- $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \ - fi; fi - @(if $(RUN_FC_CACHE_TEST); then \ - echo "fc-cache$(EXEEXT) -s -f -v"; \ @@ -26,28 +26,6 @@ - echo "*** Generate this file manually on host system using fc-cache"; \ - echo "***"; \ - fi) -+# $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) -+# if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \ -+# echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \ -+# mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \ -+# fi -+# if [ -f $(srcdir)/fonts.conf ]; then \ -+# echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \ -+# $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \ -+# else if [ -f fonts.conf ]; then \ -+# echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \ -+# $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \ -+# fi; fi -+# @(if $(RUN_FC_CACHE_TEST); then \ -+# echo "fc-cache$(EXEEXT) -s -f -v"; \ -+# fc-cache/fc-cache$(EXEEXT) -s -f -v; \ -+# else \ -+# echo "***"; \ -+# echo "*** Warning: fonts.cache not built"; \ -+# echo "***"; \ -+# echo "*** Generate this file manually on host system using fc-cache"; \ -+# echo "***"; \ -+# fi) uninstall-local: if [ -f $(srcdir)/fonts.conf ]; then \ diff --git a/x11-fonts/fontconfig/files/patch-fontconfig_fontconfig.h b/x11-fonts/fontconfig/files/patch-fontconfig_fontconfig.h deleted file mode 100644 index 3434d003b24f..000000000000 --- a/x11-fonts/fontconfig/files/patch-fontconfig_fontconfig.h +++ /dev/null @@ -1,26 +0,0 @@ -From 7069d717e982adcf8e1d300cbd10eec6322a65c9 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Sun, 22 Apr 2012 12:40:44 +0000 -Subject: C++11 requires a space between literal and identifier - -Reported by Buganini ---- -diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h -index 0e2ca50..b27ccb5 100644 ---- fontconfig/fontconfig.h -+++ fontconfig/fontconfig.h -@@ -112,9 +112,9 @@ typedef int FcBool; - #define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */ - #define FC_LCD_FILTER "lcdfilter" /* Int */ - --#define FC_CACHE_SUFFIX ".cache-"FC_CACHE_VERSION --#define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION --#define FC_USER_CACHE_FILE ".fonts.cache-"FC_CACHE_VERSION -+#define FC_CACHE_SUFFIX ".cache-" FC_CACHE_VERSION -+#define FC_DIR_CACHE_FILE "fonts.cache-" FC_CACHE_VERSION -+#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION - - /* Adjust outline rasterizer */ - #define FC_CHAR_WIDTH "charwidth" /* Int */ --- -cgit v0.9.0.2-2-gbebe diff --git a/x11-fonts/fontconfig/pkg-descr b/x11-fonts/fontconfig/pkg-descr index d41e3fdd83a8..33793ec4c289 100644 --- a/x11-fonts/fontconfig/pkg-descr +++ b/x11-fonts/fontconfig/pkg-descr @@ -13,4 +13,4 @@ Fontconfig does the following: * be used in concert with the X Render Extension and FreeType to implement high quality, anti-aliased and subpixel rendered text on a display. -WWW: http://fontconfig.org/ +WWW: http://www.freedesktop.org/wiki/Software/fontconfig diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist index 215d7e299fb2..91ad7018da80 100644 --- a/x11-fonts/fontconfig/pkg-plist +++ b/x11-fonts/fontconfig/pkg-plist @@ -5,8 +5,10 @@ bin/fc-match bin/fc-pattern bin/fc-query bin/fc-scan +bin/fc-validate etc/fonts/conf.avail/10-autohint.conf etc/fonts/conf.avail/10-no-sub-pixel.conf +etc/fonts/conf.avail/10-scale-bitmap-fonts.conf etc/fonts/conf.avail/10-sub-pixel-bgr.conf etc/fonts/conf.avail/10-sub-pixel-rgb.conf etc/fonts/conf.avail/10-sub-pixel-vbgr.conf @@ -15,7 +17,6 @@ etc/fonts/conf.avail/10-unhinted.conf etc/fonts/conf.avail/11-lcdfilter-default.conf etc/fonts/conf.avail/11-lcdfilter-legacy.conf etc/fonts/conf.avail/11-lcdfilter-light.conf -etc/fonts/conf.avail/20-fix-globaladvance.conf etc/fonts/conf.avail/20-unhint-small-vera.conf etc/fonts/conf.avail/25-unhint-nonlatin.conf etc/fonts/conf.avail/30-metric-aliases.conf @@ -34,7 +35,7 @@ etc/fonts/conf.avail/70-no-bitmaps.conf etc/fonts/conf.avail/70-yes-bitmaps.conf etc/fonts/conf.avail/80-delicious.conf etc/fonts/conf.avail/90-synthetic.conf -etc/fonts/conf.d/20-fix-globaladvance.conf +etc/fonts/conf.d/10-scale-bitmap-fonts.conf etc/fonts/conf.d/20-unhint-small-vera.conf etc/fonts/conf.d/30-metric-aliases.conf etc/fonts/conf.d/30-urw-aliases.conf diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 89b876ea4bd3..d119b1965821 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -182,6 +182,7 @@ SUBDIR += pango SUBDIR += pango-reference SUBDIR += pangomm + SUBDIR += pangox-compat SUBDIR += pangoxsl SUBDIR += paragui-devel SUBDIR += phat diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index f635ae02b4df..61f3848633f3 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -1,9 +1,9 @@ # Created by: Vanilla I. Shu <vanilla@MinJe.com.TW> # $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 @@ LATEST_LINK= gtk30 .if !defined(REFERENCE_PORT) -BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ - ${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 \ +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 -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 \ diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index ce56379d420d..6a26d1e5f036 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -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 diff --git a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in index 6eefe2bc7016..862035f409f3 100644 --- a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in @@ -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 = \ diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index a7b16ff8af33..263469f87f3b 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -20,6 +20,8 @@ include/gtk-3.0/gdk/gdkdisplaymanager.h 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/gdkx11selection.h 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/gtkhseparator.h 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/gtkvpaned.h 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/gtkfontchooser.h 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/gtkstylecontext.h 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/aclocal/gtk-3.0.m4 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 @@ share/themes/Emacs/gtk-3.0/gtk-keys.css @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 @@ share/themes/Emacs/gtk-3.0/gtk-keys.css @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 diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile index 6ce5935a0d45..45e879786d28 100644 --- a/x11-toolkits/gtkglext/Makefile +++ b/x11-toolkits/gtkglext/Makefile @@ -3,7 +3,7 @@ PORTNAME= gtkglext PORTVERSION= 1.2.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-toolkits MASTER_SITES= SF DIST_SUBDIR= gnome2 @@ -30,8 +30,8 @@ USE_AUTOTOOLS= libtool USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \ xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm USE_GL= glu -USES= pathfix pkgconfig gettext iconv -USE_GNOME= gdkpixbuf2 gtk20 +USES= gettext iconv pathfix pkgconfig +USE_GNOME= gdkpixbuf2 gtk20 pangox-compat USE_LDCONFIG= yes .include <bsd.port.options.mk> diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile index 19c2dd3b1d09..76e73438078b 100644 --- a/x11-toolkits/gtkglextmm/Makefile +++ b/x11-toolkits/gtkglextmm/Makefile @@ -24,6 +24,7 @@ post-patch: @${REINPLACE_CMD} -e 's|-DGDK_DISABLE_DEPRECATED||g' \ -e 's|-DGDK_PIXBUF_DISABLE_DEPRECATED||g' \ -e 's|-DGTK_DISABLE_DEPRECATED||g' \ + -e 's|-DG_DISABLE_DEPRECATED||g' \ ${WRKSRC}/gdkglext/gdkmm/gl/Makefile.in \ ${WRKSRC}/gtkglext/gtkmm/gl/Makefile.in diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index 1f6de37e3b97..bd64d50970c6 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -1,16 +1,16 @@ # Created by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtkmm30/Makefile,v 1.22 2012/10/21 16:52:21 kwm Exp $ +# $MCom: ports/trunk/x11-toolkits/gtkmm30/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= gtkmm -PORTVERSION= 3.6.0 +PORTVERSION= 3.8.1 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org -COMMENT= C++ wrapper for Gtk+, Pango +COMMENT= C++ wrapper for Gtk+3 USE_XZ= yes LATEST_LINK= gtkmm30 @@ -19,11 +19,10 @@ LATEST_LINK= gtkmm30 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USES= pathfix gettext +USES= gettext gmake pathfix pkgconfig USE_GNOME= gtk30 ltverhack glibmm cairomm atkmm pangomm CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11-toolkits/gtkmm30/distinfo b/x11-toolkits/gtkmm30/distinfo index 6b9d42210629..749b59964ff9 100644 --- a/x11-toolkits/gtkmm30/distinfo +++ b/x11-toolkits/gtkmm30/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gtkmm-3.6.0.tar.xz) = 888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359 -SIZE (gnome3/gtkmm-3.6.0.tar.xz) = 10111820 +SHA256 (gnome3/gtkmm-3.8.1.tar.xz) = d374c6d6d78fd9f61bca737cd7c23452de427a1662de8abf46df784e07e4c95b +SIZE (gnome3/gtkmm-3.8.1.tar.xz) = 4313172 diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index bd2481375011..f26f1847e8e6 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -1,9 +1,9 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $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 @@ USE_XZ= yes .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 @@ OPTIONS_DEFAULT=X11 .include <bsd.port.options.mk> .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: diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 4d62edcdb228..b45b6e4608ba 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -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 diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 09ff8cfe5c43..e730be6d07b6 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -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-decoder.h 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,54 +50,22 @@ lib/libpangoft2-1.0.a 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 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-24.html 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/index.sgml 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-Text-Processing.html 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 diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile index fc718f50c9d3..93faaf989064 100644 --- a/x11-toolkits/pangomm/Makefile +++ b/x11-toolkits/pangomm/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.24 2012/09/03 16:28:30 mezz Exp $ +# $MCom: ports/trunk/x11-toolkits/pangomm/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= pangomm PORTVERSION= 2.28.4 @@ -18,11 +18,10 @@ USE_XZ= yes BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= pathfix -USE_GNOME= pango cairomm glibmm +USES= gmake pathfix +USE_GNOME= cairomm glibmm pango CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-documentation \ diff --git a/x11-toolkits/pangox-compat/Makefile b/x11-toolkits/pangox-compat/Makefile new file mode 100644 index 000000000000..05d41cfedb76 --- /dev/null +++ b/x11-toolkits/pangox-compat/Makefile @@ -0,0 +1,25 @@ +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> +# $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 <bsd.port.mk> diff --git a/x11-toolkits/pangox-compat/distinfo b/x11-toolkits/pangox-compat/distinfo new file mode 100644 index 000000000000..1dc12904eaa7 --- /dev/null +++ b/x11-toolkits/pangox-compat/distinfo @@ -0,0 +1,2 @@ +SHA256 (gnome2/pangox-compat-0.0.2.tar.xz) = 552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046 +SIZE (gnome2/pangox-compat-0.0.2.tar.xz) = 267396 diff --git a/x11-toolkits/pangox-compat/pkg-descr b/x11-toolkits/pangox-compat/pkg-descr new file mode 100644 index 000000000000..803ed531099f --- /dev/null +++ b/x11-toolkits/pangox-compat/pkg-descr @@ -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/ diff --git a/x11-toolkits/pangox-compat/pkg-plist b/x11-toolkits/pangox-compat/pkg-plist new file mode 100644 index 000000000000..aa89c15c2a87 --- /dev/null +++ b/x11-toolkits/pangox-compat/pkg-plist @@ -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 diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile index 9159b71601ab..4e8153b11cd3 100644 --- a/x11-toolkits/wxgtk26/Makefile +++ b/x11-toolkits/wxgtk26/Makefile @@ -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_XORG= x11 sm xxf86vm xinerama 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\ diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index f6e4aa469b1c..5ee4f44a39e0 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -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_XORG= x11 sm xxf86vm xinerama 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\ diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile index 1c069db1fb1a..018577a969bf 100644 --- a/x11-wm/sawfish/Makefile +++ b/x11-wm/sawfish/Makefile @@ -3,7 +3,7 @@ PORTNAME= sawfish PORTVERSION= 1.9.1 -PORTEPOCH= 2 +PORTEPOCH= 3 CATEGORIES= x11-wm MASTER_SITES= http://download.tuxfamily.org/sawfish/%SUBDIR%/ MASTER_SITE_SUBDIR= . Archive @@ -15,20 +15,17 @@ LICENSE= ART20 GPLv2 LICENSE_COMB= multi BUILD_DEPENDS= rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2 -LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ - rep:${PORTSDIR}/lang/librep +LIB_DEPENDS= rep:${PORTSDIR}/lang/librep RUN_DEPENDS= rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2 USE_XZ= yes -USES= gettext pathfix pkgconfig +USES= gettext gmake pathfix pkgconfig USE_XORG= ice sm x11 xft xinerama xrandr xtst -USE_GNOME= gnomehier gtk20 -USE_GMAKE= yes +USE_GNOME= cairo gnomehier gtk20 pangox-compat GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \ --datadir=${PREFIX}/share INSTALLS_ICONS= yes -MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib |