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 /devel | |
| parent | a74217e6d9281b3d195ab0ad6e6b9434f63b6d27 (diff) | |
| download | ports-a5f590e51d3b147b9b5085ac6a2920189b42967a.tar.gz ports-a5f590e51d3b147b9b5085ac6a2920189b42967a.zip | |
Notes
Diffstat (limited to 'devel')
63 files changed, 1037 insertions, 1011 deletions
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 |